Further progress on writing the lexer