These two migrations should ideally be combined. Grab me tomorrow if you need for any of this stuff.