Task1 v2

Split up the class diagram. Hopefully this is more correct.