Tweaked grammar; started on AST creation