Migration of existing X0.04-4 (plus WIP stuff)