location info added, backend needs fix
merging
merging this maps stuff with my loc stuff