Working on better location/geolocation