Some v2 card refactors with the benefit of hindsight and teamwork