Added a bunch of new classes.