WIP: Multimedia improvments

/cc @crichard