started saves refactoring