Scheduler and tasks now track task state on the task