Working on the new apiv2