Add v2 and some stuff