finish first pass at v2 upgrade