More user and cart refactoring.