Progress on schedules data
Resolved stupid conflict