Re-written and run all migrations, working

Guys, you want to review and pull in the migrations updates?