Finished moving tracker to separate module