Check-in WIP
Further refinements of mapping