Ongoing Media Stuff: Secured, Refactoring