Implemented some stuff for the Tracking module