whitespace :-P
Redo scheduler to be UI-independent, start testing