Added a tonne of classes.