Feature/smarter cart