[AST] Some work on #6