Preparing for save refactoring.