Add a small tracker (again)

Will work as I want this time...