moved currentlocation and currentcity to CurrentUser