Sort:  

I agree that splitting this into two BSIPs would probably make the BSIP simpler, both could reference one another..