v2 nearly ready