Beginning tweaking
Tweaking (setting generic mother classes)
Updating diagram
Tweaking (continued)
Updating diagram