Looks good to me. I don't think we really need to modify the blueprint, even, I'm sure in a time of crisis people will take bunkmates if it means a safe place to stay.