Initial edits to adapt xsync code for bitrot
test commit