Lots of work on the cart storage engine