added new classes for milestone 7