Finalizing sync logic implementation
6 files changed