First pass of v1.1 to v2.0 upgrader