Moved over to User-based storage, and using Parent relationships to get
everything back for a user.