added Ian's shell branch