WIP

Committing to change-branch.  The changes to mutation.cpp are useful,
the rest not yet so much.