Added server-first flag, properly handling saving of locally created record, sync screen (not yet working)