Refactoring grande, moving client base up from storemate (doesn't belong there)