Move the Geo Location stuff into a class