Major tracking overhaul

Change-Id: I34ffeef9148400520accb6511b5cb4c69157cf68