Started working on a map prototype, testmap
Conflict resolved