Added map code, and accompanying files
Merge branch 'feature/3dmap'