Additions to map
Merge branch 'master' of https://github.com/JonWillis4554/JonathanDWillis.git