Add Shipment Confirmation, Refactor