Created 6 new classes. A few comments