lol, funny map stuff
Merge branch 'master' of https://github.com/maxbrister/nmt-jam0