Created by: bobheadxi
Migrates the remainder of the setup to setupv2 in preparation for cutting over
setupv2
Integration tests!