Still working on the parse tree, added lexeme groups