Fixed Schedule

Previous commits broke everything.  Fixed in this by merging manually.
PULL this immediately for the latest build to work on.