Uncommented in the followup, though now that I've written the `system/` side of things it looks like the api will actually be slightly different.