Client save in the works