Have full two-way syncing working