Temporary initial implementation of new schedules
Iterating on new schedules
Update tests for schedules changes