[WIP] Use lexer 

I don't see line 472. Adding it here for completeness is also ok