In progress work on geocoding
Merge branch 'geocoding_stuff' into develop