Started converting parser to use a separate tokenizer