Refactor mapping

Author His Dad <John@hisdad.org>
Author date 2015-04-25 21:52:01
Author local date 2015-04-26 09:52:01 +1200
Committer His Dad <John@hisdad.org>
Committer date 2015-04-25 21:52:01
Committer local date 2015-04-26 09:52:01 +1200
Commit fc8ac4893214f8cc9642fa2471e723df32e53c5b
Tree 243d9740471fadf708c5e3fe43ef3a6e5dfd4093
Parent 853db87c53417d0e2b1d98d1bad0398df11081dc
Refactor mapping