I want to move a lot of this out of the map wrappers so it's more transparent to library users what gets changed. And so it's more manageable.