Update to my omnibus branch

:construction: :warning: