Most of the purchasing in the shoppingcart
Merge fixes