Yet more unfinished progress toward v2