Finished Parser
Parser and Lexer refactoring