working on new lexer integration