almost done, just have to fix geolocator