Changed graph generation, phase two. Task refactoring.
Task graph fiexd.