Function stubs
Merged in geolocate changes