Migration bootstrap 3

So much work!