More reworking sync protocol (in progress)