Add initial swapper under test.
Start adding bodies for the new use cases
Add swapper bodies for all use cases.  Still need tests