converted all classes to new style with (object) inheritance