Working on new client structure.