[WIP] Use lexer 

This isn't using the lexer at all? It should