maps with a capital M
fix conflict
Sort out conflicting issues from Gavin's changes