Complete re-work of geocoding.