Move tracking code. Last commit of the day. Honest.