Adding a new repair strategy, committing because I'm about to delete the old
Massive changes everywhere, cleaned up some things.  Mainly work on bit repair.