Updates to graph, still needs some work