interim save - major refactoring of sync routines