Mappings

Am just creating this PR so it's easier to track progress (or lack thereof - might just be a pie-in-the-sky idea. See #1373 for details)
good catch