Client store in the works