More progress on the AST clasess.