Moved Timer into Tracker