WIP fixing lexer