Pre work before double migrations
A few changes
I think its working