added locations and geocoding