More work on the new classes.