Geolocation - TODOs added.