I'll do this, but note that this adds considerable functionality above what's described in the bug I'm supposed to address.