note/media refactored/unit tested