Map branch

We talked about this in the meeting today so I'll go ahead and merge ...