Various changes leading up tp sharing being enabled..