Bug 1081427 - Use custom interface to expose marionette content

And then also, of course, add our own hooks?