Initial pull request for Scheduler