Js #49 scheduler

Closes #49
Closes #50