finishing the map
Merge branch 'master' of github.com:arielspear/swap-tacular
intergrating ariels test