started big swing fixture refactoring (intermediate states are
functional, albeit a bit inconsistent in design)