refactoring, and progress on actually doing something in the lexer.