[WIP] Use lexer 

Is this just an utility class? It looks a bit confusing to me (naming doesn't expose its purpose)