Refactored migration.  Actually did something with the models.