Geocode2

Replaces #49