refactored NARSwing and related classes