Work on parser grammar and AST building