Finish up the basic multimedia editor
Merge pull request #353 from timrae/multimedia-editor

Get multimedia editor working