Rework

Relatively complete rework of geolocation-remote