WIP, overwrite
Changes to repair to only bring us up to the current version only.  This is what we need in practice.
Refactored read stage