More work on graph, edge class