This needs a rebase, but after that I expect it to be RfC.
--Jacob
The new status of this patch is: Waiting on Author