Added returns and shipments. This is probably a deviation from the original model
Adding some cost functions.
Some more changes