Omnibus updates and fanciness commit