Added first version of entire grammar (with no AST generation)