Put map in correct place
Works - kind of
Merge remote-tracking branch 'origin/dev' into dev