More implementation of the lexer