More gutting and refactoring. Early sloppiness bites bottoms hard. (leaves binary teethmarks)