tracking added, now just needs to be finished