(temp commit) more work moving to new AST