WIP: Basic structure for parsing; Lexer fixes