Fixes #671 - Adds schedules

Gets #671 started.