Work in progress for the media browser.