Changed lexer to use tokens from new Parser. Also changed types in Parser to reflect Abstract Syntax tree.