Adds some sugar around mapping
WIP