Moved the tracker into its own service