Just need to output everything as a graph now