Still incomplete, not hooked into anything... I have had this in my
local tree for months at this point, and it seems better to commit it
that to leave it lying around like this.