I still need to go add in the migration hint, but the code and tests are otherwise complete for that change