Continued overhaul

Up-to, but not including digest agility.