Updated lexer
Base parser
Updated tests