More omnimixer work

- Still a long way to go