Redoing a few classes.