This should be single return
First pass at update / finalize shipments