Restored my mysteriously vanished series of git commits and manually merged with David's latest changes.