DS-452 More work on dosomething_shipment_form