Robust Adding and Syncing almost done