This can be done in this CL without much pain; I'll make it so.