Work on refactoring Sync.