UML classes diagram mostly done