working through carts
commented stuff for logie-bear cart
fixed merge conflict
now we actually fixed the merge conflicts