Added geolocation (WIP)