More implementation of the move to MapItem centric archetecture.