Moving the location activation code to the locationService