Reorg of versions. v1 is copy of last night's version.