[Work in Progress] Changes to generate ASTs