Media tracking (7/8)

Media tracking