Change the object model a bit (a lot)
Add some shims/shams and upgrade pixi