Map is now functional!!
Updating map
merging
Working on fixing broked db