v1 Upgrade Support

Assigning directly to jconnor since he's seen a good deal of it as it was being written.