swapping almost complete.
Merge pull request #56 from NickOttrando/austin2

swapping almost complete.