Work in progress for geolocationwq