added shippable support, and a passable test