Redid some stuff and fixed that stupid bug
Merge Migrator/master