[WIP] Use lexer 

Add a comment about why this is being changed