Update lexer, start of implementing parser