progress on cleaning up the track/untrack stuff