finishing up for issue #300 - add scheduler