Finished shipment networking
Merge Black Tea's changes