Completes initial shipment status refactor.