Move tracking into its own file