Working on the media management (WIP)