Working on Grammar

Improved Grammar and started implementing AST