Progress on AST generation