Got the diagram functioning mostly