Refactoring before adding a new feature with AI (seed)

Under study….