Simplify the master frame schedule, more work for #32