Lexer

yup, merging