lots of work on the cart - some other bits too