Pre-Changes for Migration

The changes I talked to you about.