[Stable] Working on shipper.h/cpp