Added a number of classes and successful testing.