Add in some support for geoloc