geocoding added, to be refactored