Initial pull request for Scheduler

/defn seems unnecessary