added Tracking button and started to implement Tracking