Add diagrams, initial implementation