More migration work (it ALMOST works!)