More work on the AST