Add a more reliable (but hacky) tag tracking system