Geocoder

Probably have to fix a merge request.