Feature/mappin

Sorry to anyone who sees this or got a pull request. I sent it to the wrong master branch :p