Finished schedule.

Completed schedule and attended to some left over merge bits.