[#1393] WIP Start pulling addTrackEvent calls out of the update function stack.