second commit, answering last question. Only problem remained is concating the two diagrams into one