Mappings

Picking up where #1374 (inadvertently) left off. Very WIP, definitely not ready for merge.
@martypdx @MartinKolarik Yeah, didn't think of that. Fair enough, agree with those points