Intial preparation for geocoding
Merge commint