Wrote draft version of a new mapping strategy