Switch to new schedule module. Ongoing.
Merge