More work on remote sync stuff