Starting to organize the lexer in a new way