First update to new migration system. Still needs testing.