Added two classes, still working on assignment