got geolocator class working as an idividual class and broke/fixed a bunch of tests