Started structuring partner handling