Lots of additions to the map as part of #52