Split out schedule and removed a few bits; a start to adding some structure.