add the tracking stuff into its own file