Now working, but still missing Location with geolocations