Work on lexer design