tracking functionality added

Big update: tracking functionality added