Add most all of the code from the V2 implementation