Comment by trevor-e

TBH I'm not sure why I left add/remove in, track/untrack is simpler and more in line with what I was saying. :)