Started working on editing XFields.