V0.3.0 rc

This all looks like duplicate code from media service.  If it isn't then it should be moved out of the controller to the media service