Revert "Revert "incoming shipment stuff""

This reverts commit 5e3c26bd19ee6c64e6222331e8f6e6d20e952628.