Initial new Diagram Implementation