forgot class diagram factory
Merge branch 'the-great-simplification-rewrite'