Made progress on AST