This should fix various issues related to tracking & fetching. I was
approaching this incorrectly

Fixes #67