lonlat persistance
Merge conflicts resolved
Merge conflicts resolved for real