Yes, definitely should go to the shipping bundle. Order shipping state should be determined based on the states of all its shipments. We should really focus on the Shipment model here.