Added a whole bunch of existing classes back to this framework.