Configurable scheduling as per #2

Like the title say, fixes #2 :-)