Colin's updates for classes.