first draft for a tracker-less rewrite