Started lexer integration
Working
Interface adapted.
Added tests.