Added draft2 of the UML diagram -- fixed improper multiplicities and composition