AST ongoing implementation
Resolved merge