Initial work to add a map, enhancement #52