Updated Scheduler and prepared code to hand off to other team.