scheduler refactoring in process
pre-test state
test update
ui refactoring
Merge branch 'scheduler-refactoring'