restructured location start/stop so we can enable/disable it in the future