Start working on #22. Needs thorough testing and fix for the geolocation buffer itself