some forward progres towards syncing

sync to local seems to work
sync to remote kinda works, but causes problems and duplicates