Reworking some classes.