new master control

Makes some other bits wrong. so need to fix.