New diagrams (not used yet)
Debugging layout - most things commented out
Debugging layout - most things commented out