Final commit brfore lexer is done