Scheduler refactor is up and running (strategy)