Fixes with previous commit
Moved some more logic out of the tracker class