adding rest of classes