Trying to better organize graph