Map Working

Added all the code to make the map work