Updated TODO
Resolved IDs in shoppingcart