#374 - some final bits for geolocation