[WIP] Use lexer 

This stuff still needs to be converted to lexer-based, no?