Lots of media stuff done, some refactoring