Still fixing up the lexer