Initial work on the new mapping scheme