Started refactoring to add cart summary