this patch is nearly ready though, so you're welcome to it