Basic support for v2 with tests, #8