WIP on more HIT tracking