working on maps
Merge pull request #25 from kahny/mapadditions2

working on maps