scheduler refactoring, more work to go