Refactoring with Anthony
Merge branch 'master' of github.com:padillbt/swap2