Fixed Todo's in the CartController