Lexer now seems to be working