Update for Task Scheduling

Contains many changes across files for task scheduling.