Continue to Omni-ify