Making it so we can show tracker information
Merged with master