Finalizing prep for v2