TODO redesign the tracker