Fix OmniSwitch, WIP DO NOT BUILD