More work on the pixi branch