biggest change was in migrations and Gem file, needed to hurry for Stephen's review