Refactor graph to make it have little arcs and stuff :)