Some additions to the Map class, still a work in progress