Set up map thing

Merge map setup with master branch