More task 2 stuff, need to fix shopping cart after sale