Major reworking and extension of Tumbler and related logic.