Fix so that Switch is completely controlled by a SwitchController, so that downstream can control the switch