Move more logic out of tracker class