silly bugs with adding shipments
attempts to deal with memory leak...