New (hopefully) completed (until now) class diagram.