Proper 2.3 upgrade (specs pass!)

Also transitions the shipment through calling ship instead of updating
attributes