Ben is already working on it.
simplify media model, this will be bigger later on
smaller fixes
simple test for media model