Diagrams

Work in progress