AMECHE-236 : Implement Just in Time Media