Slight master_controller change

This slight change to the master controller should be one of many I want
to do, but lets do them in small steps