More encapsulation chnages. Baha walked through this with me and agrees its low risk.