Make a bunch of the logic task-centric.