Move geocoding to client
Move geocoding to client