Rewrite of Tokenizer. Not using regex any more.