Implement more of v2