New sync logic (untested)
Do not allow duplicates