Eliminated SwapComponent

can reference other components directly…nice