WIP Fixed delta syncing with locking