Adding the basic structure for the new classes and a basic test