Tokenizer additions

- tokenizer parses most of the grammar now