i think that you are right that the graph should be TaskNode centric