Fixed stupid bug in Tracker

+ Starting to change the way the Tracker tracks