Updated lexer, started updating parse!