Move geolocatable logic into class module