New omnibus

Lots of hackery here.