Now with a graph!!