reworked how the app handles location
reworked how the app handles location