-Map now updates from server!!!!!!! ACTUAL SERVER COMMUNICATION
Merge remote-tracking branch 'origin/master'