Add persistence
Add geolocation.