Added commented code for new lexer (not working)