Major rewrite to allow multiple diagrams
Bugfixes + creating follow-up diagrams