Selection and saving work, loading doesn't.
Merge pull request #824 from protherj/media-service-test

Selection and saving work, loading doesn't.