Sorted out some of my spandex stuff...

Swaps