Syncing changes before Server / Client split