Changed location services to use watch instead of a get