Factored tracker into seperate class