Refactored the swapping onto a Swappable component.