More work on stabilizing.
Better tests -- wip.