Refactored media set controller, wip