Completes the design - it is now very complex
Makes all the diagrams component complete