Changed the ClassDiagram and changed the code to fullfill the requirements of the course