Media tracking (6/8)

Media tracking