Complete first version of v2 driver