Diagram class v 0.1