Schedule refactor almost finished. Final schedule functional again.