Map almost completely functional
Merge pull request #348 from mentatzoe/master

Map almost completely functional