diff --git a/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js b/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js
index 1c19d7fadb..5678516418 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/__tests__/utils.spec.js
@@ -1,9 +1,5 @@
 import each from 'jest-each';
 import {
-  floatOrIntRegex,
-  getCorrectAnswersIndices,
-  mapCorrectAnswers,
-  updateAnswersToQuestionType,
   isImportedContent,
   importedChannelLink,
   secondsToHms,
@@ -13,7 +9,7 @@ import {
 import router from '../router';
 import { RouteNames } from '../constants';
 import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
-import { AssessmentItemTypes, CompletionCriteriaModels } from 'shared/constants';
+import { CompletionCriteriaModels } from 'shared/constants';
 
 describe('channelEdit utils', () => {
   describe('imported content', () => {
@@ -47,416 +43,6 @@ describe('channelEdit utils', () => {
       expect(importedChannelLink(notImportedContent, router)).toBe(null);
     });
   });
-  describe('getCorrectAnswersIndices', () => {
-    let questionKind;
-
-    describe('for a single selection question', () => {
-      beforeEach(() => {
-        questionKind = AssessmentItemTypes.SINGLE_SELECTION;
-      });
-
-      it('returns null if there is no correct answer', () => {
-        expect(
-          getCorrectAnswersIndices(questionKind, [
-            { answer: 'Answer 1', correct: false },
-            { answer: 'Answer 2', correct: false },
-          ]),
-        ).toBeNull();
-      });
-
-      it('returns a correct answer index', () => {
-        expect(
-          getCorrectAnswersIndices(questionKind, [
-            { answer: 'Answer 1', correct: false },
-            { answer: 'Answer 2', correct: true },
-          ]),
-        ).toBe(1);
-      });
-    });
-
-    describe('for a true/false question', () => {
-      beforeEach(() => {
-        questionKind = AssessmentItemTypes.TRUE_FALSE;
-      });
-
-      it('returns null if there is no correct answer', () => {
-        expect(
-          getCorrectAnswersIndices(questionKind, [
-            { answer: 'True', correct: false },
-            { answer: 'False', correct: false },
-          ]),
-        ).toBeNull();
-      });
-
-      it('returns a correct answer index', () => {
-        expect(
-          getCorrectAnswersIndices(questionKind, [
-            { answer: 'True', correct: false },
-            { answer: 'False', correct: true },
-          ]),
-        ).toBe(1);
-      });
-    });
-
-    describe('for a multiple selection question', () => {
-      beforeEach(() => {
-        questionKind = AssessmentItemTypes.MULTIPLE_SELECTION;
-      });
-
-      it('returns an empty array if there is no correct answer', () => {
-        expect(
-          getCorrectAnswersIndices(questionKind, [
-            { answer: 'Answer 1', correct: false },
-            { answer: 'Answer 2', correct: false },
-            { answer: 'Answer 3', correct: false },
-          ]),
-        ).toEqual([]);
-      });
-
-      it('returns an array of correct answer indices', () => {
-        expect(
-          getCorrectAnswersIndices(questionKind, [
-            { answer: 'Answer 1', correct: true },
-            { answer: 'Answer 2', correct: false },
-            { answer: 'Answer 3', correct: true },
-          ]),
-        ).toEqual([0, 2]);
-      });
-    });
-
-    describe('for an input question', () => {
-      beforeEach(() => {
-        questionKind = AssessmentItemTypes.INPUT_QUESTION;
-      });
-
-      it('returns an empty array if there is no correct answer', () => {
-        expect(
-          getCorrectAnswersIndices(questionKind, [
-            { answer: 'Answer 1', correct: false },
-            { answer: 'Answer 2', correct: false },
-            { answer: 'Answer 3', correct: false },
-          ]),
-        ).toEqual([]);
-      });
-
-      it('returns an array of correct answer indices', () => {
-        expect(
-          getCorrectAnswersIndices(questionKind, [
-            { answer: 'Answer 1', correct: true },
-            { answer: 'Answer 2', correct: true },
-            { answer: 'Answer 3', correct: true },
-          ]),
-        ).toEqual([0, 1, 2]);
-      });
-    });
-  });
-
-  describe('mapCorrectAnswers', () => {
-    describe('for a single correct answer index', () => {
-      it('returns updated answers', () => {
-        expect(
-          mapCorrectAnswers(
-            [
-              { answer: 'Answer 1', correct: true },
-              { answer: 'Answer 2', correct: false },
-              { answer: 'Answer 3', correct: true },
-            ],
-            1,
-          ),
-        ).toEqual([
-          { answer: 'Answer 1', correct: false },
-          { answer: 'Answer 2', correct: true },
-          { answer: 'Answer 3', correct: false },
-        ]);
-      });
-    });
-
-    describe('for an array of correct answers indices', () => {
-      it('returns updated answers', () => {
-        expect(
-          mapCorrectAnswers(
-            [
-              { answer: 'Answer 1', correct: true },
-              { answer: 'Answer 2', correct: false },
-              { answer: 'Answer 3', correct: true },
-            ],
-            [1, 2],
-          ),
-        ).toEqual([
-          { answer: 'Answer 1', correct: false },
-          { answer: 'Answer 2', correct: true },
-          { answer: 'Answer 3', correct: true },
-        ]);
-      });
-    });
-  });
-
-  describe('updateAnswersToQuestionType', () => {
-    let answers;
-
-    describe('when converting originally empty answers to true/false', () => {
-      it('returns true/false answers', () => {
-        expect(updateAnswersToQuestionType(AssessmentItemTypes.TRUE_FALSE, [])).toEqual([
-          { answer: 'True', correct: true, order: 1 },
-          { answer: 'False', correct: false, order: 2 },
-        ]);
-      });
-    });
-
-    describe('for originally single selection answers', () => {
-      beforeEach(() => {
-        answers = [
-          { answer: 'Mayonnaise (I mean you can, but...)', correct: false, order: 1 },
-          { answer: 'Peanut butter', correct: true, order: 2 },
-          { answer: 'Jelly', correct: false, order: 3 },
-        ];
-      });
-
-      describe('conversion to single selection', () => {
-        it('returns the same answers', () => {
-          expect(
-            updateAnswersToQuestionType(AssessmentItemTypes.SINGLE_SELECTION, answers),
-          ).toEqual(answers);
-        });
-      });
-
-      describe('conversion to multiple selection', () => {
-        it('returns the same answers', () => {
-          expect(
-            updateAnswersToQuestionType(AssessmentItemTypes.MULTIPLE_SELECTION, answers),
-          ).toEqual(answers);
-        });
-      });
-
-      describe('conversion to input question', () => {
-        beforeEach(() => {
-          answers = [
-            { answer: '1500', correct: false, order: 1 },
-            { answer: '1500.00', correct: false, order: 2 },
-            { answer: '-1500.00', correct: true, order: 3 },
-            { answer: '1500 with alphabetical', correct: false, order: 4 },
-            { answer: '$1500.00', correct: false, order: 5 },
-          ];
-        });
-
-        it('makes all answers correct and removes any answers with non-numeric characters', () => {
-          expect(updateAnswersToQuestionType(AssessmentItemTypes.INPUT_QUESTION, answers)).toEqual([
-            { answer: '1500', correct: true, order: 1 },
-            { answer: '1500.00', correct: true, order: 2 },
-            { answer: '-1500.00', correct: true, order: 3 },
-          ]);
-        });
-      });
-
-      describe('conversion to true/false', () => {
-        it('returns true/false answers only', () => {
-          expect(updateAnswersToQuestionType(AssessmentItemTypes.TRUE_FALSE, answers)).toEqual([
-            { answer: 'True', correct: true, order: 1 },
-            { answer: 'False', correct: false, order: 2 },
-          ]);
-        });
-      });
-    });
-
-    describe('for originally input question', () => {
-      beforeEach(() => {
-        answers = [
-          { answer: '8', correct: true, order: 1 },
-          { answer: '8.0', correct: true, order: 2 },
-          { answer: '-400.19090', correct: true, order: 3 },
-          { answer: '-140140104', correct: true, order: 4 },
-        ];
-      });
-
-      describe('conversion to input question', () => {
-        it('returns the same answers', () => {
-          expect(updateAnswersToQuestionType(AssessmentItemTypes.INPUT_QUESTION, answers)).toEqual(
-            answers,
-          );
-        });
-      });
-
-      describe('conversion to multiple selection', () => {
-        it('returns the same answers', () => {
-          expect(
-            updateAnswersToQuestionType(AssessmentItemTypes.MULTIPLE_SELECTION, answers),
-          ).toEqual(answers);
-        });
-      });
-
-      describe('conversion to single selection', () => {
-        it('keeps only first answer as correct', () => {
-          expect(
-            updateAnswersToQuestionType(AssessmentItemTypes.SINGLE_SELECTION, answers),
-          ).toEqual([
-            { answer: '8', correct: true, order: 1 },
-            { answer: '8.0', correct: false, order: 2 },
-            { answer: '-400.19090', correct: false, order: 3 },
-            { answer: '-140140104', correct: false, order: 4 },
-          ]);
-        });
-      });
-
-      describe('conversion to true/false', () => {
-        it('returns true/false answers only', () => {
-          expect(updateAnswersToQuestionType(AssessmentItemTypes.TRUE_FALSE, answers)).toEqual([
-            { answer: 'True', correct: true, order: 1 },
-            { answer: 'False', correct: false, order: 2 },
-          ]);
-        });
-      });
-    });
-
-    describe('for originally true/false question', () => {
-      beforeEach(() => {
-        answers = [
-          { answer: 'True', correct: false, order: 1 },
-          { answer: 'False', correct: true, order: 2 },
-        ];
-      });
-
-      describe('conversion to true/false question', () => {
-        it('returns the same answers', () => {
-          expect(
-            updateAnswersToQuestionType(AssessmentItemTypes.SINGLE_SELECTION, answers),
-          ).toEqual(answers);
-        });
-      });
-
-      describe('conversion to multiple selection', () => {
-        it('returns the same answers', () => {
-          expect(
-            updateAnswersToQuestionType(AssessmentItemTypes.MULTIPLE_SELECTION, answers),
-          ).toEqual(answers);
-        });
-      });
-
-      describe('conversion to single selection', () => {
-        it('returns the same answers', () => {
-          expect(
-            updateAnswersToQuestionType(AssessmentItemTypes.SINGLE_SELECTION, answers),
-          ).toEqual(answers);
-        });
-      });
-
-      describe('conversion to input question', () => {
-        it('remove all answers', () => {
-          expect(updateAnswersToQuestionType(AssessmentItemTypes.INPUT_QUESTION, answers)).toEqual(
-            [],
-          );
-        });
-      });
-    });
-
-    describe('for originally multiple selection answers', () => {
-      describe('conversion to multiple selection', () => {
-        it('returns the same answers', () => {
-          expect(
-            updateAnswersToQuestionType(AssessmentItemTypes.SINGLE_SELECTION, answers),
-          ).toEqual(answers);
-        });
-      });
-
-      describe('conversion to single selection', () => {
-        describe('if there are some correct answers', () => {
-          beforeEach(() => {
-            answers = [
-              { answer: 'Mayonnaise (I mean you can, but...)', correct: false, order: 1 },
-              { answer: 'Peanut butter', correct: true, order: 2 },
-              { answer: 'Jelly', correct: true, order: 3 },
-            ];
-          });
-
-          it('keeps only first correct answer', () => {
-            expect(
-              updateAnswersToQuestionType(AssessmentItemTypes.SINGLE_SELECTION, answers),
-            ).toEqual([
-              { answer: 'Mayonnaise (I mean you can, but...)', correct: false, order: 1 },
-              { answer: 'Peanut butter', correct: true, order: 2 },
-              { answer: 'Jelly', correct: false, order: 3 },
-            ]);
-          });
-        });
-
-        describe('if there is no correct answer', () => {
-          beforeEach(() => {
-            answers = [
-              { answer: 'Mayonnaise (I mean you can, but...)', correct: false, order: 1 },
-              { answer: 'Peanut butter', correct: false, order: 2 },
-              { answer: 'Jelly', correct: false, order: 3 },
-            ];
-          });
-
-          it('makes a first answer correct', () => {
-            expect(
-              updateAnswersToQuestionType(AssessmentItemTypes.SINGLE_SELECTION, answers),
-            ).toEqual([
-              { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-              { answer: 'Peanut butter', correct: false, order: 2 },
-              { answer: 'Jelly', correct: false, order: 3 },
-            ]);
-          });
-        });
-      });
-
-      describe('conversion to input question', () => {
-        beforeEach(() => {
-          answers = [
-            { answer: '1500', correct: false, order: 1 },
-            { answer: '1500 00', correct: false, order: 2 },
-            { answer: '1500 with alphabetical', correct: false, order: 3 },
-          ];
-        });
-
-        it('makes all answers correct and removes any answers with non-numeric characters', () => {
-          expect(updateAnswersToQuestionType(AssessmentItemTypes.INPUT_QUESTION, answers)).toEqual([
-            { answer: '1500', correct: true, order: 1 },
-          ]);
-        });
-      });
-
-      describe('conversion to true/false', () => {
-        beforeEach(() => {
-          answers = [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-            { answer: 'Jelly', correct: true, order: 3 },
-          ];
-        });
-
-        it('returns true/false answers only', () => {
-          expect(updateAnswersToQuestionType(AssessmentItemTypes.TRUE_FALSE, answers)).toEqual([
-            { answer: 'True', correct: true, order: 1 },
-            { answer: 'False', correct: false, order: 2 },
-          ]);
-        });
-      });
-    });
-  });
-
-  // At least we know that these will work
-  describe('floatOrIntRegex', () => {
-    it('tests true for valid values', () => {
-      [
-        '1.5', // Float
-        '-4.5', // Signed Float
-        '+1', // Signed Int
-        '10e5', // Exponentiation
-        '-15.3e5', // Combo
-        '-12345.67890e98', // Combo 2
-      ].forEach(v => expect(floatOrIntRegex.test(v)).toBe(true));
-    });
-
-    it('tests false for invalid values', () => {
-      [
-        'i * 1.5', // Math
-        'one.point.five', // Text
-        '10 5 0 100', // Spaces
-        '1.2.3.4', // IP
-      ].forEach(v => expect(floatOrIntRegex.test(v)).toBe(false));
-    });
-  });
-
   describe(`secondsToHms`, () => {
     it(`converts 0 seconds to '00:00'`, () => {
       expect(secondsToHms(0)).toBe('00:00');
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AnswersEditor/AnswersEditor.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/AnswersEditor/AnswersEditor.spec.js
deleted file mode 100644
index 5d07f3296f..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AnswersEditor/AnswersEditor.spec.js
+++ /dev/null
@@ -1,621 +0,0 @@
-import { shallowMount, mount } from '@vue/test-utils';
-
-import { AssessmentItemToolbarActions } from '../../constants';
-import AnswersEditor from './AnswersEditor';
-import { AssessmentItemTypes } from 'shared/constants';
-import TipTapEditor from 'shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue';
-
-jest.mock('shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue');
-
-jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow', () => {
-  return function useKResponsiveWindow() {
-    const { ref } = require('vue');
-    return { windowIsSmall: ref(false) };
-  };
-});
-
-const clickNewAnswerBtn = async wrapper => {
-  await wrapper.findComponent('[data-test="newAnswerBtn"]').trigger('click');
-};
-
-const rendersNewAnswerBtn = wrapper => {
-  return wrapper.findComponent('[data-test="newAnswerBtn"]').exists();
-};
-
-const clickAnswer = async (wrapper, answerIdx) => {
-  await wrapper.findAll('[data-test="answer"]').at(answerIdx).trigger('click');
-};
-
-const clickMoveAnswerUp = async (wrapper, answerIdx) => {
-  await wrapper
-    .findAllComponents(`[data-test="toolbarIcon-${AssessmentItemToolbarActions.MOVE_ITEM_UP}"]`)
-    .at(answerIdx)
-    .trigger('click');
-};
-
-const clickMoveAnswerDown = async (wrapper, answerIdx) => {
-  await wrapper
-    .findAllComponents(`[data-test="toolbarIcon-${AssessmentItemToolbarActions.MOVE_ITEM_DOWN}"]`)
-    .at(answerIdx)
-    .trigger('click');
-};
-
-const clickDeleteAnswer = async (wrapper, answerIdx) => {
-  await wrapper
-    .findAllComponents(`[data-test="toolbarIcon-${AssessmentItemToolbarActions.DELETE_ITEM}"]`)
-    .at(answerIdx)
-    .trigger('click');
-};
-
-describe('AnswersEditor', () => {
-  let wrapper;
-
-  it('smoke test', () => {
-    const wrapper = shallowMount(AnswersEditor);
-
-    expect(wrapper.exists()).toBe(true);
-  });
-
-  it('renders a placeholder when there are no answers', () => {
-    wrapper = mount(AnswersEditor, {
-      propsData: {
-        answers: [],
-      },
-    });
-
-    expect(wrapper.html()).toContain('Question has no answer options');
-  });
-
-  describe('answers label', () => {
-    it.each([
-      [AssessmentItemTypes.SINGLE_SELECTION, AnswersEditor.$trs.answersLabelSingleChoice],
-      [AssessmentItemTypes.TRUE_FALSE, AnswersEditor.$trs.answersLabelSingleChoice],
-      [AssessmentItemTypes.MULTIPLE_SELECTION, AnswersEditor.$trs.answersLabelMultipleChoice],
-      [AssessmentItemTypes.INPUT_QUESTION, AnswersEditor.$trs.answersLabelNumeric],
-    ])('renders the correct label for %s questions', (questionKind, expectedLabel) => {
-      wrapper = shallowMount(AnswersEditor, {
-        propsData: {
-          questionKind,
-          answers: [],
-        },
-      });
-
-      expect(wrapper.text()).toContain(expectedLabel);
-    });
-  });
-
-  describe('for a single selection question', () => {
-    beforeEach(() => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-          ],
-        },
-      });
-    });
-
-    it('renders answers as radio controls', () => {
-      const inputs = wrapper.findAll('input');
-
-      expect(inputs.length).toBe(2);
-      for (const n in [0, 1]) {
-        expect(inputs.at(n).attributes()['type']).toBe('radio');
-      }
-    });
-
-    it('renders only correct answers as checked', () => {
-      const inputs = wrapper.findAll('input');
-
-      expect(inputs.at(0).element.checked).toBe(true);
-      expect(inputs.at(1).element.checked).toBe(false);
-    });
-
-    it('marks correct answer rows with the selected visual state', () => {
-      const answerRows = wrapper.findAll('[data-test="answer"]');
-
-      // Correct row has both border-color and background-color applied
-      expect(answerRows.at(0).attributes('style')).toContain('border-color');
-      expect(answerRows.at(0).attributes('style')).toContain('background-color');
-      // Incorrect row has border-color but no inline background-color (null omits it)
-      expect(answerRows.at(1).attributes('style')).toContain('border-color');
-      expect(answerRows.at(1).attributes('style')).not.toContain('background-color');
-    });
-
-    it('renders all possible answers', () => {
-      // First answer is open by default (openAnswerIdx=0) — edit mode TipTapEditor
-      // Second answer is closed — view mode TipTapEditor
-      const editors = wrapper.findAllComponents(TipTapEditor);
-
-      // Closed answer uses view mode to safely render rich text
-      const viewEditor = editors.filter(e => e.props('mode') === 'view').at(0);
-      expect(viewEditor.exists()).toBe(true);
-      expect(viewEditor.props('value')).toBe('Peanut butter');
-
-      // Open answer uses edit mode
-      const editEditor = editors.filter(e => e.props('mode') === 'edit').at(0);
-      expect(editEditor.exists()).toBe(true);
-      expect(editEditor.props('value')).toBe('Mayonnaise (I mean you can, but...)');
-    });
-
-    it('renders new answer button', () => {
-      expect(rendersNewAnswerBtn(wrapper)).toBe(true);
-      expect(wrapper.findComponent('[data-test="newAnswerBtn"]').text()).toContain(
-        AnswersEditor.$trs.addOptionBtnLabel,
-      );
-    });
-
-    describe('on new answer button click', () => {
-      beforeEach(async () => {
-        await clickNewAnswerBtn(wrapper);
-      });
-
-      it('emits update event with a payload containing all answers + new answer which is wrong by default', () => {
-        expect(wrapper.emitted().update).toBeTruthy();
-        expect(wrapper.emitted().update.length).toBe(1);
-        expect(wrapper.emitted().update[0][0]).toEqual([
-          { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-          { answer: 'Peanut butter', correct: false, order: 2 },
-          { answer: '', correct: false, order: 3 },
-        ]);
-      });
-    });
-  });
-
-  describe('for a multiple selection question', () => {
-    beforeEach(() => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.MULTIPLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-            { answer: 'Jelly', correct: true, order: 3 },
-          ],
-        },
-      });
-    });
-
-    it('renders answers as checkboxes', () => {
-      const inputs = wrapper.findAll('input');
-
-      expect(inputs.length).toBe(3);
-      for (const n in [0, 1, 2]) {
-        expect(inputs.at(n).attributes()['type']).toBe('checkbox');
-      }
-    });
-
-    it('renders only correct answers as checked', () => {
-      const inputs = wrapper.findAll('input');
-
-      expect(inputs.at(0).element.checked).toBe(true);
-      expect(inputs.at(1).element.checked).toBe(false);
-      expect(inputs.at(2).element.checked).toBe(true);
-    });
-
-    it('renders all possible answers', () => {
-      // First answer is open by default (openAnswerIdx=0) — edit mode TipTapEditor
-      // Remaining answers are closed — each gets a view mode TipTapEditor
-      const editors = wrapper.findAllComponents(TipTapEditor);
-
-      const viewEditors = editors.filter(e => e.props('mode') === 'view');
-      expect(viewEditors.length).toBe(2);
-      expect(viewEditors.at(0).props('value')).toBe('Peanut butter');
-      expect(viewEditors.at(1).props('value')).toBe('Jelly');
-
-      const editEditor = editors.filter(e => e.props('mode') === 'edit').at(0);
-      expect(editEditor.exists()).toBe(true);
-      expect(editEditor.props('value')).toBe('Mayonnaise (I mean you can, but...)');
-    });
-
-    it('renders new answer button', () => {
-      expect(rendersNewAnswerBtn(wrapper)).toBe(true);
-      expect(wrapper.findComponent('[data-test="newAnswerBtn"]').text()).toContain(
-        AnswersEditor.$trs.addOptionBtnLabel,
-      );
-    });
-
-    describe('on new answer button click', () => {
-      beforeEach(async () => {
-        await clickNewAnswerBtn(wrapper);
-      });
-
-      it('emits update event with a payload containing all answers + new answer which is wrong by default', () => {
-        expect(wrapper.emitted().update).toBeTruthy();
-        expect(wrapper.emitted().update.length).toBe(1);
-        expect(wrapper.emitted().update[0][0]).toEqual([
-          { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-          { answer: 'Peanut butter', correct: false, order: 2 },
-          { answer: 'Jelly', correct: true, order: 3 },
-          { answer: '', correct: false, order: 4 },
-        ]);
-      });
-    });
-  });
-
-  describe('for a true/false question', () => {
-    beforeEach(() => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.TRUE_FALSE,
-          answers: [
-            { answer: 'True', correct: false, order: 1 },
-            { answer: 'False', correct: true, order: 2 },
-          ],
-        },
-      });
-    });
-
-    it('renders answers as radio controls', () => {
-      const inputs = wrapper.findAll('input');
-
-      expect(inputs.length).toBe(2);
-      for (const n in [0, 1]) {
-        expect(inputs.at(n).attributes()['type']).toBe('radio');
-      }
-    });
-
-    it('renders only correct answers as checked', () => {
-      const inputs = wrapper.findAll('input');
-
-      expect(inputs.at(0).element.checked).toBe(false);
-      expect(inputs.at(1).element.checked).toBe(true);
-    });
-
-    it('does not render new answer button', () => {
-      expect(rendersNewAnswerBtn(wrapper)).toBe(false);
-    });
-  });
-
-  describe('for an input question', () => {
-    beforeEach(() => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.INPUT_QUESTION,
-          answers: [
-            { answer: '1.5', correct: true, order: 1 },
-            { answer: '2', correct: true, order: 2 },
-          ],
-        },
-      });
-    });
-
-    it('renders open answer as a number input and closed answer as plain text', () => {
-      expect(wrapper.find('input[type="number"]').element.value).toBe('1.5');
-
-      expect(wrapper.html()).toContain('2');
-    });
-
-    it('renders new answer button', () => {
-      expect(rendersNewAnswerBtn(wrapper)).toBe(true);
-      expect(wrapper.findComponent('[data-test="newAnswerBtn"]').text()).toContain(
-        AnswersEditor.$trs.newAnswerBtnLabel,
-      );
-    });
-
-    describe('on new answer button click', () => {
-      beforeEach(async () => {
-        await clickNewAnswerBtn(wrapper);
-      });
-
-      it('emits update event with a payload containing all answers + new answer which is correct', () => {
-        expect(wrapper.emitted().update).toBeTruthy();
-        expect(wrapper.emitted().update.length).toBe(1);
-        expect(wrapper.emitted().update[0][0]).toEqual([
-          { answer: '1.5', correct: true, order: 1 },
-          { answer: '2', correct: true, order: 2 },
-          { answer: '', correct: true, order: 3 },
-        ]);
-      });
-    });
-  });
-
-  describe('autofocus on the open answer editor', () => {
-    beforeEach(() => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-          ],
-          openAnswerIdx: 1,
-        },
-      });
-    });
-
-    it('passes autofocus=true to the open (edit-mode) answer editor', () => {
-      // A single TipTapEditor per answer switches mode reactively.
-      // The editor for openAnswerIdx has mode='edit' and autofocus=true.
-      const editors = wrapper.findAllComponents(TipTapEditor);
-      const editModeEditor = editors.filter(e => e.props('mode') === 'edit').at(0);
-      expect(editModeEditor.props('autofocus')).toBe(true);
-    });
-  });
-
-  describe('on an answer click', () => {
-    beforeEach(async () => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-          ],
-        },
-      });
-
-      await clickAnswer(wrapper, 1);
-    });
-
-    it('emits open event with a correct answer idx', () => {
-      expect(wrapper.emitted().open).toBeTruthy();
-      expect(wrapper.emitted().open.length).toBe(1);
-      expect(wrapper.emitted().open[0][0]).toBe(1);
-    });
-  });
-
-  describe('on new answer button click', () => {
-    beforeEach(async () => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: '  ', correct: true, order: 2 },
-            { answer: 'Peanut butter', correct: false, order: 3 },
-          ],
-        },
-      });
-
-      await clickNewAnswerBtn(wrapper);
-    });
-
-    it('emits update event with a payload containing all answers and one new empty answer', () => {
-      expect(wrapper.emitted().update).toBeTruthy();
-      expect(wrapper.emitted().update.length).toBe(1);
-      expect(wrapper.emitted().update[0][0]).toEqual([
-        { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-        { answer: '  ', correct: true, order: 2 },
-        { answer: 'Peanut butter', correct: false, order: 3 },
-        { answer: '', correct: false, order: 4 },
-      ]);
-    });
-
-    it('emits open event with a new answer idx', () => {
-      expect(wrapper.emitted().open).toBeTruthy();
-      expect(wrapper.emitted().open.length).toBe(1);
-      expect(wrapper.emitted().open[0][0]).toBe(3);
-    });
-  });
-
-  describe('on answer text update', () => {
-    beforeEach(async () => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-          ],
-          openAnswerIdx: 1,
-        },
-      });
-
-      const editors = wrapper.findAllComponents(TipTapEditor);
-      editors.at(1).vm.$emit('update', 'European butter');
-
-      await wrapper.vm.$nextTick();
-    });
-
-    it('emits update event with a payload containing updated answers', () => {
-      expect(wrapper.emitted().update).toBeTruthy();
-      expect(wrapper.emitted().update.length).toBe(1);
-
-      const emittedAnswers = JSON.parse(JSON.stringify(wrapper.emitted().update[0][0]));
-
-      expect(emittedAnswers).toEqual([
-        { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-        { answer: 'European butter', correct: false, order: 2 },
-      ]);
-    });
-  });
-
-  describe('on correct answer change', () => {
-    beforeEach(async () => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-          ],
-          openAnswerIdx: 1,
-        },
-      });
-
-      await wrapper.vm.$nextTick();
-      await wrapper.findAll('.answer-selection input[type="radio"]').at(1).trigger('click');
-    });
-
-    it('emits update event with a payload containing updated answers', () => {
-      expect(wrapper.emitted().update).toBeTruthy();
-      expect(wrapper.emitted().update.length).toBe(1);
-      expect(wrapper.emitted().update[0][0]).toEqual([
-        { answer: 'Mayonnaise (I mean you can, but...)', correct: false, order: 1 },
-        { answer: 'Peanut butter', correct: true, order: 2 },
-      ]);
-    });
-  });
-
-  describe('on move answer up click', () => {
-    beforeEach(() => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-          ],
-        },
-      });
-    });
-
-    it('emits update event with a payload containing updated and properly ordered answers', async () => {
-      await clickMoveAnswerUp(wrapper, 1);
-
-      expect(wrapper.emitted().update).toBeTruthy();
-      expect(wrapper.emitted().update.length).toBe(1);
-      expect(wrapper.emitted().update[0][0]).toEqual([
-        { answer: 'Peanut butter', correct: false, order: 1 },
-        { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 2 },
-      ]);
-    });
-
-    describe('if moved answer was open', () => {
-      beforeEach(async () => {
-        await wrapper.setProps({
-          openAnswerIdx: 1,
-        });
-      });
-
-      it('emits open event with updated answer index', async () => {
-        await clickMoveAnswerUp(wrapper, 1);
-
-        expect(wrapper.emitted().open).toBeTruthy();
-        expect(wrapper.emitted().open.length).toBe(1);
-        expect(wrapper.emitted().open[0][0]).toBe(0);
-      });
-    });
-
-    describe('if an answer above a moved answer was open', () => {
-      beforeEach(async () => {
-        await wrapper.setProps({
-          openAnswerIdx: 0,
-        });
-
-        await clickMoveAnswerUp(wrapper, 1);
-      });
-
-      it('emits open event with updated, originally open, answer index', () => {
-        expect(wrapper.emitted().open).toBeTruthy();
-        expect(wrapper.emitted().open.length).toBe(1);
-        expect(wrapper.emitted().open[0][0]).toBe(1);
-      });
-    });
-  });
-
-  describe('on move answer down click', () => {
-    beforeEach(() => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-          ],
-        },
-      });
-    });
-
-    it('emits update event with a payload containing updated and properly ordered answers', async () => {
-      await clickMoveAnswerDown(wrapper, 0);
-
-      expect(wrapper.emitted().update).toBeTruthy();
-      expect(wrapper.emitted().update.length).toBe(1);
-      expect(wrapper.emitted().update[0][0]).toEqual([
-        { answer: 'Peanut butter', correct: false, order: 1 },
-        { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 2 },
-      ]);
-    });
-
-    describe('if moved answer was open', () => {
-      beforeEach(async () => {
-        await wrapper.setProps({
-          openAnswerIdx: 0,
-        });
-      });
-
-      it('emits open event with updated answer index', async () => {
-        await clickMoveAnswerDown(wrapper, 0);
-
-        expect(wrapper.emitted().open).toBeTruthy();
-        expect(wrapper.emitted().open.length).toBe(1);
-        expect(wrapper.emitted().open[0][0]).toBe(1);
-      });
-    });
-
-    describe('if an answer below a moved answer was open', () => {
-      beforeEach(async () => {
-        await wrapper.setProps({
-          openAnswerIdx: 1,
-        });
-
-        await clickMoveAnswerDown(wrapper, 0);
-      });
-
-      it('emits open event with updated, originally open, answer index', () => {
-        expect(wrapper.emitted().open).toBeTruthy();
-        expect(wrapper.emitted().open.length).toBe(1);
-        expect(wrapper.emitted().open[0][0]).toBe(0);
-      });
-    });
-  });
-
-  describe('on delete answer click', () => {
-    beforeEach(() => {
-      wrapper = mount(AnswersEditor, {
-        propsData: {
-          questionKind: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-            { answer: 'Peanut butter', correct: false, order: 2 },
-          ],
-        },
-      });
-    });
-
-    it('emits update event with a payload containing updated and properly ordered answers', async () => {
-      await clickDeleteAnswer(wrapper, 0);
-
-      expect(wrapper.emitted().update).toBeTruthy();
-      expect(wrapper.emitted().update.length).toBe(1);
-      expect(wrapper.emitted().update[0][0]).toEqual([
-        { answer: 'Peanut butter', correct: false, order: 1 },
-      ]);
-    });
-
-    describe('if deleted answer was open', () => {
-      beforeEach(async () => {
-        await wrapper.setProps({
-          openAnswerIdx: 0,
-        });
-      });
-
-      it('emits close event', async () => {
-        await clickDeleteAnswer(wrapper, 0);
-
-        expect(wrapper.emitted().close).toBeTruthy();
-        expect(wrapper.emitted().close.length).toBe(1);
-      });
-    });
-
-    describe('if an answer below a deleted answer was open', () => {
-      beforeEach(async () => {
-        await wrapper.setProps({
-          openAnswerIdx: 1,
-        });
-
-        await clickDeleteAnswer(wrapper, 0);
-      });
-
-      it('emits open event with updated, originally open, answer index', () => {
-        expect(wrapper.emitted().open).toBeTruthy();
-        expect(wrapper.emitted().open.length).toBe(1);
-        expect(wrapper.emitted().open[0][0]).toBe(0);
-      });
-    });
-  });
-});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AnswersEditor/AnswersEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AnswersEditor/AnswersEditor.vue
deleted file mode 100644
index 44ec3df510..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AnswersEditor/AnswersEditor.vue
+++ /dev/null
@@ -1,668 +0,0 @@
-<template>
-
-  <div>
-    <div
-      class="answers-label"
-      :style="{ color: $themeTokens.annotation }"
-    >
-      {{ answersLabel }}
-    </div>
-    <component
-      :is="shouldHaveOneCorrectAnswer ? 'KRadioButtonGroup' : 'div'"
-      class="answers-list"
-      :class="{ 'small-screen': isSmallScreen }"
-    >
-      <div
-        v-if="!answers || !answers.length"
-        class="answer-border no-answers-placeholder"
-        :style="{ borderColor: $themeTokens.fineLine }"
-      >
-        {{ $tr('noAnswersPlaceholder') }}
-      </div>
-      <div
-        v-for="(answer, answerIdx) in answers"
-        :key="answerIdx"
-        class="answer-border"
-        :class="answerClasses(answerIdx)"
-        :style="{
-          borderColor: answer.correct ? $themePalette.green.v_500 : $themeTokens.fineLine,
-          backgroundColor: answer.correct ? $themePalette.green.v_50 : null,
-        }"
-        data-test="answer"
-        @click="onAnswerClick($event, answerIdx)"
-      >
-        <div
-          class="answer-card-text"
-          :class="{ 'is-closed': !isAnswerOpen(answerIdx), 'small-screen': isSmallScreen }"
-        >
-          <div
-            class="answer-layout"
-            :class="{ 'is-open': isAnswerOpen(answerIdx), 'small-screen': isSmallScreen }"
-          >
-            <!-- Selection controls -->
-            <div
-              v-if="!isInputQuestion"
-              class="answer-selection"
-            >
-              <KRadioButton
-                v-if="shouldHaveOneCorrectAnswer"
-                :currentValue="correctAnswersIndices"
-                :buttonValue="answerIdx"
-                :showLabel="false"
-                :style="{
-                  width: 'auto',
-                  marginTop: !isAnswerOpen(answerIdx) ? 0 : '',
-                  marginBottom: !isAnswerOpen(answerIdx) ? 0 : '',
-                }"
-                @input="onCorrectAnswersIndicesUpdate"
-              />
-              <KCheckbox
-                v-else
-                :checked="answer.correct"
-                :style="{
-                  marginTop: !isAnswerOpen(answerIdx) ? 0 : '',
-                  marginBottom: !isAnswerOpen(answerIdx) ? 0 : '',
-                }"
-                @change="setCorrectAnswer(answerIdx, $event)"
-              />
-            </div>
-
-            <!-- Answer content -->
-            <div class="answer-content">
-              <!-- Input question shows a text field with type of `number` -->
-              <div v-if="isInputQuestion">
-                <input
-                  v-if="isAnswerOpen(answerIdx)"
-                  :value="answer.answer"
-                  class="answer-number"
-                  :class="answerNumberClasses"
-                  type="number"
-                  :placeholder="$tr('enterNumberPlaceholder')"
-                  @input="updateAnswerText($event.target.value, answerIdx)"
-                >
-                <div
-                  v-else
-                  class="answer-view-text"
-                >
-                  <div class="answer-view-editor">
-                    <span
-                      v-if="!answer.answer"
-                      :style="{ color: $themePalette.grey.v_400 }"
-                    >
-                      {{ $tr('enterNumberPlaceholder') }}
-                    </span>
-                    <template v-else>
-                      {{ answer.answer }}
-                    </template>
-                  </div>
-                </div>
-              </div>
-
-              <div v-else>
-                <TipTapEditor
-                  v-model="answer.answer"
-                  class="editor"
-                  :mode="isAnswerOpen(answerIdx) ? 'edit' : 'view'"
-                  :style="isAnswerOpen(answerIdx) ? { backgroundColor: $themePalette.white } : {}"
-                  minHeight="80px"
-                  :autofocus="isAnswerOpen(answerIdx)"
-                  :image-processor="EditorImageProcessor"
-                  @update="updateAnswerText($event, answerIdx)"
-                  @minimize="emitClose"
-                  @open-editor="emitOpen(answerIdx)"
-                />
-              </div>
-            </div>
-
-            <div
-              v-if="toolbarIconActions.length > 0"
-              class="answer-actions"
-            >
-              <AssessmentItemToolbar
-                :iconActionsConfig="toolbarIconActions"
-                :collapse="isSmallScreen"
-                :displayMenu="isSmallScreen"
-                :canEdit="!isAnswerOpen(answerIdx)"
-                :canMoveUp="!isAnswerFirst(answerIdx)"
-                :canMoveDown="!isAnswerLast(answerIdx)"
-                class="toolbar"
-                analyticsLabel="Answer"
-                data-test="toolbar"
-                @click="onToolbarClick($event, answerIdx)"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    </component>
-
-    <KButton
-      v-if="isEditingAllowed"
-      class="answer-editor-button"
-      data-test="newAnswerBtn"
-      appearance="flat-button"
-      :appearanceOverrides="buttonAppearanceOverrides"
-      @click="addNewAnswer"
-    >
-      <div class="add-answer-btn-content">
-        <KIcon
-          icon="plus"
-          :color="$themePalette.blue.v_500"
-        />
-        <span>{{ isInputQuestion ? $tr('newAnswerBtnLabel') : $tr('addOptionBtnLabel') }}</span>
-      </div>
-    </KButton>
-  </div>
-
-</template>
-
-
-<script>
-
-  import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
-  import AssessmentItemToolbar from '../AssessmentItemToolbar';
-  import { AssessmentItemToolbarActions } from '../../constants';
-  import { getCorrectAnswersIndices, mapCorrectAnswers } from '../../utils';
-  import { AssessmentItemTypes } from 'shared/constants';
-  import { swapElements } from 'shared/utils/helpers';
-  import EditorImageProcessor from 'shared/views/TipTapEditor/TipTapEditor/services/imageService';
-
-  import TipTapEditor from 'shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue';
-
-  const updateAnswersOrder = answers => {
-    return answers.map((answer, idx) => {
-      return {
-        ...answer,
-        order: idx + 1,
-      };
-    });
-  };
-
-  export default {
-    name: 'AnswersEditor',
-    components: {
-      AssessmentItemToolbar,
-      TipTapEditor,
-    },
-    setup() {
-      const { windowIsSmall } = useKResponsiveWindow();
-      return {
-        windowIsSmall,
-      };
-    },
-    model: {
-      prop: 'answers',
-      event: 'update',
-    },
-    props: {
-      questionKind: {
-        type: String,
-        validator: value => {
-          return Object.values(AssessmentItemTypes).includes(value);
-        },
-        default: AssessmentItemTypes.SINGLE_SELECTION,
-      },
-      answers: {
-        type: Array,
-        default: () => [],
-      },
-      openAnswerIdx: {
-        type: Number,
-        default: 0,
-      },
-    },
-    data() {
-      return {
-        EditorImageProcessor, // Make it available in the template
-        correctAnswersIndices: getCorrectAnswersIndices(this.questionKind, this.answers),
-      };
-    },
-    computed: {
-      isSingleSelection() {
-        return this.questionKind === AssessmentItemTypes.SINGLE_SELECTION;
-      },
-      isMultipleSelection() {
-        return this.questionKind === AssessmentItemTypes.MULTIPLE_SELECTION;
-      },
-      isTrueFalse() {
-        return this.questionKind === AssessmentItemTypes.TRUE_FALSE;
-      },
-      isInputQuestion() {
-        return this.questionKind === AssessmentItemTypes.INPUT_QUESTION;
-      },
-      shouldHaveOneCorrectAnswer() {
-        return this.isSingleSelection || this.isTrueFalse;
-      },
-      isEditingAllowed() {
-        return !this.isTrueFalse;
-      },
-      answersLabel() {
-        if (this.isSingleSelection || this.isTrueFalse) {
-          return this.$tr('answersLabelSingleChoice');
-        } else if (this.isMultipleSelection) {
-          return this.$tr('answersLabelMultipleChoice');
-        }
-        return this.$tr('answersLabelNumeric');
-      },
-      toolbarIconActions() {
-        // On small screens, collapse ALL actions into the ⋮ menu so only
-        // one icon renders, giving the answer text room to breathe.
-        const deleteAction = this.isSmallScreen
-          ? [AssessmentItemToolbarActions.DELETE_ITEM, { collapse: true }]
-          : AssessmentItemToolbarActions.DELETE_ITEM;
-
-        if (this.isSingleSelection || this.isMultipleSelection) {
-          return [
-            [AssessmentItemToolbarActions.MOVE_ITEM_UP, { collapse: true }],
-            [AssessmentItemToolbarActions.MOVE_ITEM_DOWN, { collapse: true }],
-            deleteAction,
-          ];
-        }
-
-        if (this.isInputQuestion) {
-          return [deleteAction];
-        }
-
-        return [];
-      },
-      isSmallScreen() {
-        return this.windowIsSmall;
-      },
-      buttonAppearanceOverrides() {
-        return {
-          backgroundColor: this.$themePalette.blue.v_50,
-          border: `1px dashed ${this.$themePalette.blue.v_200}`,
-          color: `${this.$themePalette.blue.v_500} !important`,
-          fontSize: '14px',
-          fontWeight: '600',
-          textTransform: 'none',
-          ':hover': {
-            backgroundColor: this.$themePalette.blue.v_100,
-          },
-        };
-      },
-      answerNumberClasses() {
-        return this.$computedClass({
-          backgroundColor: this.$themePalette.white,
-          border: `1px solid ${this.$themePalette.grey.v_300}`,
-          ':focus': {
-            borderColor: this.$themePalette.grey.v_500,
-          },
-        });
-      },
-    },
-    watch: {
-      answers() {
-        this.correctAnswersIndices = getCorrectAnswersIndices(this.questionKind, this.answers);
-      },
-    },
-    methods: {
-      isAnswerFirst(answerIdx) {
-        return answerIdx === 0;
-      },
-      isAnswerLast(answerIdx) {
-        return answerIdx === this.answers.length - 1;
-      },
-      isAnswerOpen(answerIdx) {
-        return answerIdx === this.openAnswerIdx;
-      },
-      answerClasses(answerIdx) {
-        const classes = ['answer'];
-
-        if (!this.isAnswerOpen(answerIdx)) {
-          classes.push('closed');
-
-          const hoverStyles = this.answers[answerIdx].correct
-            ? {}
-            : { ':hover': { backgroundColor: this.$themePalette.grey.v_100 } };
-
-          classes.push(
-            this.$computedClass({
-              cursor: 'pointer',
-              ...hoverStyles,
-            }),
-          );
-        }
-
-        return classes;
-      },
-      setCorrectAnswer(answerIdx, isChecked) {
-        if (this.shouldHaveOneCorrectAnswer) {
-          if (isChecked) {
-            this.onCorrectAnswersIndicesUpdate(answerIdx);
-          }
-        } else {
-          // multiple selection
-          let indices = [...this.correctAnswersIndices];
-          if (isChecked && !indices.includes(answerIdx)) {
-            indices.push(answerIdx);
-          } else if (!isChecked && indices.includes(answerIdx)) {
-            indices = indices.filter(idx => idx !== answerIdx);
-          }
-          this.onCorrectAnswersIndicesUpdate(indices);
-        }
-      },
-      onCorrectAnswersIndicesUpdate(newIndices) {
-        // indices can be an array or a single value - depends on question type
-        if (this.correctAnswersIndices !== null) {
-          if (this.shouldHaveOneCorrectAnswer && newIndices === this.correctAnswersIndices) {
-            return;
-          }
-
-          if (
-            !this.shouldHaveOneCorrectAnswer &&
-            JSON.stringify([...newIndices].sort()) ===
-            JSON.stringify([...this.correctAnswersIndices].sort())
-          ) {
-            return;
-          }
-        }
-
-        const updatedAnswers = mapCorrectAnswers(this.answers, newIndices);
-
-        this.emitUpdate(updatedAnswers);
-      },
-      emitOpen(answerIdx) {
-        if (!this.isEditingAllowed) {
-          return;
-        }
-
-        this.$emit('open', answerIdx);
-      },
-      emitClose() {
-        this.$emit('close');
-      },
-      emitUpdate(updatedAnswers) {
-        this.$emit('update', updatedAnswers);
-      },
-      moveAnswerUp(answerIdx) {
-        if (this.isAnswerFirst(answerIdx)) {
-          return;
-        }
-
-        let updatedAnswers = swapElements(this.answers, answerIdx, answerIdx - 1);
-        updatedAnswers = updateAnswersOrder(updatedAnswers);
-
-        this.emitUpdate(updatedAnswers);
-
-        if (this.isAnswerOpen(answerIdx)) {
-          this.emitOpen(answerIdx - 1);
-        } else if (this.isAnswerOpen(answerIdx - 1)) {
-          this.emitOpen(answerIdx);
-        }
-      },
-      moveAnswerDown(answerIdx) {
-        if (this.isAnswerLast(answerIdx)) {
-          return;
-        }
-
-        let updatedAnswers = swapElements(this.answers, answerIdx, answerIdx + 1);
-        updatedAnswers = updateAnswersOrder(updatedAnswers);
-
-        this.emitUpdate(updatedAnswers);
-
-        if (this.isAnswerOpen(answerIdx)) {
-          this.emitOpen(answerIdx + 1);
-        } else if (this.isAnswerOpen(answerIdx + 1)) {
-          this.emitOpen(answerIdx);
-        }
-      },
-      deleteAnswer(answerIdx) {
-        let updatedAnswers = JSON.parse(JSON.stringify(this.answers));
-
-        updatedAnswers.splice(answerIdx, 1);
-        updatedAnswers = updateAnswersOrder(updatedAnswers);
-
-        this.emitUpdate(updatedAnswers);
-
-        if (this.isAnswerOpen(answerIdx)) {
-          this.emitClose();
-        } else if (this.openAnswerIdx > answerIdx) {
-          this.emitOpen(this.openAnswerIdx - 1);
-        }
-      },
-      onAnswerClick(event, answerIdx) {
-        // do not open on toolbar click
-        if (event.target.closest('.toolbar') !== null) {
-          return;
-        }
-
-        // do not open on editor minimize button click
-        if (event.target.classList.contains('tui-toolbar-btn-minimize')) {
-          return;
-        }
-
-        // do not open on checkbox click
-        if (
-          event.target.tagName.toLowerCase() === 'input' ||
-          event.target.closest('.answer-selection') !== null
-        ) {
-          return;
-        }
-
-        this.emitOpen(answerIdx);
-        this.$analytics.trackAction('exercise_editor', 'Open', {
-          eventLabel: 'Answer',
-        });
-      },
-      onToolbarClick(action, answerIdx) {
-        switch (action) {
-          case AssessmentItemToolbarActions.MOVE_ITEM_UP:
-            this.moveAnswerUp(answerIdx);
-            break;
-
-          case AssessmentItemToolbarActions.MOVE_ITEM_DOWN:
-            this.moveAnswerDown(answerIdx);
-            break;
-
-          case AssessmentItemToolbarActions.DELETE_ITEM:
-            this.deleteAnswer(answerIdx);
-            break;
-        }
-      },
-      updateAnswerText(newAnswerText, answerIdx) {
-        const updatedAnswers = [...this.answers];
-        updatedAnswers[answerIdx].answer = newAnswerText;
-
-        this.emitUpdate(updatedAnswers);
-      },
-      addNewAnswer() {
-        let updatedAnswers = this.answers || [];
-        updatedAnswers = updateAnswersOrder(updatedAnswers);
-
-        const defaultCorrectState = this.isInputQuestion ? true : false;
-        updatedAnswers.push({
-          answer: '',
-          correct: defaultCorrectState,
-          order: updatedAnswers.length + 1,
-        });
-
-        this.emitUpdate(updatedAnswers);
-        this.emitOpen(updatedAnswers.length - 1);
-        this.$analytics.trackAction('exercise_editor', 'Add', {
-          eventLabel: 'Answer',
-        });
-      },
-    },
-    $trs: {
-      answersLabelSingleChoice: 'Answer options — select one correct answer',
-      answersLabelMultipleChoice: 'Answer options — select all correct answers',
-      answersLabelNumeric: 'Answer options — enter all acceptable spellings or formats',
-      noAnswersPlaceholder: 'Question has no answer options',
-      newAnswerBtnLabel: 'Add answer',
-      addOptionBtnLabel: 'Add option',
-      enterNumberPlaceholder: 'Enter number',
-    },
-  };
-
-</script>
-
-
-<style lang="scss" scoped>
-
-  .answers-label {
-    margin-bottom: 5px;
-    font-size: 12px;
-    font-weight: 600;
-  }
-
-  .answers-list {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-  }
-
-  .answer-border {
-    border: 1px solid;
-    border-radius: 4px;
-    transition: background-color 0.3s;
-  }
-
-  .no-answers-placeholder {
-    padding: 16px;
-  }
-
-  .answer-card-text {
-    padding: 7.5px;
-
-    &.is-closed {
-      min-height: 42px;
-      padding-top: 0;
-      padding-bottom: 0;
-
-      .small-screen & {
-        min-height: 36px;
-      }
-    }
-  }
-
-  .answer-layout {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    &.is-open {
-      align-items: flex-start;
-    }
-
-    &.small-screen {
-      &.is-open {
-        flex-wrap: wrap;
-        align-items: center;
-
-        .answer-selection {
-          flex: 0 0 auto;
-          order: 0;
-          margin-bottom: 4px;
-        }
-
-        .answer-actions {
-          flex: 0 0 auto;
-          order: 1;
-          margin-bottom: 4px;
-        }
-
-        .answer-content {
-          flex: 0 0 100%;
-          order: 2;
-          min-width: 0;
-        }
-      }
-    }
-  }
-
-  .answer-selection {
-    flex-shrink: 0;
-    margin-right: 16px;
-
-    .small-screen & {
-      margin-right: 6px;
-    }
-  }
-
-  .answer-content {
-    position: relative;
-    flex: 1;
-    min-width: 0;
-  }
-
-  .answer-view-text {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    min-height: 42px;
-    padding: 0 4px;
-    overflow: hidden;
-    border-radius: 4px;
-
-    .small-screen.is-closed & {
-      min-height: 36px;
-    }
-  }
-
-  .editor {
-    // Fills parent so the toolbar's ResizeObserver measures the correct width.
-    width: 100%;
-  }
-
-  .answer-view-editor {
-    flex: 1;
-    min-width: 0;
-    overflow: hidden;
-
-    .small-screen.is-closed & {
-      font-size: 12px;
-    }
-  }
-
-  .answer-number {
-    width: 100%;
-    padding: 10px;
-    font-size: 14px;
-    border-radius: 4px;
-    outline: none;
-
-    .small-screen & {
-      padding: 7px 8px;
-      font-size: 13px;
-    }
-
-    &::-webkit-outer-spin-button,
-    &::-webkit-inner-spin-button {
-      margin: 0;
-      appearance: none;
-    }
-
-    &[type='number'] {
-      appearance: textfield;
-    }
-  }
-
-  .answer-actions {
-    flex-shrink: 0;
-    margin-left: 16px;
-  }
-
-  .answer {
-    &.closed:hover {
-      cursor: pointer;
-    }
-  }
-
-  .answer-editor-button {
-    justify-content: center;
-    width: 100%;
-    padding: 11px 16px !important;
-    margin-top: 10px;
-    line-height: unset !important;
-    border-radius: 4px !important;
-  }
-
-  .add-answer-btn-content {
-    display: flex;
-    gap: 10px;
-    align-items: center;
-    justify-content: center;
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.spec.js
deleted file mode 100644
index e908768f04..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.spec.js
+++ /dev/null
@@ -1,437 +0,0 @@
-import { shallowMount, mount } from '@vue/test-utils';
-
-import { AssessmentItemToolbarActions } from '../../constants';
-import { assessmentItemKey } from '../../utils';
-import AssessmentEditor from './AssessmentEditor';
-import { AssessmentItemTypes, ValidationErrors, DELAYED_VALIDATION } from 'shared/constants';
-
-jest.mock('shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue');
-
-const NODE_ID = 'node-id';
-const ITEM1 = {
-  contentnode: NODE_ID,
-  assessment_id: 'question-1',
-  question: 'Question 1',
-  type: AssessmentItemTypes.INPUT_QUESTION,
-  order: 0,
-  answers: [
-    { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-    { answer: 'Peanut butter', correct: true, order: 2 },
-  ],
-  hints: [],
-};
-const ITEM2 = {
-  contentnode: NODE_ID,
-  assessment_id: 'question-2',
-  question: 'Question 2',
-  type: AssessmentItemTypes.SINGLE_SELECTION,
-  order: 1,
-  answers: [
-    { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-    { answer: 'Peanut butter', correct: true, order: 2 },
-  ],
-  hints: [
-    { hint: "It's not healthy", order: 1 },
-    { hint: 'Tasty!', order: 2 },
-  ],
-};
-const ITEM3 = {
-  contentnode: NODE_ID,
-  assessment_id: 'question-3',
-  question: 'Question 3',
-  type: AssessmentItemTypes.MULTIPLE_SELECTION,
-  order: 2,
-  answers: [
-    { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-    { answer: 'Peanut butter', correct: false, order: 2 },
-    { answer: 'Jelly', correct: true, order: 3 },
-  ],
-  hints: [],
-};
-const ITEM4 = {
-  contentnode: NODE_ID,
-  assessment_id: 'question-4',
-  question: 'Question 4',
-  type: AssessmentItemTypes.TRUE_FALSE,
-  order: 3,
-  answers: [
-    { answer: 'True', correct: false, order: 1 },
-    { answer: 'False', correct: true, order: 2 },
-  ],
-  hints: [],
-};
-
-const ITEMS = [ITEM1, ITEM2, ITEM3, ITEM4];
-const ITEMS_VALIDATION = [
-  [],
-  [ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS],
-  [ValidationErrors.QUESTION_REQUIRED],
-];
-
-const checkShowAnswers = async wrapper => {
-  await wrapper.findComponent('[data-test="showAnswersCheckbox"]').trigger('click');
-};
-
-const getItems = wrapper => {
-  return wrapper.findAllComponents('[data-test="item"]');
-};
-
-const isItemOpen = assessmentItemWrapper => {
-  return assessmentItemWrapper.findComponent('[data-test="editor"]').exists();
-};
-
-const isAnswersPreviewVisible = assessmentItemWrapper => {
-  return assessmentItemWrapper.findComponent('[data-test="item-answers-preview"]').exists();
-};
-
-const clickNewQuestionBtn = async wrapper => {
-  await wrapper.findComponent('[data-test="newQuestionBtn"]').trigger('click');
-};
-
-const clickClose = async assessmentItemWrapper => {
-  await assessmentItemWrapper.findComponent('[data-test="closeBtn"]').trigger('click');
-};
-
-const clickDelete = async assessmentItemWrapper => {
-  await assessmentItemWrapper
-    .findComponent(`[data-test="toolbarMenuItem-${AssessmentItemToolbarActions.DELETE_ITEM}"]`)
-    .trigger('click');
-};
-
-const clickAddQuestionAbove = async assessmentItemWrapper => {
-  await assessmentItemWrapper
-    .findComponent(`[data-test="toolbarMenuItem-${AssessmentItemToolbarActions.ADD_ITEM_ABOVE}"]`)
-    .trigger('click');
-};
-
-const clickAddQuestionBelow = async assessmentItemWrapper => {
-  await assessmentItemWrapper
-    .findComponent(`[data-test="toolbarMenuItem-${AssessmentItemToolbarActions.ADD_ITEM_BELOW}"]`)
-    .trigger('click');
-};
-
-const clickMoveUp = async assessmentItemWrapper => {
-  await assessmentItemWrapper
-    .findComponent(`[data-test="toolbarIcon-${AssessmentItemToolbarActions.MOVE_ITEM_UP}"]`)
-    .trigger('click');
-};
-
-const clickMoveDown = async assessmentItemWrapper => {
-  await assessmentItemWrapper
-    .findComponent(`[data-test="toolbarIcon-${AssessmentItemToolbarActions.MOVE_ITEM_DOWN}"]`)
-    .trigger('click');
-};
-
-describe('AssessmentEditor', () => {
-  let wrapper;
-  const listeners = {
-    deleteItem: jest.fn(),
-    addItem: jest.fn(),
-    updateItem: jest.fn(),
-    updateItems: jest.fn(),
-  };
-
-  beforeEach(() => {
-    wrapper = mount(AssessmentEditor, {
-      propsData: {
-        nodeId: NODE_ID,
-        items: ITEMS,
-        itemsValidation: ITEMS_VALIDATION,
-      },
-      stubs: {
-        AssessmentItemEditor: true,
-      },
-      listeners,
-    });
-  });
-
-  it('smoke test', () => {
-    const wrapper = shallowMount(AssessmentEditor);
-
-    expect(wrapper.exists()).toBe(true);
-  });
-
-  describe('for an exercise with no questions', () => {
-    let wrapper;
-
-    beforeEach(() => {
-      wrapper = mount(AssessmentEditor, {
-        propsData: {
-          nodeId: NODE_ID,
-          items: [],
-        },
-      });
-    });
-
-    it('renders placeholder text if exercise has no questions', () => {
-      expect(wrapper.html()).toContain('Exercise has no questions');
-    });
-
-    it("doesn't render 'Show answers' checkbox", () => {
-      expect(wrapper.findComponent('[data-test="showAnswersCheckbox"]').exists()).toBe(false);
-    });
-  });
-
-  it('renders all items', () => {
-    const items = getItems(wrapper);
-
-    expect(items.length).toBe(4);
-
-    expect(items.at(0).findComponent({ name: 'RichTextEditor' }).props('value')).toBe(
-      ITEM1.question,
-    );
-    expect(items.at(1).findComponent({ name: 'RichTextEditor' }).props('value')).toBe(
-      ITEM2.question,
-    );
-    expect(items.at(2).findComponent({ name: 'RichTextEditor' }).props('value')).toBe(
-      ITEM3.question,
-    );
-    expect(items.at(3).findComponent({ name: 'RichTextEditor' }).props('value')).toBe(
-      ITEM4.question,
-    );
-  });
-
-  it('renders items as closed', () => {
-    const items = getItems(wrapper);
-
-    expect(isItemOpen(items.at(0))).toBe(false);
-    expect(isItemOpen(items.at(1))).toBe(false);
-    expect(isItemOpen(items.at(2))).toBe(false);
-    expect(isItemOpen(items.at(3))).toBe(false);
-  });
-
-  it("renders 'Show answers' checkbox", () => {
-    expect(wrapper.findComponent('[data-test="showAnswersCheckbox"]').exists()).toBe(true);
-  });
-
-  it("wraps 'Show answers' checkbox in a page container", () => {
-    expect(wrapper.find('.show-answers-container').exists()).toBe(true);
-  });
-
-  it('renders question card headers', () => {
-    expect(wrapper.html()).toContain('Question 1 of 4 — Numeric input');
-    expect(wrapper.html()).toContain('Question 2 of 4 — Single choice');
-  });
-
-  it("doesn't render answers preview by default", () => {
-    const items = getItems(wrapper);
-
-    expect(isAnswersPreviewVisible(items.at(0))).toBe(false);
-    expect(isAnswersPreviewVisible(items.at(1))).toBe(false);
-    expect(isAnswersPreviewVisible(items.at(2))).toBe(false);
-    expect(isAnswersPreviewVisible(items.at(3))).toBe(false);
-  });
-
-  it('renders answers preview on show answers click', async () => {
-    await checkShowAnswers(wrapper);
-
-    const items = getItems(wrapper);
-
-    expect(isAnswersPreviewVisible(items.at(0))).toBe(true);
-    expect(isAnswersPreviewVisible(items.at(1))).toBe(true);
-    expect(isAnswersPreviewVisible(items.at(2))).toBe(true);
-    expect(isAnswersPreviewVisible(items.at(3))).toBe(true);
-  });
-
-  it('opens an item on item click', async () => {
-    const items = getItems(wrapper);
-    await items.at(1).trigger('click');
-    const updatedItems = getItems(wrapper);
-
-    expect(isItemOpen(updatedItems.at(0))).toBe(false);
-    expect(isItemOpen(updatedItems.at(1))).toBe(true);
-    expect(isItemOpen(updatedItems.at(2))).toBe(false);
-    expect(isItemOpen(updatedItems.at(3))).toBe(false);
-  });
-
-  it('closes an item on close button click', async () => {
-    // open an item at first
-    const items = getItems(wrapper);
-    await items.at(1).trigger('click');
-    let updatedItems = getItems(wrapper);
-    expect(isItemOpen(updatedItems.at(1))).toBe(true);
-
-    // now close it
-    await clickClose(updatedItems.at(1));
-    updatedItems = getItems(wrapper);
-    expect(isItemOpen(updatedItems.at(1))).toBe(false);
-  });
-
-  describe('on "Delete" click', () => {
-    beforeEach(async () => {
-      jest.clearAllMocks();
-      const items = getItems(wrapper);
-      await clickDelete(items.at(1));
-    });
-
-    it('emits delete item event with a correct key', () => {
-      expect(listeners.deleteItem).toHaveBeenCalledWith(ITEM2);
-      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
-    });
-
-    it('emits update item events with updated order of items after the deleted item', () => {
-      expect(listeners.updateItems).toHaveBeenCalledWith([
-        {
-          ...assessmentItemKey(ITEM1),
-          order: 0,
-        },
-        {
-          ...assessmentItemKey(ITEM3),
-          order: 1,
-        },
-        {
-          ...assessmentItemKey(ITEM4),
-          order: 2,
-        },
-      ]);
-      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('on "Add question above" click', () => {
-    beforeEach(async () => {
-      jest.clearAllMocks();
-      const items = getItems(wrapper);
-      await clickAddQuestionAbove(items.at(1));
-    });
-
-    it('emits add item event with a new item with a correct order', () => {
-      expect(listeners.addItem).toHaveBeenCalledWith({
-        contentnode: NODE_ID,
-        question: '',
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        answers: [],
-        hints: [],
-        order: 1,
-        [DELAYED_VALIDATION]: true,
-      });
-    });
-
-    it('emits update item events with updated order of items below the new item', () => {
-      expect(listeners.updateItems).toHaveBeenCalledWith([
-        {
-          ...assessmentItemKey(ITEM1),
-          order: 0,
-        },
-        {
-          ...assessmentItemKey(ITEM2),
-          order: 2,
-        },
-        {
-          ...assessmentItemKey(ITEM3),
-          order: 3,
-        },
-        {
-          ...assessmentItemKey(ITEM4),
-          order: 4,
-        },
-      ]);
-      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('on "Add question below" click', () => {
-    beforeEach(async () => {
-      jest.clearAllMocks();
-      const items = getItems(wrapper);
-      await clickAddQuestionBelow(items.at(1));
-    });
-
-    it('emits add item event with a new item with a correct order', () => {
-      expect(listeners.addItem).toHaveBeenCalledWith({
-        contentnode: NODE_ID,
-        question: '',
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        answers: [],
-        hints: [],
-        order: 2,
-        [DELAYED_VALIDATION]: true,
-      });
-      expect(listeners.addItem).toHaveBeenCalledTimes(1);
-    });
-
-    it('emits update item events with updated order of items below the new item', () => {
-      expect(listeners.updateItems).toHaveBeenCalledWith([
-        {
-          ...assessmentItemKey(ITEM1),
-          order: 0,
-        },
-        {
-          ...assessmentItemKey(ITEM2),
-          order: 1,
-        },
-        {
-          ...assessmentItemKey(ITEM3),
-          order: 3,
-        },
-        {
-          ...assessmentItemKey(ITEM4),
-          order: 4,
-        },
-      ]);
-      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('on "Move up" click', () => {
-    beforeEach(async () => {
-      jest.clearAllMocks();
-      const items = getItems(wrapper);
-      await clickMoveUp(items.at(1));
-    });
-
-    it('emits update item events with updated order of affected items', () => {
-      expect(listeners.updateItems).toHaveBeenCalledWith([
-        {
-          ...assessmentItemKey(ITEM2),
-          order: 0,
-        },
-        {
-          ...assessmentItemKey(ITEM1),
-          order: 1,
-        },
-      ]);
-      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('on "Move down" click', () => {
-    beforeEach(async () => {
-      jest.clearAllMocks();
-      const items = getItems(wrapper);
-      await clickMoveDown(items.at(1));
-    });
-
-    it('emits update item events with updated order of affected items', () => {
-      expect(listeners.updateItems).toHaveBeenCalledWith([
-        {
-          ...assessmentItemKey(ITEM2),
-          order: 2,
-        },
-        {
-          ...assessmentItemKey(ITEM3),
-          order: 1,
-        },
-      ]);
-      expect(listeners.updateItems).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('on "Add new question" click', () => {
-    beforeEach(async () => {
-      await clickNewQuestionBtn(wrapper);
-    });
-
-    it('emits add item event with a new item with a correct order', () => {
-      expect(listeners.addItem).toHaveBeenCalledWith({
-        contentnode: NODE_ID,
-        question: '',
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        answers: [],
-        hints: [],
-        order: 4,
-        [DELAYED_VALIDATION]: true,
-      });
-    });
-  });
-});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
deleted file mode 100644
index f6ccb6c2b0..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentEditor/AssessmentEditor.vue
+++ /dev/null
@@ -1,550 +0,0 @@
-<template>
-
-  <VContainer
-    fluid
-    :style="containerStyle"
-  >
-    <template v-if="sortedItems && sortedItems.length">
-      <KPageContainer
-        class="show-answers-container"
-        :topMargin="0"
-        noPadding
-      >
-        <div class="show-answers-inner">
-          <Checkbox
-            v-model="displayAnswersPreview"
-            :label="$tr('showAnswers')"
-            class="ma-0"
-            data-test="showAnswersCheckbox"
-            style="font-size: 16px"
-          />
-        </div>
-      </KPageContainer>
-
-      <transition-group
-        name="list-complete"
-        tag="div"
-      >
-        <KPageContainer
-          v-for="(item, idx) in sortedItems"
-          :key="itemCardKey(item)"
-          ref="questionCardRef"
-          noPadding
-          :topMargin="0"
-          class="question-card"
-          :class="itemClasses(item)"
-          data-test="item"
-          @click.native="onItemClick($event, item)"
-        >
-          <div
-            class="question-card-header"
-            :style="{ borderBottom: `1px solid ${$themePalette.grey.v_200}` }"
-          >
-            <h3
-              class="question-card-title"
-              :style="{ color: $themePalette.grey.v_800 }"
-            >
-              <template v-if="isItemActive(item)">
-                {{ questionNumberLabel(idx) }}
-              </template>
-              <template v-else>
-                {{ questionNumberAndTypeLabel(item, idx) }}
-              </template>
-            </h3>
-
-            <div class="question-card-actions toolbar">
-              <div v-if="!isItemValid(item)">
-                <template v-if="$vuetify.breakpoint.lgAndUp">
-                  <Icon icon="error" />
-                  <span class="font-weight-bold red--text">
-                    {{ $tr('incompleteItemIndicatorLabel') }}
-                  </span>
-                </template>
-                <template v-else>
-                  <Icon
-                    ref="incompleteError"
-                    icon="error"
-                  />
-                  <KTooltip
-                    reference="incompleteError"
-                    placement="bottom"
-                    :refs="$refs"
-                  >
-                    {{ $tr('incompleteItemIndicatorLabel') }}
-                  </KTooltip>
-                </template>
-              </div>
-
-              <AssessmentItemToolbar
-                :iconActionsConfig="itemToolbarIconActions()"
-                :displayMenu="true"
-                :menuActionsConfig="itemToolbarMenuActions()"
-                :canMoveUp="!isItemFirst(item)"
-                :canMoveDown="!isItemLast(item)"
-                :collapse="!$vuetify.breakpoint.mdAndUp"
-                :itemLabel="$tr('toolbarItemLabel')"
-                analyticsLabel="Question"
-                @click="onItemToolbarClick($event, item)"
-              />
-            </div>
-          </div>
-
-          <div class="question-card-body">
-            <AssessmentItemEditor
-              v-if="isItemActive(item)"
-              :item="item"
-              :errors="itemErrors(item)"
-              :openDialog="openDialog"
-              :nodeId="nodeId"
-              data-test="editor"
-              @update="onItemUpdate"
-              @close="closeActiveItem"
-            />
-            <AssessmentItemPreview
-              v-else
-              :item="item"
-              :detailed="displayAnswersPreview"
-              :showTypeLabel="false"
-            />
-          </div>
-
-          <div
-            v-if="isItemActive(item)"
-            class="question-card-footer"
-          >
-            <KButton
-              :text="$tr('closeBtnLabel')"
-              class="close-item-btn"
-              data-test="closeBtn"
-              @click="closeActiveItem"
-            />
-          </div>
-        </KPageContainer>
-      </transition-group>
-    </template>
-
-    <div v-else>
-      {{ $tr('noQuestionsPlaceholder') }}
-    </div>
-
-    <KButton
-      :text="$tr('newQuestionBtnLabel')"
-      class="ml-0 mt-4"
-      data-test="newQuestionBtn"
-      @click="addItem"
-    />
-  </VContainer>
-
-</template>
-
-
-<script>
-
-  import { AssessmentItemToolbarActions, AssessmentItemTypeLabels } from '../../constants';
-  import { assessmentItemKey } from '../../utils';
-  import translator from '../../translator';
-
-  import AssessmentItemToolbar from '../AssessmentItemToolbar';
-  import AssessmentItemEditor from '../AssessmentItemEditor/AssessmentItemEditor';
-  import AssessmentItemPreview from '../AssessmentItemPreview/AssessmentItemPreview';
-  import Checkbox from 'shared/views/form/Checkbox';
-  import { AssessmentItemTypes, DELAYED_VALIDATION } from 'shared/constants';
-
-  function areItemsEqual(item1, item2) {
-    if (!item1 || !item2) {
-      return false;
-    }
-    if (item1.assessment_id !== undefined && item2.assessment_id !== undefined) {
-      return item1.assessment_id === item2.assessment_id;
-    }
-    return item1.order === item2.order;
-  }
-
-  export default {
-    name: 'AssessmentEditor',
-    components: {
-      AssessmentItemToolbar,
-      AssessmentItemEditor,
-      AssessmentItemPreview,
-      Checkbox,
-    },
-    props: {
-      nodeId: {
-        type: String,
-        required: true,
-      },
-      items: {
-        type: Array,
-        default: () => [],
-      },
-      itemsErrors: {
-        type: Object,
-        default: null,
-      },
-      /**
-       * Inject a function that opens a dialog that should
-       * be confirmed before certain actions can be performed.
-       * If not provided, no confirmation will be required.
-       * Expected interface:
-       *   openDialog({
-       *     title: String,
-       *     message: String,
-       *     cancelLabel: String,
-       *     submitLabel: String,
-       *     onCancel: Function,
-       *     onSubmit: Function,
-       *   })
-       * })
-       */
-      openDialog: {
-        type: Function,
-        default: () => {},
-      },
-      windowIsSmall: {
-        type: Boolean,
-        default: false,
-      },
-    },
-    data() {
-      return {
-        activeItem: null,
-        displayAnswersPreview: false,
-      };
-    },
-    computed: {
-      sortedItems() {
-        if (!this.items) {
-          return [];
-        }
-        return [...this.items].sort((item1, item2) => (item1.order > item2.order ? 1 : -1));
-      },
-      firstItem() {
-        return this.sortedItems.length ? this.sortedItems[0] : null;
-      },
-      lastItem() {
-        return this.sortedItems.length ? this.sortedItems[this.sortedItems.length - 1] : null;
-      },
-      containerStyle() {
-        return this.windowIsSmall ? {} : { maxWidth: '85%', margin: '0 auto' };
-      },
-    },
-    watch: {
-      items(newItems) {
-        if (!newItems) {
-          return;
-        }
-        const updatedActiveItem = newItems.find(item => areItemsEqual(item, this.activeItem));
-        if (updatedActiveItem) {
-          this.activeItem = updatedActiveItem;
-        }
-      },
-    },
-    methods: {
-      /**
-       * @public
-       */
-      reset() {
-        this.closeActiveItem();
-        this.displayAnswersPreview = false;
-      },
-      itemIdx(item) {
-        return this.sortedItems.findIndex(i => areItemsEqual(i, item));
-      },
-      questionNumberLabel(idx) {
-        return this.$tr('questionNumberLabel', {
-          number: idx + 1,
-          total: this.sortedItems.length,
-        });
-      },
-      openItem(item) {
-        if (!this.isPerseusItem(item)) {
-          this.closeActiveItem();
-          this.activeItem = item;
-        }
-      },
-      closeActiveItem() {
-        if (this.activeItem === null) {
-          return;
-        }
-        this.$emit('updateItem', {
-          ...assessmentItemKey(this.activeItem),
-          [DELAYED_VALIDATION]: false,
-        });
-        this.activeItem = null;
-      },
-      isItemActive(item) {
-        return areItemsEqual(this.activeItem, item);
-      },
-      itemCardKey(item) {
-        return `question-card-${item.assessment_id}`;
-      },
-      questionNumberAndTypeLabel(item, idx) {
-        const kind = item?.type || '';
-        const kindLabel =
-          kind && AssessmentItemTypeLabels[kind]
-            ? translator.$tr(AssessmentItemTypeLabels[kind])
-            : '';
-        return this.$tr('questionNumberAndTypeLabel', {
-          number: idx + 1,
-          total: this.sortedItems.length,
-          type: kindLabel,
-        });
-      },
-      isPerseusItem(item) {
-        return item && item.type === AssessmentItemTypes.PERSEUS_QUESTION;
-      },
-      isItemFirst(item) {
-        return areItemsEqual(this.firstItem, item);
-      },
-      isItemLast(item) {
-        return areItemsEqual(this.lastItem, item);
-      },
-      itemErrors(item) {
-        if (!this.itemsErrors || !this.itemsErrors[item.assessment_id]) {
-          return [];
-        }
-        return this.itemsErrors[item.assessment_id];
-      },
-      isItemValid(item) {
-        return this.itemErrors(item).length === 0;
-      },
-      itemClasses(item) {
-        const classes = ['item'];
-
-        if (!this.isItemActive(item)) {
-          classes.push('closed');
-        }
-
-        return classes;
-      },
-      itemToolbarIconActions() {
-        return [
-          [AssessmentItemToolbarActions.MOVE_ITEM_UP, { collapse: true }],
-          [AssessmentItemToolbarActions.MOVE_ITEM_DOWN, { collapse: true }],
-        ];
-      },
-      itemToolbarMenuActions() {
-        return [
-          AssessmentItemToolbarActions.ADD_ITEM_ABOVE,
-          AssessmentItemToolbarActions.ADD_ITEM_BELOW,
-          AssessmentItemToolbarActions.DELETE_ITEM,
-        ];
-      },
-      onItemUpdate(item) {
-        this.$emit('updateItem', item);
-      },
-      /**
-       * @param {Object} before A new item should be added before this item.
-       * @param {Object} after A new item should be added after this item.
-       */
-      async addItem({ before, after }) {
-        let newItemOrder;
-        if (before) {
-          newItemOrder = this.itemIdx(before);
-        } else if (after) {
-          newItemOrder = this.itemIdx(after) + 1;
-        } else {
-          newItemOrder = this.items.length;
-        }
-        const newItem = {
-          contentnode: this.nodeId,
-          question: '',
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [],
-          hints: [],
-          order: newItemOrder,
-          [DELAYED_VALIDATION]: true,
-        };
-
-        const reorderedItems = [...this.sortedItems];
-        reorderedItems.splice(newItem.order, 0, newItem);
-
-        const newOrders = this.items.map(item => ({
-          ...assessmentItemKey(item),
-          order: reorderedItems.indexOf(item),
-        }));
-
-        // ensure state updates are finished before opening the new item
-        await this.$listeners.updateItems(newOrders);
-        await this.$listeners.addItem(newItem);
-
-        this.openItem(newItem);
-        this.$analytics.trackAction('exercise_editor', 'Add', {
-          eventLabel: 'Question',
-        });
-        this.$nextTick(() => {
-          const questionCards = this.$refs['questionCardRef'];
-          if (questionCards?.length >= 1) {
-            const lastQuestionCard = questionCards[questionCards.length - 1].$el;
-            const editorDiv = document.getElementById('editViewId');
-            if (!editorDiv) {
-              return;
-            }
-            editorDiv.scrollTo({
-              top: lastQuestionCard.offsetTop,
-              behavior: 'smooth',
-            });
-          }
-        });
-      },
-      async deleteItem(itemToDelete) {
-        if (this.isItemActive(itemToDelete)) {
-          this.closeActiveItem();
-        }
-
-        const newOrders = this.items
-          .filter(item => item.assessment_id != itemToDelete.assessment_id)
-          .map(item => ({
-            ...assessmentItemKey(item),
-            order: item.order > itemToDelete.order ? item.order - 1 : item.order,
-          }));
-
-        // make sure order update happens first for slightly smoother animation
-        await this.$listeners.updateItems(newOrders);
-        this.$emit('deleteItem', itemToDelete);
-      },
-      swapItems(firstItem, secondItem) {
-        this.$emit('updateItems', [
-          {
-            ...assessmentItemKey(firstItem),
-            order: this.itemIdx(secondItem),
-          },
-          {
-            ...assessmentItemKey(secondItem),
-            order: this.itemIdx(firstItem),
-          },
-        ]);
-      },
-      moveItemUp(item) {
-        if (this.isItemFirst(item)) {
-          return;
-        }
-
-        const previousItem = this.sortedItems[this.itemIdx(item) - 1];
-        this.swapItems(item, previousItem);
-      },
-      moveItemDown(item) {
-        if (this.isItemLast(item)) {
-          return;
-        }
-
-        const nextItem = this.sortedItems[this.itemIdx(item) + 1];
-        this.swapItems(item, nextItem);
-      },
-      onItemClick(event, item) {
-        if (this.isItemActive(item)) {
-          return;
-        }
-
-        if (
-          event.target.closest('.close-item-btn') !== null ||
-          event.target.closest('.toolbar') !== null ||
-          event.target.closest('.hints-preview') !== null
-        ) {
-          return;
-        }
-
-        this.openItem(item);
-        this.$analytics.trackAction('exercise_editor', 'Open', {
-          eventLabel: 'Question',
-        });
-      },
-      onItemToolbarClick(action, item) {
-        switch (action) {
-          case AssessmentItemToolbarActions.EDIT_ITEM:
-            this.openItem(item);
-            break;
-
-          case AssessmentItemToolbarActions.DELETE_ITEM:
-            this.deleteItem(item);
-            break;
-
-          case AssessmentItemToolbarActions.ADD_ITEM_ABOVE:
-            this.addItem({ before: item });
-            break;
-
-          case AssessmentItemToolbarActions.ADD_ITEM_BELOW:
-            this.addItem({ after: item });
-            break;
-
-          case AssessmentItemToolbarActions.MOVE_ITEM_UP:
-            this.moveItemUp(item);
-            break;
-
-          case AssessmentItemToolbarActions.MOVE_ITEM_DOWN:
-            this.moveItemDown(item);
-            break;
-        }
-      },
-    },
-    $trs: {
-      incompleteItemIndicatorLabel: 'Incomplete',
-      toolbarItemLabel: 'question',
-      noQuestionsPlaceholder: 'Exercise has no questions',
-      closeBtnLabel: 'Close',
-      newQuestionBtnLabel: 'New question',
-      showAnswers: 'Show answers',
-      questionNumberLabel: 'Question {number} of {total}',
-      questionNumberAndTypeLabel: 'Question {number} of {total} — {type}',
-    },
-  };
-
-</script>
-
-
-<style lang="scss" scoped>
-
-  .show-answers-container,
-  .question-card {
-    margin-bottom: 16px;
-  }
-
-  .show-answers-inner {
-    display: flex;
-    align-items: center;
-    padding: 12px;
-  }
-
-  .question-card {
-    --question-card-horizontal-padding: 20px;
-
-    position: relative;
-    min-height: 75px;
-    padding: 0;
-
-    &.closed {
-      cursor: pointer;
-    }
-  }
-
-  .question-card-header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 12px var(--question-card-horizontal-padding);
-  }
-
-  .question-card-title {
-    margin: 0;
-    font-size: 14px;
-    font-weight: 600;
-  }
-
-  .question-card-actions {
-    display: flex;
-    gap: 8px;
-    align-items: center;
-  }
-
-  .question-card-body {
-    min-width: 0;
-    padding: 10px var(--question-card-horizontal-padding);
-  }
-
-  .question-card-footer {
-    display: flex;
-    justify-content: flex-end;
-    padding: 0 var(--question-card-horizontal-padding) 20px;
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.spec.js
deleted file mode 100644
index f5d55b88d8..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.spec.js
+++ /dev/null
@@ -1,220 +0,0 @@
-import { render, screen, fireEvent, within, configure } from '@testing-library/vue';
-import userEvent from '@testing-library/user-event';
-
-import { factory } from '../../store';
-import { assessmentItemKey } from '../../utils';
-import AssessmentItemEditor from './AssessmentItemEditor';
-import { AssessmentItemTypes, ValidationErrors } from 'shared/constants';
-
-jest.mock('shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue');
-
-configure({
-  testIdAttribute: 'data-test',
-});
-
-const store = factory();
-
-const ITEM = {
-  contentnode: 'Exercise 2',
-  assessment_id: 'Question 2',
-  question: 'Exercise 2 - Question 2',
-  type: AssessmentItemTypes.SINGLE_SELECTION,
-  answers: [
-    { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-    { answer: 'Peanut butter', correct: false, order: 2 },
-  ],
-  hints: [
-    { hint: "It's not healthy", order: 1 },
-    { hint: 'Tasty!', order: 2 },
-  ],
-};
-
-const renderComponent = (props = {}) => {
-  return render(AssessmentItemEditor, {
-    store,
-    routes: [],
-    props: {
-      nodeId: 'node-id',
-      item: ITEM,
-      ...props,
-    },
-  });
-};
-
-// Returns the payload of the most recent `update` event.
-const lastUpdatePayload = emitted => {
-  const updates = emitted().update;
-  return updates[updates.length - 1][0];
-};
-
-// Opens the question editor (question starts collapsed in view mode) and returns its textbox.
-const openQuestionEditor = async user => {
-  await user.click(screen.getByTestId('questionText'));
-  // Both the type dropdown and the answers expose textboxes, so target the question editor's.
-  return screen.getAllByRole('textbox').find(el => el.tagName === 'TEXTAREA');
-};
-
-// Opens the response-type dropdown (by clicking its current value) and picks a new type.
-const changeQuestionType = async (user, currentLabel, newLabel) => {
-  const select = screen.getByTestId('kindSelect');
-  await user.click(within(select).getByText(currentLabel));
-  await user.click(await screen.findByText(newLabel));
-};
-
-describe('AssessmentItemEditor', () => {
-  it('shows the response type, question, answers, and hints of the item', () => {
-    renderComponent();
-
-    expect(screen.getByText('Type')).toBeInTheDocument();
-    expect(screen.getByText('Exercise 2 - Question 2')).toBeInTheDocument();
-    expect(screen.getByText('Peanut butter')).toBeInTheDocument();
-    expect(screen.getByText('Mayonnaise (I mean you can, but...)')).toBeInTheDocument();
-  });
-
-  it('lets the user edit the question and emits the updated question text', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent();
-
-    const questionEditor = await openQuestionEditor(user);
-    await fireEvent.update(questionEditor, 'My new question');
-
-    expect(lastUpdatePayload(emitted)).toEqual({
-      ...assessmentItemKey(ITEM),
-      question: 'My new question',
-    });
-  });
-
-  describe('changing the question type', () => {
-    it('keeps a single correct answer when switching to single choice', async () => {
-      const item = {
-        ...ITEM,
-        type: AssessmentItemTypes.MULTIPLE_SELECTION,
-        answers: [
-          { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-          { answer: 'Peanut butter', correct: true, order: 2 },
-        ],
-      };
-      const user = userEvent.setup();
-      const { emitted } = renderComponent({ item });
-
-      await changeQuestionType(user, 'Multiple choice', 'Single choice');
-
-      expect(lastUpdatePayload(emitted)).toEqual({
-        ...assessmentItemKey(item),
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        answers: [
-          { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-          { answer: 'Peanut butter', correct: false, order: 2 },
-        ],
-      });
-    });
-
-    it('replaces the answers with True and False when switching to true or false', async () => {
-      const item = {
-        ...ITEM,
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        answers: [
-          { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-          { answer: 'Peanut butter', correct: false, order: 2 },
-        ],
-      };
-      const user = userEvent.setup();
-      const { emitted } = renderComponent({ item });
-
-      await changeQuestionType(user, 'Single choice', 'True/False');
-
-      expect(lastUpdatePayload(emitted)).toEqual({
-        ...assessmentItemKey(item),
-        type: AssessmentItemTypes.TRUE_FALSE,
-        answers: [
-          { answer: 'True', order: 1, correct: true },
-          { answer: 'False', order: 2, correct: false },
-        ],
-      });
-    });
-
-    it('marks every numeric answer as correct when switching to numeric input', async () => {
-      const item = {
-        ...ITEM,
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        answers: [
-          { answer: '8', correct: true, order: 1 },
-          { answer: '8.0', correct: false, order: 2 },
-          { answer: '-400.19090', correct: false, order: 3 },
-        ],
-      };
-      const user = userEvent.setup();
-      const { emitted } = renderComponent({ item });
-
-      await changeQuestionType(user, 'Single choice', 'Numeric input');
-
-      expect(lastUpdatePayload(emitted)).toEqual({
-        ...assessmentItemKey(item),
-        type: AssessmentItemTypes.INPUT_QUESTION,
-        answers: [
-          { answer: '8', correct: true, order: 1 },
-          { answer: '8.0', correct: true, order: 2 },
-          { answer: '-400.19090', correct: true, order: 3 },
-        ],
-      });
-    });
-  });
-
-  it('emits the updated answers when the user changes which answer is correct', async () => {
-    const item = {
-      ...ITEM,
-      type: AssessmentItemTypes.SINGLE_SELECTION,
-      answers: [
-        { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-        { answer: 'Peanut butter', correct: false, order: 2 },
-      ],
-    };
-    const { emitted } = renderComponent({ item });
-
-    // Selecting the second answer's correctness control makes it the correct one.
-    const radios = screen.getAllByRole('radio');
-    await fireEvent.click(radios[1]);
-
-    expect(lastUpdatePayload(emitted)).toEqual({
-      ...assessmentItemKey(item),
-      answers: [
-        { answer: 'Mayonnaise (I mean you can, but...)', correct: false, order: 1 },
-        { answer: 'Peanut butter', correct: true, order: 2 },
-      ],
-    });
-  });
-
-  it('emits the updated hints when the user edits a hint', async () => {
-    const user = userEvent.setup();
-    const item = {
-      ...ITEM,
-      hints: [{ hint: 'Hint 1', order: 1 }],
-    };
-    const { emitted } = renderComponent({ item });
-
-    // Open the collapsible hints section, then open the hint to edit it.
-    await user.click(screen.getByRole('button', { name: /hints/i }));
-    const hintCard = screen.getByTestId('hint');
-    await user.click(hintCard);
-
-    const hintEditor = within(screen.getByTestId('hint')).getByRole('textbox');
-    await fireEvent.update(hintEditor, 'Updated hint');
-
-    expect(lastUpdatePayload(emitted)).toEqual({
-      ...assessmentItemKey(item),
-      hints: [{ hint: 'Updated hint', order: 1 }],
-    });
-  });
-
-  it('shows validation messages for an invalid item', () => {
-    renderComponent({
-      errors: [
-        ValidationErrors.QUESTION_REQUIRED,
-        ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-      ],
-    });
-
-    expect(screen.getByText('Question is required')).toBeInTheDocument();
-    expect(screen.getByText('Choose a correct answer')).toBeInTheDocument();
-  });
-});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
deleted file mode 100644
index 79acbfc85a..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemEditor/AssessmentItemEditor.vue
+++ /dev/null
@@ -1,534 +0,0 @@
-<template>
-
-  <div>
-    <VLayout>
-      <div
-        class="kind-select-container"
-        style="width: 100%"
-      >
-        <div
-          class="field-label"
-          :style="{ color: $themePalette.grey.v_800 }"
-        >
-          {{ $tr('typeLabel') }}
-        </div>
-        <KSelect
-          :key="kindSelectKey"
-          v-model="selectedKind"
-          :options="kindSelectItems"
-          :label="$tr('questionTypeLabel')"
-          class="kind-select"
-          data-test="kindSelect"
-        />
-      </div>
-    </VLayout>
-
-    <VLayout>
-      <VFlex>
-        <ErrorList
-          :errors="questionErrorMessages"
-          data-test="questionErrors"
-        />
-
-        <div class="grey--text mb-1 text--darken-2">
-          {{ $tr('questionLabel') }}
-        </div>
-
-        <transition name="fade">
-          <keep-alive include="TipTapEditor">
-            <!--analyticsLabel="Question"-->
-            <TipTapEditor
-              v-if="isQuestionOpen"
-              v-model="question"
-              mode="edit"
-              minHeight="80px"
-              :autofocus="shouldAutofocusQuestion"
-              :imageProcessor="EditorImageProcessor"
-              @update="onQuestionUpdate"
-              @minimize="closeQuestion"
-            />
-
-            <div
-              v-else
-              class="pb-3 pl-2 pr-2 pt-3 question-text"
-              :style="{ border: `1px solid ${$themePalette.grey.v_300}` }"
-              data-test="questionText"
-              @click="openQuestion"
-            >
-              <VLayout
-                align-start
-                justify-space-between
-              >
-                <VFlex grow>
-                  <TipTapEditor
-                    v-model="question"
-                    mode="view"
-                    tabindex="-1"
-                  />
-                </VFlex>
-
-                <VFlex shrink>
-                  <button
-                    class="v-btn v-btn--flat v-btn--icon v-size--default"
-                    data-test="editQuestionButton"
-                    @click.stop="openQuestion"
-                  >
-                    <Icon
-                      :color="$themePalette.grey.v_800"
-                      icon="edit"
-                      class="mr-2"
-                    />
-                  </button>
-                </VFlex>
-              </VLayout>
-            </div>
-          </keep-alive>
-        </transition>
-      </VFlex>
-    </VLayout>
-
-    <VLayout
-      v-if="kind !== AssessmentItemTypes.FREE_RESPONSE"
-      mt-4
-    >
-      <VFlex>
-        <ErrorList
-          :errors="answersErrorMessages"
-          data-test="answersErrors"
-        />
-
-        <AnswersEditor
-          :questionKind="kind"
-          :answers="answers"
-          :openAnswerIdx="openAnswerIdx"
-          @update="onAnswersUpdate"
-          @open="openAnswer"
-          @close="closeAnswer"
-        />
-
-        <div
-          class="hints-divider"
-          :style="{ borderTop: `1px solid ${$themeTokens.fineLine}` }"
-        ></div>
-
-        <HintsEditor
-          :hints="hints"
-          :openHintIdx="openHintIdx"
-          @update="onHintsUpdate"
-          @open="openHint"
-          @close="closeHint"
-        />
-      </VFlex>
-    </VLayout>
-  </div>
-
-</template>
-
-
-<script>
-
-  import { mapGetters } from 'vuex';
-
-  import HintsEditor from '../HintsEditor/HintsEditor';
-  import AnswersEditor from '../AnswersEditor/AnswersEditor';
-  import translator from '../../translator';
-  import { updateAnswersToQuestionType, assessmentItemKey } from '../../utils';
-  import { AssessmentItemTypeLabels } from '../../constants';
-  import EditorImageProcessor from 'shared/views/TipTapEditor/TipTapEditor/services/imageService';
-  import {
-    ContentModalities,
-    AssessmentItemTypes,
-    ValidationErrors,
-    FeatureFlagKeys,
-  } from 'shared/constants';
-  import ErrorList from 'shared/views/ErrorList/ErrorList';
-  import TipTapEditor from 'shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue';
-
-  export default {
-    name: 'AssessmentItemEditor',
-    components: {
-      ErrorList,
-      AnswersEditor,
-      HintsEditor,
-      TipTapEditor,
-    },
-    model: {
-      prop: 'item',
-      event: 'update',
-    },
-    props: {
-      /**
-       * An assessment item as retrieved from API:
-       * {
-       *    question
-       *    type
-       *    order
-       *    answers
-       *    hints
-       *    ...
-       * }
-       */
-      nodeId: {
-        type: String,
-        required: true,
-      },
-      item: {
-        type: Object,
-        default: null,
-      },
-      /**
-       * An array of error codes related to the item.
-       */
-      errors: {
-        type: Array,
-        default: () => [],
-      },
-      /**
-       * Inject a function that opens a dialog that should
-       * be confirmed before certain actions can be performed.
-       * If not provided, no confirmation will be required.
-       * Expected interface:
-       *   openDialog({
-       *     title: String,
-       *     message: String,
-       *     cancelLabel: String,
-       *     submitLabel: String,
-       *     onCancel: Function,
-       *     onSubmit: Function,
-       *   })
-       * })
-       */
-      openDialog: {
-        type: Function,
-        default: null,
-      },
-    },
-    data() {
-      return {
-        isQuestionOpen: false,
-        shouldAutofocusQuestion: false,
-        openHintIdx: null,
-        openAnswerIdx: null,
-        kindSelectKey: 0,
-        AssessmentItemTypes,
-        EditorImageProcessor,
-      };
-    },
-    computed: {
-      ...mapGetters(['hasFeatureEnabled']),
-      ...mapGetters('contentNode', ['getContentNode']),
-      question() {
-        if (!this.item || !this.item.question) {
-          return '';
-        }
-
-        return this.item.question;
-      },
-      modality() {
-        return this.getContentNode(this.nodeId)?.extra_fields?.options?.modality;
-      },
-      kind() {
-        if (!this.item || !this.item.type) {
-          return AssessmentItemTypes.SINGLE_SELECTION;
-        }
-
-        return this.item.type;
-      },
-      kindSelectItems() {
-        const items = [
-          {
-            value: AssessmentItemTypes.SINGLE_SELECTION,
-            label: translator.$tr(AssessmentItemTypeLabels[AssessmentItemTypes.SINGLE_SELECTION]),
-          },
-          {
-            value: AssessmentItemTypes.MULTIPLE_SELECTION,
-            label: translator.$tr(AssessmentItemTypeLabels[AssessmentItemTypes.MULTIPLE_SELECTION]),
-          },
-          {
-            value: AssessmentItemTypes.INPUT_QUESTION,
-            label: translator.$tr(AssessmentItemTypeLabels[AssessmentItemTypes.INPUT_QUESTION]),
-          },
-          {
-            value: AssessmentItemTypes.TRUE_FALSE,
-            label: translator.$tr(AssessmentItemTypeLabels[AssessmentItemTypes.TRUE_FALSE]),
-          },
-        ];
-
-        if (
-          this.hasFeatureEnabled(FeatureFlagKeys.survey) &&
-          this.modality === ContentModalities.SURVEY
-        ) {
-          items.push({
-            value: AssessmentItemTypes.FREE_RESPONSE,
-            label: translator.$tr(AssessmentItemTypeLabels[AssessmentItemTypes.FREE_RESPONSE]),
-          });
-        }
-
-        return items;
-      },
-      selectedKind: {
-        get() {
-          return (
-            this.kindSelectItems.find(option => option.value === this.kind) ||
-            this.kindSelectItems[0]
-          );
-        },
-        set(option) {
-          const newKind = option?.value;
-          if (!newKind) {
-            return;
-          }
-          this.onKindUpdate(newKind);
-        },
-      },
-      answers() {
-        if (!this.item || !this.item.answers) {
-          return [];
-        }
-
-        return this.item.answers;
-      },
-      hints() {
-        if (!this.item || !this.item.hints) {
-          return [];
-        }
-
-        return this.item.hints;
-      },
-      questionErrorMessages() {
-        const errorMessages = [];
-
-        if (this.errors && this.errors.includes(ValidationErrors.QUESTION_REQUIRED)) {
-          errorMessages.push(translator.$tr(`errorQuestionRequired`));
-        } else if (
-          this.errors &&
-          this.errors.includes(ValidationErrors.INVALID_COMPLETION_TYPE_FOR_FREE_RESPONSE_QUESTION)
-        ) {
-          errorMessages.push(translator.$tr(`errorInvalidQuestionType`));
-        }
-        return errorMessages;
-      },
-      answersErrorMessages() {
-        if (
-          !this.errors ||
-          !this.errors.includes(ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS)
-        ) {
-          return [];
-        }
-
-        const errorMessages = [];
-
-        switch (this.kind) {
-          case AssessmentItemTypes.SINGLE_SELECTION:
-          case AssessmentItemTypes.TRUE_FALSE:
-            errorMessages.push(translator.$tr(`errorMissingAnswer`));
-            break;
-
-          case AssessmentItemTypes.MULTIPLE_SELECTION:
-            errorMessages.push(translator.$tr(`errorChooseAtLeastOneCorrectAnswer`));
-            break;
-
-          case AssessmentItemTypes.INPUT_QUESTION:
-            errorMessages.push(translator.$tr(`errorProvideAtLeastOneCorrectAnswer`));
-            break;
-        }
-
-        return errorMessages;
-      },
-      hasMoreCorrectAnswers() {
-        const correctAnswers = this.answers.filter(answer => answer.correct === true);
-
-        return correctAnswers.length > 1;
-      },
-    },
-    mounted() {
-      if (!this.question) {
-        this.shouldAutofocusQuestion = true;
-        this.openQuestion();
-      }
-    },
-    methods: {
-      updateItem(payload) {
-        payload = {
-          ...assessmentItemKey(this.item),
-          ...payload,
-        };
-        this.$emit('update', payload);
-      },
-      changeKind(newKind) {
-        const newAnswers = updateAnswersToQuestionType(newKind, this.answers);
-        this.closeAnswer();
-        this.updateItem({
-          type: newKind,
-          answers: newAnswers,
-        });
-      },
-      // question type KSelect needs to be rerendered when confirmation dialog
-      // cancelled to display a correct, previous, value that has changed
-      // in the select but has not been changed in data storage actually
-      // because of cancel action
-      rerenderKindSelect() {
-        this.kindSelectKey += 1;
-      },
-      onQuestionUpdate(newQuestion) {
-        this.updateItem({ question: newQuestion });
-      },
-      onKindUpdate(newKind) {
-        if (this.kind === newKind) {
-          return;
-        }
-
-        switch (newKind) {
-          case AssessmentItemTypes.SINGLE_SELECTION:
-            if (typeof this.openDialog === 'function' && this.hasMoreCorrectAnswers) {
-              this.openDialog({
-                title: this.$tr('dialogTitle'),
-                message: this.$tr('dialogMessageChangeToSingleSelection'),
-                submitLabel: this.$tr('dialogSubmitBtnLabel'),
-                onSubmit: () => this.changeKind(newKind),
-                onCancel: this.rerenderKindSelect,
-              });
-            } else {
-              this.changeKind(newKind);
-            }
-
-            break;
-
-          case AssessmentItemTypes.TRUE_FALSE:
-            if (typeof this.openDialog === 'function' && this.answers.length > 0) {
-              this.openDialog({
-                title: this.$tr('dialogTitle'),
-                message: this.$tr('dialogMessageChangeToTrueFalse'),
-                submitLabel: this.$tr('dialogSubmitBtnLabel'),
-                onSubmit: () => this.changeKind(newKind),
-                onCancel: this.rerenderKindSelect,
-              });
-            } else {
-              this.changeKind(newKind);
-            }
-
-            break;
-
-          case AssessmentItemTypes.INPUT_QUESTION:
-            if (typeof this.openDialog === 'function' && this.answers.length > 0) {
-              this.openDialog({
-                title: this.$tr('dialogTitle'),
-                message: this.$tr('dialogMessageChangeToInput'),
-                submitLabel: this.$tr('dialogSubmitBtnLabel'),
-                onSubmit: () => this.changeKind(newKind),
-                onCancel: this.rerenderKindSelect,
-              });
-            } else {
-              this.changeKind(newKind);
-            }
-
-            break;
-
-          case AssessmentItemTypes.FREE_RESPONSE:
-            if (typeof this.openDialog === 'function' && this.answers.length > 0) {
-              this.openDialog({
-                title: this.$tr('dialogTitle'),
-                message: this.$tr('dialogMessageChangeToFreeResponse'),
-                submitLabel: this.$tr('dialogSubmitBtnLabel'),
-                onSubmit: () => this.changeKind(newKind),
-                onCancel: this.rerenderKindSelect,
-              });
-            } else {
-              this.changeKind(newKind);
-            }
-
-            break;
-
-          default:
-            this.changeKind(newKind);
-            break;
-        }
-      },
-      onAnswersUpdate(newAnswers) {
-        this.updateItem({ answers: newAnswers });
-      },
-      onHintsUpdate(newHints) {
-        this.updateItem({ hints: newHints });
-      },
-      openQuestion() {
-        this.isQuestionOpen = true;
-
-        this.closeAnswer();
-        this.closeHint();
-      },
-      closeQuestion() {
-        this.isQuestionOpen = false;
-      },
-      openHint(hintIdx) {
-        this.openHintIdx = hintIdx;
-
-        this.closeQuestion();
-        this.closeAnswer();
-      },
-      closeHint() {
-        this.openHintIdx = null;
-      },
-      openAnswer(answerIdx) {
-        this.openAnswerIdx = answerIdx;
-
-        this.closeQuestion();
-        this.closeHint();
-      },
-      closeAnswer() {
-        this.openAnswerIdx = null;
-      },
-    },
-    $trs: {
-      typeLabel: 'Type',
-      questionTypeLabel: 'Response type',
-      questionLabel: 'Question',
-      dialogTitle: 'Changing question type',
-      dialogSubmitBtnLabel: 'Change',
-      dialogMessageChangeToSingleSelection:
-        "Switching to 'single choice' will set only one answer as correct. Continue?",
-      dialogMessageChangeToTrueFalse:
-        "Switching to 'true or false' will remove all current answers. Continue?",
-      dialogMessageChangeToInput:
-        "Switching to 'numeric input' will set all answers as correct and remove all non-numeric answers. Continue?",
-      dialogMessageChangeToFreeResponse:
-        "Switching to 'free response' will remove all current answers. Continue?",
-    },
-  };
-
-</script>
-
-
-<style lang="scss" scoped>
-
-  .kind-select-container {
-    margin-bottom: 16px;
-  }
-
-  .field-label {
-    margin-bottom: 8px;
-    font-size: 14px;
-    font-weight: 600;
-  }
-
-  .kind-select {
-    width: 100%;
-    max-width: 314px;
-  }
-
-  .hints-divider {
-    max-width: none !important;
-    // Negative margin to match the horizontal padding of the parent container
-    margin: 16px calc(-1 * var(--question-card-horizontal-padding, 20px)) 0;
-  }
-
-  .question-text {
-    transition: 0.7s;
-
-    &:hover {
-      cursor: pointer;
-      /* stylelint-disable-next-line custom-property-pattern */
-      background-color: var(--v-greyBackground-base);
-    }
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemPreview/AssessmentItemPreview.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemPreview/AssessmentItemPreview.spec.js
deleted file mode 100644
index 4022762e3d..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemPreview/AssessmentItemPreview.spec.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import { mount } from '@vue/test-utils';
-
-import AssessmentItemPreview from './AssessmentItemPreview';
-import { AssessmentItemTypes } from 'shared/constants';
-
-jest.mock('shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue');
-
-describe('AssessmentItemPreview', () => {
-  let wrapper;
-
-  beforeEach(() => {
-    wrapper = mount(AssessmentItemPreview, {
-      propsData: {
-        item: {
-          question: 'Question',
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Answer 1', correct: false, order: 1 },
-            { answer: 'Answer 2', correct: true, order: 2 },
-            { answer: 'Answer 3', correct: false, order: 3 },
-          ],
-          hints: [
-            { hint: 'Hint 1', order: 1 },
-            { hint: 'Hint 2', order: 2 },
-          ],
-        },
-      },
-    });
-  });
-
-  it('smoke test', () => {
-    expect(wrapper.exists()).toBe(true);
-  });
-
-  it('renders question', () => {
-    // Find the RichTextEditor for the question and check its value prop.
-    const questionEditor = wrapper.findComponent({ name: 'RichTextEditor' });
-    expect(questionEditor.props('value')).toBe('Question');
-  });
-
-  it("doesn't render answers by default", () => {
-    expect(wrapper.html()).not.toContain('Answer 1');
-    expect(wrapper.html()).not.toContain('Answer 2');
-    expect(wrapper.html()).not.toContain('Answer 3');
-  });
-
-  it("doesn't render hints and hints toggle by default", () => {
-    expect(wrapper.findComponent('[data-test="hintsToggle"]').exists()).toBe(false);
-
-    expect(wrapper.html()).not.toContain('Hint 1');
-    expect(wrapper.html()).not.toContain('Hint 2');
-  });
-
-  describe('if detailed true', () => {
-    beforeEach(async () => {
-      await wrapper.setProps({
-        detailed: true,
-      });
-    });
-
-    it('renders answers', () => {
-      const editors = wrapper.findAllComponents({ name: 'RichTextEditor' });
-      // We expect 1 for the question + 3 for the answers = 4 total editors.
-      expect(editors.length).toBe(4);
-
-      expect(editors.at(1).props('value')).toBe('Answer 1');
-      expect(editors.at(2).props('value')).toBe('Answer 2');
-      expect(editors.at(3).props('value')).toBe('Answer 3');
-    });
-
-    it("doesn't render hints", () => {
-      expect(wrapper.html()).not.toContain('Hint 1');
-      expect(wrapper.html()).not.toContain('Hint 2');
-    });
-
-    it('renders hints toggle', () => {
-      expect(wrapper.find('[data-test="hintsToggle"]').exists()).toBe(true);
-    });
-
-    it('renders hints on hints toggle click', async () => {
-      await wrapper.find('[data-test="hintsToggle"]').trigger('click');
-
-      // After clicking, there should be more editors for the hints.
-      // 1 (question) + 3 (answers) + 2 (hints) = 6 total editors.
-      const editors = wrapper.findAllComponents({ name: 'RichTextEditor' });
-      expect(editors.length).toBe(6);
-
-      expect(editors.at(4).props('value')).toBe('Hint 1');
-      expect(editors.at(5).props('value')).toBe('Hint 2');
-    });
-  });
-
-  describe('showTypeLabel property', () => {
-    it('should render type label by default', () => {
-      expect(wrapper.find('[data-test="type-label"]').exists()).toBe(true);
-    });
-
-    it('should hide type label when showTypeLabel is false', async () => {
-      await wrapper.setProps({
-        showTypeLabel: false,
-      });
-      expect(wrapper.find('[data-test="type-label"]').exists()).toBe(false);
-    });
-  });
-});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemPreview/AssessmentItemPreview.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemPreview/AssessmentItemPreview.vue
deleted file mode 100644
index 67e3b01b48..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemPreview/AssessmentItemPreview.vue
+++ /dev/null
@@ -1,314 +0,0 @@
-<template>
-
-  <div>
-    <VLayout
-      align-top
-      justify-space-between
-    >
-      <VFlex>
-        <div
-          v-if="showTypeLabel"
-          class="caption grey--text mb-2"
-          data-test="type-label"
-        >
-          {{ kindLabel }}
-        </div>
-        <TipTapEditor
-          v-model="question"
-          mode="view"
-          tabindex="-1"
-        />
-      </VFlex>
-    </VLayout>
-
-    <VLayout
-      v-if="detailed && !isPerseus"
-      mt-3
-      class="item-answers-preview"
-      data-test="item-answers-preview"
-    >
-      <VFlex>
-        <div class="caption grey--text mb-2">
-          {{ $tr('answersLabel') }}
-        </div>
-
-        <div v-if="!answers || !answers.length">
-          {{ $tr('noAnswersPlaceholder') }}
-        </div>
-
-        <template v-else>
-          <template v-if="isSingleSelection || isTrueFalse">
-            <VRadioGroup v-model="correctAnswersIndices">
-              <VRadio
-                v-for="(answer, idx) in answers"
-                :key="idx"
-                :value="idx"
-                readonly
-              >
-                <template #label>
-                  <div class="px-2">
-                    <TipTapEditor
-                      v-model="answer.answer"
-                      mode="view"
-                      tabindex="-1"
-                    />
-                  </div>
-                </template>
-              </VRadio>
-            </VRadioGroup>
-          </template>
-
-          <template v-if="isMultipleSelection">
-            <Checkbox
-              v-for="(answer, idx) in answers"
-              :key="idx"
-              v-model="correctAnswersIndices"
-              :value="idx"
-              disabled
-            >
-              <div class="px-2">
-                <TipTapEditor
-                  v-model="answer.answer"
-                  mode="view"
-                  tabindex="-1"
-                />
-              </div>
-            </Checkbox>
-          </template>
-
-          <VList v-if="isInputQuestion">
-            <VListTile
-              v-for="(answer, idx) in answers"
-              :key="idx"
-            >
-              {{ answer.answer }}
-            </VListTile>
-          </VList>
-        </template>
-
-        <div class="my-1">
-          <!--
-          class="hints-preview" is needed for precise click
-          target detection in AssessmentView.vue
-        -->
-          <div
-            v-if="hintsCount"
-            class="hints-preview"
-          >
-            <span
-              class="grey--text hints-toggle"
-              :class="{ open: areHintsOpen }"
-              data-test="hintsToggle"
-              @click="areHintsOpen = !areHintsOpen"
-            >
-              <Icon icon="chevronRight" />
-              <span>{{ hintsToggleLabel }}</span>
-            </span>
-
-            <div v-if="areHintsOpen">
-              <VLayout
-                v-for="(hint, hintIdx) in hints"
-                :key="hintIdx"
-                class="hint"
-                flat
-              >
-                <VFlex
-                  class="hint-number"
-                  shrink
-                >
-                  {{ hintIdx + 1 }}
-                </VFlex>
-                <VFlex>
-                  <TipTapEditor
-                    v-model="hint.hint"
-                    mode="view"
-                    tabindex="-1"
-                  />
-                </VFlex>
-              </VLayout>
-            </div>
-          </div>
-        </div>
-      </VFlex>
-    </VLayout>
-  </div>
-
-</template>
-
-
-<script>
-
-  import sortBy from 'lodash/sortBy';
-  import { AssessmentItemTypeLabels } from '../../constants';
-  import { getCorrectAnswersIndices } from '../../utils';
-  import translator from '../../translator';
-  import { AssessmentItemTypes } from 'shared/constants';
-  import Checkbox from 'shared/views/form/Checkbox';
-  import TipTapEditor from 'shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue';
-
-  export default {
-    name: 'AssessmentItemPreview',
-    components: {
-      Checkbox,
-      TipTapEditor,
-    },
-    props: {
-      /**
-       * An assessment item as retrieved from API:
-       * {
-       *    question
-       *    type
-       *    order
-       *    answers
-       *    hints
-       *    ...
-       * }
-       */
-      item: {
-        type: Object,
-        default: null,
-      },
-      detailed: {
-        type: Boolean,
-        default: false,
-      },
-      showTypeLabel: {
-        type: Boolean,
-        default: true,
-      },
-    },
-    data() {
-      return {
-        areHintsOpen: false,
-      };
-    },
-    computed: {
-      question() {
-        if (!this.item || !this.item.question) {
-          return '';
-        }
-
-        return this.item.question;
-      },
-      kind() {
-        if (!this.item || !this.item.type) {
-          return '';
-        }
-
-        return this.item.type;
-      },
-      isPerseus() {
-        return this.kind === AssessmentItemTypes.PERSEUS_QUESTION;
-      },
-      answers() {
-        if (!this.item || !this.item.answers) {
-          return [];
-        }
-
-        return sortBy(this.item.answers, 'order');
-      },
-      hints() {
-        if (!this.item || !this.item.hints) {
-          return [];
-        }
-
-        return sortBy(this.item.hints, 'order');
-      },
-      kindLabel() {
-        if (!this.kind || !AssessmentItemTypeLabels[this.kind]) {
-          return '';
-        }
-
-        return translator.$tr(AssessmentItemTypeLabels[this.kind]);
-      },
-      isSingleSelection() {
-        return this.kind === AssessmentItemTypes.SINGLE_SELECTION;
-      },
-      isMultipleSelection() {
-        return this.kind === AssessmentItemTypes.MULTIPLE_SELECTION;
-      },
-      isTrueFalse() {
-        return this.kind === AssessmentItemTypes.TRUE_FALSE;
-      },
-      isInputQuestion() {
-        return this.kind === AssessmentItemTypes.INPUT_QUESTION;
-      },
-      correctAnswersIndices() {
-        return getCorrectAnswersIndices(this.kind, this.answers);
-      },
-      hintsToggleLabel() {
-        if (this.areHintsOpen) {
-          return this.$tr('hintsToggleLabelHide');
-        }
-
-        return this.$tr('hintsToggleLabelShow', { hintsCount: this.hintsCount });
-      },
-      hintsCount() {
-        if (!this.hints) {
-          return 0;
-        }
-
-        return this.hints.length;
-      },
-    },
-    $trs: {
-      answersLabel: 'Answers',
-      noAnswersPlaceholder: 'Question has no answer options',
-      hintsToggleLabelHide: 'Hide hints',
-      hintsToggleLabelShow: 'Show {hintsCount} {hintsCount, plural, one {hint} other {hints}}',
-    },
-  };
-
-</script>
-
-
-<style lang="scss" scoped>
-
-  .hints-toggle {
-    cursor: pointer;
-
-    .icon {
-      vertical-align: text-bottom;
-      transition: transform 200ms ease;
-    }
-
-    /*! rtl:begin:ignore */
-    &.open .icon {
-      transform: rotate(90deg);
-    }
-
-    [dir='rtl'] & {
-      &:not(.open) .icon {
-        transform: rotate(180deg);
-      }
-    }
-
-    /*! rtl:end:ignore */
-  }
-
-  ::v-deep .v-input--selection-controls {
-    margin-top: 0;
-
-    .accent--text {
-      color: gray !important;
-    }
-
-    .v-input__slot {
-      margin-bottom: 0 !important;
-    }
-  }
-
-  ::v-deep img {
-    max-width: 100%;
-    height: auto;
-  }
-
-  .hint-number {
-    padding: 11px;
-  }
-
-  .item-answers-preview ::v-deep .checkbox-icon {
-    top: 8px;
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue
deleted file mode 100644
index 63c7e354ff..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentItemToolbar.vue
+++ /dev/null
@@ -1,312 +0,0 @@
-<template>
-
-  <div class="assessment-item-toolbar">
-    <div class="icon-actions-wrapper">
-      <KIconButton
-        v-for="action in iconActions"
-        :key="action"
-        :icon="config[action].icon"
-        :tooltip="config[action].label"
-        :disabled="!isIconClickable(action)"
-        :color="iconColor(action)"
-        :data-test="`toolbarIcon-${action}`"
-        @click="clickItem(action)"
-      />
-    </div>
-
-    <BaseMenu
-      v-if="displayMenu"
-      bottom
-    >
-      <template #activator="{ on }">
-        <KIconButton
-          icon="optionsVertical"
-          :color="$themePalette.grey.v_800"
-          :tooltip="$tr('options')"
-          v-on="on"
-        />
-      </template>
-
-      <VList
-        v-for="(action, idx) in menuActions"
-        :key="idx"
-      >
-        <VListTile
-          :data-test="`toolbarMenuItem-${action}`"
-          @click="clickItem(action)"
-        >
-          <VListTileTitle>{{ config[action].label }}</VListTileTitle>
-        </VListTile>
-      </VList>
-    </BaseMenu>
-  </div>
-
-</template>
-
-
-<script>
-
-  import { AssessmentItemToolbarActions } from '../constants';
-
-  const configItemToAction = item => {
-    if (Array.isArray(item)) {
-      return item[0];
-    } else {
-      return item;
-    }
-  };
-
-  const isConfigItemCollapsible = item => {
-    return Array.isArray(item) && item.length === 2 && item[1].collapse === true;
-  };
-
-  const AnalyticsActionMap = {
-    [AssessmentItemToolbarActions.EDIT_ITEM]: 'Open',
-    [AssessmentItemToolbarActions.MOVE_ITEM_UP]: 'Move up',
-    [AssessmentItemToolbarActions.MOVE_ITEM_DOWN]: 'Move down',
-    [AssessmentItemToolbarActions.DELETE_ITEM]: 'Remove',
-    [AssessmentItemToolbarActions.ADD_ITEM_ABOVE]: 'Add',
-    [AssessmentItemToolbarActions.ADD_ITEM_BELOW]: 'Add',
-  };
-
-  export default {
-    name: 'AssessmentItemToolbar',
-    props: {
-      /**
-       * An array of AssessmentItemToolbarActions
-       * [
-       *   AssessmentItemToolbarActions.ADD_ITEM_ABOVE,
-       *   AssessmentItemToolbarActions.DELETE_ITEM
-       * ]
-       *
-       * If you need collapse control, you an add a configuration
-       * object to an item:
-       *
-       * [
-       *   [ AssessmentItemToolbarActions.ADD_ITEM_BELOW, { collapse: true }],
-       *   AssessmentItemToolbarActions.DELETE_ITEM,
-       *   [ AssessmentItemToolbarActions.DELETE_ITEM, { collapse: false }]
-       * ]
-       * (last two items are equivalent)
-       *
-       * `collapse` - if `true`, the action icon will be moved to menu items
-       *              in collapsed mode, otherwise it'll stay in icons section
-       *              of a toolbar
-       *
-       * Note:
-       *   ADD_ITEM_ABOVE and ADD_ITEM_BELOW action icons are currently
-       *   not supported. These actions can be rendered only within menu.
-       */
-      iconActionsConfig: {
-        type: Array,
-        default: () => [],
-      },
-      displayMenu: {
-        type: Boolean,
-        default: false,
-      },
-      /**
-       * Action items to be rendered in menu if menu displayed.
-       * Example:
-       * [
-       *   AssessmentItemToolbarActions.ADD_ITEM_ABOVE,
-       *   AssessmentItemToolbarActions.ADD_ITEM_BELOW,
-       *   AssessmentItemToolbarActions.DELETE_ITEM
-       * ]
-       */
-      menuActionsConfig: {
-        type: Array,
-        default: () => [],
-      },
-      collapse: {
-        type: Boolean,
-        default: false,
-      },
-      canEdit: {
-        type: Boolean,
-        default: true,
-      },
-      canMoveUp: {
-        type: Boolean,
-        default: true,
-      },
-      canMoveDown: {
-        type: Boolean,
-        default: true,
-      },
-      itemLabel: {
-        type: String,
-        default: 'item',
-      },
-      analyticsLabel: {
-        type: String,
-        default: null,
-      },
-    },
-    computed: {
-      config() {
-        return {
-          [AssessmentItemToolbarActions.EDIT_ITEM]: {
-            icon: 'edit',
-            label: this.$tr('toolbarLabelEdit'),
-          },
-          [AssessmentItemToolbarActions.MOVE_ITEM_UP]: {
-            icon: 'chevronUp',
-            label: this.$tr('toolbarLabelMoveUp'),
-          },
-          [AssessmentItemToolbarActions.MOVE_ITEM_DOWN]: {
-            icon: 'chevronDown',
-            label: this.$tr('toolbarLabelMoveDown'),
-          },
-          [AssessmentItemToolbarActions.DELETE_ITEM]: {
-            icon: 'close',
-            label: this.$tr('toolbarLabelDelete'),
-          },
-          [AssessmentItemToolbarActions.ADD_ITEM_ABOVE]: {
-            icon: null,
-            label: this.$tr('toolbarLabelAddAbove', { itemLabel: this.itemLabel }),
-          },
-          [AssessmentItemToolbarActions.ADD_ITEM_BELOW]: {
-            icon: null,
-            label: this.$tr('toolbarLabelAddBelow', { itemLabel: this.itemLabel }),
-          },
-        };
-      },
-      // return an array of AssessmentItemToolbarActions
-      // to be rendered as icons
-      iconActions() {
-        if (!this.iconActionsConfig) {
-          return [];
-        }
-
-        // collapse configuration of items can be ignored outside of collapse mode
-        if (!this.collapse) {
-          return this.iconActionsConfig.map(item => configItemToAction(item));
-        }
-
-        return this.iconActionsConfig
-          .filter(item => !isConfigItemCollapsible(item))
-          .map(item => configItemToAction(item));
-      },
-      // return an array of AssessmentItemToolbarActions
-      // to be rendered as menu items
-      menuActions() {
-        if (!this.collapse) {
-          return this.menuActionsConfig;
-        }
-
-        let collapsedIconActions = [];
-
-        if (this.iconActionsConfig) {
-          collapsedIconActions = this.iconActionsConfig
-            .filter(item => isConfigItemCollapsible(item))
-            .map(item => configItemToAction(item));
-
-          if (!this.canEdit) {
-            collapsedIconActions = collapsedIconActions.filter(
-              action => action !== AssessmentItemToolbarActions.EDIT_ITEM,
-            );
-          }
-
-          if (!this.canMoveUp) {
-            collapsedIconActions = collapsedIconActions.filter(
-              action => action !== AssessmentItemToolbarActions.MOVE_ITEM_UP,
-            );
-          }
-
-          if (!this.canMoveDown) {
-            collapsedIconActions = collapsedIconActions.filter(
-              action => action !== AssessmentItemToolbarActions.MOVE_ITEM_DOWN,
-            );
-          }
-        }
-
-        return [...collapsedIconActions, ...this.menuActionsConfig];
-      },
-    },
-    methods: {
-      isIconClickable(action) {
-        if (action === AssessmentItemToolbarActions.EDIT_ITEM && !this.canEdit) {
-          return false;
-        }
-
-        if (action === AssessmentItemToolbarActions.MOVE_ITEM_UP && !this.canMoveUp) {
-          return false;
-        }
-
-        if (action === AssessmentItemToolbarActions.MOVE_ITEM_DOWN && !this.canMoveDown) {
-          return false;
-        }
-
-        return true;
-      },
-      iconColor(action) {
-        switch (action) {
-          case AssessmentItemToolbarActions.EDIT_ITEM:
-            if (this.canEdit) {
-              return this.$themePalette.grey.v_800;
-            } else {
-              return this.$themeTokens.textDisabled;
-            }
-
-          case AssessmentItemToolbarActions.MOVE_ITEM_UP:
-            if (this.canMoveUp) {
-              return this.$themePalette.grey.v_800;
-            } else {
-              return this.$themeTokens.textDisabled;
-            }
-
-          case AssessmentItemToolbarActions.MOVE_ITEM_DOWN:
-            if (this.canMoveDown) {
-              return this.$themePalette.grey.v_800;
-            } else {
-              return this.$themeTokens.textDisabled;
-            }
-
-          default:
-            return this.$themePalette.grey.v_800;
-        }
-      },
-      clickItem(action) {
-        this.$emit('click', action);
-        this.trackAnalyticsEvent(action);
-      },
-      trackAnalyticsEvent(action) {
-        const analyticsAction = AnalyticsActionMap[action];
-        if (analyticsAction && this.analyticsLabel) {
-          this.$analytics.trackAction(`exercise_editor`, analyticsAction, {
-            eventLabel: this.analyticsLabel,
-          });
-        }
-      },
-    },
-    $trs: {
-      toolbarLabelEdit: 'Edit',
-      toolbarLabelMoveUp: 'Move up',
-      toolbarLabelMoveDown: 'Move down',
-      toolbarLabelDelete: 'Delete',
-      toolbarLabelAddAbove: 'Add {itemLabel} above',
-      toolbarLabelAddBelow: 'Add {itemLabel} below',
-      options: 'Options',
-    },
-  };
-
-</script>
-
-
-<style lang="scss" scoped>
-
-  .assessment-item-toolbar {
-    display: flex;
-    gap: 4px;
-    align-items: center;
-    justify-content: flex-end;
-  }
-
-  .icon-actions-wrapper {
-    display: flex;
-    gap: 4px;
-    align-items: center;
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue
index a8fbc846e2..e2511272c0 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/AssessmentTab/AssessmentTab.vue
@@ -1,46 +1,26 @@
 <template>
 
   <div>
-    <VContainer
-      v-show="!areAssessmentItemsValid"
-      fluid
-      class="pb-0"
-      :style="alertStyle"
+    <div
+      v-if="invalidItemsCount"
+      class="incomplete-banner"
+      role="status"
+      :style="bannerStyle"
     >
-      <VAlert
-        :value="true"
+      <KIcon
         icon="error"
-        type="error"
-        outline
-        data-test="alert"
-      >
-        <span class="font-weight-bold red--text">{{ invalidItemsErrorMessage }}</span>
-      </VAlert>
-    </VContainer>
+        :color="$themeTokens.error"
+      />
+      <span :style="{ color: $themeTokens.error }">
+        {{ $tr('incompleteItemsCountMessage', { invalidItemsCount }) }}
+      </span>
+    </div>
 
-    <AssessmentEditor
-      ref="assessmentEditor"
-      :nodeId="nodeId"
-      :items="assessmentItems"
-      :itemsErrors="assessmentItemsErrors"
-      :openDialog="openDialog"
-      :windowIsSmall="windowIsSmall"
-      @addItem="onAddAssessmentItem"
-      @updateItem="onUpdateAssessmentItem"
-      @updateItems="onUpdateAssessmentItems"
-      @deleteItem="onDeleteAssessmentItem"
+    <QTIEditor
+      :assessments="assessmentItems"
+      :allowFreeResponse="allowFreeResponse"
+      @update="applyUpdate"
     />
-
-    <KModal
-      v-if="dialog.open"
-      :title="dialog.title"
-      :cancelText="dialog.cancelLabel || $tr('dialogCancelBtnLabel')"
-      :submitText="dialog.submitLabel || $tr('dialogSubmitBtnLabel')"
-      @cancel="dialog.onCancel"
-      @submit="dialog.onSubmit"
-    >
-      {{ dialog.message }}
-    </KModal>
   </div>
 
 </template>
@@ -48,19 +28,28 @@
 
 <script>
 
-  import { mapGetters, mapActions } from 'vuex';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
+  import { computed, toRefs } from 'vue';
 
-  import AssessmentEditor from '../AssessmentEditor/AssessmentEditor';
+  import useAssessmentItems from '../../composables/useAssessmentItems';
+  import QTIEditor from 'shared/views/QTIEditor/index';
 
   export default {
     name: 'AssessmentTab',
     components: {
-      AssessmentEditor,
+      QTIEditor,
     },
-    setup() {
+    setup(props) {
+      const { nodeId } = toRefs(props);
       const { windowIsSmall } = useKResponsiveWindow();
-      return { windowIsSmall };
+      const { assessmentItems, invalidItemsCount, allowFreeResponse, applyUpdate } =
+        useAssessmentItems(nodeId);
+
+      const bannerStyle = computed(() =>
+        windowIsSmall.value ? {} : { maxWidth: '1200px', margin: '0 auto' },
+      );
+
+      return { assessmentItems, invalidItemsCount, allowFreeResponse, applyUpdate, bannerStyle };
     },
     props: {
       nodeId: {
@@ -68,121 +57,23 @@
         required: true,
       },
     },
-    data() {
-      return {
-        dialog: {
-          open: false,
-          title: '',
-          message: '',
-          cancelLabel: '',
-          submitLabel: '',
-          onCancel: () => {},
-          onSubmit: () => {},
-        },
-      };
-    },
-    computed: {
-      ...mapGetters('assessmentItem', [
-        'getAssessmentItems',
-        'getAssessmentItemsErrors',
-        'getAssessmentItemsAreValid',
-        'getInvalidAssessmentItemsCount',
-      ]),
-      alertStyle() {
-        return this.windowIsSmall ? {} : { maxWidth: '85%', margin: '0 auto' };
-      },
-      assessmentItems() {
-        return this.getAssessmentItems(this.nodeId);
-      },
-      areAssessmentItemsValid() {
-        return this.getAssessmentItemsAreValid({
-          contentNodeId: this.nodeId,
-          ignoreDelayed: true,
-        });
-      },
-      assessmentItemsErrors() {
-        const errorMap = this.getAssessmentItemsErrors({
-          contentNodeId: this.nodeId,
-          ignoreDelayed: true,
-        });
-        return errorMap;
-      },
-      invalidItemsErrorMessage() {
-        const invalidItemsCount = this.getInvalidAssessmentItemsCount({
-          contentNodeId: this.nodeId,
-          ignoreDelayed: true,
-        });
-        if (!invalidItemsCount) {
-          return '';
-        }
-        return this.$tr('incompleteItemsCountMessage', { invalidItemsCount });
-      },
-    },
-    methods: {
-      ...mapActions('assessmentItem', [
-        'addAssessmentItem',
-        'updateAssessmentItem',
-        'updateAssessmentItems',
-        'deleteAssessmentItem',
-      ]),
-      async onAddAssessmentItem(item) {
-        await this.addAssessmentItem(item);
-      },
-      async onUpdateAssessmentItem(item) {
-        await this.updateAssessmentItem(item);
-      },
-      async onUpdateAssessmentItems(items) {
-        await this.updateAssessmentItems(items);
-      },
-      async onDeleteAssessmentItem(item) {
-        await this.deleteAssessmentItem(item);
-      },
-      openDialog({
-        title = '',
-        message = '',
-        cancelLabel = '',
-        submitLabel = '',
-        onCancel = () => {},
-        onSubmit = () => {},
-      } = {}) {
-        this.dialog = {
-          open: true,
-          title,
-          message,
-          cancelLabel,
-          submitLabel,
-          onCancel: () => {
-            if (typeof onCancel === 'function') {
-              onCancel();
-            }
-            this.closeDialog();
-          },
-          onSubmit: () => {
-            if (typeof onSubmit === 'function') {
-              onSubmit();
-            }
-            this.closeDialog();
-          },
-        };
-      },
-      closeDialog() {
-        this.dialog = {
-          open: false,
-          title: '',
-          message: '',
-          cancelLabel: '',
-          submitLabel: '',
-          onCancel: () => {},
-          onSubmit: () => {},
-        };
-      },
-    },
     $trs: {
       incompleteItemsCountMessage:
         '{invalidItemsCount} incomplete {invalidItemsCount, plural, one {question} other {questions}}',
-      dialogSubmitBtnLabel: 'Submit',
-      dialogCancelBtnLabel: 'Cancel',
     },
   };
 
 </script>
+
+
+<style lang="scss" scoped>
+
+  .incomplete-banner {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+    padding: 16px 32px 0;
+    font-weight: bold;
+  }
+
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/HintsEditor/HintsEditor.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/HintsEditor/HintsEditor.spec.js
deleted file mode 100644
index 3efedcb4c8..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/HintsEditor/HintsEditor.spec.js
+++ /dev/null
@@ -1,320 +0,0 @@
-import { render, screen, within, configure } from '@testing-library/vue';
-import userEvent from '@testing-library/user-event';
-
-import { AssessmentItemToolbarActions } from '../../constants';
-import HintsEditor from './HintsEditor';
-
-jest.mock('shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue');
-jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow', () => {
-  return function useKResponsiveWindow() {
-    const { ref } = require('vue');
-    return { windowIsSmall: ref(false) };
-  };
-});
-
-configure({
-  testIdAttribute: 'data-test',
-});
-
-const renderComponent = props => {
-  return render(HintsEditor, {
-    routes: [],
-    props: {
-      hints: [],
-      ...props,
-    },
-  });
-};
-
-const openHintsSection = async user => {
-  await user.click(screen.getByText(HintsEditor.$trs.hintsLabel));
-};
-
-const getHintCards = () => {
-  return screen.getAllByTestId('hint');
-};
-
-const clickToolbarAction = async ({ action, hintIdx, user }) => {
-  const buttons = screen.getAllByTestId(`toolbarIcon-${action}`);
-  expect(buttons[hintIdx]).toBeInTheDocument();
-  await user.click(buttons[hintIdx]);
-};
-
-describe('HintsEditor', () => {
-  it('smoke test', async () => {
-    const user = userEvent.setup();
-    renderComponent();
-    await openHintsSection(user);
-
-    expect(
-      screen.getByRole('button', { name: HintsEditor.$trs.newHintBtnLabel }),
-    ).toBeInTheDocument();
-  });
-
-  it('shows an empty-state message when a question has no hints', async () => {
-    const user = userEvent.setup();
-    renderComponent({
-      hints: [],
-    });
-    await openHintsSection(user);
-
-    expect(screen.getByText(HintsEditor.$trs.noHintsPlaceholder)).toBeInTheDocument();
-  });
-
-  it('shows hints in the same order as the question', async () => {
-    const user = userEvent.setup();
-    renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-    });
-    await openHintsSection(user);
-
-    const hintCards = getHintCards();
-    expect(within(hintCards[0]).getByText('First hint')).toBeInTheDocument();
-    expect(within(hintCards[1]).getByText('Second hint')).toBeInTheDocument();
-  });
-
-  it('lets the user update the text of the currently open hint', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-      openHintIdx: 1,
-    });
-    await openHintsSection(user);
-
-    const hintCards = getHintCards();
-    const hintTextField = within(hintCards[1]).getByRole('textbox');
-
-    await user.clear(hintTextField);
-    await user.type(hintTextField, 'Updated hint');
-
-    const updateEvents = emitted().update;
-    expect(updateEvents[updateEvents.length - 1][0]).toEqual([
-      { hint: 'First hint', order: 1 },
-      { hint: 'Updated hint', order: 2 },
-    ]);
-  });
-
-  it('autofocuses the editor of the open hint', async () => {
-    const user = userEvent.setup();
-    renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-      openHintIdx: 0,
-    });
-    await openHintsSection(user);
-
-    const hintCards = getHintCards();
-    // The open hint renders an editable textbox that should request autofocus.
-    expect(within(hintCards[0]).getByRole('textbox')).toHaveAttribute('data-autofocus', 'true');
-    // Closed hints render in view mode, so they have no editable textbox to focus.
-    expect(within(hintCards[1]).queryByRole('textbox')).not.toBeInTheDocument();
-  });
-
-  it('adds a new hint and removes existing empty hints when the user clicks New hint', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: '', order: 2 },
-        { hint: 'Third hint', order: 3 },
-      ],
-    });
-    await openHintsSection(user);
-
-    await user.click(screen.getByRole('button', { name: HintsEditor.$trs.newHintBtnLabel }));
-
-    expect(emitted().update).toHaveLength(1);
-    expect(emitted().update[0][0]).toEqual([
-      { hint: 'First hint', order: 1 },
-      { hint: 'Third hint', order: 2 },
-      { hint: '', order: 3 },
-    ]);
-    expect(emitted().open).toHaveLength(1);
-    expect(emitted().open[0][0]).toBe(2);
-  });
-
-  it('opens a different hint when the user clicks that hint card', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-      openHintIdx: 0,
-    });
-    await openHintsSection(user);
-
-    const hintCards = getHintCards();
-    await user.click(hintCards[1]);
-
-    expect(emitted().open).toHaveLength(1);
-    expect(emitted().open[0][0]).toBe(1);
-  });
-
-  it('moves a hint up and keeps the same hint open after moving', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-      openHintIdx: 1,
-    });
-    await openHintsSection(user);
-
-    await clickToolbarAction({
-      action: AssessmentItemToolbarActions.MOVE_ITEM_UP,
-      hintIdx: 1,
-      user,
-    });
-
-    expect(emitted().update).toHaveLength(1);
-    expect(emitted().update[0][0]).toEqual([
-      { hint: 'Second hint', order: 1 },
-      { hint: 'First hint', order: 2 },
-    ]);
-    expect(emitted().open).toHaveLength(1);
-    expect(emitted().open[0][0]).toBe(0);
-  });
-
-  it('keeps track of the open hint when the user moves the hint below it upward', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-      openHintIdx: 0,
-    });
-    await openHintsSection(user);
-
-    await clickToolbarAction({
-      action: AssessmentItemToolbarActions.MOVE_ITEM_UP,
-      hintIdx: 1,
-      user,
-    });
-
-    expect(emitted().open).toHaveLength(1);
-    expect(emitted().open[0][0]).toBe(1);
-  });
-
-  it('moves a hint down and keeps the same hint open after moving', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-      openHintIdx: 0,
-    });
-    await openHintsSection(user);
-
-    await clickToolbarAction({
-      action: AssessmentItemToolbarActions.MOVE_ITEM_DOWN,
-      hintIdx: 0,
-      user,
-    });
-
-    expect(emitted().update).toHaveLength(1);
-    expect(emitted().update[0][0]).toEqual([
-      { hint: 'Second hint', order: 1 },
-      { hint: 'First hint', order: 2 },
-    ]);
-    expect(emitted().open).toHaveLength(1);
-    expect(emitted().open[0][0]).toBe(1);
-  });
-
-  it('keeps track of the open hint when the user moves the hint above it downward', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-      openHintIdx: 1,
-    });
-    await openHintsSection(user);
-
-    await clickToolbarAction({
-      action: AssessmentItemToolbarActions.MOVE_ITEM_DOWN,
-      hintIdx: 0,
-      user,
-    });
-
-    expect(emitted().open).toHaveLength(1);
-    expect(emitted().open[0][0]).toBe(0);
-  });
-
-  it('deletes a hint and closes the editor when that hint was open', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-      openHintIdx: 0,
-    });
-    await openHintsSection(user);
-
-    await clickToolbarAction({
-      action: AssessmentItemToolbarActions.DELETE_ITEM,
-      hintIdx: 0,
-      user,
-    });
-
-    expect(emitted().update).toHaveLength(1);
-    expect(emitted().update[0][0]).toEqual([{ hint: 'Second hint', order: 1 }]);
-    expect(emitted().close).toHaveLength(1);
-  });
-
-  it('keeps track of the open hint when the user deletes a hint above it', async () => {
-    const user = userEvent.setup();
-    const { emitted } = renderComponent({
-      hints: [
-        { hint: 'First hint', order: 1 },
-        { hint: 'Second hint', order: 2 },
-      ],
-      openHintIdx: 1,
-    });
-    await openHintsSection(user);
-
-    await clickToolbarAction({
-      action: AssessmentItemToolbarActions.DELETE_ITEM,
-      hintIdx: 0,
-      user,
-    });
-
-    expect(emitted().open).toHaveLength(1);
-    expect(emitted().open[0][0]).toBe(0);
-  });
-
-  it('toggles the hints section open and closed when clicking the header button', async () => {
-    const user = userEvent.setup();
-    renderComponent({
-      hints: [{ hint: 'First hint', order: 1 }],
-    });
-
-    // The header button acts as an accordion trigger with correct initial attributes
-    const headerButton = screen.getByRole('button', { name: HintsEditor.$trs.hintsLabel });
-    expect(headerButton).toHaveAttribute('aria-expanded', 'false');
-    expect(screen.queryByTestId('hint')).not.toBeInTheDocument();
-
-    // Click to open the section
-    await user.click(headerButton);
-    expect(headerButton).toHaveAttribute('aria-expanded', 'true');
-    expect(screen.getByTestId('hint')).toBeInTheDocument();
-
-    // Click to close the section
-    await user.click(headerButton);
-    expect(headerButton).toHaveAttribute('aria-expanded', 'false');
-    expect(screen.queryByTestId('hint')).not.toBeInTheDocument();
-  });
-});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/HintsEditor/HintsEditor.vue b/contentcuration/contentcuration/frontend/channelEdit/components/HintsEditor/HintsEditor.vue
deleted file mode 100644
index 2acdb20eba..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/HintsEditor/HintsEditor.vue
+++ /dev/null
@@ -1,534 +0,0 @@
-<template>
-
-  <div>
-    <div class="hints-header">
-      <button
-        id="hints-section-button"
-        class="hints-header-button"
-        :aria-expanded="sectionOpen.toString()"
-        aria-controls="hints-section-content"
-        :class="$computedClass(coreOutlineFocus)"
-        @click="sectionOpen = !sectionOpen"
-      >
-        <span class="hints-label">
-          {{ $tr('hintsLabel') }}
-        </span>
-        <KIcon
-          icon="dropdown"
-          class="hints-chevron"
-          :style="{ transform: sectionOpen ? 'rotate(180deg)' : 'rotate(0deg)', fontSize: '24px' }"
-        />
-      </button>
-      <div
-        class="full-width-divider"
-        :style="{ borderTop: `1px solid ${$themeTokens.fineLine}` }"
-      ></div>
-    </div>
-
-    <div
-      v-if="sectionOpen"
-      id="hints-section-content"
-      role="region"
-      aria-labelledby="hints-section-button"
-      class="hints-section"
-    >
-      <div class="hints-list">
-        <div
-          v-if="!hints || !hints.length"
-          class="hint-border no-hints-placeholder"
-          :style="{ borderColor: $themeTokens.fineLine }"
-        >
-          {{ $tr('noHintsPlaceholder') }}
-        </div>
-        <div
-          v-for="(hint, hintIdx) in hints"
-          :key="hintIdx"
-          class="hint-border"
-          :style="{ borderColor: $themeTokens.fineLine }"
-          data-test="hint"
-          @click="onHintClick($event, hintIdx)"
-        >
-          <div :class="hintClasses(hintIdx)">
-            <div
-              class="hint-card-text"
-              :class="{ 'is-closed': !isHintOpen(hintIdx), 'small-screen': isSmallScreen }"
-            >
-              <div
-                class="hint-layout"
-                :class="{ 'is-open': isHintOpen(hintIdx), 'small-screen': isSmallScreen }"
-              >
-                <div class="hint-content">
-                  <!-- View mode: TipTapEditor in view mode to render Markdown properly -->
-                  <div
-                    v-if="!isHintOpen(hintIdx)"
-                    class="hint-view-text"
-                  >
-                    <span
-                      v-if="isHintEmpty(hint)"
-                      :style="hintPlaceholderStyle"
-                    >
-                      {{ hintDisplayText(hint, hintIdx) }}
-                    </span>
-                    <div
-                      v-else
-                      class="hint-view-editor"
-                    >
-                      <TipTapEditor
-                        v-model="hint.hint"
-                        mode="view"
-                        :image-processor="EditorImageProcessor"
-                      />
-                    </div>
-                  </div>
-                  <!-- Edit mode: TipTapEditor -->
-                  <keep-alive
-                    v-else
-                    :max="5"
-                  >
-                    <TipTapEditor
-                      v-model="hint.hint"
-                      mode="edit"
-                      :autofocus="isHintOpen(hintIdx)"
-                      :image-processor="EditorImageProcessor"
-                      minHeight="80px"
-                      @update="updateHintText($event, hintIdx)"
-                      @minimize="emitClose"
-                    />
-                  </keep-alive>
-                </div>
-
-                <div class="hint-actions">
-                  <AssessmentItemToolbar
-                    :iconActionsConfig="toolbarIconActions"
-                    :collapse="isSmallScreen"
-                    :displayMenu="isSmallScreen"
-                    :canMoveUp="!isHintFirst(hintIdx)"
-                    :canMoveDown="!isHintLast(hintIdx)"
-                    class="toolbar"
-                    analyticsLabel="Hint"
-                    @click="onToolbarClick($event, hintIdx)"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <KButton
-        class="hint-editor-button"
-        data-test="newHintBtn"
-        appearance="flat-button"
-        :appearanceOverrides="buttonAppearanceOverrides"
-        @click="addNewHint"
-      >
-        <div class="add-hint-btn-content">
-          <KIcon
-            icon="plus"
-            :color="$themeTokens.primary"
-          />
-          <span>{{ $tr('newHintBtnLabel') }}</span>
-        </div>
-      </KButton>
-    </div>
-  </div>
-
-</template>
-
-
-<script>
-
-  import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
-  import AssessmentItemToolbar from '../AssessmentItemToolbar';
-  import { AssessmentItemToolbarActions } from '../../constants';
-  import { swapElements } from 'shared/utils/helpers';
-  import EditorImageProcessor from 'shared/views/TipTapEditor/TipTapEditor/services/imageService';
-  import TipTapEditor from 'shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue';
-
-  const updateHintsOrder = hints => {
-    return hints.map((hint, idx) => {
-      return {
-        ...hint,
-        order: idx + 1,
-      };
-    });
-  };
-
-  export default {
-    name: 'HintsEditor',
-    components: {
-      AssessmentItemToolbar,
-      TipTapEditor,
-    },
-    setup() {
-      const { windowIsSmall } = useKResponsiveWindow();
-      return {
-        windowIsSmall,
-      };
-    },
-    model: {
-      prop: 'hints',
-      event: 'update',
-    },
-    props: {
-      hints: {
-        type: Array,
-        default: () => [],
-      },
-      openHintIdx: {
-        type: Number,
-        default: 0,
-      },
-    },
-    data() {
-      return {
-        sectionOpen: false,
-        toolbarIconActions: [
-          [AssessmentItemToolbarActions.MOVE_ITEM_UP, { collapse: true }],
-          [AssessmentItemToolbarActions.MOVE_ITEM_DOWN, { collapse: true }],
-          AssessmentItemToolbarActions.DELETE_ITEM,
-        ],
-        EditorImageProcessor,
-      };
-    },
-    computed: {
-      coreOutlineFocus() {
-        return {
-          ':focus': {
-            ...this.$coreOutline,
-            outlineOffset: '0px',
-          },
-        };
-      },
-      isSmallScreen() {
-        return this.windowIsSmall;
-      },
-      buttonAppearanceOverrides() {
-        return {
-          backgroundColor: this.$themeBrand.primary.v_50,
-          border: `1px dashed ${this.$themeBrand.primary.v_200}`,
-          color: `${this.$themeTokens.primary} !important`,
-          fontSize: '14px',
-          fontWeight: '600',
-          textTransform: 'none',
-          ':hover': {
-            backgroundColor: this.$themeBrand.primary.v_100,
-          },
-        };
-      },
-      hintPlaceholderStyle() {
-        return {
-          color: this.$themePalette.grey.v_300,
-        };
-      },
-    },
-    methods: {
-      emitOpen(hintIdx) {
-        this.$emit('open', hintIdx);
-      },
-      emitClose() {
-        this.$emit('close');
-      },
-      emitUpdate(updatedHints) {
-        this.$emit('update', updatedHints);
-      },
-      isHintOpen(hintIdx) {
-        return hintIdx === this.openHintIdx;
-      },
-      isHintEmpty(hint) {
-        return !hint.hint || !hint.hint.trim();
-      },
-      hintDisplayText(hint, hintIdx) {
-        return this.isHintEmpty(hint)
-          ? this.$tr('hintPlaceholder', { index: hintIdx + 1 })
-          : hint.hint;
-      },
-      isHintFirst(hintIdx) {
-        return hintIdx === 0;
-      },
-      isHintLast(hintIdx) {
-        return hintIdx === this.hints.length - 1;
-      },
-      hintClasses(hintIdx) {
-        const classes = ['hint'];
-
-        if (!this.isHintOpen(hintIdx)) {
-          classes.push('closed');
-          classes.push(
-            this.$computedClass({
-              ':hover': {
-                backgroundColor: this.$themePalette.grey.v_100,
-              },
-            }),
-          );
-        }
-
-        return classes;
-      },
-      moveHintUp(hintIdx) {
-        if (this.isHintFirst(hintIdx)) {
-          return;
-        }
-
-        let updatedHints = swapElements(this.hints, hintIdx, hintIdx - 1);
-        updatedHints = updateHintsOrder(updatedHints);
-
-        this.emitUpdate(updatedHints);
-
-        if (this.isHintOpen(hintIdx)) {
-          this.emitOpen(hintIdx - 1);
-        } else if (this.isHintOpen(hintIdx - 1)) {
-          this.emitOpen(hintIdx);
-        }
-      },
-      moveHintDown(hintIdx) {
-        if (this.isHintLast(hintIdx)) {
-          return;
-        }
-
-        let updatedHints = swapElements(this.hints, hintIdx, hintIdx + 1);
-        updatedHints = updateHintsOrder(updatedHints);
-
-        this.emitUpdate(updatedHints);
-
-        if (this.isHintOpen(hintIdx)) {
-          this.emitOpen(hintIdx + 1);
-        } else if (this.isHintOpen(hintIdx + 1)) {
-          this.emitOpen(hintIdx);
-        }
-      },
-      deleteHint(hintIdx) {
-        let updatedHints = JSON.parse(JSON.stringify(this.hints));
-
-        updatedHints.splice(hintIdx, 1);
-        updatedHints = updateHintsOrder(updatedHints);
-
-        this.emitUpdate(updatedHints);
-
-        if (this.isHintOpen(hintIdx)) {
-          this.emitClose();
-        } else if (this.openHintIdx > hintIdx) {
-          this.emitOpen(this.openHintIdx - 1);
-        }
-      },
-      onHintClick(event, hintIdx) {
-        if (this.isHintOpen(hintIdx)) {
-          return;
-        }
-
-        // do not open hint on toolbar click
-        if (event.target.closest('.toolbar') !== null) {
-          return;
-        }
-
-        // do not open on editor minimize button click
-        if (event.target.classList.contains('tui-toolbar-btn-minimize')) {
-          return;
-        }
-
-        this.emitOpen(hintIdx);
-        this.$analytics.trackAction('exercise_editor', 'Open', {
-          eventLabel: 'Hint',
-        });
-      },
-      onToolbarClick(action, hintIdx) {
-        switch (action) {
-          case AssessmentItemToolbarActions.MOVE_ITEM_UP:
-            this.moveHintUp(hintIdx);
-            break;
-
-          case AssessmentItemToolbarActions.MOVE_ITEM_DOWN:
-            this.moveHintDown(hintIdx);
-            break;
-
-          case AssessmentItemToolbarActions.DELETE_ITEM:
-            this.deleteHint(hintIdx);
-            break;
-        }
-      },
-      addNewHint() {
-        // do not allow adding more empty hints
-        let updatedHints = [];
-        if (this.hints) {
-          updatedHints = this.hints.filter(
-            hint => hint.hint !== undefined && hint.hint.trim() !== '',
-          );
-        }
-        updatedHints = updateHintsOrder(updatedHints);
-
-        updatedHints.push({
-          hint: '',
-          order: updatedHints.length + 1,
-        });
-
-        this.emitUpdate(updatedHints);
-        this.emitOpen(updatedHints.length - 1);
-        this.$analytics.trackAction('exercise_editor', 'Add', {
-          eventLabel: 'Hint',
-        });
-      },
-      updateHintText(newHintText, hintIdx) {
-        if (newHintText === this.hints[hintIdx].hint) {
-          return;
-        }
-
-        const updatedHints = [...this.hints];
-        updatedHints[hintIdx].hint = newHintText;
-
-        this.emitUpdate(updatedHints);
-      },
-    },
-    $trs: {
-      hintsLabel: 'Hints (optional)',
-      noHintsPlaceholder: 'Question has no hints',
-      newHintBtnLabel: 'Add hint',
-      hintPlaceholder: 'Enter hint {index}...',
-    },
-  };
-
-</script>
-
-
-<style lang="scss" scoped>
-
-  .full-width-divider {
-    max-width: none !important;
-    margin: 0 calc(-1 * var(--question-card-horizontal-padding, 20px)) 0;
-  }
-
-  .hints-header {
-    user-select: none;
-  }
-
-  .hints-header-button {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    padding: 15px 0;
-    cursor: pointer;
-    background: transparent;
-    border: 0;
-  }
-
-  .hints-label {
-    font-size: 12px;
-    font-weight: 600;
-  }
-
-  .hints-chevron {
-    transition: transform 0.2s ease;
-  }
-
-  .hints-section {
-    margin-top: 10px;
-  }
-
-  .hints-list {
-    display: flex;
-    flex-direction: column;
-    gap: 15px;
-  }
-
-  .hint-border {
-    border: 1px solid;
-    border-radius: 4px;
-  }
-
-  .no-hints-placeholder {
-    padding: 16px;
-  }
-
-  .hint-card-text {
-    padding: 16px;
-
-    &.small-screen {
-      padding: 8px;
-    }
-
-    &.is-closed {
-      padding-top: 0;
-      padding-bottom: 0;
-    }
-  }
-
-  .hint-layout {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    &.is-open {
-      align-items: flex-start;
-    }
-
-    &.small-screen {
-      .hint-actions {
-        margin-left: 4px;
-      }
-
-      &.is-open {
-        flex-direction: column-reverse;
-
-        .hint-actions {
-          display: flex;
-          justify-content: flex-end;
-          width: 100%;
-          margin-bottom: 8px;
-          margin-left: 0;
-        }
-      }
-    }
-  }
-
-  .hint-content {
-    position: relative;
-    flex: 1;
-    min-width: 0;
-  }
-
-  .hint-actions {
-    flex-shrink: 0;
-    margin-left: 16px;
-  }
-
-  .hint {
-    transition: 0.7s;
-
-    &.closed:hover {
-      cursor: pointer;
-    }
-  }
-
-  .hint-view-text {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    min-height: 42px;
-    padding: 0 4px;
-    overflow: hidden;
-    border-radius: 4px;
-  }
-
-  .hint-view-editor {
-    flex: 1;
-    min-width: 0;
-    overflow: hidden;
-  }
-
-  .hint-editor-button {
-    justify-content: center;
-    width: 100%;
-    padding: 11px 16px !important;
-    margin-top: 10px;
-    line-height: unset !important;
-    border-radius: 4px !important;
-  }
-
-  .add-hint-btn-content {
-    display: flex;
-    gap: 10px;
-    align-items: center;
-    justify-content: center;
-  }
-
-</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
index e8616b3c1e..0750653f47 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
@@ -138,31 +138,17 @@
               {{ $tr('questionCount', { value: assessmentItems.length }) }}
             </VFlex>
           </VLayout>
-          <VCard
+          <QTIItemEditor
             v-for="(item, index) in assessmentItems"
-            :key="item.id"
-            flat
-          >
-            <VCardText>
-              <VLayout>
-                <VFlex
-                  shrink
-                  class="py-2"
-                >
-                  <div style="width: 64px">
-                    {{ index + 1 }}
-                  </div>
-                </VFlex>
-                <VFlex>
-                  <AssessmentItemPreview
-                    :item="item"
-                    :detailed="showAnswers"
-                  />
-                </VFlex>
-              </VLayout>
-            </VCardText>
-            <VDivider v-if="index < assessmentItems.length - 1" />
-          </VCard>
+            :key="item.assessment_id"
+            :item="item"
+            :index="index"
+            :total="assessmentItems.length"
+            mode="view"
+            :allowFreeResponse="allowFreeResponse"
+            :showAnswers="showAnswers"
+            class="question-preview"
+          />
         </VTabItem>
         <VTabItem value="details">
           <!-- File preview -->
@@ -507,12 +493,15 @@
   import camelCase from 'lodash/camelCase';
   import { isImportedContent, importedChannelLink, getCompletionCriteriaLabels } from '../utils';
   import FilePreview from '../views/files/FilePreview';
-  import { ContentLevels, Categories, AccessibilityCategories } from '../../shared/constants';
-  import AssessmentItemPreview from './AssessmentItemPreview/AssessmentItemPreview';
+  import {
+    ContentLevels,
+    Categories,
+    AccessibilityCategories,
+    ContentModalities,
+  } from '../../shared/constants';
   import ContentNodeValidator from './ContentNodeValidator';
 
   import {
-    getAssessmentItemErrors,
     getNodeLicenseErrors,
     getNodeCopyrightHolderErrors,
     getNodeLicenseDescriptionErrors,
@@ -520,6 +509,7 @@
     getNodeMasteryModelMErrors,
     getNodeMasteryModelNErrors,
   } from 'shared/utils/validation';
+  import QTIItemEditor from 'shared/views/QTIEditor/components/QTIItemEditor/index';
   import ContentNodeLearningActivityIcon from 'shared/views/ContentNodeLearningActivityIcon';
   import LoadingText from 'shared/views/LoadingText';
   import DetailsRow from 'shared/views/details/DetailsRow';
@@ -544,7 +534,7 @@
       DetailsRow,
       FilePreview,
       ExpandableList,
-      AssessmentItemPreview,
+      QTIItemEditor,
       Checkbox,
       ContentNodeValidator,
       Banner,
@@ -579,7 +569,7 @@
         'getImmediatePreviousStepsList',
       ]),
       ...mapGetters('file', ['getContentNodeFiles', 'contentNodesTotalSize']),
-      ...mapGetters('assessmentItem', ['getAssessmentItems']),
+      ...mapGetters('assessmentItem', ['getAssessmentItems', 'getInvalidAssessmentItemsCount']),
       node() {
         return this.getContentNode(this.nodeId);
       },
@@ -626,6 +616,10 @@
       assessmentItems() {
         return this.getAssessmentItems(this.nodeId);
       },
+      // Free-response questions cannot be scored, so they only count as complete on a survey.
+      allowFreeResponse() {
+        return this.node?.extra_fields?.options?.modality === ContentModalities.SURVEY;
+      },
       fileSize() {
         return this.contentNodesTotalSize([this.nodeId]);
       },
@@ -724,8 +718,7 @@
       },
       invalidQuestionCount() {
         return (
-          this.isExercise &&
-          this.assessmentItems.filter(ai => getAssessmentItemErrors(ai).length).length
+          this.isExercise && this.getInvalidAssessmentItemsCount({ contentNodeId: this.nodeId })
         );
       },
       invalidDetails() {
@@ -918,6 +911,10 @@
     padding: 0;
   }
 
+  .question-preview {
+    margin-bottom: 8px;
+  }
+
   .preview-error {
     padding: 24% 0;
 
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
index 7818968982..a52f1c4dee 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -219,7 +219,6 @@
   import BottomBar from 'shared/views/BottomBar';
   import FileDropzone from 'shared/views/files/FileDropzone';
   import { isNodeComplete } from 'shared/utils/validation';
-  import { DELAYED_VALIDATION } from 'shared/constants';
 
   const CHECK_STORAGE_INTERVAL = 10000;
 
@@ -276,6 +275,8 @@
     },
     computed: {
       ...mapGetters('contentNode', ['getContentNode', 'getContentNodeIsValid']),
+      // Read through `vm` in the route guard below, which the lint rule cannot see.
+      // eslint-disable-next-line vue/no-unused-properties
       ...mapGetters('assessmentItem', ['getAssessmentItems']),
       // eslint-disable-next-line vue/no-unused-properties
       ...mapGetters('currentChannel', ['currentChannel', 'canEdit']),
@@ -452,7 +453,7 @@
         'createContentNode',
       ]),
       ...mapActions('file', ['loadFiles', 'updateFile']),
-      ...mapActions('assessmentItem', ['loadAssessmentItems', 'updateAssessmentItems']),
+      ...mapActions('assessmentItem', ['loadAssessmentItems']),
       /* eslint-enable vue/no-unused-properties */
       ...mapMutations('contentNode', { enableValidation: 'ENABLE_VALIDATION_ON_NODES' }),
       closeModal(changed = false) {
@@ -495,11 +496,6 @@
         this.selected = this.nodeIds;
         this.$nextTick(() => {
           this.enableValidation(this.nodeIds);
-          const assessmentItems = this.getAssessmentItems(this.nodeIds);
-          assessmentItems.forEach(item =>
-            item.question ? (item[DELAYED_VALIDATION] = false) : '',
-          );
-          this.updateAssessmentItems(assessmentItems);
 
           // reaches into Details Tab to run save of diffTracker
           // before the validation pop up is executed
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
index c185311763..9bc90fd936 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
@@ -285,8 +285,7 @@
       },
       areAssessmentItemsValid() {
         return (
-          !this.oneSelected ||
-          this.getAssessmentItemsAreValid({ contentNodeId: this.nodeIds[0], ignoreDelayed: true })
+          !this.oneSelected || this.getAssessmentItemsAreValid({ contentNodeId: this.nodeIds[0] })
         );
       },
       areFilesValid() {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/composables/__tests__/useAssessmentItems.spec.js b/contentcuration/contentcuration/frontend/channelEdit/composables/__tests__/useAssessmentItems.spec.js
new file mode 100644
index 0000000000..66dced531c
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/composables/__tests__/useAssessmentItems.spec.js
@@ -0,0 +1,159 @@
+import { Store } from 'vuex';
+import VueRouter from 'vue-router';
+import { render } from '@testing-library/vue';
+import useAssessmentItems from '../useAssessmentItems';
+import { AssessmentItemTypes, ContentModalities } from 'shared/constants';
+
+const NODE_ID = 'node-1';
+
+const item = (assessment_id, order, raw_data = `<xml>${assessment_id}</xml>`) => ({
+  assessment_id,
+  contentnode: NODE_ID,
+  type: AssessmentItemTypes.QTI,
+  order,
+  raw_data,
+});
+
+/**
+ * Renders a component that does nothing but run the composable, and returns it alongside
+ * the actions the composable dispatched, in the order it dispatched them.
+ */
+function setup(storedItems, { modality = null } = {}) {
+  const dispatched = [];
+  const record = name => (context, payload) => dispatched.push([name, payload]);
+
+  const store = new Store({
+    modules: {
+      contentNode: {
+        namespaced: true,
+        getters: {
+          getContentNode: () => () => ({ extra_fields: { options: { modality } } }),
+        },
+      },
+      assessmentItem: {
+        namespaced: true,
+        getters: {
+          getAssessmentItems: () => () => storedItems,
+          getInvalidAssessmentItemsCount: () => () => 0,
+        },
+        actions: {
+          updateAssessmentItems: record('updateAssessmentItems'),
+          updateAssessmentItem: record('updateAssessmentItem'),
+          addAssessmentItem: record('addAssessmentItem'),
+          deleteAssessmentItem: record('deleteAssessmentItem'),
+        },
+      },
+    },
+  });
+
+  let composable;
+  render(
+    {
+      template: '<div />',
+      setup() {
+        composable = useAssessmentItems(NODE_ID);
+      },
+    },
+    { store, routes: new VueRouter() },
+  );
+
+  return { composable, dispatched };
+}
+
+describe('useAssessmentItems', () => {
+  describe('allowFreeResponse', () => {
+    it('accepts a question with no correct answer on a survey', () => {
+      const { composable } = setup([], { modality: ContentModalities.SURVEY });
+
+      expect(composable.allowFreeResponse.value).toBe(true);
+    });
+
+    it('does not accept one on an exercise, whose questions are scored', () => {
+      const { composable } = setup([]);
+
+      expect(composable.allowFreeResponse.value).toBe(false);
+    });
+  });
+
+  it('dispatches nothing when the list is unchanged', async () => {
+    const items = [item('a', 0), item('b', 1)];
+    const { composable, dispatched } = setup(items);
+
+    await composable.applyUpdate([...items]);
+
+    expect(dispatched).toEqual([]);
+  });
+
+  it('updates only the question whose content changed', async () => {
+    const { composable, dispatched } = setup([item('a', 0), item('b', 1)]);
+
+    await composable.applyUpdate([item('a', 0), item('b', 1, '<xml>edited</xml>')]);
+
+    expect(dispatched).toEqual([
+      [
+        'updateAssessmentItem',
+        { contentnode: NODE_ID, assessment_id: 'b', raw_data: '<xml>edited</xml>' },
+      ],
+    ]);
+  });
+
+  it('adds a new question with its position as order, and nothing else', async () => {
+    const { composable, dispatched } = setup([item('a', 0)]);
+    const added = {
+      assessment_id: 'new',
+      type: AssessmentItemTypes.QTI,
+      raw_data: '<xml>new</xml>',
+    };
+
+    await composable.applyUpdate([item('a', 0), added]);
+
+    expect(dispatched).toEqual([
+      ['addAssessmentItem', { contentnode: NODE_ID, ...added, order: 1 }],
+    ]);
+  });
+
+  it('reorders the questions that moved before adding a new one between them', async () => {
+    const { composable, dispatched } = setup([item('a', 0), item('b', 1)]);
+    const added = {
+      assessment_id: 'new',
+      type: AssessmentItemTypes.QTI,
+      raw_data: '<xml>new</xml>',
+    };
+
+    await composable.applyUpdate([item('a', 0), added, item('b', 1)]);
+
+    expect(dispatched.map(([name]) => name)).toEqual([
+      'updateAssessmentItems',
+      'addAssessmentItem',
+    ]);
+    expect(dispatched[0][1]).toEqual([{ contentnode: NODE_ID, assessment_id: 'b', order: 2 }]);
+    expect(dispatched[1][1].order).toBe(1);
+  });
+
+  it('reorders the remaining questions before deleting one', async () => {
+    const { composable, dispatched } = setup([item('a', 0), item('b', 1), item('c', 2)]);
+
+    await composable.applyUpdate([item('a', 0), item('c', 2)]);
+
+    expect(dispatched).toEqual([
+      ['updateAssessmentItems', [{ contentnode: NODE_ID, assessment_id: 'c', order: 1 }]],
+      ['deleteAssessmentItem', { contentnode: NODE_ID, assessment_id: 'b' }],
+    ]);
+  });
+
+  it('reorders swapped questions', async () => {
+    const { composable, dispatched } = setup([item('a', 0), item('b', 1)]);
+
+    await composable.applyUpdate([item('b', 1), item('a', 0)]);
+
+    expect(dispatched).toEqual([
+      [
+        'updateAssessmentItems',
+        [
+          { contentnode: NODE_ID, assessment_id: 'b', order: 0 },
+          { contentnode: NODE_ID, assessment_id: 'a', order: 1 },
+        ],
+      ],
+    ]);
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/composables/useAssessmentItems.js b/contentcuration/contentcuration/frontend/channelEdit/composables/useAssessmentItems.js
new file mode 100644
index 0000000000..08c418439c
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/composables/useAssessmentItems.js
@@ -0,0 +1,111 @@
+import { computed, unref } from 'vue';
+import useStore from 'shared/composables/useStore';
+import { ContentModalities } from 'shared/constants';
+
+/**
+ * Work out what changed between the list Studio holds and the list the editor produced.
+ *
+ * The QTI editor is a controlled list component: it hands back the whole array and knows
+ * nothing about how questions are stored. Studio, on the other hand, syncs one change
+ * record per assessment item, so the array has to be translated back into per-item writes.
+ *
+ * Position in the array is the question's order, and `raw_data` is the only field the
+ * editor ever rewrites.
+ *
+ * @param {Array} prevItems - The items currently in the store
+ * @param {Array} nextItems - The items the editor emitted
+ * @returns {{ orders: Array, added: Array, updated: Array, deleted: Array }}
+ */
+function diffAssessmentItems(prevItems, nextItems) {
+  const prevById = new Map(prevItems.map(item => [item.assessment_id, item]));
+  const nextIds = new Set(nextItems.map(item => item.assessment_id));
+
+  const orders = [];
+  const added = [];
+  const updated = [];
+  const deleted = prevItems.filter(item => !nextIds.has(item.assessment_id));
+
+  nextItems.forEach((item, order) => {
+    const previous = prevById.get(item.assessment_id);
+
+    if (!previous) {
+      added.push({ ...item, order });
+      return;
+    }
+    if (previous.order !== order) {
+      orders.push({ assessment_id: item.assessment_id, order });
+    }
+    if (previous.raw_data !== item.raw_data) {
+      updated.push({ assessment_id: item.assessment_id, raw_data: item.raw_data });
+    }
+  });
+
+  return { orders, added, updated, deleted };
+}
+
+/**
+ * Everything the questions tab needs about one content node's assessment items: the
+ * ordered list to render, how many of them are incomplete, and a way to save an edited
+ * list back through the change-sync layer.
+ *
+ * @param {string|import('vue').Ref<string>} nodeId
+ */
+export default function useAssessmentItems(nodeId) {
+  const store = useStore();
+
+  const assessmentItems = computed(() =>
+    store.getters['assessmentItem/getAssessmentItems'](unref(nodeId)),
+  );
+
+  /**
+   * Currently free responses are only allowed in surveys
+   */
+  const allowFreeResponse = computed(
+    () =>
+      store.getters['contentNode/getContentNode'](unref(nodeId))?.extra_fields?.options
+        ?.modality === ContentModalities.SURVEY,
+  );
+
+  const invalidItemsCount = computed(() =>
+    store.getters['assessmentItem/getInvalidAssessmentItemsCount']({
+      contentNodeId: unref(nodeId),
+    }),
+  );
+
+  /**
+   * Persist an edited list of items.
+   *
+   * Reordering runs first so that added and removed questions never leave two items
+   * claiming the same position, even briefly.
+   *
+   * @param {Array} nextItems - The full ordered list emitted by the editor
+   */
+  async function applyUpdate(nextItems) {
+    const contentnode = unref(nodeId);
+    const { orders, added, updated, deleted } = diffAssessmentItems(
+      assessmentItems.value,
+      nextItems,
+    );
+
+    if (orders.length) {
+      await store.dispatch(
+        'assessmentItem/updateAssessmentItems',
+        orders.map(order => ({ contentnode, ...order })),
+      );
+    }
+    for (const item of added) {
+      await store.dispatch('assessmentItem/addAssessmentItem', { contentnode, ...item });
+    }
+    for (const item of updated) {
+      await store.dispatch('assessmentItem/updateAssessmentItem', { contentnode, ...item });
+    }
+    for (const item of deleted) {
+      await store.dispatch('assessmentItem/deleteAssessmentItem', {
+        contentnode,
+        assessment_id: item.assessment_id,
+      });
+    }
+  }
+
+  return { assessmentItems, invalidItemsCount, allowFreeResponse, applyUpdate };
+}
diff --git a/contentcuration/contentcuration/frontend/channelEdit/constants.js b/contentcuration/contentcuration/frontend/channelEdit/constants.js
index 8932058ecf..cb34622eaf 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/constants.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/constants.js
@@ -1,5 +1,3 @@
-import { AssessmentItemTypes } from 'shared/constants';
-
 export const RouteNames = {
   TREE_ROOT_VIEW: 'TREE_ROOT_VIEW',
   TREE_VIEW: 'TREE_VIEW',
@@ -32,24 +30,6 @@ export const ChannelEditPageErrors = Object.freeze({
   CHANNEL_DELETED: 'CHANNEL_EDIT_ERROR_CHANNEL_DELETED',
 });
 
-export const AssessmentItemToolbarActions = {
-  EDIT_ITEM: 'EDIT_ITEM',
-  MOVE_ITEM_UP: 'MOVE_ITEM_UP',
-  MOVE_ITEM_DOWN: 'MOVE_ITEM_DOWN',
-  DELETE_ITEM: 'DELETE_ITEM',
-  ADD_ITEM_ABOVE: 'ADD_ITEM_ABOVE',
-  ADD_ITEM_BELOW: 'ADD_ITEM_BELOW',
-};
-
-export const AssessmentItemTypeLabels = {
-  [AssessmentItemTypes.SINGLE_SELECTION]: 'questionTypeSingleSelection',
-  [AssessmentItemTypes.MULTIPLE_SELECTION]: 'questionTypeMultipleSelection',
-  [AssessmentItemTypes.TRUE_FALSE]: 'questionTypeTrueFalse',
-  [AssessmentItemTypes.INPUT_QUESTION]: 'questionTypeInput',
-  [AssessmentItemTypes.PERSEUS_QUESTION]: 'questionTypePerseus',
-  [AssessmentItemTypes.FREE_RESPONSE]: 'questionTypeFreeResponse',
-};
-
 export const TabNames = {
   DETAILS: 'details',
   PREVIEW: 'preview',
diff --git a/contentcuration/contentcuration/frontend/channelEdit/translator.js b/contentcuration/contentcuration/frontend/channelEdit/translator.js
index 17d9c684af..6493330e64 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/translator.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/translator.js
@@ -3,19 +3,6 @@ import { createTranslator } from 'shared/i18n';
 const NAMESPACE = 'channelEditVue';
 
 const MESSAGES = {
-  true: 'True',
-  false: 'False',
-  questionTypeSingleSelection: 'Single choice',
-  questionTypeMultipleSelection: 'Multiple choice',
-  questionTypeTrueFalse: 'True/False',
-  questionTypeInput: 'Numeric input',
-  questionTypePerseus: 'Perseus',
-  questionTypeFreeResponse: 'Free response',
-  errorQuestionRequired: 'Question is required',
-  errorInvalidQuestionType: 'Invalid question type',
-  errorMissingAnswer: 'Choose a correct answer',
-  errorChooseAtLeastOneCorrectAnswer: 'Choose at least one correct answer',
-  errorProvideAtLeastOneCorrectAnswer: 'Provide at least one correct answer',
   selectionCount:
     '{topicCount, plural, =0 {} one {# folder, } other {# folders, }}{resourceCount, plural, one {# resource} other {# resources}}',
 };
diff --git a/contentcuration/contentcuration/frontend/channelEdit/utils.js b/contentcuration/contentcuration/frontend/channelEdit/utils.js
index 0d734e558f..9c4f5d081a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/utils.js
@@ -1,4 +1,3 @@
-import translator from './translator';
 import { RouteNames } from './constants';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
@@ -6,139 +5,12 @@ import { metadataStrings } from 'shared/strings/metadataStrings';
 import { constantStrings } from 'shared/mixins';
 import {
   ContentModalities,
-  AssessmentItemTypes,
   CompletionCriteriaModels,
   SHORT_LONG_ACTIVITY_MIDPOINT,
   defaultCompletionCriteriaModels,
   defaultCompletionCriteriaThresholds,
 } from 'shared/constants';
 
-/**
- * Get correct answer index/indices out of an array of answer objects.
- * @param {String} questionType single/multiple selection, true/false, input question
- * @param {Array} answers An array of answer objects { answer: ..., correct: ..., ...}
- * @returns {Number|null|Array} Returns a correct answer index or null for single selection
- * or true/false question. Returns an array of correct answers indices for multiple selection
- * or input question.
- */
-export function getCorrectAnswersIndices(questionType, answers) {
-  if (!questionType || !answers || !answers.length) {
-    return null;
-  }
-
-  if (
-    questionType === AssessmentItemTypes.SINGLE_SELECTION ||
-    questionType === AssessmentItemTypes.TRUE_FALSE
-  ) {
-    const idx = answers.findIndex(answer => answer.correct);
-    return idx === -1 ? null : idx;
-  }
-
-  return answers
-    .map((answer, idx) => {
-      return answer.correct ? idx : undefined;
-    })
-    .filter(idx => idx !== undefined);
-}
-
-/**
- * Updates `correct` fields of answers based on index/indexes stored in `correctAnswersIndices`.
- * @param {Array} answers An array of answer objects { answer: ..., correct: ..., ...}
- * @param {Number|null|Array} correctAnswersIndices A correct answer index or an array
- * of correct answers indexes.
- * @returns {Array} An array of answer objects with updated `correct` fields.
- */
-export function mapCorrectAnswers(answers, correctAnswersIndices) {
-  if (!answers || !answers.length) {
-    return null;
-  }
-
-  return answers.map((answer, idx) => {
-    const isAnswerCorrect =
-      correctAnswersIndices === idx ||
-      (Array.isArray(correctAnswersIndices) && correctAnswersIndices.includes(idx));
-
-    return {
-      ...answer,
-      correct: isAnswerCorrect,
-    };
-  });
-}
-
-// RegEx to test for signed floats or ints. Also allows the letter e
-// to comply with what Chrome permits in their type="number" fields
-export const floatOrIntRegex = /^(?=.)([+-]?([0-9e]*)(\.([0-9e]+))?)$/;
-
-/**
- * Update answers to correspond to a question type:
- * - multiple selection: No answers updates needed.
- * - input question: Make all answers correct and remove non-numerics altogether
- * - true/false: Remove answers in favour of new true/false values.
- * - single selection: Keep first correct choice only if there is any.
- *                     Otherwise mark first choice as correct.
- * @param {String} newQuestionType single/multiple selection, true/false, input question
- * @param {Array} answers An array of answer objects.
- * @returns {Array} An array of updated answer objects.
- */
-export function updateAnswersToQuestionType(questionType, answers) {
-  const NEW_TRUE_FALSE_ANSWERS = [
-    { answer: translator.$tr('true'), correct: true, order: 1 },
-    { answer: translator.$tr('false'), correct: false, order: 2 },
-  ];
-
-  if (!answers || !answers.length) {
-    if (questionType === AssessmentItemTypes.TRUE_FALSE) {
-      return NEW_TRUE_FALSE_ANSWERS;
-    } else {
-      return [];
-    }
-  }
-
-  if (questionType === AssessmentItemTypes.FREE_RESPONSE) {
-    return [];
-  }
-
-  const answersCopy = JSON.parse(JSON.stringify(answers));
-
-  switch (questionType) {
-    case AssessmentItemTypes.MULTIPLE_SELECTION:
-      return answersCopy;
-
-    case AssessmentItemTypes.INPUT_QUESTION:
-      return answersCopy.reduce((obj, answer) => {
-        // If there is anything other than a number in the answer
-        // we'll just skip it - removing non-numeric answers
-        if (floatOrIntRegex.test(answer.answer) === false) {
-          return obj;
-        }
-
-        // Otherwise, set the answer to correct and push it to our obj
-        answer.correct = true;
-        obj.push(answer);
-        return obj;
-      }, []);
-
-    case AssessmentItemTypes.TRUE_FALSE:
-      return NEW_TRUE_FALSE_ANSWERS;
-
-    case AssessmentItemTypes.SINGLE_SELECTION: {
-      let firstCorrectAnswerIdx = answers.findIndex(answer => answer.correct === true);
-      if (firstCorrectAnswerIdx === -1) {
-        firstCorrectAnswerIdx = 0;
-      }
-
-      const newAnswers = answersCopy.map(answer => {
-        answer.correct = false;
-        return answer;
-      });
-
-      newAnswers[firstCorrectAnswerIdx].correct = true;
-
-      return newAnswers;
-    }
-  }
-}
-
 export function isImportedContent(node) {
   return Boolean(
     node && node.original_source_node_id && node.node_id !== node.original_source_node_id,
@@ -162,14 +34,6 @@ export function importedChannelLink(node, router) {
   }
 }
 
-// AssessmentItems are referenced by `[contentnode, assessment_id]`
-export function assessmentItemKey(assessmentItem) {
-  return {
-    contentnode: assessmentItem.contentnode,
-    assessment_id: assessmentItem.assessment_id,
-  };
-}
-
 /**
  * Converts a value in seconds to a human-readable format.
  * If the value is greater than or equal to one hour, the format will be hh:mm:ss.
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/__tests__/getters.spec.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/__tests__/getters.spec.js
index 3155fdbc00..7222701222 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/__tests__/getters.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/__tests__/getters.spec.js
@@ -5,7 +5,22 @@ import {
   getInvalidAssessmentItemsCount,
   getAssessmentItemsAreValid,
 } from '../getters';
-import { AssessmentItemTypes, DELAYED_VALIDATION, ValidationErrors } from 'shared/constants';
+import { AssessmentItemTypes, ContentModalities } from 'shared/constants';
+import { ValidationError } from 'shared/views/QTIEditor/constants';
+import {
+  VALID_CHOICE_ITEM_DOCUMENT,
+  CHOICE_ITEM_DOCUMENT_NO_PROMPT,
+  CHOICE_ITEM_DOCUMENT_NO_CORRECT_ANSWER,
+  FREE_RESPONSE_ITEM_DOCUMENT,
+} from 'shared/views/QTIEditor/utils/testingFixtures';
+
+const item = (assessment_id, contentnode, raw_data, extra = {}) => ({
+  assessment_id,
+  contentnode,
+  type: AssessmentItemTypes.QTI,
+  raw_data,
+  ...extra,
+});
 
 describe('assessmentItem getters', () => {
   let state;
@@ -15,72 +30,44 @@ describe('assessmentItem getters', () => {
     state = {
       assessmentItemsMap: {
         'content-node-id-1': {
-          'assessment-id-1': {
-            assessment_id: 'assessment-id-1',
-            contentnode: 'content-node-id-1',
-            type: AssessmentItemTypes.SINGLE_SELECTION,
-            question: '1+1=?',
-            answers: [
-              {
-                answer: '2',
-                correct: false,
-                order: 1,
-              },
-              {
-                answer: '11',
-                correct: true,
-                order: 2,
-              },
-            ],
-          },
+          'assessment-id-1': item(
+            'assessment-id-1',
+            'content-node-id-1',
+            VALID_CHOICE_ITEM_DOCUMENT,
+          ),
         },
         'content-node-id-2': {
-          'assessment-id-2': {
-            assessment_id: 'assessment-id-2',
-            contentnode: 'content-node-id-2',
-            type: AssessmentItemTypes.SINGLE_SELECTION,
-            question: '',
-            answers: [],
-            order: 1,
-          },
-          'assessment-id-3': {
-            assessment_id: 'assessment-id-3',
-            contentnode: 'content-node-id-2',
-            [DELAYED_VALIDATION]: true,
-            type: AssessmentItemTypes.SINGLE_SELECTION,
-            question: 'What color are minions?',
-            answers: [
-              {
-                answer: 'Blue',
-                correct: false,
-                order: 1,
-              },
-              {
-                answer: 'Yellow',
-                correct: false,
-                order: 2,
-              },
-            ],
-            order: 2,
-          },
+          'assessment-id-2': item(
+            'assessment-id-2',
+            'content-node-id-2',
+            CHOICE_ITEM_DOCUMENT_NO_PROMPT,
+            { order: 1 },
+          ),
+          'assessment-id-3': item(
+            'assessment-id-3',
+            'content-node-id-2',
+            CHOICE_ITEM_DOCUMENT_NO_CORRECT_ANSWER,
+            { order: 2 },
+          ),
         },
         'content-node-id-3': {
-          'assessment-id-4': {
-            assessment_id: 'assessment-id-4',
-            contentnode: 'content-node-id-3',
-            [DELAYED_VALIDATION]: true,
-            type: AssessmentItemTypes.SINGLE_SELECTION,
-            question: '',
-            answers: [],
-          },
-          'assessment-id-5': {
-            assessment_id: 'assessment-id-5',
-            contentnode: 'content-node-id-3',
-            [DELAYED_VALIDATION]: true,
-            type: AssessmentItemTypes.SINGLE_SELECTION,
-            question: '',
-            answers: [],
-          },
+          'assessment-id-4': item(
+            'assessment-id-4',
+            'content-node-id-3',
+            CHOICE_ITEM_DOCUMENT_NO_PROMPT,
+          ),
+          'assessment-id-5': item(
+            'assessment-id-5',
+            'content-node-id-3',
+            CHOICE_ITEM_DOCUMENT_NO_PROMPT,
+          ),
+        },
+        'content-node-id-survey': {
+          'assessment-id-6': item(
+            'assessment-id-6',
+            'content-node-id-survey',
+            FREE_RESPONSE_ITEM_DOCUMENT,
+          ),
         },
       },
     };
@@ -89,45 +76,26 @@ describe('assessmentItem getters', () => {
       'contentNode/getContentNode': id => ({
         id,
         kind: 'exercise',
+        extra_fields:
+          id === 'content-node-id-survey'
+            ? { options: { modality: ContentModalities.SURVEY } }
+            : {},
       }),
     };
   });
 
+  const errorsFor = (contentNodeId, options = {}) =>
+    getAssessmentItemsErrors(state, {}, {}, rootGetters)({ contentNodeId, ...options });
+
   describe('getAssessmentItems', () => {
     it('returns an empty array if a content node not found', () => {
       expect(getAssessmentItems(state)('content-node-id-4')).toEqual([]);
     });
 
     it('returns an array of assessment items belonging to a content node', () => {
-      expect(getAssessmentItems(state)('content-node-id-2')).toEqual([
-        {
-          assessment_id: 'assessment-id-2',
-          contentnode: 'content-node-id-2',
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          question: '',
-          answers: [],
-          order: 1,
-        },
-        {
-          assessment_id: 'assessment-id-3',
-          contentnode: 'content-node-id-2',
-          [DELAYED_VALIDATION]: true,
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          question: 'What color are minions?',
-          answers: [
-            {
-              answer: 'Blue',
-              correct: false,
-              order: 1,
-            },
-            {
-              answer: 'Yellow',
-              correct: false,
-              order: 2,
-            },
-          ],
-          order: 2,
-        },
+      expect(getAssessmentItems(state)('content-node-id-2').map(i => i.assessment_id)).toEqual([
+        'assessment-id-2',
+        'assessment-id-3',
       ]);
     });
   });
@@ -144,38 +112,24 @@ describe('assessmentItem getters', () => {
 
   describe('getAssessmentItemsErrors', () => {
     it('returns validation codes corresponding to invalid assessment items of a content node', () => {
-      expect(
-        getAssessmentItemsErrors(
-          state,
-          {},
-          {},
-          rootGetters,
-        )({ contentNodeId: 'content-node-id-2' }),
-      ).toEqual({
-        'assessment-id-2': [
-          ValidationErrors.QUESTION_REQUIRED,
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ],
-        'assessment-id-3': [ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS],
+      expect(errorsFor('content-node-id-2')).toEqual({
+        'assessment-id-2': [{ code: ValidationError.PROMPT_REQUIRED }],
+        'assessment-id-3': [{ code: ValidationError.NO_CORRECT_ANSWER }],
       });
     });
 
-    it("doesn't include invalid nodes errors that are new if `ignoreDelayed` set to true", () => {
-      expect(
-        getAssessmentItemsErrors(
-          state,
-          {},
-          {},
-          rootGetters,
-        )({ contentNodeId: 'content-node-id-2', ignoreDelayed: true }),
-      ).toEqual({
-        'assessment-id-2': [
-          ValidationErrors.QUESTION_REQUIRED,
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ],
-        'assessment-id-3': [],
+    it('rejects a free-response question on a node that is not a survey', () => {
+      state.assessmentItemsMap['content-node-id-1']['assessment-id-1'].raw_data =
+        FREE_RESPONSE_ITEM_DOCUMENT;
+
+      expect(errorsFor('content-node-id-1')['assessment-id-1']).toContainEqual({
+        code: ValidationError.FREE_RESPONSE_NOT_ALLOWED,
       });
     });
+
+    it('accepts a free-response question on a survey', () => {
+      expect(errorsFor('content-node-id-survey')).toEqual({ 'assessment-id-6': [] });
+    });
   });
 
   describe('getInvalidAssessmentItemsCount', () => {
@@ -190,17 +144,18 @@ describe('assessmentItem getters', () => {
       ).toBe(2);
     });
 
-    it("doesn't count invalid nodes that are new if `ignoreDelayed` set to true", () => {
+    it('counts an item the author has only just added like any other', () => {
+      state.assessmentItemsMap['content-node-id-3'] = {
+        'assessment-id-7': item('assessment-id-7', 'content-node-id-3', ''),
+      };
+
       expect(
         getInvalidAssessmentItemsCount(
           state,
           {},
           {},
           rootGetters,
-        )({
-          contentNodeId: 'content-node-id-2',
-          ignoreDelayed: true,
-        }),
+        )({ contentNodeId: 'content-node-id-3' }),
       ).toBe(1);
     });
   });
@@ -228,18 +183,15 @@ describe('assessmentItem getters', () => {
       ).toBe(false);
     });
 
-    it('returns true if all assessment items are not valid and marked as new if `ignoreDelayed` set to true', () => {
+    it('returns false when every assessment item of a content node is invalid', () => {
       expect(
         getAssessmentItemsAreValid(
           state,
           {},
           {},
           rootGetters,
-        )({
-          contentNodeId: 'content-node-id-4',
-          ignoreDelayed: true,
-        }),
-      ).toBe(true);
+        )({ contentNodeId: 'content-node-id-3' }),
+      ).toBe(false);
     });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/__tests__/mutations.spec.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/__tests__/mutations.spec.js
index 07c5ab28cb..77786a6082 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/__tests__/mutations.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/__tests__/mutations.spec.js
@@ -1,6 +1,14 @@
 import { UPDATE_ASSESSMENTITEM, DELETE_ASSESSMENTITEM } from '../mutations';
 import { AssessmentItemTypes } from 'shared/constants';
 
+const item = (assessment_id, contentnode, extra = {}) => ({
+  assessment_id,
+  contentnode,
+  type: AssessmentItemTypes.QTI,
+  raw_data: `<xml>${assessment_id}</xml>`,
+  ...extra,
+});
+
 describe('assessmentItem mutations', () => {
   let state;
 
@@ -8,223 +16,67 @@ describe('assessmentItem mutations', () => {
     state = {
       assessmentItemsMap: {
         'content-node-id-1': {
-          'assessment-id-1': {
-            assessment_id: 'assessment-id-1',
-            contentnode: 'content-node-id-1',
-            type: AssessmentItemTypes.SINGLE_SELECTION,
-            question: '1+1=?',
-            answers: [
-              {
-                answer: '2',
-                correct: false,
-                order: 1,
-              },
-              {
-                answer: '11',
-                correct: true,
-                order: 2,
-              },
-            ],
-            hints: [],
-          },
+          'assessment-id-1': item('assessment-id-1', 'content-node-id-1'),
         },
         'content-node-id-2': {
-          'assessment-id-2': {
-            assessment_id: 'assessment-id-2',
-            contentnode: 'content-node-id-2',
-            type: AssessmentItemTypes.SINGLE_SELECTION,
-            question: '',
-            answers: [],
-            hints: [],
-          },
-          'assessment-id-3': {
-            assessment_id: 'assessment-id-3',
-            contentnode: 'content-node-id-2',
-            type: AssessmentItemTypes.SINGLE_SELECTION,
-            question: 'What color are minions?',
-            answers: [
-              {
-                answer: 'Blue',
-                correct: false,
-                order: 1,
-              },
-              {
-                answer: 'Yellow',
-                correct: true,
-                order: 2,
-              },
-            ],
-            hints: [],
-          },
+          'assessment-id-2': item('assessment-id-2', 'content-node-id-2'),
         },
       },
     };
   });
 
   describe('UPDATE_ASSESSMENTITEM', () => {
-    it('adds a new assessment item, parses and sorts answers and hints', () => {
-      UPDATE_ASSESSMENTITEM(state, {
-        assessment_id: 'assessment-id-4',
-        contentnode: 'content-node-id-1',
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        question: 'Question',
-        answers: JSON.stringify([
-          {
-            answer: 'Answer 2',
-            correct: false,
-            order: 2,
-          },
-          {
-            answer: 'Answer 1',
-            correct: true,
-            order: 1,
-          },
-        ]),
-        hints: JSON.stringify([
-          {
-            answer: 'Hint 2',
-            order: 2,
-          },
-          {
-            answer: 'Hint 1',
-            order: 1,
-          },
-        ]),
+    it('throws if the item cannot be identified', () => {
+      expect(() => UPDATE_ASSESSMENTITEM(state, { contentnode: 'content-node-id-1' })).toThrow(
+        ReferenceError,
+      );
+      expect(() => UPDATE_ASSESSMENTITEM(state, { assessment_id: 'assessment-id-9' })).toThrow(
+        ReferenceError,
+      );
+    });
+
+    it('adds an assessment item to a content node that has some already', () => {
+      const newItem = item('assessment-id-3', 'content-node-id-1');
+
+      UPDATE_ASSESSMENTITEM(state, newItem);
+
+      expect(state.assessmentItemsMap['content-node-id-1']).toEqual({
+        'assessment-id-1': item('assessment-id-1', 'content-node-id-1'),
+        'assessment-id-3': newItem,
       });
+    });
 
-      expect(state.assessmentItemsMap['content-node-id-1']['assessment-id-4']).toEqual({
-        assessment_id: 'assessment-id-4',
-        contentnode: 'content-node-id-1',
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        question: 'Question',
-        answers: [
-          {
-            answer: 'Answer 1',
-            correct: true,
-            order: 1,
-          },
-          {
-            answer: 'Answer 2',
-            correct: false,
-            order: 2,
-          },
-        ],
-        hints: [
-          {
-            answer: 'Hint 1',
-            order: 1,
-          },
-          {
-            answer: 'Hint 2',
-            order: 2,
-          },
-        ],
+    it('adds an assessment item to a content node with none yet', () => {
+      const newItem = item('assessment-id-4', 'content-node-id-3');
+
+      UPDATE_ASSESSMENTITEM(state, newItem);
+
+      expect(state.assessmentItemsMap['content-node-id-3']).toEqual({
+        'assessment-id-4': newItem,
       });
     });
 
-    it('updates an assessment item, parses and sorts answers and hints', () => {
+    it('merges the given fields into an existing assessment item', () => {
       UPDATE_ASSESSMENTITEM(state, {
-        assessment_id: 'assessment-id-3',
-        contentnode: 'content-node-id-2',
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        question: 'What color are minions?',
-        answers: JSON.stringify([
-          {
-            answer: 'Blue',
-            correct: false,
-            order: 3,
-          },
-          {
-            answer: 'Yellow',
-            correct: true,
-            order: 1,
-          },
-          {
-            answer: 'Red',
-            correct: false,
-            order: 2,
-          },
-        ]),
-        hints: JSON.stringify([
-          {
-            answer: 'Not red',
-            order: 2,
-          },
-          {
-            answer: 'Not blue',
-            order: 1,
-          },
-        ]),
+        assessment_id: 'assessment-id-1',
+        contentnode: 'content-node-id-1',
+        raw_data: '<xml>edited</xml>',
       });
 
-      expect(state.assessmentItemsMap['content-node-id-2']['assessment-id-3']).toEqual({
-        assessment_id: 'assessment-id-3',
-        contentnode: 'content-node-id-2',
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        question: 'What color are minions?',
-        answers: [
-          {
-            answer: 'Yellow',
-            correct: true,
-            order: 1,
-          },
-          {
-            answer: 'Red',
-            correct: false,
-            order: 2,
-          },
-          {
-            answer: 'Blue',
-            correct: false,
-            order: 3,
-          },
-        ],
-        hints: [
-          {
-            answer: 'Not blue',
-            order: 1,
-          },
-          {
-            answer: 'Not red',
-            order: 2,
-          },
-        ],
-      });
+      expect(state.assessmentItemsMap['content-node-id-1']['assessment-id-1']).toEqual(
+        item('assessment-id-1', 'content-node-id-1', { raw_data: '<xml>edited</xml>' }),
+      );
     });
   });
 
   describe('DELETE_ASSESSMENTITEM', () => {
     it('removes an assessment item', () => {
       DELETE_ASSESSMENTITEM(state, {
-        assessment_id: 'assessment-id-3',
-        contentnode: 'content-node-id-2',
-        type: AssessmentItemTypes.SINGLE_SELECTION,
-        question: 'What color are minions?',
-        answers: [
-          {
-            answer: 'Blue',
-            correct: false,
-            order: 1,
-          },
-          {
-            answer: 'Yellow',
-            correct: true,
-            order: 2,
-          },
-        ],
-        hints: [],
+        assessment_id: 'assessment-id-1',
+        contentnode: 'content-node-id-1',
       });
 
-      expect(state.assessmentItemsMap['content-node-id-2']).toEqual({
-        'assessment-id-2': {
-          assessment_id: 'assessment-id-2',
-          contentnode: 'content-node-id-2',
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          question: '',
-          answers: [],
-          hints: [],
-        },
-      });
+      expect(state.assessmentItemsMap['content-node-id-1']).toEqual({});
     });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/actions.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/actions.js
index e26d2b8763..07a0fdc9d6 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/actions.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/actions.js
@@ -50,18 +50,12 @@ export function loadAssessmentItems(context, params = {}) {
 }
 
 export function addAssessmentItem(context, assessmentItem) {
-  // API accepts answers and hints as strings
-  const stringifiedAssessmentItem = {
-    ...assessmentItem,
-    answers: JSON.stringify(assessmentItem.answers || []),
-    hints: JSON.stringify(assessmentItem.hints || []),
-  };
-
+  // Questions are authored as QTI, whose content lives in raw_data.
   return db.transaction(
     'rw',
     [TABLE_NAMES.CONTENTNODE, TABLE_NAMES.ASSESSMENTITEM, TABLE_NAMES.CHANGES_TABLE],
     () => {
-      return AssessmentItem.add(stringifiedAssessmentItem).then(([contentnode, assessment_id]) => {
+      return AssessmentItem.add(assessmentItem).then(([contentnode, assessment_id]) => {
         context.commit('UPDATE_ASSESSMENTITEM', {
           ...assessmentItem,
           contentnode,
@@ -91,19 +85,9 @@ export function updateAssessmentItems(context, assessmentItems) {
     () => {
       return Promise.all(
         assessmentItems.map(assessmentItem => {
-          // API accepts answers and hints as strings
-          const stringifiedAssessmentItem = {
-            ...assessmentItem,
-          };
-          if (assessmentItem.answers) {
-            stringifiedAssessmentItem.answers = JSON.stringify(assessmentItem.answers);
-          }
-          if (assessmentItem.hints) {
-            stringifiedAssessmentItem.hints = JSON.stringify(assessmentItem.hints);
-          }
           return AssessmentItem.update(
             [assessmentItem.contentnode, assessmentItem.assessment_id],
-            stringifiedAssessmentItem,
+            assessmentItem,
           ).then(() => {
             updateNodeComplete(assessmentItem.contentnode, context);
           });
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/getters.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/getters.js
index 5c454113f7..63b74e0641 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/getters.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/getters.js
@@ -1,4 +1,4 @@
-import { AssessmentItemTypes, ContentModalities, DELAYED_VALIDATION } from 'shared/constants';
+import { ContentModalities } from 'shared/constants';
 import { getAssessmentItemErrors } from 'shared/utils/validation';
 /**
  * Get assessment items of a node.
@@ -25,10 +25,9 @@ export function getAssessmentItemsCount(state) {
 
 /**
  * Get a map of assessment items errors where keys are assessment ids.
- * Consider new assessment items as valid if `ignoreDelayed` is true.
  */
 export function getAssessmentItemsErrors(state, getters, rootState, rootGetters) {
-  return function ({ contentNodeId, ignoreDelayed = false }) {
+  return function ({ contentNodeId }) {
     const assessmentItemsErrors = {};
 
     const contentNode = rootGetters['contentNode/getContentNode'](contentNodeId);
@@ -37,20 +36,15 @@ export function getAssessmentItemsErrors(state, getters, rootState, rootGetters)
     if (!state.assessmentItemsMap || !state.assessmentItemsMap[contentNodeId]) {
       return assessmentItemsErrors;
     }
+    // Free-response questions cannot be scored, so they only make sense on a survey.
+    const allowFreeResponse = modality === ContentModalities.SURVEY;
+
     Object.keys(state.assessmentItemsMap[contentNodeId]).forEach(assessmentItemId => {
       const assessmentItem = state.assessmentItemsMap[contentNodeId][assessmentItemId];
-      const freeResponseInvalid =
-        modality !== ContentModalities.SURVEY &&
-        assessmentItem.type === AssessmentItemTypes.FREE_RESPONSE;
 
-      if (ignoreDelayed && assessmentItem[DELAYED_VALIDATION]) {
-        assessmentItemsErrors[assessmentItemId] = [];
-      } else {
-        assessmentItemsErrors[assessmentItemId] = getAssessmentItemErrors(
-          assessmentItem,
-          freeResponseInvalid,
-        );
-      }
+      assessmentItemsErrors[assessmentItemId] = getAssessmentItemErrors(assessmentItem, {
+        allowFreeResponse,
+      });
     });
     return assessmentItemsErrors;
   };
@@ -58,20 +52,16 @@ export function getAssessmentItemsErrors(state, getters, rootState, rootGetters)
 
 /**
  * Get total number of invalid assessment items of a node.
- * Consider new assessment items as valid if `ignoreDelayed` is true.
  */
 export function getInvalidAssessmentItemsCount(state, getters, rootState, rootGetters) {
-  return function ({ contentNodeId, ignoreDelayed = false }) {
+  return function ({ contentNodeId }) {
     let count = 0;
     const assessmentItemsErrors = getAssessmentItemsErrors(
       state,
       getters,
       rootState,
       rootGetters,
-    )({
-      contentNodeId,
-      ignoreDelayed,
-    });
+    )({ contentNodeId });
 
     for (const assessmentItemId in assessmentItemsErrors) {
       if (assessmentItemsErrors[assessmentItemId].length) {
@@ -85,17 +75,12 @@ export function getInvalidAssessmentItemsCount(state, getters, rootState, rootGe
 
 /**
  * Are all assessment items of a node valid?
- * Consider new assessment items as valid if `ignoreDelayed` is true.
  */
 export function getAssessmentItemsAreValid(state, getters, rootState, rootGetters) {
-  return function ({ contentNodeId, ignoreDelayed = false }) {
+  return function ({ contentNodeId }) {
     return (
-      getInvalidAssessmentItemsCount(
-        state,
-        getters,
-        rootState,
-        rootGetters,
-      )({ contentNodeId, ignoreDelayed }) === 0
+      getInvalidAssessmentItemsCount(state, getters, rootState, rootGetters)({ contentNodeId }) ===
+      0
     );
   };
 }
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js
index 3962c00a3b..10a325b39f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/assessmentItem/mutations.js
@@ -10,30 +10,6 @@ export function UPDATE_ASSESSMENTITEM(state, assessmentItem) {
     throw ReferenceError('contentnode must be defined to update an assessment item');
   }
 
-  // data can come from API that returns answers and hints as string
-  let answers, hints;
-  if (typeof assessmentItem.answers === 'string') {
-    answers = JSON.parse(assessmentItem.answers);
-  } else {
-    answers = assessmentItem.answers ? assessmentItem.answers : null;
-  }
-
-  if (answers) {
-    answers.sort((answer1, answer2) => (answer1.order > answer2.order ? 1 : -1));
-    assessmentItem.answers = answers;
-  }
-
-  if (typeof assessmentItem.hints === 'string') {
-    hints = JSON.parse(assessmentItem.hints);
-  } else {
-    hints = assessmentItem.hints ? assessmentItem.hints : null;
-  }
-
-  if (hints) {
-    hints.sort((hint1, hint2) => (hint1.order > hint2.order ? 1 : -1));
-    assessmentItem.hints = hints;
-  }
-
   set(
     state.assessmentItemsMap,
     assessmentItem.contentnode,
diff --git a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
index 3e31ce6ed3..6c754cf4cb 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/getters.js
@@ -144,14 +144,7 @@ export function getContentNodeIsValid(state, getters, rootState, rootGetters) {
       (contentNode[NEW_OBJECT] ||
         (getContentNodeDetailsAreValid(state)(contentNodeId) &&
           getContentNodeFilesAreValid(state, getters, rootState, rootGetters)(contentNodeId) &&
-          rootGetters['assessmentItem/getAssessmentItemsAreValid']({
-            contentNodeId,
-            // Because this is called after items have been created,
-            // and it is not used within a form to run field validations,
-            //  it's okay to set this to false. This also accounts for
-            // any async delays with the node creation
-            ignoreDelayed: false,
-          })))
+          rootGetters['assessmentItem/getAssessmentItemsAreValid']({ contentNodeId })))
     );
   };
 }
diff --git a/contentcuration/contentcuration/frontend/shared/constants.js b/contentcuration/contentcuration/frontend/shared/constants.js
index d08a6d803c..909f79d99e 100644
--- a/contentcuration/contentcuration/frontend/shared/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/constants.js
@@ -52,10 +52,6 @@ export const NOVALUE = Symbol('No value default');
 // that they have not yet been committed to our IndexedDB layer.
 export const NEW_OBJECT = Symbol('New object');
 
-// This symbol is used as a key on new objects used to denote when
-// validation should be delayed
-export const DELAYED_VALIDATION = Symbol('Delayed validation');
-
 export const kindToIconMap = {
   audio: 'headset',
   channel: 'apps',
@@ -153,12 +149,8 @@ export const ErrorTypes = Object.freeze({
 
 // should correspond to backend types
 export const AssessmentItemTypes = {
-  SINGLE_SELECTION: 'single_selection',
-  MULTIPLE_SELECTION: 'multiple_selection',
-  TRUE_FALSE: 'true_false',
-  INPUT_QUESTION: 'input_question',
+  QTI: 'QTI',
   PERSEUS_QUESTION: 'perseus_question',
-  FREE_RESPONSE: 'free_response',
 };
 
 export const ValidationErrors = {
@@ -174,10 +166,6 @@ export const ValidationErrors = {
   MASTERY_MODEL_N_REQUIRED: 'MASTERY_MODEL_N_REQUIRED',
   MASTERY_MODEL_N_WHOLE_NUMBER: 'MASTERY_MODEL_N_WHOLE_NUMBER',
   MASTERY_MODEL_N_GT_ZERO: 'MASTERY_MODEL_N_GT_ZERO',
-  QUESTION_REQUIRED: 'QUESTION_REQUIRED',
-  INVALID_NUMBER_OF_CORRECT_ANSWERS: 'INVALID_NUMBER_OF_CORRECT_ANSWERS',
-  INVALID_COMPLETION_TYPE_FOR_FREE_RESPONSE_QUESTION:
-    'INVALID_COMPLETION_TYPE_FOR_FREE_RESPONSE_QUESTION',
   NO_VALID_PRIMARY_FILES: 'NO_VALID_PRIMARY_FILES',
   INVALID_COMPLETION_CRITERIA_MODEL: 'INVALID_COMPLETION_CRITERIA_MODEL',
   COMPLETION_REQUIRED: 'COMPLETION_REQUIRED',
diff --git a/contentcuration/contentcuration/frontend/shared/data/resources.js b/contentcuration/contentcuration/frontend/shared/data/resources.js
index 2a458cd2a3..0f4388bcbc 100644
--- a/contentcuration/contentcuration/frontend/shared/data/resources.js
+++ b/contentcuration/contentcuration/frontend/shared/data/resources.js
@@ -47,7 +47,7 @@ import {
 import urls from 'shared/urls';
 import { currentLanguage } from 'shared/i18n';
 import client, { paramsSerializer } from 'shared/client';
-import { DELAYED_VALIDATION, fileErrors, NEW_OBJECT } from 'shared/constants';
+import { fileErrors, NEW_OBJECT } from 'shared/constants';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 import { getMergedMapFields } from 'shared/utils/helpers';
 
@@ -606,8 +606,7 @@ class IndexedDBResource {
   }
 
   /**
-   * Method to remove the NEW_OBJECT and DELAYED_VALIDATION symbols
-   * property so we don't commit it to IndexedDB
+   * Method to remove the NEW_OBJECT symbol property so we don't commit it to IndexedDB
    * @param {Object} obj
    * @return {Object}
    */
@@ -616,7 +615,6 @@ class IndexedDBResource {
       ...obj,
     };
     delete out[NEW_OBJECT];
-    delete out[DELAYED_VALIDATION];
     return out;
   }
 
diff --git a/contentcuration/contentcuration/frontend/shared/utils/helpers.js b/contentcuration/contentcuration/frontend/shared/utils/helpers.js
index 2545b91c85..8e1c4c0053 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/helpers.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/helpers.js
@@ -19,49 +19,6 @@ function safeParseInt(str) {
 
 const EXTENDED_SLOT = '__extendedSlot';
 
-/**
- * Insert an item into an array before another item.
- * @param {Array} arr
- * @param {Number} idx An index of an item before which
- *                     a new item will be inserted.
- * @param {*} item A new item to be inserted into an array.
- */
-export function insertBefore(arr, idx, item) {
-  const newArr = JSON.parse(JSON.stringify(arr));
-  const insertAt = Math.max(0, idx);
-  newArr.splice(insertAt, 0, item);
-
-  return newArr;
-}
-
-/**
- * Insert an item into an array after another item.
- * @param {Array} arr
- * @param {Number} idx An index of an item after which
- *                     a new item will be inserted.
- * @param {*} item A new item to be inserted into an array.
- */
-export function insertAfter(arr, idx, item) {
-  const newArr = JSON.parse(JSON.stringify(arr));
-  const insertAt = Math.min(arr.length, idx + 1);
-  newArr.splice(insertAt, 0, item);
-
-  return newArr;
-}
-
-/**
- * Swap two elements of an array
- * @param {Array} arr
- * @param {Number} idx1
- * @param {Number} idx2
- */
-export function swapElements(arr, idx1, idx2) {
-  const newArr = JSON.parse(JSON.stringify(arr));
-  [newArr[idx1], newArr[idx2]] = [newArr[idx2], newArr[idx1]];
-
-  return newArr;
-}
-
 /**
  * Chunks an array of `things`, calling `callback` with `chunkSize` amount of items,
  * expecting callback to return `Promise` that when resolved will allow next chunk to be processed.
diff --git a/contentcuration/contentcuration/frontend/shared/utils/helpers.spec.js b/contentcuration/contentcuration/frontend/shared/utils/helpers.spec.js
index 5d01b4026a..d16a1399e7 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/helpers.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/helpers.spec.js
@@ -2,40 +2,7 @@
 
 import Vue from 'vue';
 import { mount } from '@vue/test-utils';
-import each from 'jest-each';
-
-import { insertBefore, insertAfter, swapElements, extendSlot } from './helpers';
-
-describe('insertBefore', () => {
-  each([
-    [[], 0, 'pink', ['pink']],
-    [['blue', 'yellow', 'violet'], -1, 'pink', ['pink', 'blue', 'yellow', 'violet']],
-    [['blue', 'yellow', 'violet'], 0, 'pink', ['pink', 'blue', 'yellow', 'violet']],
-    [['blue', 'yellow', 'violet'], 1, 'pink', ['blue', 'pink', 'yellow', 'violet']],
-  ]).it('inserts a new item before another item', (arr, idx, item, expected) => {
-    expect(insertBefore(arr, idx, item)).toEqual(expected);
-  });
-});
-
-describe('insertAfter', () => {
-  each([
-    [[], 2, 'pink', ['pink']],
-    [['blue', 'yellow', 'violet'], 3, 'pink', ['blue', 'yellow', 'violet', 'pink']],
-    [['blue', 'yellow', 'violet'], 2, 'pink', ['blue', 'yellow', 'violet', 'pink']],
-    [['blue', 'yellow', 'violet'], 1, 'pink', ['blue', 'yellow', 'pink', 'violet']],
-  ]).it('inserts a new item after another item', (arr, idx, item, expected) => {
-    expect(insertAfter(arr, idx, item)).toEqual(expected);
-  });
-});
-
-describe('swapElements', () => {
-  each([
-    [['blue', 'yellow', 'violet'], 0, 0, ['blue', 'yellow', 'violet']],
-    [['blue', 'yellow', 'violet'], 0, 2, ['violet', 'yellow', 'blue']],
-  ]).it('swaps two elements', (arr, idx1, idx2, expected) => {
-    expect(swapElements(arr, idx1, idx2)).toEqual(expected);
-  });
-});
+import { extendSlot } from './helpers';
 
 describe('extendSlot', () => {
   // Component that implements extendSlot functionality
diff --git a/contentcuration/contentcuration/frontend/shared/utils/validation.js b/contentcuration/contentcuration/frontend/shared/utils/validation.js
index e576d678e5..ff613a2079 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/validation.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/validation.js
@@ -2,6 +2,7 @@ import get from 'lodash/get';
 import CompletionCriteriaModels from 'kolibri-constants/CompletionCriteria';
 import translator from '../translator';
 import { AssessmentItemTypes, ValidationErrors, ContentModalities } from '../constants';
+import { validateQtiItem } from 'shared/views/QTIEditor/validateItem';
 import Licenses from 'shared/leUtils/Licenses';
 import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
@@ -90,10 +91,7 @@ export function isNodeComplete({ nodeDetails, assessmentItems, files }) {
       return false;
     }
 
-    const isInvalid = assessmentItem => {
-      const sanitizedAssessmentItem = sanitizeAssessmentItem(assessmentItem, true);
-      return getAssessmentItemErrors(sanitizedAssessmentItem).length;
-    };
+    const isInvalid = assessmentItem => getAssessmentItemErrors(assessmentItem).length;
     if (assessmentItems.some(isInvalid)) {
       if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
         // eslint-disable-next-line no-console
@@ -432,151 +430,44 @@ export function getNodeFilesErrors(files) {
 }
 
 /**
- * Sanitize assesment item answers
- * - trim answers
- * - (optional) remove empty answers
- * @param {Array} answers Assessment item answers
- * @param {Boolean} removeEmpty Remove all empty answers?
- * @returns {Array} Cleaned answers
- */
-export function sanitizeAssessmentItemAnswers(answers, removeEmpty = false) {
-  if (!answers || !answers.length) {
-    return [];
-  }
-
-  let sanitizedAnswers = answers.map(answer => {
-    let answerText = answer.answer;
-    if (typeof answerText !== 'number') {
-      answerText = answerText ? answerText.trim() : '';
-    }
-
-    return {
-      ...answer,
-      answer: answerText,
-    };
-  });
-
-  if (removeEmpty) {
-    sanitizedAnswers = sanitizedAnswers.filter(answer => answer.answer.length > 0);
-  }
-
-  sanitizedAnswers = sanitizedAnswers.map((answer, answerIdx) => {
-    return {
-      ...answer,
-      order: answerIdx + 1,
-    };
-  });
-
-  return sanitizedAnswers;
-}
-
-/**
- * Sanitize assesment item hints
- *  - trim hints
- *  - (optional) remove empty hints
- * @param {Array} hints Assessment item hints
- * @param {Boolean} removeEmpty Remove all empty hints?
- * @returns {Array} Cleaned hints
- */
-export function sanitizeAssessmentItemHints(hints, removeEmpty = false) {
-  if (!hints || !hints.length) {
-    return [];
-  }
-
-  let sanitizedHints = hints.map(hint => {
-    const hintText = hint.hint ? hint.hint.trim() : '';
-
-    return {
-      ...hint,
-      hint: hintText,
-    };
-  });
-
-  if (removeEmpty) {
-    sanitizedHints = sanitizedHints.filter(hint => hint.hint.length > 0);
-  }
-
-  sanitizedHints = sanitizedHints.map((hint, hintIdx) => {
-    return {
-      ...hint,
-      order: hintIdx + 1,
-    };
-  });
-
-  return sanitizedHints;
-}
-
-/**
- * Sanitize an assesment item
- *  - trim question text
- *  - sanitize answers and hints
- * @param {Array} assessmentItem An assessment item
- * @param {Boolean} removeEmpty Remove empty answers and hints?
- * @returns {Array} Cleaned assessment item
+ * The last verdict reached for an item. Keyed by the item,
+ *
+ * @type {WeakMap<Object, { rawData: string, allowFreeResponse: boolean, errors: Array }>}
  */
-export function sanitizeAssessmentItem(assessmentItem, removeEmpty = false) {
-  const question = assessmentItem.question ? assessmentItem.question.trim() : '';
-  const answers = assessmentItem.answers
-    ? sanitizeAssessmentItemAnswers(assessmentItem.answers, removeEmpty)
-    : [];
-  const hints = assessmentItem.hints
-    ? sanitizeAssessmentItemHints(assessmentItem.hints, removeEmpty)
-    : [];
-
-  return {
-    ...assessmentItem,
-    question,
-    answers,
-    hints,
-  };
-}
+const errorsByAssessmentItem = new WeakMap();
 
 /**
  * Validate an assessment item.
+ *
+ * Questions are authored and stored as QTI, so the QTI editor owns what makes one valid;
+ * this reads its verdict without rendering anything. Perseus questions come from other
+ * tools and are not validated here.
+ *
  * @param {Object} assessmentItem An assessment item.
- * @returns {Array} An array of error codes.
+ * @param {Object} [options]
+ * @param {Boolean} [options.allowFreeResponse] Whether free-response questions are
+ *   permitted — they are only meaningful on surveys.
+ * @returns {Array} An array of errors.
  */
-export function getAssessmentItemErrors(assessmentItem, freeResponseInvalid = false) {
-  const errors = [];
-
-  // Don't validate perseus questions
+export function getAssessmentItemErrors(assessmentItem, { allowFreeResponse = true } = {}) {
   if (assessmentItem.type === AssessmentItemTypes.PERSEUS_QUESTION) {
-    return errors;
-  }
-  // Convert answers to string to handle numeric responses
-  const hasOneCorrectAnswer =
-    assessmentItem.answers &&
-    assessmentItem.answers.filter(
-      answer => answer.answer && String(answer.answer).trim() && answer.correct === true,
-    ).length === 1;
-  const hasAtLeatOneCorrectAnswer =
-    assessmentItem.answers &&
-    assessmentItem.answers.filter(
-      answer => answer.answer && String(answer.answer).trim() && answer.correct === true,
-    ).length > 0;
-
-  if (!assessmentItem.question || !assessmentItem.question.trim()) {
-    errors.push(ValidationErrors.QUESTION_REQUIRED);
-  }
-  if (freeResponseInvalid) {
-    errors.push(ValidationErrors.INVALID_COMPLETION_TYPE_FOR_FREE_RESPONSE_QUESTION);
+    return [];
   }
 
-  switch (assessmentItem.type) {
-    case AssessmentItemTypes.MULTIPLE_SELECTION:
-    case AssessmentItemTypes.INPUT_QUESTION:
-      if (!hasAtLeatOneCorrectAnswer) {
-        errors.push(ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS);
-      }
-      break;
-
-    case AssessmentItemTypes.TRUE_FALSE:
-    case AssessmentItemTypes.SINGLE_SELECTION:
-      if (!hasOneCorrectAnswer) {
-        errors.push(ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS);
-      }
-      break;
+  const cached = errorsByAssessmentItem.get(assessmentItem);
+  if (
+    cached &&
+    cached.rawData === assessmentItem.raw_data &&
+    cached.allowFreeResponse === allowFreeResponse
+  ) {
+    return cached.errors;
   }
 
+  const errors = validateQtiItem(assessmentItem.raw_data, { allowFreeResponse });
+  errorsByAssessmentItem.set(assessmentItem, {
+    rawData: assessmentItem.raw_data,
+    allowFreeResponse,
+    errors,
+  });
   return errors;
 }
diff --git a/contentcuration/contentcuration/frontend/shared/utils/validation.spec.js b/contentcuration/contentcuration/frontend/shared/utils/validation.spec.js
index 11e2fe367f..05b0dadf27 100644
--- a/contentcuration/contentcuration/frontend/shared/utils/validation.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/utils/validation.spec.js
@@ -14,12 +14,16 @@ import {
   isNodeComplete,
   getNodeDetailsErrors,
   getNodeFilesErrors,
-  sanitizeAssessmentItemAnswers,
-  sanitizeAssessmentItemHints,
-  sanitizeAssessmentItem,
   getAssessmentItemErrors,
   getNodeLearningActivityErrors,
 } from './validation';
+import { ValidationError } from 'shared/views/QTIEditor/constants';
+import {
+  VALID_CHOICE_ITEM_DOCUMENT,
+  CHOICE_ITEM_DOCUMENT_NO_PROMPT,
+  CHOICE_ITEM_DOCUMENT_NO_CORRECT_ANSWER,
+  FREE_RESPONSE_ITEM_DOCUMENT,
+} from 'shared/views/QTIEditor/utils/testingFixtures';
 import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
 import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
 
@@ -403,12 +407,8 @@ describe('channelEdit utils', () => {
         };
         assessmentItems = [
           {
-            question: 'Question',
-            type: AssessmentItemTypes.SINGLE_SELECTION,
-            answers: [
-              { answer: 'Mayonnaise (I mean you can, but...)', correct: true, order: 1 },
-              { answer: 'Peanut butter', correct: false, order: 2 },
-            ],
+            type: AssessmentItemTypes.QTI,
+            raw_data: VALID_CHOICE_ITEM_DOCUMENT,
           },
         ];
       });
@@ -436,17 +436,13 @@ describe('channelEdit utils', () => {
 
       it('returns false if there is at least one invalid assessment item', () => {
         const invalidAssessmentItem = {
-          question: 'A question with missing answers',
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [],
+          type: AssessmentItemTypes.QTI,
+          raw_data: CHOICE_ITEM_DOCUMENT_NO_CORRECT_ANSWER,
         };
         expect(
           isNodeComplete({
             nodeDetails,
-            assessmentItems: {
-              ...assessmentItems,
-              invalidAssessmentItem,
-            },
+            assessmentItems: [...assessmentItems, invalidAssessmentItem],
           }),
         ).toBe(false);
       });
@@ -808,348 +804,69 @@ describe('channelEdit utils', () => {
     });
   });
 
-  describe('sanitizeAssessmentItemAnswers', () => {
-    it('trims answers', () => {
-      const answers = [
-        { answer: '', order: 1, correct: true },
-        { answer: ' 3 ', order: 2, correct: false },
-        { answer: '  ', order: 3, correct: true },
-      ];
-
-      expect(sanitizeAssessmentItemAnswers(answers)).toEqual([
-        { answer: '', order: 1, correct: true },
-        { answer: '3', order: 2, correct: false },
-        { answer: '', order: 3, correct: true },
-      ]);
-    });
-
-    it('removes all empty answers and reorders remaining answers if removeEmpty true', () => {
-      const answers = [
-        { answer: '', order: 1, correct: true },
-        { answer: ' 3 ', order: 2, correct: false },
-        { answer: '  ', order: 3, correct: true },
-      ];
-
-      expect(sanitizeAssessmentItemAnswers(answers, true)).toEqual([
-        { answer: '3', order: 1, correct: false },
-      ]);
-    });
-  });
-
-  describe('sanitizeAssessmentItemHints', () => {
-    it('trims hints', () => {
-      const hints = [
-        { hint: '', order: 1 },
-        { hint: ' Hint 1 ', order: 2 },
-        { hint: '  ', order: 3 },
-      ];
-
-      expect(sanitizeAssessmentItemHints(hints)).toEqual([
-        { hint: '', order: 1 },
-        { hint: 'Hint 1', order: 2 },
-        { hint: '', order: 3 },
-      ]);
-    });
-
-    it('removes all empty hints and reorders remaining hints if removeEmpty true', () => {
-      const hints = [
-        { hint: '', order: 1 },
-        { hint: ' Hint 1 ', order: 2 },
-        { hint: '  ', order: 3 },
-      ];
-
-      expect(sanitizeAssessmentItemHints(hints, true)).toEqual([{ hint: 'Hint 1', order: 1 }]);
-    });
-  });
-
-  describe('sanitizeAssessmentItem', () => {
-    it('trims question, hints and answers', () => {
+  describe('getAssessmentItemErrors', () => {
+    it('reports no errors for a complete question', () => {
       const assessmentItem = {
-        order: 1,
-        question: ' Question text ',
-        answers: [
-          { answer: ' Answer 1', order: 1, correct: false },
-          { answer: '', order: 2, correct: true },
-          { answer: 'Answer 3    ', order: 3, correct: true },
-        ],
-        hints: [
-          { hint: ' ', order: 1 },
-          { hint: '', order: 2 },
-          { hint: ' Hint 3', order: 3 },
-        ],
+        type: AssessmentItemTypes.QTI,
+        raw_data: VALID_CHOICE_ITEM_DOCUMENT,
       };
 
-      expect(sanitizeAssessmentItem(assessmentItem)).toEqual({
-        order: 1,
-        question: 'Question text',
-        answers: [
-          { answer: 'Answer 1', order: 1, correct: false },
-          { answer: '', order: 2, correct: true },
-          { answer: 'Answer 3', order: 3, correct: true },
-        ],
-        hints: [
-          { hint: '', order: 1 },
-          { hint: '', order: 2 },
-          { hint: 'Hint 3', order: 3 },
-        ],
-      });
+      expect(getAssessmentItemErrors(assessmentItem)).toEqual([]);
     });
 
-    it('removes all empty hints and answers if removeEmpty true', () => {
+    it('reports the errors of the question it holds', () => {
       const assessmentItem = {
-        order: 1,
-        question: ' Question text ',
-        answers: [
-          { answer: ' Answer 1', order: 1, correct: false },
-          { answer: '', order: 2, correct: true },
-          { answer: 'Answer 3    ', order: 3, correct: true },
-        ],
-        hints: [
-          { hint: ' ', order: 1 },
-          { hint: '', order: 2 },
-          { hint: ' Hint 3', order: 3 },
-        ],
+        type: AssessmentItemTypes.QTI,
+        raw_data: CHOICE_ITEM_DOCUMENT_NO_PROMPT,
       };
 
-      expect(sanitizeAssessmentItem(assessmentItem, true)).toEqual({
-        order: 1,
-        question: 'Question text',
-        answers: [
-          { answer: 'Answer 1', order: 1, correct: false },
-          { answer: 'Answer 3', order: 2, correct: true },
-        ],
-        hints: [{ hint: 'Hint 3', order: 1 }],
-      });
-    });
-  });
-
-  describe('getAssessmentItemErrors', () => {
-    describe('when question text is missing', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: '',
-          answers: [{ answer: 'Answer', correct: true, order: 1 }],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.QUESTION_REQUIRED,
-        ]);
-      });
-    });
-
-    describe('for single selection with no answers', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
-    });
-
-    describe('for single selection with no correct answer', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [{ answer: 'Answer', correct: false, order: 1 }],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
-    });
-
-    describe('for single selection with more correct answers', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Answer 1', correct: true, order: 1 },
-            { answer: 'Answer 2', correct: true, order: 2 },
-          ],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
+      expect(getAssessmentItemErrors(assessmentItem).map(error => error.code)).toContain(
+        ValidationError.PROMPT_REQUIRED,
+      );
     });
 
-    describe('for single selection with one correct answer', () => {
-      it('returns positive validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.SINGLE_SELECTION,
-          answers: [
-            { answer: 'Answer 1', correct: false, order: 1 },
-            { answer: 'Answer 2', correct: true, order: 2 },
-          ],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([]);
-      });
-    });
-
-    describe('for multiple selection with no answers', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.MULTIPLE_SELECTION,
-          answers: [],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
-    });
-
-    describe('for multiple selection with no correct answer', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.MULTIPLE_SELECTION,
-          answers: [
-            { answer: 'Answer 1', correct: false, order: 1 },
-            { answer: 'Answer 2', correct: false, order: 2 },
-          ],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
-    });
-
-    describe('for multiple selection with at least one correct answer', () => {
-      it('returns positive validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.MULTIPLE_SELECTION,
-          answers: [
-            { answer: 'Answer 1', correct: true, order: 1 },
-            { answer: 'Answer 2', correct: false, order: 2 },
-          ],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([]);
-      });
-    });
-
-    describe('for input question with no answers', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.INPUT_QUESTION,
-          answers: [],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
-    });
-
-    describe('for input question with no correct answer', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.INPUT_QUESTION,
-          answers: [
-            { answer: 'Answer 1', correct: false, order: 1 },
-            { answer: 'Answer 2', correct: false, order: 2 },
-          ],
-        };
+    it('reports no errors for a Perseus question, which is authored elsewhere', () => {
+      const assessmentItem = {
+        type: AssessmentItemTypes.PERSEUS_QUESTION,
+        raw_data: 'not qti at all',
+      };
 
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
+      expect(getAssessmentItemErrors(assessmentItem)).toEqual([]);
     });
 
-    describe('for input question with at least one correct answer', () => {
-      it('returns positive validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.INPUT_QUESTION,
-          answers: [
-            { answer: 'Answer 1', correct: true, order: 1 },
-            { answer: 'Answer 2', correct: true, order: 2 },
-          ],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([]);
-      });
-    });
-
-    describe('for true/false with no answers', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.TRUE_FALSE,
-          answers: [],
-        };
+    it('reports the same errors when asked about the same question again', () => {
+      const assessmentItem = {
+        type: AssessmentItemTypes.QTI,
+        raw_data: CHOICE_ITEM_DOCUMENT_NO_PROMPT,
+      };
 
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
+      expect(getAssessmentItemErrors(assessmentItem)).toEqual(
+        getAssessmentItemErrors(assessmentItem),
+      );
     });
 
-    describe('for true/false with no correct answer', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.TRUE_FALSE,
-          answers: [
-            { answer: 'True', correct: false, order: 1 },
-            { answer: 'False', correct: false, order: 2 },
-          ],
-        };
-
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
-    });
+    it('reports the errors of the question as it is now, not as it was', () => {
+      const assessmentItem = {
+        type: AssessmentItemTypes.QTI,
+        raw_data: CHOICE_ITEM_DOCUMENT_NO_PROMPT,
+      };
+      getAssessmentItemErrors(assessmentItem);
 
-    describe('for true/false with more correct answers', () => {
-      it('returns negative validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.TRUE_FALSE,
-          answers: [
-            { answer: 'True', correct: true, order: 1 },
-            { answer: 'False', correct: true, order: 2 },
-          ],
-        };
+      assessmentItem.raw_data = VALID_CHOICE_ITEM_DOCUMENT;
 
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([
-          ValidationErrors.INVALID_NUMBER_OF_CORRECT_ANSWERS,
-        ]);
-      });
+      expect(getAssessmentItemErrors(assessmentItem)).toEqual([]);
     });
 
-    describe('for true/false with one correct answer', () => {
-      it('returns positive validation results', () => {
-        const assessmentItem = {
-          question: 'Question',
-          type: AssessmentItemTypes.TRUE_FALSE,
-          answers: [
-            { answer: 'True', correct: false, order: 1 },
-            { answer: 'False', correct: true, order: 2 },
-          ],
-        };
+    it('reports a free-response question differently depending on whether it is allowed', () => {
+      const assessmentItem = {
+        type: AssessmentItemTypes.QTI,
+        raw_data: FREE_RESPONSE_ITEM_DOCUMENT,
+      };
 
-        expect(getAssessmentItemErrors(assessmentItem)).toEqual([]);
-      });
+      expect(getAssessmentItemErrors(assessmentItem, { allowFreeResponse: true })).toEqual([]);
+      expect(
+        getAssessmentItemErrors(assessmentItem, { allowFreeResponse: false }).map(e => e.code),
+      ).toContain(ValidationError.FREE_RESPONSE_NOT_ALLOWED);
     });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/__tests__/validateItem.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/__tests__/validateItem.spec.js
new file mode 100644
index 0000000000..0b072d7b38
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/__tests__/validateItem.spec.js
@@ -0,0 +1,81 @@
+import { validateItemShape, validateQtiItem } from '../validateItem';
+import { QuestionType, ValidationError } from '../constants';
+import {
+  VALID_CHOICE_ITEM_DOCUMENT,
+  CHOICE_ITEM_DOCUMENT_NO_PROMPT,
+  CHOICE_ITEM_DOCUMENT_NO_CORRECT_ANSWER,
+  NO_INTERACTION_ITEM_DOCUMENT,
+} from '../utils/testingFixtures';
+
+const codesOf = errors => errors.map(error => error.code);
+
+describe('validateQtiItem', () => {
+  it('returns no errors for a complete item', () => {
+    expect(validateQtiItem(VALID_CHOICE_ITEM_DOCUMENT)).toEqual([]);
+  });
+
+  it('reports a missing prompt', () => {
+    expect(codesOf(validateQtiItem(CHOICE_ITEM_DOCUMENT_NO_PROMPT))).toContain(
+      ValidationError.PROMPT_REQUIRED,
+    );
+  });
+
+  it('reports a missing correct answer', () => {
+    expect(codesOf(validateQtiItem(CHOICE_ITEM_DOCUMENT_NO_CORRECT_ANSWER))).toContain(
+      ValidationError.NO_CORRECT_ANSWER,
+    );
+  });
+
+  it('reports an item whose body holds no interaction', () => {
+    expect(validateQtiItem(NO_INTERACTION_ITEM_DOCUMENT)).toEqual([
+      { code: ValidationError.NO_INTERACTION },
+    ]);
+  });
+
+  it('reports an item with no raw data at all', () => {
+    expect(validateQtiItem('')).toEqual([{ code: ValidationError.NO_INTERACTION }]);
+    expect(validateQtiItem(undefined)).toEqual([{ code: ValidationError.NO_INTERACTION }]);
+  });
+
+  it('reports unparseable XML', () => {
+    expect(validateQtiItem('<qti-assessment-item><oops>')).toEqual([
+      { code: ValidationError.PARSE_ERROR },
+    ]);
+  });
+});
+
+// What the editor asks about an item it is already showing, which is everything an
+// interaction cannot answer for itself.
+describe('validateItemShape', () => {
+  it('accepts an item with something to answer', () => {
+    expect(
+      validateItemShape({ interactions: [{}], questionTypes: [QuestionType.SINGLE_SELECT] }),
+    ).toEqual([]);
+  });
+
+  it('reports an item with nothing to answer', () => {
+    expect(validateItemShape({ interactions: [] })).toEqual([
+      { code: ValidationError.NO_INTERACTION },
+    ]);
+  });
+
+  it('accepts a free-response question when the consumer allows it', () => {
+    expect(
+      validateItemShape({
+        interactions: [{}],
+        questionTypes: [QuestionType.FREE_RESPONSE],
+        allowFreeResponse: true,
+      }),
+    ).toEqual([]);
+  });
+
+  it('reports a free-response question when the consumer scores its questions', () => {
+    expect(
+      validateItemShape({
+        interactions: [{}],
+        questionTypes: [QuestionType.FREE_RESPONSE],
+        allowFreeResponse: false,
+      }),
+    ).toEqual([{ code: ValidationError.FREE_RESPONSE_NOT_ALLOWED }]);
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/HintsSection/__tests__/HintsSection.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/HintsSection/__tests__/HintsSection.spec.js
new file mode 100644
index 0000000000..2db31bbe2d
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/HintsSection/__tests__/HintsSection.spec.js
@@ -0,0 +1,160 @@
+import { render, screen, fireEvent } from '@testing-library/vue';
+import VueRouter from 'vue-router';
+import HintsSection from '../index.vue';
+import { qtiEditorStrings } from '../../../qtiEditorStrings';
+
+jest.mock('shared/views/TipTapEditor/TipTapEditor/TipTapEditor');
+jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow', () => {
+  const { ref } = require('vue');
+  return {
+    __esModule: true,
+    default: () => ({ windowIsSmall: ref(false) }),
+  };
+});
+
+const {
+  hintsLabel$,
+  noHintsPlaceholder$,
+  hintPlaceholder$,
+  editHintLabel$,
+  addHintBtn$,
+  deleteHintBtn$,
+  moveHintUpBtn$,
+  moveHintDownBtn$,
+} = qtiEditorStrings;
+
+const HINTS = [
+  { id: 'hint_a', content: '<p>test</p>' },
+  { id: 'hint_b', content: '<p>test2 2</p>' },
+  { id: 'hint_c', content: '<p>test3 3</p>' },
+];
+
+const renderComponent = (props = {}) =>
+  render(HintsSection, {
+    props: { hints: HINTS, mode: 'edit', ...props },
+    routes: new VueRouter(),
+  });
+
+const expand = async () => {
+  await fireEvent.click(screen.getByRole('button', { name: hintsLabel$() }));
+};
+
+describe('HintsSection', () => {
+  it('starts collapsed, showing only the header', () => {
+    renderComponent();
+    expect(screen.getByText(hintsLabel$())).toBeInTheDocument();
+    expect(screen.queryAllByTestId('hint')).toHaveLength(0);
+  });
+
+  it('lists the hints once expanded', async () => {
+    renderComponent();
+    await expand();
+    expect(screen.getAllByTestId('hint')).toHaveLength(3);
+  });
+
+  it('reports the section as expanded to assistive technology', async () => {
+    renderComponent();
+    const toggle = screen.getByRole('button', { name: hintsLabel$() });
+    expect(toggle).toHaveAttribute('aria-expanded', 'false');
+    await expand();
+    expect(toggle).toHaveAttribute('aria-expanded', 'true');
+  });
+
+  it('says so when the question has no hints left', async () => {
+    renderComponent({ hints: [] });
+    await expand();
+    expect(screen.getByText(noHintsPlaceholder$())).toBeInTheDocument();
+  });
+
+  it('shows a placeholder for a hint with nothing written in it', async () => {
+    renderComponent({ hints: [{ id: 'hint_a', content: '' }] });
+    await expand();
+    expect(screen.getByText(hintPlaceholder$({ index: 1 }))).toBeInTheDocument();
+  });
+
+  describe('editing', () => {
+    it('appends an empty hint', async () => {
+      const { emitted } = renderComponent();
+      await expand();
+      await fireEvent.click(screen.getByRole('button', { name: addHintBtn$() }));
+
+      const [hints] = emitted()['update:hints'].at(-1);
+      expect(hints).toHaveLength(4);
+      expect(hints[3].content).toBe('');
+    });
+
+    it('removes the hint whose delete action was used', async () => {
+      const { emitted } = renderComponent();
+      await expand();
+      await fireEvent.click(screen.getAllByRole('button', { name: deleteHintBtn$() })[1]);
+
+      const [hints] = emitted()['update:hints'].at(-1);
+      expect(hints.map(h => h.id)).toEqual(['hint_a', 'hint_c']);
+    });
+
+    it('moves a hint up', async () => {
+      const { emitted } = renderComponent();
+      await expand();
+      await fireEvent.click(screen.getAllByRole('button', { name: moveHintUpBtn$() })[2]);
+
+      const [hints] = emitted()['update:hints'].at(-1);
+      expect(hints.map(h => h.id)).toEqual(['hint_a', 'hint_c', 'hint_b']);
+    });
+
+    it('moves a hint down', async () => {
+      const { emitted } = renderComponent();
+      await expand();
+      await fireEvent.click(screen.getAllByRole('button', { name: moveHintDownBtn$() })[0]);
+
+      const [hints] = emitted()['update:hints'].at(-1);
+      expect(hints.map(h => h.id)).toEqual(['hint_b', 'hint_a', 'hint_c']);
+    });
+
+    it('cannot move the first hint up or the last one down', async () => {
+      renderComponent();
+      await expand();
+      expect(screen.getAllByRole('button', { name: moveHintUpBtn$() })[0]).toBeDisabled();
+      expect(screen.getAllByRole('button', { name: moveHintDownBtn$() })[2]).toBeDisabled();
+    });
+  });
+
+  describe('opening a hint from the keyboard', () => {
+    it('reaches each hint through a button that names which one it is', async () => {
+      renderComponent();
+      await expand();
+      expect(
+        screen.getByRole('button', { name: editHintLabel$({ number: 2 }) }),
+      ).toBeInTheDocument();
+    });
+
+    it('opens the hint that button belongs to, and stops offering it', async () => {
+      renderComponent();
+      await expand();
+      await fireEvent.click(screen.getByRole('button', { name: editHintLabel$({ number: 2 }) }));
+      expect(
+        screen.queryByRole('button', { name: editHintLabel$({ number: 2 }) }),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.getByRole('button', { name: editHintLabel$({ number: 1 }) }),
+      ).toBeInTheDocument();
+    });
+  });
+
+  describe('view mode', () => {
+    it('offers no way to change the hints', async () => {
+      renderComponent({ mode: 'view' });
+      await expand();
+      expect(screen.getAllByTestId('hint')).toHaveLength(3);
+      expect(screen.queryByRole('button', { name: addHintBtn$() })).not.toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: deleteHintBtn$() })).not.toBeInTheDocument();
+    });
+
+    it('offers no clickable region for a hint that cannot be edited', async () => {
+      renderComponent({ mode: 'view' });
+      await expand();
+      expect(
+        screen.queryByRole('button', { name: editHintLabel$({ number: 1 }) }),
+      ).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/HintsSection/index.vue b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/HintsSection/index.vue
new file mode 100644
index 0000000000..eb7c952932
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/HintsSection/index.vue
@@ -0,0 +1,441 @@
+<template>
+
+  <div>
+    <div class="hints-header">
+      <h4 class="hints-heading">
+        <button
+          class="hints-header-button"
+          :aria-expanded="sectionOpen.toString()"
+          :aria-controls="contentId"
+          @click="sectionOpen = !sectionOpen"
+        >
+          <span class="hints-label">
+            {{ hintsLabel$() }}
+          </span>
+          <KIcon
+            icon="dropdown"
+            class="hints-chevron"
+            :class="{ 'is-open': sectionOpen }"
+          />
+        </button>
+      </h4>
+      <div class="full-width-divider"></div>
+    </div>
+
+    <!--
+      The controlled element stays in the document so the button's aria-controls always
+      resolves; it is hidden rather than removed. What it holds is mounted only while open,
+      because a rich-text editor per hint per question is not worth paying for unseen.
+    -->
+    <div
+      :id="contentId"
+      class="hints-section"
+      :class="{ 'is-collapsed': !sectionOpen }"
+      data-testid="hintsSectionContent"
+    >
+      <template v-if="sectionOpen">
+        <div class="hints-list">
+          <div
+            v-if="!hints.length"
+            class="hint-border no-hints-placeholder"
+          >
+            {{ noHintsPlaceholder$() }}
+          </div>
+          <ClickableRegion
+            v-for="(hint, index) in hints"
+            :key="hint.id"
+            class="hint hint-border"
+            :class="{ 'is-clickable': isHintClickable(hint.id) }"
+            :suppressed="!isHintClickable(hint.id)"
+            :ariaLabel="editHintLabel$({ number: index + 1 })"
+            data-testid="hint"
+            @click="onHintClick($event, hint.id)"
+          >
+            <div
+              class="hint-card-text"
+              :class="{ 'is-closed': !isHintOpen(hint.id), 'small-screen': windowIsSmall }"
+            >
+              <div
+                class="hint-layout"
+                :class="{ 'is-open': isHintOpen(hint.id), 'small-screen': windowIsSmall }"
+              >
+                <div class="hint-content">
+                  <span
+                    v-if="!isHintOpen(hint.id) && !hasContent(hint)"
+                    class="hint-placeholder hint-view-text"
+                  >
+                    {{ hintPlaceholder$({ index: index + 1 }) }}
+                  </span>
+                  <TipTapEditor
+                    v-else
+                    :value="hint.content"
+                    :mode="isHintOpen(hint.id) ? 'edit' : 'view'"
+                    format="html"
+                    minHeight="80px"
+                    :autofocus="isHintOpen(hint.id)"
+                    :imageProcessor="EditorImageProcessor"
+                    :tabindex="-1"
+                    class="editor"
+                    @update="html => setHintContent(hint.id, html)"
+                    @minimize="closeHint"
+                  />
+                </div>
+
+                <div
+                  v-if="mode === 'edit'"
+                  class="hint-actions toolbar"
+                  @click.stop
+                >
+                  <CollapsibleToolbar :actions="getHintRowActions(hint.id, index)" />
+                </div>
+              </div>
+            </div>
+          </ClickableRegion>
+        </div>
+
+        <AddListItemButton
+          v-if="mode === 'edit'"
+          :label="addHintBtn$()"
+          :aria-label="addHintBtn$()"
+          data-testid="addHintBtn"
+          @click="onAddHint"
+        />
+      </template>
+    </div>
+  </div>
+
+</template>
+
+
+<script>
+
+  import { ref } from 'vue';
+  import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
+  import { qtiEditorStrings } from '../../qtiEditorStrings';
+  import { hintHasContent } from '../../serialization/hints';
+  import { generateRandomSlug } from '../../utils/generateRandomSlug';
+  import CollapsibleToolbar from '../CollapsibleToolbar/index.vue';
+  import AddListItemButton from '../AddListItemButton/index.vue';
+  import ClickableRegion from '../ClickableRegion/index.vue';
+  import TipTapEditor from 'shared/views/TipTapEditor/TipTapEditor/TipTapEditor';
+  import EditorImageProcessor from 'shared/views/TipTapEditor/TipTapEditor/services/imageService';
+
+  export default {
+    name: 'HintsSection',
+
+    components: { CollapsibleToolbar, AddListItemButton, ClickableRegion, TipTapEditor },
+
+    setup(props, { emit }) {
+      const {
+        hintsLabel$,
+        noHintsPlaceholder$,
+        hintPlaceholder$,
+        editHintLabel$,
+        addHintBtn$,
+        deleteHintBtn$,
+        moveHintUpBtn$,
+        moveHintDownBtn$,
+      } = qtiEditorStrings;
+
+      const { windowIsSmall } = useKResponsiveWindow();
+
+      const sectionOpen = ref(false);
+
+      const openHintId = ref(null);
+
+      const contentId = `${generateRandomSlug('hints')}-content`;
+
+      function isHintOpen(id) {
+        return props.mode === 'edit' && openHintId.value === id;
+      }
+
+      function hasContent(hint) {
+        return hintHasContent(hint);
+      }
+
+      function isHintClickable(id) {
+        return props.mode === 'edit' && !isHintOpen(id);
+      }
+
+      function emitHints(hints) {
+        emit('update:hints', hints);
+      }
+
+      function closeHint() {
+        openHintId.value = null;
+      }
+
+      function onHintClick(event, id) {
+        if (props.mode !== 'edit' || isHintOpen(id)) {
+          return;
+        }
+        // The toolbar's own buttons must not also open the hint they act on.
+        if (event.target.closest('.toolbar')) {
+          return;
+        }
+        openHintId.value = id;
+      }
+
+      function setHintContent(id, content) {
+        const hint = props.hints.find(h => h.id === id);
+        if (!hint || hint.content === content) {
+          return;
+        }
+        emitHints(props.hints.map(h => (h.id === id ? { ...h, content } : h)));
+      }
+
+      function moveHint(id, offset) {
+        const index = props.hints.findIndex(h => h.id === id);
+        const target = index + offset;
+        if (index < 0 || target < 0 || target >= props.hints.length) {
+          return;
+        }
+        const hints = [...props.hints];
+        [hints[index], hints[target]] = [hints[target], hints[index]];
+        emitHints(hints);
+      }
+
+      function removeHint(id) {
+        if (openHintId.value === id) {
+          closeHint();
+        }
+        emitHints(props.hints.filter(h => h.id !== id));
+      }
+
+      function onAddHint() {
+        const hint = { id: generateRandomSlug('hint'), content: '' };
+        emitHints([...props.hints, hint]);
+        sectionOpen.value = true;
+        openHintId.value = hint.id;
+      }
+
+      function getHintRowActions(id, index) {
+        return [
+          {
+            id: 'up',
+            icon: 'chevronUp',
+            label: moveHintUpBtn$(),
+            disabled: index === 0,
+            handler: () => moveHint(id, -1),
+            collapsed: windowIsSmall.value,
+          },
+          {
+            id: 'down',
+            icon: 'chevronDown',
+            label: moveHintDownBtn$(),
+            disabled: index === props.hints.length - 1,
+            handler: () => moveHint(id, 1),
+            collapsed: windowIsSmall.value,
+          },
+          {
+            id: 'delete',
+            icon: 'close',
+            label: deleteHintBtn$(),
+            handler: () => removeHint(id),
+            collapsed: windowIsSmall.value,
+          },
+        ];
+      }
+
+      return {
+        sectionOpen,
+        contentId,
+        windowIsSmall,
+        EditorImageProcessor,
+        hintsLabel$,
+        noHintsPlaceholder$,
+        hintPlaceholder$,
+        editHintLabel$,
+        addHintBtn$,
+        isHintOpen,
+        hasContent,
+        isHintClickable,
+        onHintClick,
+        setHintContent,
+        closeHint,
+        onAddHint,
+        getHintRowActions,
+      };
+    },
+
+    props: {
+      /** Item hints, in order: [{ id, content }] */
+      hints: {
+        type: Array,
+        default: () => [],
+      },
+      /** Whether the question card this sits in is being edited */
+      mode: {
+        type: String,
+        default: 'view',
+        validator: val => ['view', 'edit'].includes(val),
+      },
+    },
+
+    emits: ['update:hints'],
+  };
+
+</script>
+
+
+<style lang="scss" scoped>
+
+  .full-width-divider {
+    max-width: none !important;
+    margin: 0 calc(-1 * var(--question-card-horizontal-padding, 20px)) 0;
+    border-top: 1px solid v-bind('$themeTokens.fineLine');
+  }
+
+  .hints-header {
+    user-select: none;
+  }
+
+  .hints-heading {
+    margin: 0;
+  }
+
+  .hints-header-button {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: calc(100% + 2 * var(--question-card-horizontal-padding, 20px));
+    padding: 15px var(--question-card-horizontal-padding, 20px);
+    margin: 0 calc(-1 * var(--question-card-horizontal-padding, 20px)) 0;
+    cursor: pointer;
+    background: transparent;
+    border: 0;
+
+    &:hover {
+      background-color: rgba(0, 0, 0, 0.1);
+    }
+
+    /*
+     * Inset, because this button is deliberately wider than the card it sits in — an
+     * outline drawn outside its box has its left and right edges off the card, leaving
+     * only two horizontal rules above and below the heading.
+     */
+    &:focus-visible {
+      outline: 3px solid v-bind('$themeTokens.focusOutline');
+      outline-offset: -3px;
+    }
+  }
+
+  /* Matches the field labels the interaction editors use for "Question" and "Answers" */
+  .hints-label {
+    font-size: 14px;
+    font-weight: 600;
+    color: v-bind('$themePalette.grey.v_700');
+  }
+
+  .hints-chevron {
+    font-size: 24px;
+    transition: transform 0.2s ease;
+
+    &.is-open {
+      transform: rotate(180deg);
+    }
+  }
+
+  .hints-section {
+    margin-top: 10px;
+
+    &.is-collapsed {
+      display: none;
+    }
+  }
+
+  .hints-list {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+  }
+
+  .hint-border {
+    border: 1px solid v-bind('$themeTokens.fineLine');
+    border-radius: 4px;
+  }
+
+  .no-hints-placeholder {
+    padding: 16px;
+  }
+
+  .hint-card-text {
+    padding: 16px;
+
+    &.small-screen {
+      padding: 8px;
+    }
+
+    &.is-closed {
+      padding-top: 0;
+      padding-bottom: 0;
+    }
+  }
+
+  .hint-layout {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    &.is-open {
+      align-items: flex-start;
+    }
+
+    &.small-screen {
+      .hint-actions {
+        margin-left: 4px;
+      }
+
+      &.is-open {
+        flex-direction: column-reverse;
+
+        .hint-actions {
+          display: flex;
+          justify-content: flex-end;
+          width: 100%;
+          margin-bottom: 8px;
+          margin-left: 0;
+        }
+      }
+    }
+  }
+
+  .hint-content {
+    position: relative;
+    flex: 1;
+    min-width: 0;
+    overflow: hidden;
+  }
+
+  .hint-actions {
+    flex-shrink: 0;
+    margin-left: 16px;
+  }
+
+  .hint {
+    transition: background-color 0.3s;
+
+    &.is-clickable {
+      cursor: pointer;
+
+      &:hover {
+        background-color: v-bind('$themePalette.grey.v_100');
+      }
+    }
+  }
+
+  .hint-view-text {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    min-height: 42px;
+    padding: 0 4px;
+    overflow: hidden;
+    border-radius: 4px;
+  }
+
+  .hint-placeholder {
+    color: v-bind('$themePalette.grey.v_300');
+  }
+
+</style>
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/InteractionSection/index.vue b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/InteractionSection/index.vue
index 060b191f58..080bc5bc7a 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/InteractionSection/index.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/InteractionSection/index.vue
@@ -12,11 +12,12 @@
         v-if="mode === 'edit'"
         :questionType="questionType"
         :settingsTargetId="settingsTargetId"
+        :allowFreeResponse="allowFreeResponse"
         @update:questionType="onUpdateQuestionType"
       />
 
       <component
-        :is="descriptor.editorComponent"
+        :is="editorComponent"
         :key="descriptor.type"
         :questionType="questionType"
         :interaction="interaction"
@@ -24,6 +25,7 @@
         :showAnswers="showAnswers"
         :teleportTargetId="settingsTargetId"
         @update:interaction="onUpdateInteraction"
+        @update:errors="errors => $emit('update:errors', errors)"
       />
     </div>
   </div>
@@ -37,7 +39,7 @@
   import useInteractionDescriptor from '../../composables/useInteractionDescriptor';
   import QuestionTypeSelector from '../QuestionTypeSelector/index.vue';
   import { generateRandomSlug } from '../../utils/generateRandomSlug';
-  import { descriptors } from '../../interactions';
+  import { descriptors, editors } from '../../interactions';
 
   export default {
     name: 'InteractionSection',
@@ -81,8 +83,11 @@
 
       const settingsTargetId = generateRandomSlug('answer-settings');
 
+      const editorComponent = computed(() => editors[descriptor.value.type]);
+
       return {
         descriptor,
+        editorComponent,
         questionType,
         parseError,
         onUpdateQuestionType,
@@ -112,9 +117,17 @@
         type: Boolean,
         default: false,
       },
+      /**
+       * Whether a question with no correct answer is acceptable here. Passed straight to the
+       * type selector, which is the only part of an interaction this concerns.
+       */
+      allowFreeResponse: {
+        type: Boolean,
+        default: true,
+      },
     },
 
-    emits: ['update:questionType', 'update:interaction'],
+    emits: ['update:questionType', 'update:interaction', 'update:errors'],
   };
 
 </script>
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QTIItemEditor/__tests__/QTIItemEditor.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QTIItemEditor/__tests__/QTIItemEditor.spec.js
index 8a9d19fe02..4e84bf71cb 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QTIItemEditor/__tests__/QTIItemEditor.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QTIItemEditor/__tests__/QTIItemEditor.spec.js
@@ -1,8 +1,18 @@
 import { render, screen, fireEvent } from '@testing-library/vue';
+import { nextTick } from 'vue';
 import VueRouter from 'vue-router';
 import QTIItemEditor from '../index.vue';
 import { qtiEditorStrings } from '../../../qtiEditorStrings';
 import { AssessmentItemTypes } from '../../../constants';
+import {
+  VALID_CHOICE_ITEM_DOCUMENT,
+  CHOICE_ITEM_DOCUMENT_NO_CORRECT_ANSWER,
+  ORDERING_ITEM_DOCUMENT_NO_PROMPT,
+  FREE_RESPONSE_ITEM_DOCUMENT,
+  NO_INTERACTION_ITEM_DOCUMENT,
+  CHOICE_ITEM_DOCUMENT_WITH_HINTS,
+  NO_INTERACTION_ITEM_WITH_HINTS,
+} from '../../../utils/testingFixtures';
 
 jest.mock('shared/views/TipTapEditor/TipTapEditor/TipTapEditor');
 jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow', () => {
@@ -13,7 +23,13 @@ jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow', () => {
   };
 });
 
-const { closeBtnLabel$, questionContentPlaceholder$ } = qtiEditorStrings;
+const {
+  closeBtnLabel$,
+  questionContentPlaceholder$,
+  unsupportedItemMessage$,
+  incompleteItemIndicatorLabel$,
+  hintsLabel$,
+} = qtiEditorStrings;
 
 const defaultProps = {
   item: {
@@ -77,6 +93,204 @@ describe('QTIItemEditor', () => {
     });
   });
 
+  describe('items this editor cannot edit', () => {
+    test('shows a read-only message for an item authored elsewhere', () => {
+      renderComponent({
+        item: { assessment_id: 'perseus-item', type: 'perseus_question', raw_data: '{}' },
+      });
+      expect(screen.getByText(unsupportedItemMessage$())).toBeInTheDocument();
+    });
+
+    test('shows a read-only message when the item XML cannot be read', () => {
+      renderComponent({
+        item: {
+          assessment_id: 'broken-item',
+          type: AssessmentItemTypes.QTI,
+          raw_data: '<qti-assessment-item><oops>',
+        },
+      });
+      expect(screen.getByText(unsupportedItemMessage$())).toBeInTheDocument();
+    });
+  });
+
+  describe('incomplete indicator', () => {
+    const renderAndValidate = async raw_data => {
+      renderComponent({
+        item: { assessment_id: 'item-id', type: AssessmentItemTypes.QTI, raw_data },
+      });
+      await nextTick();
+    };
+
+    test('is shown for a question missing something the author has to supply', async () => {
+      await renderAndValidate(CHOICE_ITEM_DOCUMENT_NO_CORRECT_ANSWER);
+      expect(screen.getByText(incompleteItemIndicatorLabel$())).toBeInTheDocument();
+    });
+
+    test('is not shown for a complete question', async () => {
+      await renderAndValidate(VALID_CHOICE_ITEM_DOCUMENT);
+      expect(screen.queryByText(incompleteItemIndicatorLabel$())).not.toBeInTheDocument();
+    });
+
+    // The card reads the item's XML rather than errors an interaction editor reports, so an
+    // interaction that reports nothing is covered like any other.
+    test('is shown for an incomplete question of any interaction type', async () => {
+      await renderAndValidate(ORDERING_ITEM_DOCUMENT_NO_PROMPT);
+      expect(screen.getByText(incompleteItemIndicatorLabel$())).toBeInTheDocument();
+    });
+
+    test('is shown for an item with no interaction at all', async () => {
+      await renderAndValidate(NO_INTERACTION_ITEM_DOCUMENT);
+      expect(screen.getByText(incompleteItemIndicatorLabel$())).toBeInTheDocument();
+    });
+
+    test('is shown for a free-response question where those are not accepted', async () => {
+      renderComponent({
+        allowFreeResponse: false,
+        item: {
+          assessment_id: 'item-id',
+          type: AssessmentItemTypes.QTI,
+          raw_data: FREE_RESPONSE_ITEM_DOCUMENT,
+        },
+      });
+      await nextTick();
+
+      expect(screen.getByText(incompleteItemIndicatorLabel$())).toBeInTheDocument();
+    });
+
+    test('is not shown for a free-response question where those are accepted', async () => {
+      await renderAndValidate(FREE_RESPONSE_ITEM_DOCUMENT);
+      expect(screen.queryByText(incompleteItemIndicatorLabel$())).not.toBeInTheDocument();
+    });
+    test('is not shown for a question this editor cannot read', async () => {
+      renderComponent({
+        item: {
+          assessment_id: 'item-id',
+          type: AssessmentItemTypes.PERSEUS_QUESTION,
+          raw_data: '{"not":"qti"}',
+        },
+      });
+      await nextTick();
+
+      expect(screen.queryByText(incompleteItemIndicatorLabel$())).not.toBeInTheDocument();
+    });
+  });
+
+  describe('reporting content changes', () => {
+    const renderWithContent = mode =>
+      renderComponent({
+        mode,
+        item: {
+          assessment_id: 'item-id',
+          type: AssessmentItemTypes.QTI,
+          raw_data: VALID_CHOICE_ITEM_DOCUMENT,
+        },
+      });
+
+    test('a card that is only being viewed reports nothing', async () => {
+      // A closed card re-assembles its XML too; reporting that would rewrite every
+      // question in the list just for being on screen.
+      const { emitted } = renderWithContent('view');
+      await nextTick();
+
+      expect(emitted()['update:rawData']).toBeUndefined();
+    });
+
+    test('a change made while editing is still reported once the card closes', async () => {
+      const { emitted, updateProps } = renderWithContent('edit');
+      // Deliberately not awaited: the change and the close land in the same flush, which is
+      // what happens when a click closes the card the author was just typing in.
+      fireEvent.click(screen.getByRole('button', { name: /add choice/i }));
+      await updateProps({ mode: 'view' });
+      await nextTick();
+
+      expect(emitted()['update:rawData']).toBeDefined();
+    });
+
+    test('the card being edited reports the new XML when the author changes it', async () => {
+      const { emitted } = renderWithContent('edit');
+      // The fixture starts with two choices.
+      await fireEvent.click(screen.getByRole('button', { name: /add choice/i }));
+      await nextTick();
+
+      const reported = emitted()['update:rawData'].pop()[0];
+      expect(reported.match(/<qti-simple-choice/g)).toHaveLength(3);
+    });
+  });
+
+  describe('hints', () => {
+    // Adaptation of the hints previously used in Studio. New hints are not
+    // supported, only the display of existing ones.
+    test('offers no hints section on a question that arrived without any', () => {
+      renderComponent({
+        item: { ...defaultProps.item, raw_data: VALID_CHOICE_ITEM_DOCUMENT },
+        mode: 'edit',
+      });
+      expect(screen.queryByText(hintsLabel$())).not.toBeInTheDocument();
+    });
+
+    test('offers no hints section on a newly created question', () => {
+      renderComponent({ mode: 'edit' });
+      expect(screen.queryByText(hintsLabel$())).not.toBeInTheDocument();
+    });
+
+    test('shows the hints section on a question that arrived with hints', () => {
+      renderComponent({
+        item: { ...defaultProps.item, raw_data: CHOICE_ITEM_DOCUMENT_WITH_HINTS },
+        mode: 'edit',
+      });
+      expect(screen.getByText(hintsLabel$())).toBeInTheDocument();
+    });
+
+    test('keeps the hints of a closed question out of the way until answers are shown', () => {
+      renderComponent({
+        item: { ...defaultProps.item, raw_data: CHOICE_ITEM_DOCUMENT_WITH_HINTS },
+        mode: 'view',
+        showAnswers: false,
+      });
+      expect(screen.queryByText(hintsLabel$())).not.toBeInTheDocument();
+    });
+
+    test('shows the hints of a closed question when answers are shown', () => {
+      renderComponent({
+        item: { ...defaultProps.item, raw_data: CHOICE_ITEM_DOCUMENT_WITH_HINTS },
+        mode: 'view',
+        showAnswers: true,
+      });
+      expect(screen.getByText(hintsLabel$())).toBeInTheDocument();
+    });
+
+    test('keeps the body of a question that has no interaction when a hint changes', async () => {
+      // Nothing mounts an interaction editor here, so the editor holds no body of its own.
+      // Assembling from that empty state would replace the question's text with an empty
+      // <qti-item-body/> — a hint edit silently deleting the question.
+      const { emitted } = renderComponent({
+        item: { ...defaultProps.item, raw_data: NO_INTERACTION_ITEM_WITH_HINTS },
+        mode: 'edit',
+      });
+      await fireEvent.click(screen.getByRole('button', { name: hintsLabel$() }));
+      await fireEvent.click(screen.getAllByRole('button', { name: 'Delete hint' })[0]);
+      await nextTick();
+
+      const [xml] = emitted()['update:rawData'].at(-1);
+      expect(xml).toContain('What is the capital of France?');
+      expect(xml).not.toContain('<qti-item-body/>');
+    });
+
+    test('reports the item XML when a hint changes', async () => {
+      const { emitted } = renderComponent({
+        item: { ...defaultProps.item, raw_data: CHOICE_ITEM_DOCUMENT_WITH_HINTS },
+        mode: 'edit',
+      });
+      await fireEvent.click(screen.getByRole('button', { name: hintsLabel$() }));
+      await fireEvent.click(screen.getAllByRole('button', { name: 'Delete hint' })[0]);
+      await nextTick();
+
+      const [xml] = emitted()['update:rawData'].at(-1);
+      expect(xml).toContain('<p>test2 2</p>');
+      expect(xml).not.toContain('<p>test</p>');
+    });
+  });
+
   describe('toolbarActions slot', () => {
     test('renders content injected into the toolbarActions slot', () => {
       renderComponent({}, { toolbarActions: '<button>Edit</button>' });
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QTIItemEditor/index.vue b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QTIItemEditor/index.vue
index 40711ad6f9..b9ac1279ec 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QTIItemEditor/index.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QTIItemEditor/index.vue
@@ -22,18 +22,39 @@
       </h3>
 
       <div class="question-card-actions toolbar">
+        <span
+          v-if="isIncomplete"
+          class="incomplete-indicator"
+          :style="{ color: $themeTokens.error }"
+          data-testid="incompleteIndicator"
+        >
+          <KIcon
+            icon="error"
+            :color="$themeTokens.error"
+          />
+          <span>{{ incompleteItemIndicatorLabel$() }}</span>
+        </span>
         <slot name="toolbarActions"></slot>
       </div>
     </div>
 
     <div class="question-card-body">
+      <p
+        v-if="isUnsupported"
+        :style="{ color: $themePalette.grey.v_500, margin: 0, fontStyle: 'italic' }"
+        data-testid="unsupportedMessage"
+      >
+        {{ unsupportedItemMessage$() }}
+      </p>
       <InteractionSection
-        v-if="interactions.length > 0"
+        v-else-if="interactions.length > 0"
         :interaction="currentInteraction"
         :mode="mode"
         :showAnswers="showAnswers"
+        :allowFreeResponse="allowFreeResponse"
         @update:questionType="type => (currentQuestionType = type)"
         @update:interaction="onUpdateInteraction"
+        @update:errors="onUpdateErrors"
       />
       <p
         v-else
@@ -41,6 +62,13 @@
       >
         {{ questionContentPlaceholder$() }}
       </p>
+
+      <HintsSection
+        v-if="hasHints && (mode === 'edit' || showAnswers)"
+        :hints="hints"
+        :mode="mode"
+        @update:hints="onUpdateHints"
+      />
     </div>
 
     <div
@@ -62,14 +90,16 @@
 
   import { computed, ref, watch } from 'vue';
   import { qtiEditorStrings } from '../../qtiEditorStrings';
-  import { QuestionType } from '../../constants';
+  import { AssessmentItemTypes, QuestionType } from '../../constants';
   import useQtiItem from '../../composables/useQtiItem';
+  import { validateItemShape } from '../../validateItem';
   import InteractionSection from '../InteractionSection/index.vue';
+  import HintsSection from '../HintsSection/index.vue';
 
   export default {
     name: 'QTIItemEditor',
 
-    components: { InteractionSection },
+    components: { InteractionSection, HintsSection },
 
     setup(props, { emit }) {
       const {
@@ -78,6 +108,8 @@
         closeBtnLabel$,
         questionContentPlaceholder$,
         unknownTypeLabel$,
+        incompleteItemIndicatorLabel$,
+        unsupportedItemMessage$,
       } = qtiEditorStrings;
 
       /**
@@ -92,14 +124,32 @@
       // Parse the item XML. rawData is a computed inside useQtiItem that
       // re-assembles the full XML whenever identifier/title/language or the
       // editor refs change — no need to duplicate assembleItemXml here.
-      const { interactions, rawData } = useQtiItem(props.item.raw_data, {
-        bodyXml: currentBodyXml,
-        responseDeclarations: currentResponseDeclarations,
-      });
+      const { interactions, itemBodyXml, hints, parseError, rawData } = useQtiItem(
+        props.item.raw_data,
+        {
+          bodyXml: currentBodyXml,
+          responseDeclarations: currentResponseDeclarations,
+        },
+      );
 
-      // Seed the editor refs from the parsed interactions (first interaction only).
+      /**
+       * Items authored outside this editor (e.g. Perseus questions) and items whose XML
+       * cannot be read are shown as read-only cards.
+       */
+      const isUnsupported = computed(
+        () => props.item.type !== AssessmentItemTypes.QTI || Boolean(parseError.value),
+      );
+
+      /*
+       * Seed the editor refs from the parsed item (first interaction only).
+       *
+       * The body is seeded even when there is no interaction to edit. Such an item still has
+       * content — its own text, and any interaction this editor has no descriptor for — and
+       * anything else the author can change, a hint, reassembles the whole item. Leaving the
+       * body unseeded would write an empty <qti-item-body/> over that text.
+       */
+      currentBodyXml.value = interactions.value[0]?.bodyXml ?? itemBodyXml.value;
       if (interactions.value.length > 0) {
-        currentBodyXml.value = interactions.value[0].bodyXml;
         currentResponseDeclarations.value = interactions.value[0].responseDeclarations;
       }
 
@@ -144,35 +194,92 @@
         }),
       );
 
+      /**
+       * Whether the change the watcher below is about to report came from an edit in this
+       * card. Recorded as the change happens rather than read from `mode` when the watcher
+       * flushes: closing the card sets the parent's active item to none, and that re-render
+       * lands first, so a change made just before the close would look like it came from a
+       * card nobody was editing.
+       */
+      let editedHere = false;
+
       // Emit only when the assembled XML actually changes after initial mount.
       watch(rawData, newVal => {
+        if (!editedHere) return;
+        editedHere = false;
         if (process.env.NODE_ENV === 'development') {
+          // debug to help devs understand what the editor is sending to the parent
           // eslint-disable-next-line no-console
-          console.log('[QTIItemEditor] assembled XML:\n', newVal);
+          console.debug('[QTIItemEditor] assembled XML:\n', newVal);
         }
         emit('update:rawData', newVal);
       });
 
       function onUpdateInteraction({ bodyXml, responseDeclarations }) {
+        editedHere = props.mode === 'edit';
         currentBodyXml.value = bodyXml;
         currentResponseDeclarations.value = responseDeclarations;
       }
 
+      /**
+       * Whether this question offers hints at all, which is settled by what the item arrived
+       * with: only a question that already has them shows the section (product decision).
+       *
+       * Read once from the parsed item rather than from the live list, so removing the last
+       * hint does not take the section away while the author is still working in it.
+       */
+      const hasHints = hints.value.length > 0;
+
+      function onUpdateHints(newHints) {
+        editedHere = props.mode === 'edit';
+        hints.value = newHints;
+      }
+
+      /** Errors the interaction editor reports about the state it holds. */
+      const errors = ref([]);
+
+      function onUpdateErrors(newErrors) {
+        errors.value = newErrors;
+      }
+
+      /**
+       * Whether the question is missing something an author still has to supply.
+       */
+      const isIncomplete = computed(() => {
+        if (isUnsupported.value) {
+          return false;
+        }
+        const itemErrors = validateItemShape({
+          interactions: interactions.value,
+          questionTypes: [currentQuestionType.value],
+          allowFreeResponse: props.allowFreeResponse,
+        });
+        return itemErrors.length > 0 || errors.value.length > 0;
+      });
+
       return {
         currentQuestionType,
         interactions,
         currentInteraction,
+        isUnsupported,
+        isIncomplete,
         questionNumberLabel,
         questionNumberAndTypeLabel,
         closeBtnLabel$,
         questionContentPlaceholder$,
+        incompleteItemIndicatorLabel$,
+        unsupportedItemMessage$,
         onUpdateInteraction,
+        onUpdateErrors,
+        hints,
+        hasHints,
+        onUpdateHints,
       };
     },
 
     props: {
       /**
-       * Assessment item: { assessment_id, type, raw_data? }
+       * Assessment item: { assessment_id, type, raw_data }
        * raw_data is the full QTI XML string; absent on blank newly-created items.
        */
       item: {
@@ -200,6 +307,14 @@
         type: Boolean,
         default: false,
       },
+      /**
+       * Whether a question with no correct answer counts as complete. Only a survey
+       * accepts those, so a consumer that scores its questions passes false.
+       */
+      allowFreeResponse: {
+        type: Boolean,
+        default: true,
+      },
     },
 
     emits: ['close', 'update:rawData'],
@@ -235,7 +350,19 @@
     align-items: center;
   }
 
+  .incomplete-indicator {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+    font-size: 14px;
+    font-weight: 600;
+    white-space: nowrap;
+  }
+
   .question-card-body {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
     min-width: 0;
     padding: 10px var(--question-card-horizontal-padding) 16px;
   }
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QuestionTypeSelector/__tests__/QuestionTypeSelector.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QuestionTypeSelector/__tests__/QuestionTypeSelector.spec.js
index 1a1fd991d5..d3d5309a4b 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QuestionTypeSelector/__tests__/QuestionTypeSelector.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QuestionTypeSelector/__tests__/QuestionTypeSelector.spec.js
@@ -66,4 +66,52 @@ describe('QuestionTypeSelector', () => {
     expect(emitted()['update:questionType']).toBeTruthy();
     expect(emitted()['update:questionType'][0]).toEqual([QuestionType.MULTI_SELECT]);
   });
+
+  describe('free response', () => {
+    const openDropdown = async () => fireEvent.click(screen.getByText(tr.$tr('singleSelectLabel')));
+
+    it('is offered where a question need not be scored', async () => {
+      renderHeader({ allowFreeResponse: true });
+      await openDropdown();
+      expect(screen.getByText(tr.$tr('freeResponseLabel'))).toBeInTheDocument();
+    });
+
+    it('is not offered where the questions are scored', async () => {
+      renderHeader({ allowFreeResponse: false });
+      await openDropdown();
+      expect(screen.queryByText(tr.$tr('freeResponseLabel'))).not.toBeInTheDocument();
+    });
+
+    it('leaves the other types alone', async () => {
+      renderHeader({ allowFreeResponse: false });
+      await openDropdown();
+      expect(screen.getByText(tr.$tr('multiSelectLabel'))).toBeInTheDocument();
+      expect(screen.getByText(tr.$tr('numericLabel'))).toBeInTheDocument();
+      expect(screen.getByText(tr.$tr('textEntryLabel'))).toBeInTheDocument();
+    });
+
+    it('stays available to a question that already is one, so it can be changed', async () => {
+      renderHeader({ allowFreeResponse: false, questionType: QuestionType.FREE_RESPONSE });
+      // Shown as the selection, rather than the select falling back to another type
+      expect(screen.getByText(tr.$tr('freeResponseLabel'))).toBeInTheDocument();
+
+      await fireEvent.click(screen.getByText(tr.$tr('freeResponseLabel')));
+      expect(screen.getByText(tr.$tr('multiSelectLabel'))).toBeInTheDocument();
+    });
+
+    it('says why it cannot stay, for a question that already is one', () => {
+      renderHeader({ allowFreeResponse: false, questionType: QuestionType.FREE_RESPONSE });
+      expect(screen.getByRole('alert')).toHaveTextContent(tr.$tr('errorFreeResponseNotAllowed'));
+    });
+
+    it('says nothing when the type is allowed', () => {
+      renderHeader({ allowFreeResponse: true, questionType: QuestionType.FREE_RESPONSE });
+      expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+    });
+
+    it('says nothing about a question that is not a free response', () => {
+      renderHeader({ allowFreeResponse: false });
+      expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+    });
+  });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QuestionTypeSelector/index.vue b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QuestionTypeSelector/index.vue
index 1cb89f6cf5..68d4fcd265 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QuestionTypeSelector/index.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/components/QuestionTypeSelector/index.vue
@@ -3,7 +3,6 @@
   <div
     class="question-type-selector"
     :class="{ 'small-screen': windowIsSmall }"
-    :style="{ borderBottom: `1px solid ${$themeTokens.fineLine}` }"
   >
     <div
       class="type-selector-group"
@@ -48,6 +47,10 @@
           @click="showTypeInfoModal = true"
         />
       </div>
+
+      <ValidationMessage v-if="freeResponseNotAllowed">
+        {{ errorFreeResponseNotAllowed$() }}
+      </ValidationMessage>
     </div>
 
     <div
@@ -93,24 +96,53 @@
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import { qtiEditorStrings } from '../../qtiEditorStrings';
   import { descriptors } from '../../interactions';
+  import { QuestionType } from '../../constants';
   import { generateRandomSlug } from '../../utils/generateRandomSlug';
+  import ValidationMessage from '../ValidationMessage/index.vue';
 
   export default {
     name: 'QuestionTypeSelector',
 
+    components: { ValidationMessage },
+
     setup(props) {
       const { windowIsSmall } = useKResponsiveWindow();
-      const { typeLabel$, responseTypeLabel$, responseTypeInfoTitle$, closeBtnLabel$ } =
-        qtiEditorStrings;
+      const {
+        typeLabel$,
+        responseTypeLabel$,
+        responseTypeInfoTitle$,
+        closeBtnLabel$,
+        errorFreeResponseNotAllowed$,
+      } = qtiEditorStrings;
 
       const showTypeInfoModal = ref(false);
 
       const labelId = generateRandomSlug('type-selector');
 
+      /** Whether the question already is a free response, whatever the consumer allows. */
+      const isFreeResponse = computed(() => props.questionType === QuestionType.FREE_RESPONSE);
+
       const questionTypeOptions = computed(() => {
-        return descriptors.flatMap(d => d.getTypeOptions?.(qtiEditorStrings) ?? []);
+        const options = descriptors.flatMap(d => d.getTypeOptions?.(qtiEditorStrings) ?? []);
+        if (props.allowFreeResponse) {
+          return options;
+        }
+        /**
+         * A free response has no correct answer, so it is not offered where the questions are
+         * scored. A question that already is one keeps the option: dropping it would leave the
+         * select showing some other type as if that were the question, and the author with no
+         * way to see what they have — or to deliberately change it.
+         */
+        return options.filter(
+          option => option.value !== QuestionType.FREE_RESPONSE || isFreeResponse.value,
+        );
       });
 
+      /** Shown under the select for a question that is a free response where it cannot be. */
+      const freeResponseNotAllowed = computed(
+        () => !props.allowFreeResponse && isFreeResponse.value,
+      );
+
       const selectedOption = computed(
         () =>
           questionTypeOptions.value.find(o => o.value === props.questionType) ||
@@ -127,6 +159,8 @@
         labelId,
         questionTypeOptions,
         selectedOption,
+        freeResponseNotAllowed,
+        errorFreeResponseNotAllowed$,
       };
     },
 
@@ -140,6 +174,15 @@
         type: String,
         required: true,
       },
+
+      /**
+       * Whether a question with no correct answer is acceptable here. False on an exercise,
+       * whose questions are scored, and true on a survey.
+       */
+      allowFreeResponse: {
+        type: Boolean,
+        default: true,
+      },
     },
 
     emits: ['update:questionType'],
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/__tests__/useInteraction.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/__tests__/useInteraction.spec.js
index 57dcd875de..4b768951fe 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/__tests__/useInteraction.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/__tests__/useInteraction.spec.js
@@ -1,14 +1,6 @@
 import { ref, nextTick } from 'vue';
 import { useInteraction } from '../useInteraction';
 
-jest.mock('lodash/debounce', () => {
-  return jest.fn(fn => {
-    const mocked = jest.fn((...args) => fn(...args));
-    mocked.cancel = jest.fn();
-    return mocked;
-  });
-});
-
 function makeDescriptor({ parseReturn = {}, buildReturn = null, validateReturn = [] } = {}) {
   return {
     parse: jest.fn(() => parseReturn),
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/__tests__/useTextEntryInteraction.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/__tests__/useTextEntryInteraction.spec.js
index 9da18c9334..3cb643866e 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/__tests__/useTextEntryInteraction.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/__tests__/useTextEntryInteraction.spec.js
@@ -36,12 +36,17 @@ describe('useTextEntryInteraction', () => {
       expect(state.value.answers[0].value).toBe('12');
     });
 
-    it('starts with empty errors', () => {
+    it('starts with no errors when the parsed state is already valid', () => {
       const { errors } = setupNumeric();
-      // errors populates asynchronously via debounced watcher;
-      // immediately after setup it is still empty.
+
       expect(errors.value).toEqual([]);
     });
+
+    it('reports errors for an invalid parsed state without waiting', () => {
+      const { errors } = setupNumeric([]);
+
+      expect(errors.value.map(e => e.code)).toContain(ValidationError.NO_CORRECT_ANSWER);
+    });
   });
 
   describe('addAnswer()', () => {
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useChoiceInteraction.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useChoiceInteraction.js
index dff8864cb7..3106bba39c 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useChoiceInteraction.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useChoiceInteraction.js
@@ -1,7 +1,7 @@
 import { computed, readonly } from 'vue';
 import { QuestionType } from '../constants';
 import { generateRandomSlug } from '../utils/generateRandomSlug';
-import { choiceInteractionDescriptor } from '../interactions/choice/ChoiceInteractionDescriptor';
+import { choiceInteractionDescriptor } from '../interactions/choice/Descriptor';
 import { useInteraction } from './useInteraction';
 
 /**
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useInteraction.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useInteraction.js
index f9c9d64691..316ffe0b9f 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useInteraction.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useInteraction.js
@@ -1,5 +1,4 @@
-import { ref, computed, watch, onUnmounted } from 'vue';
-import debounce from 'lodash/debounce';
+import { ref, computed, watch } from 'vue';
 
 /**
  * Base composable for all interaction editors.
@@ -8,12 +7,11 @@ import debounce from 'lodash/debounce';
  * interaction plugin must go through. Individual interaction composables
  * (e.g. useChoiceInteraction) call this and add mutation methods on top.
  *
- * Validation runs immediately when called explicitly (e.g. when closing a
- * panel), but is debounced when triggered by state changes so that errors
- * only appear after the user pauses typing (400 ms), avoiding noisy
- * inline error flicker on every keystroke.
+ * Validation runs on every state or questionType change, so errors always describe the
+ * state the editor is showing. runValidation is exposed for explicit triggers, such as
+ * closing a panel.
  *
- * @param {import('../interactions/defineInteraction').InteractionDescriptor} descriptor
+ * @param {import('../interactions/InteractionDescriptor').InteractionDescriptor} descriptor
  * @param {{ bodyXml: string, responseDeclarations: string[] }} interactionBlock
  * @param {import('vue').Ref<string|null>} questionType
  * @returns {{
@@ -43,21 +41,12 @@ export function useInteraction(descriptor, interactionBlock, questionType) {
 
   const errors = ref([]);
 
-  /** Immediately validates and updates errors. Use this for explicit triggers (e.g. close). */
+  /** Validates and updates errors. Exposed for explicit triggers (e.g. close). */
   function runValidation() {
     errors.value = descriptor.validate(state.value, questionType.value);
   }
 
-  /**
-   * Debounced version used by the state watcher — waits 400 ms after the user
-   * stops typing before showing inline errors.
-   */
-  const debouncedValidation = debounce(runValidation, 400);
-
-  // Cancel any pending debounce when the component is torn down.
-  onUnmounted(() => debouncedValidation.cancel());
-
-  watch([state, questionType], debouncedValidation, { deep: true, immediate: true });
+  watch([state, questionType], runValidation, { deep: true, immediate: true });
 
   return { state, bodyXml, responseDeclarations, errors, runValidation };
 }
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useInteractionDescriptor.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useInteractionDescriptor.js
index 76b40f311b..2bba518481 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useInteractionDescriptor.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useInteractionDescriptor.js
@@ -1,6 +1,6 @@
 import { computed, ref } from 'vue';
-import { parseXML } from '../serialization/parseItem';
 import { descriptors, registry, DEFAULT_INTERACTION } from '../interactions/index';
+import { resolveDescriptor } from '../interactions/resolveDescriptor';
 import { qtiEditorStrings } from '../qtiEditorStrings';
 
 const { errorParsingQuestion$ } = qtiEditorStrings;
@@ -14,48 +14,20 @@ const { errorParsingQuestion$ } = qtiEditorStrings;
  */
 export default function useInteractionDescriptor(interactionRef) {
   /**
-   * Parses bodyXml and returns the matching descriptor, resolved
-   * question type, and any parse error without touching reactive state.
-   */
-  function inferFromXml(xml, declarations) {
-    if (!xml) {
-      return { descriptor: registry[DEFAULT_INTERACTION], questionType: null, error: null };
-    }
-    try {
-      const doc = parseXML(xml);
-      const interactionEl = doc.documentElement;
-      const desc = descriptors.find(d => d.matches(interactionEl)) ?? registry[DEFAULT_INTERACTION];
-      return {
-        descriptor: desc,
-        questionType: desc.getQuestionType(interactionEl, declarations) ?? null,
-        error: null,
-      };
-    } catch (e) {
-      // eslint-disable-next-line no-console
-      console.error('[QTI] Failed to parse interaction XML:', e.message);
-      return {
-        descriptor: registry[DEFAULT_INTERACTION],
-        questionType: null,
-        error: errorParsingQuestion$(),
-      };
-    }
-  }
-
-  /**
-   * Parse the initial XML synchronously during component setup.
+   * Resolve the initial XML synchronously during component setup.
    *
    * This ensures `questionType` is immediately available for downstream components
    * on first render, avoiding prop validation warnings that would occur if
    * initialization was deferred to a lifecycle hook.
    */
-  const initial = inferFromXml(
+  const initial = resolveDescriptor(
     interactionRef.value?.bodyXml,
     interactionRef.value?.responseDeclarations,
   );
 
   /** Writable ref driven by UI selections after initial parse. */
   const questionType = ref(initial.questionType);
-  const parseError = ref(initial.error);
+  const parseError = ref(initial.error ? errorParsingQuestion$() : null);
 
   /**
    * Derived from questionType so the descriptor updates when the user switches
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useOrderingInteraction.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useOrderingInteraction.js
index 67922513c2..02341e9f32 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useOrderingInteraction.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useOrderingInteraction.js
@@ -1,6 +1,6 @@
 import { readonly } from 'vue';
 import { generateRandomSlug } from '../utils/generateRandomSlug';
-import { orderingInteractionDescriptor } from '../interactions/ordering/OrderingInteractionDescriptor';
+import { orderingInteractionDescriptor } from '../interactions/ordering/Descriptor';
 import { useInteraction } from './useInteraction';
 
 /**
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useQtiItem.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useQtiItem.js
index cece5bc5e6..deb8008d21 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useQtiItem.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useQtiItem.js
@@ -17,7 +17,9 @@ import { assembleItemXml } from '../serialization/assembleItem';
  *   identifier: import('vue').Ref<string>,
  *   title: import('vue').Ref<string>,
  *   language: import('vue').Ref<string>,
+ *   itemBodyXml: import('vue').Ref<string>,
  *   interactions: import('vue').Ref<Array<{ bodyXml: string, responseDeclarations: string[] }>>,
+ *   hints: import('vue').Ref<Array<{ id: string, content: string }>>,
  *   parseError: import('vue').Ref<string | null>,
  *   rawData: import('vue').ComputedRef<string>,
  * }}
@@ -27,6 +29,13 @@ export default function useQtiItem(rawXml, { bodyXml, responseDeclarations } = {
   const title = ref('');
   const language = ref('');
   const interactions = ref([]);
+  /** The item's `<qti-item-body>` as parsed, whether or not it holds an interaction. */
+  const itemBodyXml = ref('');
+  /**
+   * Hints belong to the item, not to any one interaction, so they live here beside
+   * identifier and title — mutable, and read back by the rawData computed below.
+   */
+  const hints = ref([]);
   const parseError = ref(null);
 
   if (rawXml) {
@@ -36,6 +45,8 @@ export default function useQtiItem(rawXml, { bodyXml, responseDeclarations } = {
       title.value = model.title;
       language.value = model.language;
       interactions.value = model.interactions;
+      itemBodyXml.value = model.itemBodyXml;
+      hints.value = model.hints;
     } catch (e) {
       parseError.value = e.message;
     }
@@ -43,8 +54,8 @@ export default function useQtiItem(rawXml, { bodyXml, responseDeclarations } = {
 
   /**
    * Re-assembles the full QTI item XML whenever identifier, title, language,
-   * bodyXml, or responseDeclarations change. Only available when the caller
-   * passes in bodyXml and responseDeclarations refs.
+   * hints, bodyXml, or responseDeclarations change. The interaction parts are
+   * only present when the caller passes in bodyXml and responseDeclarations refs.
    */
   const rawData = computed(() =>
     assembleItemXml({
@@ -53,8 +64,18 @@ export default function useQtiItem(rawXml, { bodyXml, responseDeclarations } = {
       language: language.value,
       bodyXml: bodyXml?.value ?? '',
       responseDeclarations: responseDeclarations?.value ?? [],
+      hints: hints.value,
     }),
   );
 
-  return { identifier, title, language, interactions, parseError, rawData };
+  return {
+    identifier,
+    title,
+    language,
+    itemBodyXml,
+    interactions,
+    hints,
+    parseError,
+    rawData,
+  };
 }
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useTextEntryInteraction.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useTextEntryInteraction.js
index e607fc206a..43d9546312 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useTextEntryInteraction.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/composables/useTextEntryInteraction.js
@@ -1,6 +1,6 @@
 import { readonly } from 'vue';
 import { generateRandomSlug } from '../utils/generateRandomSlug';
-import { textEntryInteractionDescriptor } from '../interactions/textEntry/TextEntryInteractionDescriptor';
+import { textEntryInteractionDescriptor } from '../interactions/textEntry/Descriptor';
 import { useInteraction } from './useInteraction';
 
 /**
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/constants.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/constants.js
index 3fa2bcd6a4..1ebd3f003e 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/constants.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/constants.js
@@ -34,14 +34,14 @@ export const Orientation = Object.freeze({
  * 2. QuestionType -> The type editors will select per assessment item.
  *    It's different from AssessmentItemType because we will extend this for all
  *    new question types without confusing it with values stored in the database
- *    (all of these will be assessment item type: "qti"). Value is related to how
+ *    (all of these will be assessment item type: "QTI"). Value is related to how
  *    Studio presents different question options to users in the UI.
  *
  * 3. InteractionType (QtiInteraction) -> The actual interactions defined by QTI,
  *    and the ones that dictate how to parse and what descriptor we will use.
  *    Each QTI interaction can have multiple related question types (e.g., choice
  *    can be singleSelect or multiSelect), but all of them will have assessment
- *    item type "qti".
+ *    item type "QTI".
  */
 
 /**
@@ -66,7 +66,8 @@ export const QTI_INTERACTION_TAGS = Object.freeze(Object.values(QtiInteraction))
  * by the broader Studio assessment system, not by this editor.
  */
 export const AssessmentItemTypes = Object.freeze({
-  QTI: 'qti',
+  // Matches the value the API stores and returns (le_utils exercises.QTI).
+  QTI: 'QTI',
 });
 
 /**
@@ -89,6 +90,10 @@ export const QuestionType = Object.freeze({
  * this set in their own validate.js module.
  */
 export const ValidationError = Object.freeze({
+  // Item-level codes, produced by validateItem.js rather than an interaction
+  PARSE_ERROR: 'PARSE_ERROR',
+  NO_INTERACTION: 'NO_INTERACTION',
+  FREE_RESPONSE_NOT_ALLOWED: 'FREE_RESPONSE_NOT_ALLOWED',
   PROMPT_REQUIRED: 'PROMPT_REQUIRED',
   NO_CORRECT_ANSWER: 'NO_CORRECT_ANSWER',
   TOO_MANY_CORRECT_ANSWERS: 'TOO_MANY_CORRECT_ANSWERS',
@@ -102,10 +107,7 @@ export const ValidationError = Object.freeze({
 
 export const RESPONSE_IDENTIFIER = 'RESPONSE';
 
-/**
- * Set of QTI interaction tag names that have `placement: 'inline'`.
- * Used by parseItem to decide whether to serialize the full `<qti-item-body>`
- * (inline) or just the interaction element (block).
- * Kept here to avoid a circular dependency with the descriptor registry.
- */
-export const INLINE_INTERACTION_TAGS = new Set([QtiInteraction.TEXT_ENTRY]);
+export const Placement = Object.freeze({
+  BLOCK: 'block',
+  INLINE: 'inline',
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/index.vue b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/index.vue
index cc9b2af339..f6ab305f08 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/index.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/index.vue
@@ -26,6 +26,7 @@
           :index="idx"
           :total="items.length"
           :mode="activeId === item.assessment_id ? 'edit' : 'view'"
+          :allowFreeResponse="allowFreeResponse"
           :showAnswers="showAnswers"
           data-testid="item"
           @close="closeItem"
@@ -66,6 +67,7 @@
   import QTIItemEditor from './components/QTIItemEditor/index';
   import CollapsibleToolbar from './components/CollapsibleToolbar/index.vue';
   import useQTIEditorActions from './useQTIEditorActions';
+  import { createBlankItemXml } from './serialization/createBlankItem';
 
   // Custom uuid4 function to match our dashless uuids on the server side
   function uuid4() {
@@ -77,6 +79,7 @@
     return {
       assessment_id: uuid4(),
       type: AssessmentItemTypes.QTI,
+      raw_data: createBlankItemXml(),
     };
   }
 
@@ -100,6 +103,9 @@
       const showAnswers = ref(false);
 
       function openItem(id) {
+        const item = props.assessments.find(i => i.assessment_id === id);
+        // Items authored elsewhere (e.g. Perseus) are read-only here.
+        if (!item || item.type !== AssessmentItemTypes.QTI) return;
         activeId.value = id;
       }
 
@@ -196,6 +202,14 @@
         type: Array,
         default: () => [],
       },
+      /**
+       * Whether a question with no correct answer counts as complete. Only a survey
+       * accepts those, so a consumer that scores its questions passes false.
+       */
+      allowFreeResponse: {
+        type: Boolean,
+        default: true,
+      },
     },
 
     emits: ['update'],
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/InteractionDescriptor.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/InteractionDescriptor.js
new file mode 100644
index 0000000000..271e0b5ead
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/InteractionDescriptor.js
@@ -0,0 +1,81 @@
+/**
+ * Base class for every interaction descriptor.
+ *
+ * A descriptor owns everything about one QTI interaction except how it looks: recognising
+ * its element, resolving which question type an element represents, parsing XML to state,
+ * building XML back, and validating that state. The Vue editor is deliberately not part of
+ * it, so that headless parse/validation does not import any .vue components.
+ *
+ * The contract is checked as the descriptor is constructed, which happens at import time
+ * for the module singletons.
+ */
+
+import { Placement } from '../constants';
+
+/**
+ * Methods a subclass has to implement. `matches` and `getTypeOptions` are not listed
+ * because this class provides usable defaults for them.
+ */
+const REQUIRED_METHODS = [
+  'getQuestionType',
+  'getResponseDeclarationSchema',
+  'parse',
+  'buildXML',
+  'validate',
+];
+
+export class InteractionDescriptor {
+  /**
+   * @param {object} options
+   * @param {string} options.type - The interaction's XML tag name, e.g. 'qti-choice-interaction'
+   * @param {string[]} options.questionTypes - QuestionType values this interaction can author
+   * @param {string} [options.placement] - Placement.BLOCK (default) or Placement.INLINE.
+   *   Inline interactions are handed the whole item body to parse, since their prompt lives
+   *   in the body around them rather than in a `<qti-prompt>` child.
+   */
+  constructor({ type, questionTypes, placement = Placement.BLOCK } = {}) {
+    const name = this.constructor.name;
+
+    if (!type) {
+      throw new Error(`${name}: type is required`);
+    }
+    if (!Array.isArray(questionTypes) || !questionTypes.length) {
+      throw new Error(`${name}: questionTypes must list at least one question type`);
+    }
+
+    if (!Object.values(Placement).includes(placement)) {
+      throw new Error(`${name}: placement must be one of ${Object.values(Placement).join(', ')}`);
+    }
+
+    const missing = REQUIRED_METHODS.filter(method => typeof this[method] !== 'function');
+    if (missing.length) {
+      throw new Error(`${name}: missing required method(s) ${missing.join(', ')}`);
+    }
+
+    this.type = type;
+    this.questionTypes = questionTypes;
+    this.placement = placement;
+  }
+
+  /**
+   * Whether this descriptor handles the given interaction element. Defaults to matching the
+   * element whose tag name is this interaction's type; interactions that can appear nested
+   * in the item body (inline ones) override this.
+   *
+   * @param {Element} el
+   * @returns {boolean}
+   */
+  matches(el) {
+    return el.tagName.toLowerCase() === this.type;
+  }
+
+  /**
+   * Options this interaction contributes to the question type selector. An interaction that
+   * authors are not meant to pick directly contributes none.
+   *
+   * @returns {Array<{ value: string, label: string, description: string }>}
+   */
+  getTypeOptions() {
+    return [];
+  }
+}
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/__tests__/InteractionDescriptor.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/__tests__/InteractionDescriptor.spec.js
new file mode 100644
index 0000000000..0144f108f8
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/__tests__/InteractionDescriptor.spec.js
@@ -0,0 +1,102 @@
+import { InteractionDescriptor } from '../InteractionDescriptor';
+import { Placement, QtiInteraction, QuestionType } from '../../constants';
+
+const IMPLEMENTED = {
+  getQuestionType: () => QuestionType.SINGLE_SELECT,
+  getResponseDeclarationSchema: () => ({}),
+  parse: () => ({}),
+  buildXML: () => ({ bodyXml: '', responseDeclarations: [] }),
+  validate: () => [],
+};
+
+/** Builds a subclass implementing everything except the listed methods. */
+function makeDescriptorClass({ omit = [], options } = {}) {
+  class TestDescriptor extends InteractionDescriptor {
+    constructor() {
+      super(
+        options ?? {
+          type: QtiInteraction.CHOICE,
+          questionTypes: [QuestionType.SINGLE_SELECT],
+        },
+      );
+    }
+  }
+  for (const [name, fn] of Object.entries(IMPLEMENTED)) {
+    if (!omit.includes(name)) {
+      TestDescriptor.prototype[name] = fn;
+    }
+  }
+  return TestDescriptor;
+}
+
+describe('InteractionDescriptor', () => {
+  it('constructs when the subclass implements the contract', () => {
+    const Descriptor = makeDescriptorClass();
+    const descriptor = new Descriptor();
+
+    expect(descriptor.type).toBe(QtiInteraction.CHOICE);
+    expect(descriptor.questionTypes).toEqual([QuestionType.SINGLE_SELECT]);
+  });
+
+  it('names every method the subclass failed to implement', () => {
+    const Descriptor = makeDescriptorClass({ omit: ['parse', 'validate'] });
+
+    expect(() => new Descriptor()).toThrow(/missing required method\(s\) parse, validate/);
+  });
+
+  it('requires a type', () => {
+    const Descriptor = makeDescriptorClass({
+      options: { questionTypes: [QuestionType.SINGLE_SELECT] },
+    });
+
+    expect(() => new Descriptor()).toThrow(/type is required/);
+  });
+
+  it('places an interaction in the body as a block unless told otherwise', () => {
+    expect(new (makeDescriptorClass())().placement).toBe(Placement.BLOCK);
+
+    const Inline = makeDescriptorClass({
+      options: {
+        type: QtiInteraction.TEXT_ENTRY,
+        questionTypes: [QuestionType.TEXT_ENTRY],
+        placement: Placement.INLINE,
+      },
+    });
+    expect(new Inline().placement).toBe(Placement.INLINE);
+  });
+
+  it('rejects a placement it does not know', () => {
+    const Descriptor = makeDescriptorClass({
+      options: {
+        type: QtiInteraction.CHOICE,
+        questionTypes: [QuestionType.SINGLE_SELECT],
+        placement: 'floating',
+      },
+    });
+
+    expect(() => new Descriptor()).toThrow(/placement must be one of/);
+  });
+
+  it('requires at least one question type', () => {
+    const Descriptor = makeDescriptorClass({
+      options: { type: QtiInteraction.CHOICE, questionTypes: [] },
+    });
+
+    expect(() => new Descriptor()).toThrow(/at least one question type/);
+  });
+
+  describe('defaults', () => {
+    it('matches the element whose tag name is the interaction type', () => {
+      const descriptor = new (makeDescriptorClass())();
+      const matching = { tagName: 'QTI-CHOICE-INTERACTION' };
+      const other = { tagName: 'QTI-ORDER-INTERACTION' };
+
+      expect(descriptor.matches(matching)).toBe(true);
+      expect(descriptor.matches(other)).toBe(false);
+    });
+
+    it('contributes no question type options', () => {
+      expect(new (makeDescriptorClass())().getTypeOptions()).toEqual([]);
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/__tests__/defineInteraction.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/__tests__/defineInteraction.spec.js
deleted file mode 100644
index f56266a565..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/__tests__/defineInteraction.spec.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import defineInteraction from '../defineInteraction';
-
-// A minimal valid descriptor with all required keys except editorComponent,
-// which is now always supplied as the second argument to defineInteraction.
-const makeValidDescriptor = (overrides = {}) => ({
-  type: 'test',
-  placement: 'block',
-  questionTypes: [],
-  convertsFrom: [],
-  matches: () => false,
-  getQuestionType: () => null,
-  getResponseDeclarationSchema: () => ({ baseType: 'string', cardinality: 'single' }),
-  parse: () => ({}),
-  buildXML: () => ({ bodyXml: '', responseDeclarations: [] }),
-  validate: () => [],
-  ...overrides,
-});
-
-const STUB_COMPONENT = {};
-
-describe('defineInteraction', () => {
-  it('returns the descriptor unchanged when all required keys are present', () => {
-    const descriptor = makeValidDescriptor();
-    expect(defineInteraction(descriptor, STUB_COMPONENT)).toBe(descriptor);
-  });
-
-  it('attaches the editorComponent from the second argument onto the descriptor', () => {
-    const descriptor = makeValidDescriptor();
-    const component = { name: 'MyEditor' };
-    defineInteraction(descriptor, component);
-    expect(descriptor.editorComponent).toBe(component);
-  });
-
-  const REQUIRED_DESCRIPTOR_KEYS = [
-    'type',
-    'placement',
-    'questionTypes',
-    'convertsFrom',
-    'matches',
-    'getQuestionType',
-    'getResponseDeclarationSchema',
-    'parse',
-    'buildXML',
-    'validate',
-  ];
-
-  it.each(REQUIRED_DESCRIPTOR_KEYS)('throws when the required key "%s" is missing', key => {
-    const descriptor = makeValidDescriptor();
-    delete descriptor[key];
-    expect(() => defineInteraction(descriptor, STUB_COMPONENT)).toThrow(
-      new RegExp(`missing required key "${key}"`, 'i'),
-    );
-  });
-
-  it('throws when editorComponent is not passed as the second argument', () => {
-    const descriptor = makeValidDescriptor();
-    expect(() => defineInteraction(descriptor)).toThrow(/missing required key "editorComponent"/i);
-  });
-
-  it('includes the descriptor type in the error message when type is present', () => {
-    const descriptor = makeValidDescriptor({ type: 'myPlugin' });
-    delete descriptor.buildXML; // delete a different key to trigger the error
-    expect(() => defineInteraction(descriptor, STUB_COMPONENT)).toThrow(/myPlugin/);
-  });
-
-  it('uses "(unknown)" in the error message when type is also missing', () => {
-    const descriptor = makeValidDescriptor();
-    delete descriptor.type;
-    delete descriptor.buildXML;
-    expect(() => defineInteraction(descriptor, STUB_COMPONENT)).toThrow(/\(unknown\)/);
-  });
-});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/__tests__/registry.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/__tests__/registry.spec.js
new file mode 100644
index 0000000000..1f753c67cd
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/__tests__/registry.spec.js
@@ -0,0 +1,48 @@
+import { descriptors, editors, registry, DEFAULT_INTERACTION } from '../index';
+import { isInlineInteraction } from '../descriptors';
+import { Placement } from '../../constants';
+
+/**
+ * An interaction is registered in two places: its descriptor in `descriptors.js` and its
+ * editor in `index.js`. That split keeps the editors out of the parse/validate import
+ * graph, at the cost of two lists that have to agree — so these assert they do. A new
+ * interaction that only got half-registered fails here rather than at the moment an author
+ * opens the question.
+ */
+describe('interaction registry', () => {
+  it('registers an editor for every descriptor', () => {
+    const missing = descriptors.filter(d => !editors[d.type]).map(d => d.type);
+    expect(missing).toEqual([]);
+  });
+
+  it('registers a descriptor for every editor', () => {
+    const orphans = Object.keys(editors).filter(type => !registry[type]);
+    expect(orphans).toEqual([]);
+  });
+
+  it('holds the same number of descriptors and editors', () => {
+    expect(Object.keys(editors)).toHaveLength(descriptors.length);
+  });
+
+  it('keys the registry by every descriptor type', () => {
+    expect(Object.keys(registry).sort()).toEqual(descriptors.map(d => d.type).sort());
+  });
+
+  it('has a descriptor for the fallback interaction', () => {
+    expect(registry[DEFAULT_INTERACTION]).toBeDefined();
+  });
+
+  describe('isInlineInteraction', () => {
+    it('reports the placement each descriptor declares', () => {
+      for (const descriptor of descriptors) {
+        expect(isInlineInteraction(descriptor.type)).toBe(
+          descriptor.placement === Placement.INLINE,
+        );
+      }
+    });
+
+    it('reports an interaction with no descriptor as not inline', () => {
+      expect(isInlineInteraction('qti-match-interaction')).toBe(false);
+    });
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/ChoiceInteractionDescriptor.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/Descriptor.js
similarity index 86%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/ChoiceInteractionDescriptor.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/Descriptor.js
index 26b04163f6..354d0bbc5a 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/ChoiceInteractionDescriptor.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/Descriptor.js
@@ -1,17 +1,18 @@
 import { QtiInteraction, QuestionType, BaseType, Cardinality } from '../../constants';
-import { parseXML } from '../../serialization/parseItem';
+import { parseXML } from '../../serialization/xml';
+import { InteractionDescriptor } from '../InteractionDescriptor';
 import { parseChoiceInteraction, buildChoiceInteractionXML } from './parse';
 import { validateChoiceInteraction } from './validation';
 
 /**
  * Owns all choice-specific interaction logic: schema, parse, buildXML, and validate.
  */
-export class ChoiceInteractionDescriptor {
-  constructor({ editorComponent = null } = {}) {
-    this.type = QtiInteraction.CHOICE;
-    this.placement = 'block';
-    this.questionTypes = [QuestionType.SINGLE_SELECT, QuestionType.MULTI_SELECT];
-    this.editorComponent = editorComponent;
+export class ChoiceInteractionDescriptor extends InteractionDescriptor {
+  constructor() {
+    super({
+      type: QtiInteraction.CHOICE,
+      questionTypes: [QuestionType.SINGLE_SELECT, QuestionType.MULTI_SELECT],
+    });
     this.convertsFrom = [];
   }
 
@@ -30,11 +31,6 @@ export class ChoiceInteractionDescriptor {
     ];
   }
 
-  /** @param {Element} el */
-  matches(el) {
-    return el.tagName.toLowerCase() === QtiInteraction.CHOICE;
-  }
-
   /**
    * Reads cardinality from the response declaration to determine question type.
    *
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/ChoiceInteractionEditor.vue b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/Editor.vue
similarity index 86%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/ChoiceInteractionEditor.vue
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/Editor.vue
index 0ed605d5ca..be363e2496 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/ChoiceInteractionEditor.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/Editor.vue
@@ -19,12 +19,12 @@
       <ValidationMessage v-if="questionHasError">
         {{ errorPromptRequired$() }}
       </ValidationMessage>
-      <div
+      <h4
         class="field-label"
         :style="{ color: $themePalette.grey.v_700 }"
       >
         {{ questionLabel$() }}
-      </div>
+      </h4>
 
       <!-- Prompt -->
       <ClickableRegion
@@ -66,13 +66,13 @@
       <ValidationMessage v-if="tooManyCorrectError">
         {{ errorTooManyCorrectAnswers$() }}
       </ValidationMessage>
-      <div
+      <h4
         :id="answersHeaderId"
         class="answers-header field-label"
         :style="{ color: $themePalette.grey.v_700 }"
       >
         {{ answersLabel$() }}
-      </div>
+      </h4>
       <div
         v-if="mode === 'edit'"
         class="choices-label"
@@ -127,61 +127,63 @@
                         'small-screen': windowIsSmall,
                       }"
                     >
-                      <!-- `@click.stop` so using the handle does not open the choice
+                      <div class="choice-handlers">
+                        <!-- `@click.stop` so using the handle does not open the choice
                            for editing -->
-                      <DraggableHandle v-if="isReorderable">
+                        <DraggableHandle v-if="isReorderable">
+                          <div
+                            class="choice-drag"
+                            @click.stop
+                          >
+                            <DragSortWidget
+                              :color="$themePalette.grey.v_700"
+                              :isFirst="index === 0"
+                              :isLast="index === state.choices.length - 1"
+                              :itemLabel="choiceItemLabel$({ number: index + 1 })"
+                              :position="index + 1"
+                              :total="state.choices.length"
+                              @moveUp="moveChoiceUp(choice.id)"
+                              @moveDown="moveChoiceDown(choice.id)"
+                            />
+                          </div>
+                        </DraggableHandle>
+
+                        <!-- Selection control; an invalid choice shows the error icon
+                           in its place -->
                         <div
-                          class="choice-drag"
+                          class="choice-selection"
                           @click.stop
                         >
-                          <DragSortWidget
-                            :color="$themePalette.grey.v_700"
-                            :isFirst="index === 0"
-                            :isLast="index === state.choices.length - 1"
-                            :itemLabel="choiceItemLabel$({ number: index + 1 })"
-                            :position="index + 1"
-                            :total="state.choices.length"
-                            @moveUp="moveChoiceUp(choice.id)"
-                            @moveDown="moveChoiceDown(choice.id)"
+                          <KIcon
+                            v-if="choiceHasError(choice.id)"
+                            icon="error"
+                            class="choice-error-icon"
+                            :color="$themeTokens.error"
+                          />
+                          <KRadioButton
+                            v-else-if="isSingleSelect"
+                            class="margin-0"
+                            :currentValue="correctChoiceId || ''"
+                            :buttonValue="choice.id"
+                            :label="markCorrectLabel$()"
+                            :showLabel="false"
+                            :disabled="mode !== 'edit'"
+                            :style="{ width: 'auto' }"
+                            :color="$themePalette.green.v_600"
+                            @change="onToggleCorrect(choice.id)"
+                          />
+                          <!-- KCheckbox color prop colors the checked icon green -->
+                          <KCheckbox
+                            v-else
+                            class="margin-0"
+                            :checked="choice.correct"
+                            :label="markCorrectLabel$()"
+                            :showLabel="false"
+                            :disabled="mode !== 'edit'"
+                            :color="$themePalette.green.v_600"
+                            @change="onToggleCorrect(choice.id)"
                           />
                         </div>
-                      </DraggableHandle>
-
-                      <!-- Selection control; an invalid choice shows the error icon
-                           in its place -->
-                      <div
-                        class="choice-selection"
-                        @click.stop
-                      >
-                        <KIcon
-                          v-if="choiceHasError(choice.id)"
-                          icon="error"
-                          class="choice-error-icon"
-                          :color="$themeTokens.error"
-                        />
-                        <KRadioButton
-                          v-else-if="isSingleSelect"
-                          class="margin-0"
-                          :currentValue="correctChoiceId || ''"
-                          :buttonValue="choice.id"
-                          :label="markCorrectLabel$()"
-                          :showLabel="false"
-                          :disabled="mode !== 'edit'"
-                          :style="{ width: 'auto' }"
-                          :color="$themePalette.green.v_600"
-                          @change="onToggleCorrect(choice.id)"
-                        />
-                        <!-- KCheckbox color prop colors the checked icon green -->
-                        <KCheckbox
-                          v-else
-                          class="margin-0"
-                          :checked="choice.correct"
-                          :label="markCorrectLabel$()"
-                          :showLabel="false"
-                          :disabled="mode !== 'edit'"
-                          :color="$themePalette.green.v_600"
-                          @change="onToggleCorrect(choice.id)"
-                        />
                       </div>
 
                       <div class="choice-content">
@@ -389,6 +391,9 @@
       }));
       watch(workingInteraction, newVal => emit('update:interaction', newVal), { immediate: true });
 
+      // Errors are reported the same way, for the card to show that the question needs work.
+      watch(errors, newVal => emit('update:errors', newVal), { immediate: true });
+
       const answersDescription = computed(() =>
         isSingleSelect.value
           ? answersDescriptionSingleChoice$()
@@ -597,7 +602,7 @@
       },
     },
 
-    emits: ['update:interaction'],
+    emits: ['update:interaction', 'update:errors'],
   };
 
 </script>
@@ -611,8 +616,9 @@
     gap: 16px;
   }
 
+  /* A heading, so its own margins are set rather than inherited from the UA stylesheet */
   .field-label {
-    margin-bottom: 8px;
+    margin: 0 0 8px;
     font-size: 14px;
     font-weight: 600;
   }
@@ -674,7 +680,7 @@
     padding: 7.5px;
   }
 
-  /* Flex row: [drag] [selection] [content] [actions] */
+  /* Flex row: [[drag] [selection]] [content] [actions] */
   .choice-layout {
     display: flex;
     align-items: center;
@@ -703,6 +709,12 @@
         }
       }
     }
+
+    .choice-handlers {
+      display: flex;
+      flex-shrink: 0;
+      align-items: center;
+    }
   }
 
   .choice-drag {
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/ChoiceInteractionDescriptor.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/Descriptor.spec.js
similarity index 96%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/ChoiceInteractionDescriptor.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/Descriptor.spec.js
index bd321d465d..60dc3a9bca 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/ChoiceInteractionDescriptor.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/Descriptor.spec.js
@@ -1,4 +1,4 @@
-import { ChoiceInteractionDescriptor } from '../ChoiceInteractionDescriptor';
+import { ChoiceInteractionDescriptor } from '../Descriptor';
 import { BaseType, Cardinality, QtiInteraction, QuestionType } from '../../../constants';
 
 describe('ChoiceInteractionDescriptor', () => {
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/ChoiceInteractionEditor.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/Editor.spec.js
similarity index 93%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/ChoiceInteractionEditor.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/Editor.spec.js
index d7beebbf50..5389d5a562 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/ChoiceInteractionEditor.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/Editor.spec.js
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import { nextTick } from 'vue';
 import VueRouter from 'vue-router';
 import useKLiveRegion from 'kolibri-design-system/lib/composables/useKLiveRegion';
-import ChoiceInteractionEditor from '../ChoiceInteractionEditor.vue';
+import ChoiceInteractionEditor from '../Editor.vue';
 
 import {
   CHOICE_SINGLE_SELECT_XML,
@@ -215,7 +215,9 @@ describe('ChoiceInteractionEditor', () => {
         questionType: QuestionType.SINGLE_SELECT,
       });
       await fireEvent.click(screen.getByRole('button', { name: tr.$tr('addChoiceBtn') }));
-      expect(screen.getAllByRole('radio')).toHaveLength(4);
+      // Counted by row rather than by radio: the added choice is empty, so validation —
+      // no longer debounced — puts the error icon where its radio would be.
+      expect(screen.getAllByRole('button', { name: tr.$tr('deleteChoiceBtn') })).toHaveLength(4);
     });
 
     it('gives every choice row its own delete button', () => {
@@ -432,65 +434,64 @@ describe('ChoiceInteractionEditor', () => {
   });
 
   describe('validation', () => {
-    it('does not show errors before any field is touched', () => {
+    it('reports what is missing as soon as it renders', () => {
+      // Validation is not debounced, so errors describe the state on screen from the start:
+      // this fixture has no declaration, so no choice is marked correct.
       renderEditor({
         interaction: block(CHOICE_SINGLE_SELECT_XML),
         questionType: QuestionType.SINGLE_SELECT,
       });
+
+      expect(screen.getByText(tr.errorNoCorrectAnswer$())).toBeInTheDocument();
+    });
+
+    it('shows no errors for a question that is already complete', () => {
+      renderEditor({
+        interaction: blockWithDecl(CHOICE_SINGLE_SELECT_XML, SINGLE_DECL),
+        questionType: QuestionType.SINGLE_SELECT,
+      });
+
       expect(screen.queryByRole('alert')).not.toBeInTheDocument();
     });
 
     it('shows global errors (no correct choice) after a structural mutation', async () => {
-      jest.useFakeTimers();
       // Add a choice so we have 2+ choices — then the only error is no correct choice.
       renderEditor({
         interaction: block(CHOICE_SINGLE_SELECT_XML),
         questionType: QuestionType.SINGLE_SELECT,
       });
-      // Clicking Add choice mutates state → debounced validate fires.
+      // Clicking Add choice mutates state, which validates straight away.
       await fireEvent.click(screen.getByRole('button', { name: /add choice/i }));
-      // Flush Vue watcher queue.
-      await nextTick();
-      // Advance past the 400ms debounce, then flush the resulting DOM update.
-      jest.advanceTimersByTime(400);
       await nextTick();
-      jest.useRealTimers();
+
       // NO_CORRECT_ANSWER (and potentially others) should be shown after validation runs.
       expect(screen.getAllByRole('alert').length).toBeGreaterThan(0);
     });
 
     it('replaces the selection control with the error icon on an invalid choice', async () => {
-      jest.useFakeTimers();
-      const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+      const user = userEvent.setup();
       renderEditor({
         interaction: block(CHOICE_SINGLE_SELECT_XML),
         questionType: QuestionType.SINGLE_SELECT,
       });
       expect(screen.getAllByRole('radio')).toHaveLength(3);
-      // The added choice starts empty, so the debounced validation flags it.
+      // The added choice starts empty, so validation flags it straight away.
       await user.click(screen.getByRole('button', { name: /add choice/i }));
       await nextTick();
-      jest.advanceTimersByTime(400);
-      await nextTick();
-      jest.useRealTimers();
       // Four rows, but the invalid one shows the error icon where its radio was
       expect(screen.getAllByRole('button', { name: tr.$tr('deleteChoiceBtn') })).toHaveLength(4);
       expect(screen.getAllByRole('radio')).toHaveLength(3);
     });
 
-    it('shows no-correct-choice error after toggling and running validation', async () => {
-      jest.useFakeTimers();
+    it('shows the empty-choice error as soon as a choice is added', async () => {
       renderEditor({
         interaction: blockWithDecl(CHOICE_SINGLE_SELECT_XML, SINGLE_DECL),
         questionType: QuestionType.SINGLE_SELECT,
       });
-      // Trigger validation via add-choice which mutates state → debounced validate fires.
       await fireEvent.click(screen.getByRole('button', { name: /add choice/i }));
       await nextTick();
-      jest.advanceTimersByTime(400);
-      await nextTick();
-      jest.useRealTimers();
-      // Validate fires; errors should appear (e.g. empty choice content).
+
+      expect(screen.getByText(tr.errorEmptyChoiceContent$())).toBeInTheDocument();
     });
   });
 
@@ -661,15 +662,18 @@ describe('ChoiceInteractionEditor', () => {
     });
   });
 
+  // The default state is one empty choice, which validation flags immediately now that it
+  // is not debounced — so the row is counted by its delete button, its radio having been
+  // replaced by the error icon.
   describe('graceful fallback', () => {
     it('renders default interaction state when bodyXml is empty', () => {
       renderEditor({ interaction: block(''), questionType: QuestionType.SINGLE_SELECT });
-      expect(screen.getAllByRole('radio')).toHaveLength(1);
+      expect(screen.getAllByRole('button', { name: tr.$tr('deleteChoiceBtn') })).toHaveLength(1);
     });
 
     it('renders default interaction state when XML is malformed', () => {
       renderEditor({ interaction: block('<unclosed'), questionType: QuestionType.SINGLE_SELECT });
-      expect(screen.getAllByRole('radio')).toHaveLength(1);
+      expect(screen.getAllByRole('button', { name: tr.$tr('deleteChoiceBtn') })).toHaveLength(1);
     });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/parse.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/parse.spec.js
index 53f5f286bf..0ba74d36ed 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/parse.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/parse.spec.js
@@ -2,7 +2,7 @@
 // The eslint-dom matchers reject XML nodes produced by DOMParser(..., 'text/xml').
 // Native DOM APIs (getAttribute, textContent) work correctly on XML elements.
 
-import { choiceInteractionDescriptor } from '../ChoiceInteractionDescriptor';
+import { choiceInteractionDescriptor } from '../Descriptor';
 
 import {
   CHOICE_SINGLE_SELECT_XML,
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/validate.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/validation.spec.js
similarity index 98%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/validate.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/validation.spec.js
index b333a3bee3..bcf9119cc5 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/validate.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/__tests__/validation.spec.js
@@ -1,4 +1,4 @@
-import { choiceInteractionDescriptor } from '../ChoiceInteractionDescriptor';
+import { choiceInteractionDescriptor } from '../Descriptor';
 
 import { ValidationError, QuestionType, Orientation } from '../../../constants';
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/index.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/index.js
deleted file mode 100644
index 966cc2dd7e..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import defineInteraction from '../defineInteraction';
-import ChoiceInteractionEditor from './ChoiceInteractionEditor.vue';
-import { choiceInteractionDescriptor } from './ChoiceInteractionDescriptor';
-
-export default defineInteraction(choiceInteractionDescriptor, ChoiceInteractionEditor);
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/parse.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/parse.js
index d9c83d4872..4293ef5d40 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/parse.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/choice/parse.js
@@ -1,5 +1,5 @@
 import { QTIDeclaration } from '../../serialization/qti/QTIDeclaration';
-import { getPromptHTML, parseXML } from '../../serialization/parseItem';
+import { getPromptHTML, parseXML } from '../../serialization/xml';
 import { buildXmlNode } from '../../serialization/assembleItem';
 import CorrectResponse from '../../serialization/qti/declarations/correctResponse';
 import { generateRandomSlug } from '../../utils/generateRandomSlug';
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/defineInteraction.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/defineInteraction.js
deleted file mode 100644
index f08d273877..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/defineInteraction.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Required keys every interaction descriptor must provide.
- * Validated at import time so missing fields surface immediately during development.
- */
-const REQUIRED_KEYS = [
-  'type',
-  'placement',
-  'questionTypes',
-  'editorComponent',
-  'convertsFrom',
-  'matches',
-  'getQuestionType',
-  'getResponseDeclarationSchema',
-  'parse',
-  'buildXML',
-  'validate',
-];
-
-/**
- * Validates that a descriptor has every required key and returns it unchanged.
- * Throws at call-time (i.e. module import time) if any key is absent.
- *
- * Pass the Vue editor component as the second argument to attach it to the
- * descriptor here rather than mutating the descriptor after construction.
- *
- * @template {object} T
- * @param {T} descriptor - The interaction descriptor to validate
- * @param {object} editorComponent - The Vue component that edits this interaction
- * @returns {T} The same descriptor, with editorComponent attached
- * @throws {Error} If any required key is missing from the descriptor
- */
-export default function defineInteraction(descriptor, editorComponent) {
-  // Attach editorComponent before validation so the required-key check can
-  // confirm it is present even when the descriptor class does not set it.
-  descriptor.editorComponent = editorComponent;
-
-  for (const key of REQUIRED_KEYS) {
-    // Use a truthiness check for editorComponent (a Vue component object) so
-    // that passing `undefined` as the second argument is caught as missing.
-    const isMissing = key === 'editorComponent' ? !descriptor[key] : !(key in descriptor);
-    if (isMissing) {
-      const name = descriptor.type ?? '(unknown)';
-      throw new Error(`defineInteraction: missing required key "${key}" on descriptor "${name}"`);
-    }
-  }
-  return descriptor;
-}
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/descriptors.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/descriptors.js
new file mode 100644
index 0000000000..2b9fadd2e1
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/descriptors.js
@@ -0,0 +1,46 @@
+import { Placement, QtiInteraction } from '../constants';
+import { choiceInteractionDescriptor } from './choice/Descriptor';
+import { textEntryInteractionDescriptor } from './textEntry/Descriptor';
+import { orderingInteractionDescriptor } from './ordering/Descriptor';
+
+/**
+ * Every interaction's descriptor: matching, parsing, building and validating XML.
+ *
+ * This module imports `Descriptor.js` files only so that headless validation can be done withou
+ * the bundle size cost of the editors.
+ *
+ * Registering a new interaction means adding its descriptor here and its editor in index.js
+ */
+
+/**
+ * The default interaction type used as fallback when no descriptor matches
+ * the interaction element found in the XML body.
+ */
+export const DEFAULT_INTERACTION = QtiInteraction.CHOICE;
+
+/**
+ * Ordered list of all registered interaction descriptors.
+ * Searched in order; the first whose `matches(el)` returns true wins.
+ */
+export const descriptors = [
+  choiceInteractionDescriptor,
+  textEntryInteractionDescriptor,
+  orderingInteractionDescriptor,
+];
+
+/**
+ * @type {Object.<string, import('./InteractionDescriptor').InteractionDescriptor>}
+ */
+export const registry = Object.fromEntries(descriptors.map(d => [d.type, d]));
+
+/**
+ * Whether an interaction is authored inline, and so needs the whole item body to parse
+ * rather than its own element. Read off the descriptor's placement, so declaring it there
+ * is all a new inline interaction has to do.
+ *
+ * @param {string} tagName - The interaction's XML tag name, lower-cased
+ * @returns {boolean}
+ */
+export function isInlineInteraction(tagName) {
+  return registry[tagName]?.placement === Placement.INLINE;
+}
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/index.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/index.js
index 107a549a6b..1bad224177 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/index.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/index.js
@@ -1,34 +1,20 @@
 import { QtiInteraction } from '../constants';
-import choiceDescriptor from './choice/index';
-import textEntryDescriptor from './textEntry/index';
-import orderingDescriptor from './ordering/index';
+import ChoiceEditor from './choice/Editor.vue';
+import TextEntryEditor from './textEntry/Editor.vue';
+import OrderingEditor from './ordering/Editor.vue';
 
 /**
- * The default interaction type used as fallback when no descriptor matches
- * the interaction element found in the XML body.
- */
-export const DEFAULT_INTERACTION = QtiInteraction.CHOICE;
-
-/**
- * Ordered list of all registered interaction descriptors.
- * Searched in order; the first whose `matches(el)` returns true wins.
- */
-export const descriptors = [choiceDescriptor, textEntryDescriptor, orderingDescriptor];
-
-/**
- * Registry map keyed by descriptor.type for O(1) direct lookup.
- * Built from the descriptors array — do not populate manually.
+ * Entry point for the editor tree: the descriptors, plus the Vue component that edits each
+ * interaction.
  *
- * @type {Object.<string, import('./defineInteraction').InteractionDescriptor>}
+ * The editors live here rather than on the descriptors themselves so that `./descriptors`
+ * stays free of `.vue` files — see the note there. Import this module when something is
+ * going to be rendered, and `./descriptors` when it is not.
  */
-export const registry = Object.fromEntries(descriptors.map(d => [d.type, d]));
+export const editors = Object.freeze({
+  [QtiInteraction.CHOICE]: ChoiceEditor,
+  [QtiInteraction.TEXT_ENTRY]: TextEntryEditor,
+  [QtiInteraction.ORDER]: OrderingEditor,
+});
 
-/**
- * Find the interaction descriptor that supports a given question type.
- *
- * @param {string} questionType
- * @returns {import('./defineInteraction').InteractionDescriptor|undefined}
- */
-export function getDescriptorForQuestionType(questionType) {
-  return descriptors.find(d => d.questionTypes.includes(questionType));
-}
+export { DEFAULT_INTERACTION, descriptors, registry } from './descriptors';
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/OrderingInteractionDescriptor.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/Descriptor.js
similarity index 81%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/OrderingInteractionDescriptor.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/Descriptor.js
index d6f281780d..58bce294de 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/OrderingInteractionDescriptor.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/Descriptor.js
@@ -1,16 +1,17 @@
 import { QtiInteraction, QuestionType, BaseType, Cardinality } from '../../constants';
+import { InteractionDescriptor } from '../InteractionDescriptor';
 import { parseOrderingInteraction, buildOrderingInteractionXML } from './parse';
-import { validateOrderingInteraction } from './validate';
+import { validateOrderingInteraction } from './validation';
 
 /**
  * Owns all ordering-specific interaction logic: schema, parse, buildXML, and validate.
  */
-export class OrderingInteractionDescriptor {
-  constructor({ editorComponent = null } = {}) {
-    this.type = QtiInteraction.ORDER;
-    this.placement = 'block';
-    this.questionTypes = [QuestionType.ORDERING];
-    this.editorComponent = editorComponent;
+export class OrderingInteractionDescriptor extends InteractionDescriptor {
+  constructor() {
+    super({
+      type: QtiInteraction.ORDER,
+      questionTypes: [QuestionType.ORDERING],
+    });
     this.convertsFrom = [];
   }
 
@@ -24,11 +25,6 @@ export class OrderingInteractionDescriptor {
     ];
   }
 
-  /** @param {Element} el */
-  matches(el) {
-    return el.tagName.toLowerCase() === QtiInteraction.ORDER;
-  }
-
   /**
    * Ordering always has exactly one question type.
    *
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/OrderingInteractionEditor.vue b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/Editor.vue
similarity index 97%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/OrderingInteractionEditor.vue
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/Editor.vue
index a01d149292..f528f6ec11 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/OrderingInteractionEditor.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/Editor.vue
@@ -6,12 +6,12 @@
       <ValidationMessage v-if="promptHasError">
         {{ errorPromptRequired$() }}
       </ValidationMessage>
-      <div
+      <h4
         class="field-label"
         :style="{ color: $themePalette.grey.v_700 }"
       >
         {{ questionLabel$() }}
-      </div>
+      </h4>
       <ClickableRegion
         :class="promptWrapperClass"
         :style="promptWrapperStyle"
@@ -50,12 +50,12 @@
 
       <!-- Section header -->
       <div class="ordering-headers">
-        <div
-          class="ordering-header-label"
+        <h4
+          class="field-label ordering-header-label"
           :style="{ color: $themePalette.grey.v_700 }"
         >
           {{ correctOrderLabel$() }}
-        </div>
+        </h4>
         <div
           v-if="mode === 'edit'"
           class="ordering-sublabel"
@@ -324,6 +324,9 @@
 
       const isOnlyItem = computed(() => state.value.items.length <= 1);
 
+      // Errors are reported the same way, for the card to show that the question needs work.
+      watch(errors, newVal => emit('update:errors', newVal), { immediate: true });
+
       const errorCodes = computed(() => errors.value.map(e => e.code));
 
       const promptHasError = computed(() =>
@@ -464,7 +467,7 @@
       },
     },
 
-    emits: ['update:interaction'],
+    emits: ['update:interaction', 'update:errors'],
   };
 
 </script>
@@ -484,8 +487,9 @@
     gap: 4px;
   }
 
+  /* A heading, so its own margins are set rather than inherited from the UA stylesheet */
   .field-label {
-    margin-bottom: 8px;
+    margin: 0 0 8px;
     font-size: 14px;
     font-weight: 600;
   }
@@ -498,8 +502,7 @@
   }
 
   .ordering-header-label {
-    font-size: 12px;
-    font-weight: 600;
+    margin-bottom: 0;
   }
 
   .ordering-sublabel {
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/OrderingInteractionEditor.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/Editor.spec.js
similarity index 95%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/OrderingInteractionEditor.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/Editor.spec.js
index 348970475c..efce88f596 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/OrderingInteractionEditor.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/Editor.spec.js
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import { nextTick } from 'vue';
 import VueRouter from 'vue-router';
 import useKLiveRegion from 'kolibri-design-system/lib/composables/useKLiveRegion';
-import OrderingInteractionEditor from '../OrderingInteractionEditor.vue';
+import OrderingEditor from '../Editor.vue';
 
 import {
   ORDERING_XML,
@@ -44,7 +44,7 @@ const moveUpName = number => dragTr.$tr('moveItemUpLabel', { item: itemLabel(num
 const moveDownName = number => dragTr.$tr('moveItemDownLabel', { item: itemLabel(number) });
 
 const renderEditor = (props = {}) =>
-  render(OrderingInteractionEditor, {
+  render(OrderingEditor, {
     props: { mode: 'edit', ...props },
     routes: new VueRouter(),
   });
@@ -62,7 +62,7 @@ const dragFirstRowToLast = async () => {
   await nextTick();
 };
 
-describe('OrderingInteractionEditor', () => {
+describe('OrderingEditor', () => {
   describe('edit mode rendering', () => {
     it('renders the prompt text from the XML', () => {
       renderEditor({
@@ -314,7 +314,7 @@ describe('OrderingInteractionEditor', () => {
   });
 
   describe('validation', () => {
-    it('does not show errors before any field is touched', () => {
+    it('shows no errors for a question that is already complete', () => {
       renderEditor({
         interaction: blockWithDecl(ORDERING_XML, ORDERING_DECL_XML),
         questionType: QuestionType.ORDERING,
@@ -322,19 +322,15 @@ describe('OrderingInteractionEditor', () => {
       expect(screen.queryByRole('alert')).not.toBeInTheDocument();
     });
 
-    it('shows errors after runValidation is triggered by state mutation', async () => {
-      jest.useFakeTimers();
+    it('reports what is missing as soon as the state changes', async () => {
       renderEditor({
         interaction: block(''),
         questionType: QuestionType.ORDERING,
       });
       await fireEvent.click(screen.getByRole('button', { name: tr.$tr('addItemBtn') }));
       await nextTick();
-      jest.advanceTimersByTime(400);
-      await nextTick();
-      jest.useRealTimers();
-      // Prompt is empty → should show prompt required error
-      expect(screen.getAllByRole('alert').length).toBeGreaterThan(0);
+
+      expect(screen.getByText(tr.errorPromptRequired$())).toBeInTheDocument();
     });
   });
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/parse.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/parse.spec.js
index 0cafc5b252..4fc6d09766 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/parse.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/parse.spec.js
@@ -1,7 +1,7 @@
 /* eslint-disable jest-dom/prefer-to-have-attribute, jest-dom/prefer-to-have-text-content */
 // The eslint-dom matchers reject XML nodes produced by DOMParser(..., 'text/xml').
 
-import { orderingInteractionDescriptor } from '../OrderingInteractionDescriptor';
+import { orderingInteractionDescriptor } from '../Descriptor';
 import { ORDERING_XML, ORDERING_DECL_XML } from '../../../utils/testingFixtures';
 import { QuestionType, Orientation } from '../../../constants';
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/validate.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/validation.spec.js
similarity index 98%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/validate.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/validation.spec.js
index f480cd7fcd..2222e8afd1 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/validate.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/__tests__/validation.spec.js
@@ -1,4 +1,4 @@
-import { validateOrderingInteraction } from '../validate';
+import { validateOrderingInteraction } from '../validation';
 import { ValidationError, Orientation } from '../../../constants';
 
 function makeItem(overrides = {}) {
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/index.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/index.js
deleted file mode 100644
index 2a16ab7fcc..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import defineInteraction from '../defineInteraction';
-import OrderingInteractionEditor from './OrderingInteractionEditor.vue';
-import { orderingInteractionDescriptor } from './OrderingInteractionDescriptor';
-
-export default defineInteraction(orderingInteractionDescriptor, OrderingInteractionEditor);
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/parse.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/parse.js
index 7b30cc8472..aab176caf0 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/parse.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/parse.js
@@ -1,5 +1,5 @@
 import { QTIDeclaration } from '../../serialization/qti/QTIDeclaration';
-import { getPromptHTML, parseXML } from '../../serialization/parseItem';
+import { getPromptHTML, parseXML } from '../../serialization/xml';
 import { buildXmlNode } from '../../serialization/assembleItem';
 import CorrectResponse from '../../serialization/qti/declarations/correctResponse';
 import { generateRandomSlug } from '../../utils/generateRandomSlug';
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/validate.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/validation.js
similarity index 100%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/validate.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/ordering/validation.js
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/resolveDescriptor.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/resolveDescriptor.js
new file mode 100644
index 0000000000..c02f778346
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/resolveDescriptor.js
@@ -0,0 +1,42 @@
+import { parseXML } from '../serialization/xml';
+import { ValidationError } from '../constants';
+import { descriptors, registry, DEFAULT_INTERACTION } from './descriptors';
+
+/**
+ * Resolve the interaction descriptor and question type for a single interaction block.
+ *
+ * Pure and component-free, so both the editor (via useInteractionDescriptor) and the
+ * headless validator (validateItem.js) can share one resolution path.
+ *
+ * @param {string} bodyXml - Serialized interaction element (or item body, for inline
+ *   interactions)
+ * @param {string[]} [responseDeclarations]
+ * @returns {{
+ *   descriptor: object,
+ *   questionType: string|null,
+ *   error: string|null,
+ * }} `error` is a ValidationError code; callers own how it is presented.
+ */
+export function resolveDescriptor(bodyXml, responseDeclarations) {
+  if (!bodyXml) {
+    return { descriptor: registry[DEFAULT_INTERACTION], questionType: null, error: null };
+  }
+  try {
+    const interactionEl = parseXML(bodyXml).documentElement;
+    const descriptor =
+      descriptors.find(d => d.matches(interactionEl)) ?? registry[DEFAULT_INTERACTION];
+    return {
+      descriptor,
+      questionType: descriptor.getQuestionType(interactionEl, responseDeclarations) ?? null,
+      error: null,
+    };
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.error('[QTI] Failed to parse interaction XML:', e.message);
+    return {
+      descriptor: registry[DEFAULT_INTERACTION],
+      questionType: null,
+      error: ValidationError.PARSE_ERROR,
+    };
+  }
+}
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/TextEntryInteractionDescriptor.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/Descriptor.js
similarity index 85%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/TextEntryInteractionDescriptor.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/Descriptor.js
index 9972eb691f..934189eea7 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/TextEntryInteractionDescriptor.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/Descriptor.js
@@ -1,25 +1,22 @@
-import { QtiInteraction, QuestionType, BaseType, Cardinality } from '../../constants';
-import { parseXML } from '../../serialization/parseItem';
+import { QtiInteraction, QuestionType, BaseType, Cardinality, Placement } from '../../constants';
+import { parseXML } from '../../serialization/xml';
+import { InteractionDescriptor } from '../InteractionDescriptor';
 import { parseTextEntryInteraction, buildTextEntryInteractionXML } from './parse';
 import { validateTextEntryInteraction } from './validation';
 
 /**
  * Owns all text-entry-specific interaction logic: schema, parse, buildXML, validate.
  *
- * placement: 'inline' — signals to parseItem that the whole <qti-item-body>
- * should be passed as bodyXml rather than just the interaction element, so
- * parse() can recover the prompt from body siblings.
+ * Inline placement means parse() is handed the whole <qti-item-body> rather than just the
+ * interaction element, so it can recover the prompt from the body siblings.
  */
-class TextEntryInteractionDescriptor {
+class TextEntryInteractionDescriptor extends InteractionDescriptor {
   constructor() {
-    this.type = QtiInteraction.TEXT_ENTRY;
-    this.placement = 'inline';
-    this.questionTypes = [
-      QuestionType.NUMERIC,
-      QuestionType.TEXT_ENTRY,
-      QuestionType.FREE_RESPONSE,
-    ];
-    this.editorComponent = null;
+    super({
+      type: QtiInteraction.TEXT_ENTRY,
+      questionTypes: [QuestionType.NUMERIC, QuestionType.TEXT_ENTRY, QuestionType.FREE_RESPONSE],
+      placement: Placement.INLINE,
+    });
     this.convertsFrom = [];
   }
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/TextEntryEditor.vue b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/Editor.vue
similarity index 97%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/TextEntryEditor.vue
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/Editor.vue
index d4cbbbe0a7..29d72caf76 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/TextEntryEditor.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/Editor.vue
@@ -6,12 +6,12 @@
       <ValidationMessage v-if="questionHasError">
         {{ errorPromptRequired$() }}
       </ValidationMessage>
-      <div
+      <h4
         class="field-label"
         :style="{ color: $themePalette.grey.v_700 }"
       >
         {{ questionLabel$() }}
-      </div>
+      </h4>
 
       <ClickableRegion
         :class="[
@@ -49,12 +49,12 @@
         {{ errorNoCorrectAnswer$() }}
       </ValidationMessage>
 
-      <div
+      <h4
         class="field-label"
         :style="{ color: $themePalette.grey.v_700 }"
       >
         {{ acceptableAnswersLabel$() }}
-      </div>
+      </h4>
       <div
         v-if="mode === 'edit'"
         class="answers-description"
@@ -349,6 +349,9 @@
         { immediate: true },
       );
 
+      // Errors are reported the same way, for the card to show that the question needs work.
+      watch(errors, newVal => emit('update:errors', newVal), { immediate: true });
+
       return {
         state,
         windowIsSmall,
@@ -411,7 +414,7 @@
       },
     },
 
-    emits: ['update:interaction'],
+    emits: ['update:interaction', 'update:errors'],
   };
 
 </script>
@@ -430,8 +433,9 @@
     flex-direction: column;
   }
 
+  /* A heading, so its own margins are set rather than inherited from the UA stylesheet */
   .field-label {
-    margin-bottom: 8px;
+    margin: 0 0 8px;
     font-size: 14px;
     font-weight: 600;
   }
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/TextEntryEditor.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/Editor.spec.js
similarity index 95%
rename from contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/TextEntryEditor.spec.js
rename to contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/Editor.spec.js
index a804d84e81..e060c07846 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/TextEntryEditor.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/Editor.spec.js
@@ -1,7 +1,7 @@
 import { render, screen, fireEvent } from '@testing-library/vue';
 import { nextTick } from 'vue';
 import VueRouter from 'vue-router';
-import TextEntryEditor from '../TextEntryEditor.vue';
+import TextEntryEditor from '../Editor.vue';
 
 import {
   TEXT_ENTRY_BODY_XML,
@@ -126,10 +126,6 @@ describe('TextEntryEditor — numeric', () => {
   });
 
   describe('validation', () => {
-    afterEach(() => {
-      jest.useRealTimers();
-    });
-
     it('does not show errors before any field is touched', () => {
       renderEditor({
         interaction: blockWithDecl(TEXT_ENTRY_BODY_XML, NUMERIC_DECL),
@@ -139,7 +135,6 @@ describe('TextEntryEditor — numeric', () => {
     });
 
     it('shows an error after typing a non-numeric value and blurring', async () => {
-      jest.useFakeTimers();
       renderEditor({
         interaction: blockWithDecl(TEXT_ENTRY_BODY_XML, NUMERIC_DECL),
         questionType: QuestionType.NUMERIC,
@@ -147,22 +142,19 @@ describe('TextEntryEditor — numeric', () => {
       const input = answerInputs()[0];
       await fireEvent.input(input, { target: { value: 'not-a-number' } });
       await fireEvent.blur(input);
-      jest.useRealTimers();
       await nextTick();
+
       expect(screen.getByRole('alert')).toBeInTheDocument();
     });
 
-    it('shows validation errors after a state mutation and debounce', async () => {
-      jest.useFakeTimers();
+    it('shows validation errors as soon as the state changes', async () => {
       renderEditor({
         interaction: block(TEXT_ENTRY_BODY_XML),
         questionType: QuestionType.NUMERIC,
       });
       await fireEvent.click(screen.getByRole('button', { name: tr.$tr('addAnswerBtn') }));
       await nextTick();
-      jest.advanceTimersByTime(400);
-      jest.useRealTimers();
-      await nextTick();
+
       expect(screen.getAllByRole('alert').length).toBeGreaterThan(0);
     });
   });
@@ -260,7 +252,10 @@ describe('TextEntryEditor — accessibility', () => {
 describe('TextEntryEditor — graceful fallback', () => {
   it('does not crash with empty bodyXml for numeric', () => {
     renderEditor({ interaction: block(''), questionType: QuestionType.NUMERIC });
-    expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+
+    // An empty interaction is incomplete, and validation is not debounced, so it says so
+    // right away rather than rendering nothing.
+    expect(screen.getByText(tr.errorPromptRequired$())).toBeInTheDocument();
   });
 
   it('does not crash with empty bodyXml for freeResponse', () => {
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/parse.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/parse.spec.js
index 9d308bfe41..f507069708 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/parse.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/__tests__/parse.spec.js
@@ -243,6 +243,28 @@ describe('buildTextEntryInteractionXML', () => {
       expect(doc.querySelector('qti-item-body')).not.toBeNull();
     });
 
+    it('leaves no xhtml namespace on the prompt markup', () => {
+      // The prompt comes from the HTML parser; an explicit xmlns on it makes the whole
+      // item fail schema validation on the server.
+      const { bodyXml } = buildTextEntryInteractionXML(
+        { prompt: '<p>What is <strong>H2O</strong>?</p>', answers: [], expectedLength: 0 },
+        QuestionType.FREE_RESPONSE,
+        FREE_SCHEMA,
+      );
+      expect(bodyXml).not.toContain('http://www.w3.org/1999/xhtml');
+    });
+
+    it('keeps the prompt before the interaction', () => {
+      const { bodyXml } = buildTextEntryInteractionXML(
+        { prompt: '<p>Question</p>', answers: [], expectedLength: 0 },
+        QuestionType.FREE_RESPONSE,
+        FREE_SCHEMA,
+      );
+      expect(bodyXml.indexOf('Question')).toBeLessThan(
+        bodyXml.indexOf('qti-text-entry-interaction'),
+      );
+    });
+
     it('contains a <qti-text-entry-interaction> element', () => {
       const { bodyXml } = buildTextEntryInteractionXML(
         { prompt: '', answers: [], expectedLength: 0 },
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/index.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/index.js
deleted file mode 100644
index d587280220..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import defineInteraction from '../defineInteraction';
-import TextEntryEditor from './TextEntryEditor.vue';
-import { textEntryInteractionDescriptor } from './TextEntryInteractionDescriptor';
-
-export default defineInteraction(textEntryInteractionDescriptor, TextEntryEditor);
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/parse.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/parse.js
index 921bd47091..d42669475d 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/parse.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/interactions/textEntry/parse.js
@@ -1,5 +1,5 @@
 import { QTIDeclaration } from '../../serialization/qti/QTIDeclaration';
-import { parseXML } from '../../serialization/parseItem';
+import { parseXML } from '../../serialization/xml';
 import { buildXmlNode } from '../../serialization/assembleItem';
 import CorrectResponse from '../../serialization/qti/declarations/correctResponse';
 import Mapping from '../../serialization/qti/declarations/mapping';
@@ -199,15 +199,10 @@ export function buildTextEntryInteractionXML(state, questionType, declarationSch
     children: [interactionEl],
   });
 
-  // Build body children: prompt HTML nodes (if any) followed by the interaction paragraph.
-  const bodyChildren = [];
-  if (prompt) {
-    const promptDoc = parseXML(`<!DOCTYPE html><body>${prompt}</body>`, 'text/html');
-    bodyChildren.push(...promptDoc.body.childNodes);
-  }
-  bodyChildren.push(interactionParagraph);
-
-  const bodyEl = buildXmlNode({ tag: 'qti-item-body', children: bodyChildren });
+  // The prompt is authored HTML, so it goes in through innerHTML: buildXmlNode parses it
+  // and adopts the result into the item's namespace.
+  const bodyEl = buildXmlNode({ tag: 'qti-item-body', innerHTML: prompt || '' });
+  bodyEl.appendChild(interactionParagraph);
   const bodyXml = serializer.serializeToString(bodyEl);
 
   // Build the response declaration.
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/qtiEditorStrings.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/qtiEditorStrings.js
index 503a844152..43a7fc06bc 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/qtiEditorStrings.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/qtiEditorStrings.js
@@ -29,6 +29,15 @@ export const qtiEditorStrings = createTranslator('QTIEditorStrings', {
     message: 'Show answers',
     context: 'Checkbox label to toggle displaying answers/previews',
   },
+  incompleteItemIndicatorLabel: {
+    message: 'Incomplete',
+    context: 'Shown in a question card header when the question is missing something',
+  },
+  unsupportedItemMessage: {
+    message: 'This question cannot be edited here',
+    context:
+      'Shown in place of the editor for questions authored elsewhere, or whose content could not be read',
+  },
   singleSelectLabel: {
     message: 'Single Choice',
     context: 'Display name for a single-select question type',
@@ -144,6 +153,10 @@ export const qtiEditorStrings = createTranslator('QTIEditorStrings', {
     message: 'Edit answer option {number}',
     context: 'Accessible label for the clickable region to edit an answer choice',
   },
+  editHintLabel: {
+    message: 'Edit hint {number}',
+    context: 'Accessible label for the clickable region to edit a hint',
+  },
   deleteChoiceBtn: {
     message: 'Delete choice',
     context: 'Accessible label for the delete-choice icon button',
@@ -157,6 +170,34 @@ export const qtiEditorStrings = createTranslator('QTIEditorStrings', {
     message: 'Mark as correct answer',
     context: 'Accessible label for radio / checkbox that marks a choice as correct',
   },
+  hintsLabel: {
+    message: 'Hints',
+    context: 'Header of the collapsible hints section of a question',
+  },
+  noHintsPlaceholder: {
+    message: 'Question has no hints',
+    context: 'Shown in the hints section when the question has no hints',
+  },
+  hintPlaceholder: {
+    message: 'Enter hint {index}...',
+    context: 'Placeholder shown in place of a hint that has no text yet',
+  },
+  addHintBtn: {
+    message: 'Add hint',
+    context: 'Button that appends a new hint to the question',
+  },
+  deleteHintBtn: {
+    message: 'Delete hint',
+    context: 'Accessible label for the delete-hint icon button',
+  },
+  moveHintUpBtn: {
+    message: 'Move hint up',
+    context: 'Accessible label for the move-hint-up icon button',
+  },
+  moveHintDownBtn: {
+    message: 'Move hint down',
+    context: 'Accessible label for the move-hint-down icon button',
+  },
   errorPromptRequired: {
     message: 'Question is required',
     context: 'Validation error shown when the prompt is empty',
@@ -205,6 +246,11 @@ export const qtiEditorStrings = createTranslator('QTIEditorStrings', {
     message: 'Free response',
     context: 'Display name for a free-response text-entry question type',
   },
+  errorFreeResponseNotAllowed: {
+    message: 'Free response is only available on surveys. Choose another type.',
+    context:
+      'Validation error shown under the type selector when a question is a free response but the exercise scores its questions',
+  },
   freeResponseDescription: {
     message: 'Learners can write an open-ended response. No correct answer is enforced.',
     context: 'Description for the free response question type in the info modal',
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/assembleItem.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/assembleItem.spec.js
index 47192f2ddc..5f75943b6c 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/assembleItem.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/assembleItem.spec.js
@@ -2,6 +2,7 @@
 // HTML and do not work reliably on strict XML elements generated by serialization.
 /* eslint-disable jest-dom/prefer-to-have-attribute, jest-dom/prefer-to-have-text-content */
 import { buildXmlNode, assembleItemXml } from '../assembleItem.js';
+import { parseItem } from '../parseItem.js';
 
 const serializer = new XMLSerializer();
 
@@ -142,6 +143,38 @@ describe('assembleItem', () => {
         buildXmlNode({ tag: 'qti-simple-choice', children: ['x'], innerHTML: '<p>y</p>' }),
       ).toThrow('mutually exclusive');
     });
+
+    it('leaves no xhtml namespace on the markup it appends', () => {
+      // The QTI schema expects inline content in the namespace the item root declares, so
+      // an explicit xmlns from the HTML parser makes the whole item invalid on the server.
+      const node = buildXmlNode({
+        tag: 'qti-simple-choice',
+        innerHTML: '<p>Lima</p>',
+      });
+      expect(new XMLSerializer().serializeToString(node)).toBe(
+        '<qti-simple-choice><p>Lima</p></qti-simple-choice>',
+      );
+    });
+
+    it('drops an xhtml namespace already carried by stored content', () => {
+      const node = buildXmlNode({
+        tag: 'qti-simple-choice',
+        innerHTML: '<p xmlns="http://www.w3.org/1999/xhtml">Lima</p>',
+      });
+      expect(new XMLSerializer().serializeToString(node)).toBe(
+        '<qti-simple-choice><p>Lima</p></qti-simple-choice>',
+      );
+    });
+
+    it('keeps a foreign namespace, which QTI expects declared', () => {
+      const node = buildXmlNode({
+        tag: 'qti-prompt',
+        innerHTML: '<math xmlns="http://www.w3.org/1998/Math/MathML"><mi>x</mi></math>',
+      });
+      expect(new XMLSerializer().serializeToString(node)).toContain(
+        '<math xmlns="http://www.w3.org/1998/Math/MathML">',
+      );
+    });
   });
 
   describe('innerHTML — HTML5 void elements (TipTap regression)', () => {
@@ -248,4 +281,79 @@ describe('assembleItemXml', () => {
     expect(doc.querySelector('parsererror')).toBeNull();
     expect(doc.querySelector('qti-assessment-item').getAttribute('title')).toBe('Plain Title');
   });
+
+  describe('namespaces', () => {
+    const MATHML_NS = 'http://www.w3.org/1998/Math/MathML';
+    const QTI_NS = 'http://www.imsglobal.org/xsd/imsqtiasi_v3p0';
+
+    // buildXmlNode gets this right on its own, but the body is handed here as a string
+    // and parsed again, so the declaration has to survive that too. A <math> that ends
+    // up inheriting the QTI namespace makes the server reject the whole item.
+    it('keeps a foreign namespace declared inside the body', () => {
+      const prompt = buildXmlNode({
+        tag: 'qti-prompt',
+        innerHTML: `<p>What is <math xmlns="${MATHML_NS}"><mi>x</mi></math>?</p>`,
+      });
+      const interaction = buildXmlNode({
+        tag: 'qti-choice-interaction',
+        attrs: { 'response-identifier': 'RESPONSE' },
+        children: [prompt],
+      });
+
+      const xml = assembleItemXml({
+        identifier: 'item-math',
+        title: 'T',
+        language: 'en',
+        bodyXml: serializer.serializeToString(interaction),
+        responseDeclarations: [],
+      });
+
+      expect(
+        new DOMParser().parseFromString(xml, 'text/xml').querySelector('math').namespaceURI,
+      ).toBe(MATHML_NS);
+    });
+
+    // An interaction the author did not touch is handed back exactly as parseItem read
+    // it, still carrying the item's own declaration. Re-declaring the same namespace is
+    // redundant but valid, and it must not cost the foreign one nested inside.
+    it('assembles a body whose root already declares the QTI namespace', () => {
+      const xml = assembleItemXml({
+        identifier: 'item-math',
+        title: 'T',
+        language: 'en',
+        bodyXml:
+          `<qti-choice-interaction xmlns="${QTI_NS}" response-identifier="RESPONSE">` +
+          `<qti-prompt><p>What is <math xmlns="${MATHML_NS}"><mi>x</mi></math>?</p></qti-prompt>` +
+          `</qti-choice-interaction>`,
+        responseDeclarations: [],
+      });
+
+      const doc = new DOMParser().parseFromString(xml, 'text/xml');
+      expect(doc.querySelector('parsererror')).toBeNull();
+      expect(doc.querySelector('qti-choice-interaction').namespaceURI).toBe(QTI_NS);
+      expect(doc.querySelector('math').namespaceURI).toBe(MATHML_NS);
+    });
+
+    it('preserves MathML through a parseItem round trip', () => {
+      const original =
+        '<?xml version="1.0" encoding="UTF-8"?>\n' +
+        `<qti-assessment-item xmlns="${QTI_NS}" identifier="item-math" title="T" adaptive="false" time-dependent="false" xml:lang="en">` +
+        '<qti-item-body><qti-choice-interaction response-identifier="RESPONSE">' +
+        `<qti-prompt><p>What is <math xmlns="${MATHML_NS}"><mi>x</mi></math>?</p></qti-prompt>` +
+        '</qti-choice-interaction></qti-item-body></qti-assessment-item>';
+
+      const item = parseItem(original);
+      const xml = assembleItemXml({
+        identifier: item.identifier,
+        title: item.title,
+        language: item.language,
+        bodyXml: item.interactions[0].bodyXml,
+        responseDeclarations: item.interactions[0].responseDeclarations,
+      });
+
+      expect(
+        new DOMParser().parseFromString(xml, 'text/xml').querySelector('math').namespaceURI,
+      ).toBe(MATHML_NS);
+    });
+  });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/convertedItem.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/convertedItem.spec.js
new file mode 100644
index 0000000000..b842f57ec1
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/convertedItem.spec.js
@@ -0,0 +1,137 @@
+/**
+ * The editor's read/write pair against what the converter actually emits.
+ *
+ * These read the converter's own fixtures rather than a copy, because the bug this file
+ * exists to catch was a disagreement between the two: `testingFixtures.js` is hand-written
+ * and carries no grading declarations, so nothing noticed that a converted item loses its
+ * scoring rules on the first save.
+ */
+// Disabled because jest-dom's matchers are built for HTML elements and reject the strict
+// XML nodes this serialization produces — same reason as assembleItem.spec.js.
+/* eslint-disable jest-dom/prefer-to-have-attribute */
+import fs from 'fs';
+import path from 'path';
+import { parseItem } from '../parseItem';
+import { assembleItemXml } from '../assembleItem';
+
+const FIXTURES = path.join(__dirname, '../../../../../../tests/utils/qti/fixtures');
+
+const read = name => fs.readFileSync(path.join(FIXTURES, `${name}.xml`), 'utf8');
+
+const rebuild = item =>
+  assembleItemXml({
+    identifier: item.identifier,
+    title: item.title,
+    language: item.language,
+    bodyXml: item.interactions[0].bodyXml,
+    responseDeclarations: item.interactions[0].responseDeclarations,
+    hints: item.hints,
+  });
+
+describe('a converted single-selection item', () => {
+  const original = read('single_selection');
+
+  it('is read with the language the converter wrote', () => {
+    expect(parseItem(original).language).toBe('en-US');
+  });
+
+  it('writes the language back as xml:lang, the attribute QTI declares', () => {
+    const xml = rebuild(parseItem(original));
+    expect(xml).toContain('xml:lang="en-US"');
+    expect(xml).not.toContain(' language="');
+  });
+
+  it('keeps its scoring outcome and response processing', () => {
+    const xml = rebuild(parseItem(original));
+    const doc = new DOMParser().parseFromString(xml, 'text/xml');
+    expect(doc.querySelector('parsererror')).toBeNull();
+    expect(doc.querySelector('qti-outcome-declaration').getAttribute('identifier')).toBe('SCORE');
+    expect(doc.querySelector('qti-response-processing').getAttribute('template')).toBe(
+      'https://purl.imsglobal.org/spec/qti/v3p0/rptemplates/match_correct',
+    );
+  });
+
+  it('puts the children in the order the schema fixes', () => {
+    const xml = rebuild(parseItem(original));
+    const order = [...xml.matchAll(/<(qti-[a-z-]+)/g)]
+      .map(m => m[1])
+      .filter(tag =>
+        [
+          'qti-response-declaration',
+          'qti-outcome-declaration',
+          'qti-item-body',
+          'qti-response-processing',
+        ].includes(tag),
+      );
+    expect(order).toEqual([
+      'qti-response-declaration',
+      'qti-outcome-declaration',
+      'qti-item-body',
+      'qti-response-processing',
+    ]);
+  });
+});
+
+describe('a converted question with nothing to answer', () => {
+  // The conversion gives an answerless legacy question an interaction with no choices to pick
+  // from, so its prompt is the whole of its content. Reassembling the item has to keep that,
+  // or the only edit available — a hint — writes an empty body over the question.
+  const original = read('single_selection_no_answers');
+
+  it('is read with the interaction carrying its prompt', () => {
+    const item = parseItem(original);
+    expect(item.interactions).toHaveLength(1);
+    expect(item.interactions[0].bodyXml).toContain('What is 2+2?');
+  });
+
+  it('keeps that body when reassembled', () => {
+    const item = parseItem(original);
+    const xml = assembleItemXml({
+      identifier: item.identifier,
+      title: item.title,
+      language: item.language,
+      bodyXml: item.interactions[0]?.bodyXml ?? item.itemBodyXml,
+      responseDeclarations: [],
+      hints: item.hints,
+    });
+    expect(xml).toContain('What is 2+2?');
+    expect(xml).not.toContain('<qti-item-body/>');
+  });
+});
+
+describe('an item this editor wrote', () => {
+  it('keeps xml:lang, the spelling this editor uses', () => {
+    const xml = assembleItemXml({
+      identifier: 'i',
+      title: 't',
+      language: 'es',
+      bodyXml: '<qti-choice-interaction response-identifier="RESPONSE"/>',
+      responseDeclarations: ['<qti-response-declaration identifier="RESPONSE"/>'],
+    });
+    expect(xml).toContain('xml:lang="es"');
+  });
+
+  it('omits the language rather than inventing one', () => {
+    const xml = assembleItemXml({
+      identifier: 'i',
+      title: 't',
+      language: '',
+      bodyXml: '<qti-choice-interaction response-identifier="RESPONSE"/>',
+      responseDeclarations: [],
+    });
+    expect(xml).not.toContain('xml:lang');
+    expect(xml).not.toContain('language=');
+  });
+
+  it('scores nothing when there is nothing to answer', () => {
+    const xml = assembleItemXml({
+      identifier: 'i',
+      title: 't',
+      language: 'en',
+      bodyXml: '<qti-item-body><p>Just text.</p></qti-item-body>',
+      responseDeclarations: [],
+    });
+    expect(xml).toContain('qti-outcome-declaration');
+    expect(xml).not.toContain('qti-response-processing');
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/createBlankItem.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/createBlankItem.spec.js
new file mode 100644
index 0000000000..f1c2200213
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/createBlankItem.spec.js
@@ -0,0 +1,32 @@
+import { createBlankItemXml, DEFAULT_ITEM_TITLE } from '../createBlankItem';
+import { parseItem } from '../parseItem';
+import { parseXML } from '../xml';
+import { QtiInteraction } from '../../constants';
+import { validateQtiItem } from '../../validateItem';
+
+describe('createBlankItemXml', () => {
+  it('produces an item holding exactly one default interaction', () => {
+    const { interactions } = parseItem(createBlankItemXml());
+
+    expect(interactions).toHaveLength(1);
+    expect(parseXML(interactions[0].bodyXml).documentElement.tagName.toLowerCase()).toBe(
+      QtiInteraction.CHOICE,
+    );
+  });
+
+  it('stamps a unique identifier and the default title', () => {
+    const first = parseItem(createBlankItemXml());
+    const second = parseItem(createBlankItemXml());
+
+    expect(first.title).toBe(DEFAULT_ITEM_TITLE);
+    // The identifier is an XML NCName: a letter or underscore, then name characters.
+    expect(first.identifier).toMatch(/^[A-Za-z_][\w.-]*$/);
+    expect(first.identifier).not.toBe(second.identifier);
+  });
+
+  it('is renderable but not yet complete, so the author has something to fill in', () => {
+    // A blank item must parse into an interaction — otherwise the editor has nothing to
+    // render — while still reporting as invalid until the author fills it in.
+    expect(validateQtiItem(createBlankItemXml()).length).toBeGreaterThan(0);
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/hints.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/hints.spec.js
new file mode 100644
index 0000000000..e69d3e8810
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/hints.spec.js
@@ -0,0 +1,187 @@
+// Disabled because jest-dom's matchers are built for HTML elements and misbehave on the
+// strict XML nodes this serialization produces - same reason as assembleItem.spec.js.
+/* eslint-disable jest-dom/prefer-to-have-attribute */
+import { parseItem } from '../parseItem';
+import { assembleItemXml } from '../assembleItem';
+import { parseHints, hintHasContent, HINT_SUPPORT } from '../hints';
+import { parseXML } from '../xml';
+import {
+  CHOICE_ITEM_DOCUMENT_WITH_HINTS,
+  VALID_CHOICE_ITEM_DOCUMENT,
+} from '../../utils/testingFixtures';
+
+const hintContents = doc => parseHints(parseXML(doc)).map(h => h.content);
+
+describe('parseHints', () => {
+  it('reads every hint card, in document order', () => {
+    expect(hintContents(CHOICE_ITEM_DOCUMENT_WITH_HINTS)).toEqual([
+      '<p>test</p>',
+      '<p>test2 2</p>',
+      '<p>test3 3</p>',
+    ]);
+  });
+
+  it('returns nothing for an item with no catalog', () => {
+    expect(hintContents(VALID_CHOICE_ITEM_DOCUMENT)).toEqual([]);
+  });
+
+  it('ignores cards that carry some other support value', () => {
+    const doc = `<qti-assessment-item><qti-catalog-info><qti-catalog id="other">
+      <qti-card support="ext:something-else"><qti-html-content><p>no</p></qti-html-content></qti-card>
+      </qti-catalog></qti-catalog-info></qti-assessment-item>`;
+    expect(hintContents(doc)).toEqual([]);
+  });
+
+  it('reads a hint card that carries no content as empty', () => {
+    const doc = `<qti-assessment-item><qti-catalog-info><qti-catalog id="kolibri-hints">
+      <qti-card support="${HINT_SUPPORT}"/></qti-catalog></qti-catalog-info></qti-assessment-item>`;
+    expect(hintContents(doc)).toEqual(['']);
+  });
+
+  it('gives each hint an id so a list can key on it', () => {
+    const ids = parseHints(parseXML(CHOICE_ITEM_DOCUMENT_WITH_HINTS)).map(h => h.id);
+    expect(new Set(ids).size).toBe(3);
+  });
+});
+
+describe('hintHasContent', () => {
+  it.each([
+    ['<p>text</p>', true],
+    ['plain text', true],
+    ['', false],
+    ['   ', false],
+    ['<p></p>', false],
+    ['<p>&nbsp;</p>', false],
+    // A hint can be entirely an image or a formula — from a converted Perseus hint, or
+    // from the editor's own image and formula buttons. Reading only the text would drop it.
+    ['<p><img src="abc123.png"/></p>', true],
+    ['<p><img src="abc123.png" alt=""/></p>', true],
+    ['<p><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>x</mi></math></p>', true],
+    ['<p><svg viewBox="0 0 1 1"></svg></p>', true],
+    ['<p>see <img src="abc123.png"/></p>', true],
+  ])('%s -> %s', (content, expected) => {
+    expect(hintHasContent({ content })).toBe(expected);
+  });
+});
+
+describe('parseItem', () => {
+  it('returns hints beside the interactions rather than inside them', () => {
+    const item = parseItem(CHOICE_ITEM_DOCUMENT_WITH_HINTS);
+    expect(item.hints.map(h => h.content)).toEqual([
+      '<p>test</p>',
+      '<p>test2 2</p>',
+      '<p>test3 3</p>',
+    ]);
+    expect(item.interactions[0]).not.toHaveProperty('hints');
+  });
+
+  it('returns an empty hint list for an item without any', () => {
+    expect(parseItem(VALID_CHOICE_ITEM_DOCUMENT).hints).toEqual([]);
+  });
+});
+
+describe('assembleItemXml with hints', () => {
+  const BASE = {
+    identifier: 'item-1',
+    title: 'T',
+    language: 'en',
+    bodyXml: '<qti-choice-interaction response-identifier="RESPONSE" max-choices="1"/>',
+    responseDeclarations: [],
+  };
+
+  it('writes a catalog of hint cards', () => {
+    const xml = assembleItemXml({
+      ...BASE,
+      hints: [
+        { id: 'a', content: '<p>first</p>' },
+        { id: 'b', content: '<p>second</p>' },
+      ],
+    });
+    const doc = parseXML(xml);
+    expect(doc.querySelector('parsererror')).toBeNull();
+    expect(doc.querySelector('qti-catalog').getAttribute('id')).toBe('kolibri-hints');
+    const cards = [...doc.querySelectorAll('qti-card')];
+    expect(cards.map(c => c.getAttribute('support'))).toEqual([HINT_SUPPORT, HINT_SUPPORT]);
+    expect(parseHints(doc).map(h => h.content)).toEqual(['<p>first</p>', '<p>second</p>']);
+  });
+
+  it('puts the catalog after the item body, which the schema requires', () => {
+    const xml = assembleItemXml({ ...BASE, hints: [{ id: 'a', content: '<p>x</p>' }] });
+    expect(xml.indexOf('<qti-item-body')).toBeLessThan(xml.indexOf('<qti-catalog-info'));
+  });
+
+  it('writes no catalog when there are no hints', () => {
+    expect(assembleItemXml({ ...BASE, hints: [] })).not.toContain('qti-catalog-info');
+    expect(assembleItemXml(BASE)).not.toContain('qti-catalog-info');
+  });
+
+  it('keeps a hint that is only an image', () => {
+    const xml = assembleItemXml({
+      ...BASE,
+      hints: [{ id: 'a', content: '<p><img src="abc123.png" alt=""/></p>' }],
+    });
+    expect(parseHints(parseXML(xml)).map(h => h.content)).toEqual([
+      '<p><img src="abc123.png" alt=""/></p>',
+    ]);
+  });
+
+  it('leaves out a hint the author has not written yet', () => {
+    const xml = assembleItemXml({
+      ...BASE,
+      hints: [
+        { id: 'a', content: '<p>kept</p>' },
+        { id: 'b', content: '' },
+      ],
+    });
+    expect([...parseXML(xml).querySelectorAll('qti-card')]).toHaveLength(1);
+  });
+
+  it('writes no catalog at all when every hint is empty', () => {
+    const xml = assembleItemXml({ ...BASE, hints: [{ id: 'a', content: '' }] });
+    expect(xml).not.toContain('qti-catalog-info');
+  });
+
+  it('leaves no xhtml namespace on hint markup', () => {
+    const xml = assembleItemXml({ ...BASE, hints: [{ id: 'a', content: '<p>x</p>' }] });
+    expect(xml).toContain('<qti-html-content><p>x</p></qti-html-content>');
+  });
+});
+
+describe('hint round trip', () => {
+  it('survives parseItem -> assembleItemXml unchanged', () => {
+    const item = parseItem(CHOICE_ITEM_DOCUMENT_WITH_HINTS);
+    const xml = assembleItemXml({
+      identifier: item.identifier,
+      title: item.title,
+      language: item.language,
+      bodyXml: item.interactions[0].bodyXml,
+      responseDeclarations: item.interactions[0].responseDeclarations,
+      hints: item.hints,
+    });
+
+    expect(parseItem(xml).hints.map(h => h.content)).toEqual([
+      '<p>test</p>',
+      '<p>test2 2</p>',
+      '<p>test3 3</p>',
+    ]);
+  });
+
+  it('keeps an edited hint', () => {
+    const item = parseItem(CHOICE_ITEM_DOCUMENT_WITH_HINTS);
+    const hints = item.hints.map((h, i) => (i === 1 ? { ...h, content: '<p>rewritten</p>' } : h));
+    const xml = assembleItemXml({
+      identifier: item.identifier,
+      title: item.title,
+      language: item.language,
+      bodyXml: item.interactions[0].bodyXml,
+      responseDeclarations: item.interactions[0].responseDeclarations,
+      hints,
+    });
+
+    expect(parseItem(xml).hints.map(h => h.content)).toEqual([
+      '<p>test</p>',
+      '<p>rewritten</p>',
+      '<p>test3 3</p>',
+    ]);
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/parseItem.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/parseItem.spec.js
index 48b8941460..711b63bb2f 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/parseItem.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/parseItem.spec.js
@@ -1,5 +1,5 @@
 /* eslint-disable jest-dom/prefer-to-have-attribute, jest-dom/prefer-to-have-text-content */
-import { parseXML, parseItem } from '../parseItem';
+import { parseItem } from '../parseItem';
 import { VALID_CHOICE_ITEM_DOCUMENT, TWO_INTERACTIONS_DOCUMENT } from '../../utils/testingFixtures';
 
 // Fixtures
@@ -15,46 +15,6 @@ const ITEM_NO_INTERACTIONS = `<?xml version="1.0" encoding="UTF-8"?>
   <qti-item-body></qti-item-body>
 </qti-assessment-item>`;
 
-// parseXML
-describe('parseXML', () => {
-  it('parses valid XML into a Document', () => {
-    const doc = parseXML(VALID_CHOICE_ITEM_DOCUMENT);
-    expect(doc).toBeInstanceOf(Document);
-    expect(doc.querySelector('qti-assessment-item')).not.toBeNull();
-  });
-
-  it('throws for malformed XML', () => {
-    expect(() => parseXML('<unclosed')).toThrow(/QTI XML parse error/i);
-  });
-
-  it('throws for XML with a parsererror node', () => {
-    // An extra closing tag causes a parsererror in jsdom
-    expect(() => parseXML('<root></root></extra>')).toThrow(/QTI XML parse error/i);
-  });
-
-  it('parses valid XML when text/xml is passed explicitly', () => {
-    const doc = parseXML(VALID_CHOICE_ITEM_DOCUMENT, 'text/xml');
-    expect(doc.querySelector('qti-assessment-item')).not.toBeNull();
-  });
-
-  it('parses HTML leniently into a Document when text/html is passed', () => {
-    const doc = parseXML('<b>bold</b>', 'text/html');
-    expect(doc).toBeInstanceOf(Document);
-    // doc.body is a DOMParser-realm node, not a testing-library node, so
-    // toHaveTextContent rejects it; assert on textContent directly.
-    // eslint-disable-next-line jest-dom/prefer-to-have-text-content
-    expect(doc.body.textContent).toBe('bold');
-  });
-
-  it('does not throw for malformed HTML', () => {
-    expect(() => parseXML('<unclosed', 'text/html')).not.toThrow();
-  });
-
-  it('does not treat a literal parsererror element in HTML as a failure', () => {
-    expect(() => parseXML('<parsererror>x</parsererror>', 'text/html')).not.toThrow();
-  });
-});
-
 // parseItem — meta extraction
 describe('parseItem — meta', () => {
   it('returns an object with the top-level item attributes', () => {
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/xml.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/xml.spec.js
new file mode 100644
index 0000000000..e531a37a66
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/__tests__/xml.spec.js
@@ -0,0 +1,83 @@
+import { parseXML, getPromptHTML } from '../xml';
+import { VALID_CHOICE_ITEM_DOCUMENT } from '../../utils/testingFixtures';
+
+// parseXML
+describe('parseXML', () => {
+  it('parses valid XML into a Document', () => {
+    const doc = parseXML(VALID_CHOICE_ITEM_DOCUMENT);
+    expect(doc).toBeInstanceOf(Document);
+    expect(doc.querySelector('qti-assessment-item')).not.toBeNull();
+  });
+
+  it('throws for malformed XML', () => {
+    expect(() => parseXML('<unclosed')).toThrow(/QTI XML parse error/i);
+  });
+
+  it('throws for XML with a parsererror node', () => {
+    // An extra closing tag causes a parsererror in jsdom
+    expect(() => parseXML('<root></root></extra>')).toThrow(/QTI XML parse error/i);
+  });
+
+  it('parses valid XML when text/xml is passed explicitly', () => {
+    const doc = parseXML(VALID_CHOICE_ITEM_DOCUMENT, 'text/xml');
+    expect(doc.querySelector('qti-assessment-item')).not.toBeNull();
+  });
+
+  it('parses HTML leniently into a Document when text/html is passed', () => {
+    const doc = parseXML('<b>bold</b>', 'text/html');
+    expect(doc).toBeInstanceOf(Document);
+    // doc.body is a DOMParser-realm node, not a testing-library node, so
+    // toHaveTextContent rejects it; assert on textContent directly.
+    // eslint-disable-next-line jest-dom/prefer-to-have-text-content
+    expect(doc.body.textContent).toBe('bold');
+  });
+
+  it('does not throw for malformed HTML', () => {
+    expect(() => parseXML('<unclosed', 'text/html')).not.toThrow();
+  });
+
+  it('does not treat a literal parsererror element in HTML as a failure', () => {
+    expect(() => parseXML('<parsererror>x</parsererror>', 'text/html')).not.toThrow();
+  });
+
+  it('leaves the namespace declared on the document element in place', () => {
+    const doc = parseXML(
+      '<qti-assessment-item xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"/>',
+    );
+    expect(doc.documentElement.namespaceURI).toBe('http://www.imsglobal.org/xsd/imsqtiasi_v3p0');
+  });
+
+  it('leaves a foreign namespace declared on a nested element in place', () => {
+    // MathML has to keep its own namespace: without it, serializing the subtree back
+    // into a QTI-namespaced item makes <math> inherit the QTI namespace, which the
+    // schema rejects.
+    const doc = parseXML(
+      '<qti-prompt><p>x <math xmlns="http://www.w3.org/1998/Math/MathML"><mi>x</mi></math></p></qti-prompt>',
+    );
+    expect(doc.querySelector('math').namespaceURI).toBe('http://www.w3.org/1998/Math/MathML');
+  });
+
+  it('finds an element by local name regardless of the namespace it is in', () => {
+    // Which is why nothing needs the declarations removed to look elements up.
+    const doc = parseXML(
+      '<qti-assessment-item xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"><qti-item-body/></qti-assessment-item>',
+    );
+    expect(doc.querySelector('qti-item-body')).not.toBeNull();
+  });
+});
+
+describe('getPromptHTML', () => {
+  it('returns the prompt markup of an interaction', () => {
+    const el = parseXML(
+      '<qti-choice-interaction><qti-prompt>Pick <strong>one</strong></qti-prompt></qti-choice-interaction>',
+    ).documentElement;
+
+    expect(getPromptHTML(el)).toBe('Pick <strong>one</strong>');
+  });
+
+  it('returns an empty string when the interaction has no prompt', () => {
+    const el = parseXML('<qti-choice-interaction />').documentElement;
+
+    expect(getPromptHTML(el)).toBe('');
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/assembleItem.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/assembleItem.js
index 48295a8889..91406eb61b 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/assembleItem.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/assembleItem.js
@@ -8,11 +8,57 @@
  * (e.g. XMLSerializer.serializeToString).
  */
 
-import { parseXML } from './parseItem';
+import { HINT_CATALOG_ID, HINT_SUPPORT, hintHasContent } from './hints';
+import { parseXML } from './xml';
 
 const xmlDoc = new DOMParser().parseFromString('<root/>', 'text/xml');
 const serializer = new XMLSerializer();
 
+const XHTML_NS = 'http://www.w3.org/1999/xhtml';
+
+/**
+ * Re-create a node parsed from HTML inside the XML document.
+ *
+ * The HTML parser puts elements in the XHTML namespace, and XMLSerializer then writes
+ * that out as an explicit `xmlns` on every element it produces — `<p xmlns="…xhtml">`.
+ * The QTI schema rejects that: inline content belongs to the QTI namespace the item root
+ * declares, so these elements have to be namespace-less in order to inherit it. Foreign
+ * subtrees (MathML, SVG) keep their own namespace, which QTI does expect declared.
+ *
+ * @param {Node} node
+ * @returns {Node|null} null for node types that carry no content (comments, etc.)
+ */
+function adoptHtmlNode(node) {
+  if (node.nodeType === Node.TEXT_NODE) {
+    return xmlDoc.createTextNode(node.nodeValue);
+  }
+  if (node.nodeType !== Node.ELEMENT_NODE) {
+    return null;
+  }
+
+  const namespace = node.namespaceURI;
+  const el =
+    !namespace || namespace === XHTML_NS
+      ? xmlDoc.createElement(node.localName)
+      : xmlDoc.createElementNS(namespace, node.tagName);
+
+  for (const attr of node.attributes) {
+    // A literal xmlns attribute would re-introduce the namespace we just dropped.
+    if (attr.name !== 'xmlns') {
+      el.setAttribute(attr.name, attr.value);
+    }
+  }
+
+  for (const child of node.childNodes) {
+    const adopted = adoptHtmlNode(child);
+    if (adopted) {
+      el.appendChild(adopted);
+    }
+  }
+
+  return el;
+}
+
 /**
  * Build an XML element node.
  *
@@ -42,7 +88,10 @@ export function buildXmlNode({ tag, attrs = {}, children, innerHTML }) {
   if (innerHTML !== undefined) {
     const htmlDoc = parseXML(`<!DOCTYPE html><body>${innerHTML}</body>`, 'text/html');
     for (const child of [...htmlDoc.body.childNodes]) {
-      el.appendChild(xmlDoc.importNode(child, true));
+      const adopted = adoptHtmlNode(child);
+      if (adopted) {
+        el.appendChild(adopted);
+      }
     }
   } else {
     for (const child of children ?? []) {
@@ -62,6 +111,63 @@ export function buildXmlNode({ tag, attrs = {}, children, innerHTML }) {
   return el;
 }
 
+/**
+ * Build the `<qti-catalog-info>` holding the item's hints, or null when there is nothing
+ * to write. A catalog has to hold at least one card, so an item whose hints are all empty
+ * carries no catalog at all rather than an empty one.
+ *
+ * @param {Array<{ content: string }>} hints
+ * @returns {Element|null}
+ */
+function buildHintCatalogNode(hints) {
+  const cards = hints.filter(hintHasContent).map(hint =>
+    buildXmlNode({
+      tag: 'qti-card',
+      attrs: { support: HINT_SUPPORT },
+      children: [buildXmlNode({ tag: 'qti-html-content', innerHTML: hint.content })],
+    }),
+  );
+
+  if (!cards.length) {
+    return null;
+  }
+
+  return buildXmlNode({
+    tag: 'qti-catalog-info',
+    children: [
+      buildXmlNode({ tag: 'qti-catalog', attrs: { id: HINT_CATALOG_ID }, children: cards }),
+    ],
+  });
+}
+
+/** The scoring outcome every item carries, matching what the legacy conversion emits. */
+function buildOutcomeDeclarationNode() {
+  return buildXmlNode({
+    tag: 'qti-outcome-declaration',
+    attrs: { identifier: 'SCORE', cardinality: 'single', 'base-type': 'float' },
+  });
+}
+
+/**
+ * How the item is scored, or null when there is nothing to score against.
+ *
+ * Written rather than carried over from whatever the item arrived with: an author's edit
+ * can invalidate the rules a previous tool recorded, and match_correct is the one template
+ * this editor knows how to keep true. An item with no response declaration — a question
+ * with nothing to answer — gets no processing at all, which is what the converter does too.
+ */
+function buildResponseProcessingNode(declarationCount) {
+  if (!declarationCount) {
+    return null;
+  }
+  return buildXmlNode({
+    tag: 'qti-response-processing',
+    attrs: {
+      template: 'https://purl.imsglobal.org/spec/qti/v3p0/rptemplates/match_correct',
+    },
+  });
+}
+
 /**
  * Assembles a full QTI assessment-item XML string from its constituent parts.
  *
@@ -73,12 +179,20 @@ export function buildXmlNode({ tag, attrs = {}, children, innerHTML }) {
  * @param {object}   params
  * @param {string}   params.identifier            - Item identifier attribute
  * @param {string}   params.title                 - Item title attribute
- * @param {string}   params.language              - xml:lang attribute value
+ * @param {string}   params.language              - Language tag, or '' to omit it
  * @param {string}   params.bodyXml               - Serialized interaction element XML string
  * @param {string[]} params.responseDeclarations  - Array of serialized declaration XML strings
+ * @param {Array<{ content: string }>} [params.hints] - Item hints, in order
  * @returns {string} Full QTI XML string
  */
-export function assembleItemXml({ identifier, title, language, bodyXml, responseDeclarations }) {
+export function assembleItemXml({
+  identifier,
+  title,
+  language,
+  bodyXml,
+  responseDeclarations,
+  hints = [],
+}) {
   // Parse each serialized declaration string back into a DOM node so it can be
   // adopted into the assessment item tree via buildXmlNode's importNode logic.
   const declNodes = (responseDeclarations || []).map(declXml => {
@@ -96,20 +210,31 @@ export function assembleItemXml({ identifier, title, language, bodyXml, response
           children: [bodyRoot],
         });
 
+  const catalogInfoNode = buildHintCatalogNode(hints);
+  const responseProcessingNode = buildResponseProcessingNode(declNodes.length);
+
   const assessmentItemNode = buildXmlNode({
     tag: 'qti-assessment-item',
     attrs: {
       xmlns: 'http://www.imsglobal.org/xsd/imsqtiasi_v3p0',
-      // TODO: We will need to properly generate the identifier and title
-      // on the useQtiItem composable when we integrate the question type selector
-      // and have the add question button working.
+      // New items get their identifier and title from createBlankItem.js; these fallbacks
+      // only cover items assembled from XML that never carried them.
       identifier: identifier || 'item',
       title: title || '',
       adaptive: 'false',
       'time-dependent': 'false',
-      'xml:lang': language || 'en',
+      // Omitted rather than guessed when the item has no language: the schema allows an
+      // item without one.
+      'xml:lang': language || null,
     },
-    children: [...declNodes, itemBodyNode],
+    // The schema fixes this order: declarations, the body, the catalog, the processing.
+    children: [
+      ...declNodes,
+      buildOutcomeDeclarationNode(),
+      itemBodyNode,
+      ...(catalogInfoNode ? [catalogInfoNode] : []),
+      ...(responseProcessingNode ? [responseProcessingNode] : []),
+    ],
   });
 
   return `<?xml version="1.0" encoding="UTF-8"?>\n${serializer.serializeToString(assessmentItemNode)}`;
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/createBlankItem.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/createBlankItem.js
new file mode 100644
index 0000000000..39f9737825
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/createBlankItem.js
@@ -0,0 +1,36 @@
+import { QuestionType } from '../constants';
+import { choiceInteractionDescriptor } from '../interactions/choice/Descriptor';
+import { _defaultState } from '../interactions/choice/parse';
+import { generateRandomSlug } from '../utils/generateRandomSlug';
+import { assembleItemXml } from './assembleItem';
+
+/**
+ * Title stamped on newly created items. Deliberately fixed rather than derived from the
+ * item's position, which would go stale on the next reorder.
+ */
+export const DEFAULT_ITEM_TITLE = 'Question';
+
+/**
+ * Build the QTI XML for a brand new, empty assessment item.
+ *
+ * A new item cannot start with empty `raw_data`: the editor only renders an interaction
+ * when one is present in the body, and the server validates every item against the QTI
+ * schema before storing it. So a new item starts as the default interaction's empty
+ * state, which the author then fills in.
+ *
+ * @returns {string} Full QTI assessment item XML
+ */
+export function createBlankItemXml() {
+  const { bodyXml, responseDeclarations } = choiceInteractionDescriptor.buildXML(
+    _defaultState(),
+    QuestionType.SINGLE_SELECT,
+  );
+
+  return assembleItemXml({
+    identifier: generateRandomSlug('item'),
+    title: DEFAULT_ITEM_TITLE,
+    language: '',
+    bodyXml,
+    responseDeclarations,
+  });
+}
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/hints.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/hints.js
new file mode 100644
index 0000000000..a1be30ea32
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/hints.js
@@ -0,0 +1,83 @@
+/**
+ * Hints, which QTI has no element of its own for.
+ *
+ * A legacy question's hints are carried in the item's `<qti-catalog-info>` — dormant
+ * content the delivery engine never renders on its own — as cards tagged with a Kolibri
+ * support value.
+ *
+ *   <qti-catalog-info>
+ *     <qti-catalog id="kolibri-hints">
+ *       <qti-card support="ext:kolibri-hint">
+ *         <qti-html-content><p>Try halving it first</p></qti-html-content>
+ *       </qti-card>
+ *     </qti-catalog>
+ *   </qti-catalog-info>
+ */
+
+import { generateRandomSlug } from '../utils/generateRandomSlug';
+import { stripTags } from '../utils/stripTags';
+
+/** The catalog this editor writes hints into. */
+export const HINT_CATALOG_ID = 'kolibri-hints';
+
+/** The support value that marks a card as a hint. Mirrors qti/catalog.py. */
+export const HINT_SUPPORT = 'ext:kolibri-hint';
+
+/**
+ * The item's own namespace, which its content inherits from the root and therefore does
+ * not declare. Serializing a subtree on its own re-declares it on every top-level
+ * element, so reading a card's markup back out of the document reintroduces a
+ * declaration that was never in the stored XML. Dropped by value rather than by pattern,
+ * so a foreign namespace a hint legitimately carries — MathML from the formula button —
+ * is left alone.
+ */
+const QTI_NAMESPACE_DECLARATION = / xmlns="http:\/\/www\.imsglobal\.org\/xsd\/imsqtiasi_v3p0"/g;
+
+/**
+ * Read the item's hints, in document order.
+ *
+ * Cards are matched on their support value rather than the catalog they sit in, the same
+ * way the publish-side derivation does — a catalog id is a name, the support value is the
+ * contract. `id` is generated here for list keys and is not part of the XML.
+ *
+ * @param {Document} doc - Parsed assessment item document
+ * @returns {Array<{ id: string, content: string }>}
+ */
+export function parseHints(doc) {
+  const cards = [...doc.querySelectorAll(`qti-card[support="${HINT_SUPPORT}"]`)];
+
+  return cards.map(card => {
+    const htmlContent = card.querySelector('qti-html-content');
+    return {
+      id: generateRandomSlug('hint'),
+      // Pretty-printed XML puts the card's indentation inside the element, and the
+      // editor would otherwise open on a stray blank line.
+      content: htmlContent
+        ? htmlContent.innerHTML.replace(QTI_NAMESPACE_DECLARATION, '').trim()
+        : '',
+    };
+  });
+}
+
+/** Markup that is content in its own right, with no text to find. */
+const EMBEDDED_MEDIA = /<(img|math|svg)\b/i;
+
+/**
+ * Whether a hint holds anything worth writing.
+ *
+ * An empty card is schema-valid but says nothing, so a hint the author has not written
+ * yet stays in the editor without reaching the item — the same log-and-skip rule the
+ * legacy conversion applies to a hint with no text.
+ *
+ * A hint can say something without saying it in words: an image, or a formula from the
+ * editor's own formula button, is the whole hint. Reading only the text would drop those
+ * on the next save, and show them as the empty-hint placeholder in the meantime.
+ *
+ * @param {{ content: string }} hint
+ * @returns {boolean}
+ */
+export function hintHasContent(hint) {
+  const content = hint.content || '';
+  const text = stripTags(content).replace(/&nbsp;/g, ' ');
+  return text.trim().length > 0 || EMBEDDED_MEDIA.test(content);
+}
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/parseItem.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/parseItem.js
index d0bccb018c..ae4c18ddcf 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/parseItem.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/parseItem.js
@@ -1,52 +1,9 @@
-import { QTI_INTERACTION_TAGS, INLINE_INTERACTION_TAGS } from '../constants';
+import { QTI_INTERACTION_TAGS } from '../constants';
+import { isInlineInteraction } from '../interactions/descriptors';
+import { parseHints } from './hints';
+import { parseXML } from './xml';
 
 const serializer = new XMLSerializer();
-const parser = new DOMParser();
-
-/**
- * Parses a QTI XML or HTML string into a Document.
- *
- * @param {string} xmlString - Raw QTI XML (or HTML fragment) string
- * @param {string} [mimeType='text/xml'] - Parse mode. `'text/xml'` runs the
- *   `parsererror` check; `'text/html'` parses leniently and never throws.
- * @returns {Document} Parsed XML or HTML Document
- * @throws {Error} If parsing as `'text/xml'` and the input is malformed or
- *   contains a parsererror. HTML parsing never throws.
- */
-export function parseXML(xmlString, mimeType = 'text/xml') {
-  let input = xmlString;
-  if (mimeType === 'text/xml') {
-    input = xmlString.replace(/ xmlns="[^"]*"/, '');
-  }
-
-  const doc = parser.parseFromString(input, mimeType);
-
-  // DOMParser never throws — it signals failure via a <parsererror> node. This
-  // only applies to XML: the HTML parser recovers silently and never emits one,
-  // so an HTML document literally containing a <parsererror> must not trip it.
-  if (mimeType === 'text/xml') {
-    const error = doc.querySelector('parsererror');
-    if (error) {
-      throw new Error(`QTI XML parse error: ${error.textContent.trim()}`);
-    }
-  }
-
-  return doc;
-}
-
-/**
- * Extract the inner HTML of the first <qti-prompt> child of an interaction element.
- * Returns an empty string when no prompt element is present.
- * Using innerHTML (not textContent) preserves rich inline markup (<p>, <strong>, etc.)
- * for round-trip fidelity.
- *
- * @param {Element} interactionEl - The <qti-*-interaction> root element
- * @returns {string}
- */
-export function getPromptHTML(interactionEl) {
-  const promptEl = interactionEl.querySelector('qti-prompt');
-  return promptEl ? promptEl.innerHTML : '';
-}
 
 /**
  * Parses a raw QTI XML string into the structured ItemModel.
@@ -55,16 +12,23 @@ export function getPromptHTML(interactionEl) {
  * A response declaration belongs to an interaction when the declaration's
  * `identifier` matches the interaction's `response-identifier` attribute.
  *
- * For descriptors with `placement: 'inline'`, `bodyXml` is the serialized
- * `<qti-item-body>` rather than the interaction element alone, so the
- * interaction's parse() function can recover prompt content from body siblings.
+ * An interaction its descriptor declares as inline gets the serialized
+ * `<qti-item-body>` as its `bodyXml` rather than the interaction element alone,
+ * so its parse() can recover prompt content from body siblings.
+ *
+ * Hints belong to the item rather than to any one interaction, so they come back
+ * alongside `interactions` rather than inside them. So does the body: an item can carry
+ * content with no interaction this editor recognises, and a caller that reassembles the
+ * item needs its body whether or not it found one.
  *
  * @param {string} rawData - Raw QTI XML string (the full assessment item XML)
  * @returns {{
  *   identifier: string,
  *   title: string,
  *   language: string,
- *   interactions: Array<{ bodyXml: string, responseDeclarations: string[] }>
+ *   itemBodyXml: string,
+ *   interactions: Array<{ bodyXml: string, responseDeclarations: string[] }>,
+ *   hints: Array<{ id: string, content: string }>
  * }}
  */
 export function parseItem(rawData) {
@@ -93,7 +57,7 @@ export function parseItem(rawData) {
         .filter(d => d.getAttribute('identifier') === responseId)
         .map(d => serializer.serializeToString(d));
 
-      const isInline = INLINE_INTERACTION_TAGS.has(el.tagName.toLowerCase());
+      const isInline = isInlineInteraction(el.tagName.toLowerCase());
 
       interactions.push({
         bodyXml: isInline ? serializer.serializeToString(body) : serializer.serializeToString(el),
@@ -102,5 +66,12 @@ export function parseItem(rawData) {
     }
   }
 
-  return { identifier, title, language, interactions };
+  return {
+    identifier,
+    title,
+    language,
+    itemBodyXml: body ? serializer.serializeToString(body) : '',
+    interactions,
+    hints: parseHints(doc),
+  };
 }
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/QTIDeclaration.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/QTIDeclaration.js
index 9941b80309..ac2ef196d1 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/QTIDeclaration.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/QTIDeclaration.js
@@ -330,7 +330,11 @@ export class QTIDeclaration {
       attrs['base-type'] = this.baseType;
     }
 
-    const children = Object.values(this._capabilities).map(cap => cap.getXML());
+    // A capability returns null when it has nothing valid to serialize (e.g. a correct
+    // response with no values); those are dropped rather than emitted empty.
+    const children = Object.values(this._capabilities)
+      .map(cap => cap.getXML())
+      .filter(Boolean);
 
     return buildXmlNode({ tag: this.tag, attrs, children });
   }
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/QTISanitizer.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/QTISanitizer.js
index 7c50c8b240..97736127db 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/QTISanitizer.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/QTISanitizer.js
@@ -4,7 +4,7 @@
  * @module serialization/qti/QTISanitizer
  */
 
-import { parseXML } from '../parseItem';
+import { parseXML } from '../xml';
 
 // Valid QTI 3.0 base-type values — https://www.imsglobal.org/spec/qti/v3p0/impl/#h.wq4e8lbs4wa9
 const VALID_BASE_TYPES = new Set([
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/__tests__/declarations/correctResponse.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/__tests__/declarations/correctResponse.spec.js
index 7aa7c250fc..3b9f87fe08 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/__tests__/declarations/correctResponse.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/__tests__/declarations/correctResponse.spec.js
@@ -110,10 +110,10 @@ describe('CorrectResponse', () => {
       expect(values).toEqual(['ChoiceA', 'ChoiceC']);
     });
 
-    it('produces an empty qti-correct-response when values is empty', () => {
-      expect(
-        new CorrectResponse([], makeDeclaration()).getXML().querySelectorAll('qti-value').length,
-      ).toBe(0);
+    it('produces no element at all when values is empty', () => {
+      // The schema requires at least one qti-value inside qti-correct-response, so an
+      // answer-less declaration omits the element instead of emitting an empty one.
+      expect(new CorrectResponse([], makeDeclaration()).getXML()).toBeNull();
     });
 
     it('round-trips: qti-value child carries correct text', () => {
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/__tests__/testUtils.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/__tests__/testUtils.js
index 0d95a0b659..d1d9b50adb 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/__tests__/testUtils.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/__tests__/testUtils.js
@@ -1,7 +1,7 @@
 /**
  * Shared XML parse helper for declaration tests.
  */
-import { parseXML as parseXMLDocument } from '../../parseItem';
+import { parseXML as parseXMLDocument } from '../../xml';
 
 const serializer = new XMLSerializer();
 
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/declarations/correctResponse.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/declarations/correctResponse.js
index e492ea8c9b..c492e4712d 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/declarations/correctResponse.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/declarations/correctResponse.js
@@ -42,9 +42,16 @@ export default class CorrectResponse {
   }
 
   /**
-   * @returns {Element}
+   * `qti-correct-response` is optional but must hold at least one `qti-value` when
+   * present, so an answer-less declaration omits the element rather than emitting an
+   * empty one the schema would reject.
+   *
+   * @returns {Element|null}
    */
   getXML() {
+    if (!this._values.length) {
+      return null;
+    }
     return buildXmlNode({
       tag: 'qti-correct-response',
       children: this._declaration
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/declarations/defaultValue.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/declarations/defaultValue.js
index 00432f8e0b..0712c94f42 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/declarations/defaultValue.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/qti/declarations/defaultValue.js
@@ -40,9 +40,15 @@ export default class DefaultValue {
   }
 
   /**
-   * @returns {Element}
+   * Like `qti-correct-response`, the element is optional but must hold at least one
+   * `qti-value`, so an empty one is omitted rather than emitted.
+   *
+   * @returns {Element|null}
    */
   getXML() {
+    if (!this._values.length) {
+      return null;
+    }
     return buildXmlNode({
       tag: 'qti-default-value',
       children: this._declaration
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/xml.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/xml.js
new file mode 100644
index 0000000000..c4740c2021
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/serialization/xml.js
@@ -0,0 +1,49 @@
+/**
+ * DOM helpers for reading QTI XML.
+ */
+
+const parser = new DOMParser();
+
+/**
+ * Parses a QTI XML or HTML string into a Document.
+ *
+ * @param {string} xmlString - Raw QTI XML (or HTML fragment) string
+ * @param {string} [mimeType='text/xml'] - Parse mode. `'text/xml'` runs the
+ *   `parsererror` check; `'text/html'` parses leniently and never throws.
+ * @returns {Document} Parsed XML or HTML Document
+ * @throws {Error} If parsing as `'text/xml'` and the input is malformed or
+ *   contains a parsererror. HTML parsing never throws.
+ */
+export function parseXML(xmlString, mimeType = 'text/xml') {
+  // Namespace declarations are left in place. Everything here looks elements up by local
+  // name, which matches in any namespace, so removing them buys nothing — while a foreign
+  // namespace a nested subtree does need (MathML from the formula button, SVG) would be
+  // lost with them, and inheriting the QTI namespace instead makes the item invalid.
+  const doc = parser.parseFromString(xmlString, mimeType);
+
+  // DOMParser never throws — it signals failure via a <parsererror> node. This
+  // only applies to XML: the HTML parser recovers silently and never emits one,
+  // so an HTML document literally containing a <parsererror> must not trip it.
+  if (mimeType === 'text/xml') {
+    const error = doc.querySelector('parsererror');
+    if (error) {
+      throw new Error(`QTI XML parse error: ${error.textContent.trim()}`);
+    }
+  }
+
+  return doc;
+}
+
+/**
+ * Extract the inner HTML of the first <qti-prompt> child of an interaction element.
+ * Returns an empty string when no prompt element is present.
+ * Using innerHTML (not textContent) preserves rich inline markup (<p>, <strong>, etc.)
+ * for round-trip fidelity.
+ *
+ * @param {Element} interactionEl - The <qti-*-interaction> root element
+ * @returns {string}
+ */
+export function getPromptHTML(interactionEl) {
+  const promptEl = interactionEl.querySelector('qti-prompt');
+  return promptEl ? promptEl.innerHTML : '';
+}
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/useQTIEditorActions.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/useQTIEditorActions.js
index cd3b77c29a..62fbbb40d1 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/useQTIEditorActions.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/useQTIEditorActions.js
@@ -1,4 +1,5 @@
 import { qtiEditorStrings } from './qtiEditorStrings';
+import { AssessmentItemTypes } from './constants';
 
 /**
  * Generates the toolbar actions array for a specific QTI item in the list.
@@ -32,7 +33,8 @@ export default function useQTIEditorActions({
       label: toolbarLabelEdit$(),
       handler: () => openItem(item.assessment_id),
       collapsed: false,
-      disabled: isEditMode,
+      // Items authored elsewhere (e.g. Perseus) can be moved or removed, but not opened.
+      disabled: isEditMode || item.type !== AssessmentItemTypes.QTI,
     });
 
     result.push({
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/utils/__tests__/math.spec.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/utils/__tests__/math.spec.js
new file mode 100644
index 0000000000..346742fa4e
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/utils/__tests__/math.spec.js
@@ -0,0 +1,23 @@
+import { floatOrIntRegex } from '../math';
+
+describe('floatOrIntRegex', () => {
+  it('tests true for valid values', () => {
+    [
+      '1.5', // Float
+      '-4.5', // Signed Float
+      '+1', // Signed Int
+      '10e5', // Exponentiation
+      '-15.3e5', // Combo
+      '-12345.67890e98', // Combo 2
+    ].forEach(v => expect(floatOrIntRegex.test(v)).toBe(true));
+  });
+
+  it('tests false for invalid values', () => {
+    [
+      'i * 1.5', // Math
+      'one.point.five', // Text
+      '10 5 0 100', // Spaces
+      '1.2.3.4', // IP
+    ].forEach(v => expect(floatOrIntRegex.test(v)).toBe(false));
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/utils/testingFixtures.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/utils/testingFixtures.js
index 24c12a77c2..0cd93d610d 100644
--- a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/utils/testingFixtures.js
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/utils/testingFixtures.js
@@ -91,6 +91,196 @@ export const VALID_CHOICE_ITEM_DOCUMENT = `<?xml version="1.0" encoding="UTF-8"?
   </qti-item-body>
 </qti-assessment-item>`;
 
+export const CHOICE_ITEM_DOCUMENT_NO_PROMPT = `<?xml version="1.0" encoding="UTF-8"?>
+<qti-assessment-item
+  xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"
+  identifier="item-test-2"
+  title="Test Question"
+  adaptive="false"
+  time-dependent="false"
+  xml:lang="en"
+>
+  <qti-response-declaration
+    identifier="RESPONSE"
+    cardinality="single"
+    base-type="identifier"
+  >
+    <qti-correct-response>
+      <qti-value>choice-a</qti-value>
+    </qti-correct-response>
+  </qti-response-declaration>
+
+  <qti-item-body>
+    <qti-choice-interaction response-identifier="RESPONSE" max-choices="1">
+      <qti-simple-choice identifier="choice-a">A</qti-simple-choice>
+      <qti-simple-choice identifier="choice-b">B</qti-simple-choice>
+    </qti-choice-interaction>
+  </qti-item-body>
+</qti-assessment-item>`;
+
+export const CHOICE_ITEM_DOCUMENT_NO_CORRECT_ANSWER = `<?xml version="1.0" encoding="UTF-8"?>
+<qti-assessment-item
+  xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"
+  identifier="item-test-3"
+  title="Test Question"
+  adaptive="false"
+  time-dependent="false"
+  xml:lang="en"
+>
+  <qti-response-declaration
+    identifier="RESPONSE"
+    cardinality="single"
+    base-type="identifier"
+  />
+
+  <qti-item-body>
+    <qti-choice-interaction response-identifier="RESPONSE" max-choices="1">
+      <qti-prompt>Pick one.</qti-prompt>
+      <qti-simple-choice identifier="choice-a">A</qti-simple-choice>
+      <qti-simple-choice identifier="choice-b">B</qti-simple-choice>
+    </qti-choice-interaction>
+  </qti-item-body>
+</qti-assessment-item>`;
+
+/**
+ * An ordering item missing its prompt — used to check that an interaction which reports
+ * nothing to the card is still reported as incomplete.
+ */
+export const ORDERING_ITEM_DOCUMENT_NO_PROMPT = `<?xml version="1.0" encoding="UTF-8"?>
+<qti-assessment-item
+  xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"
+  identifier="item-ordering"
+  title="Ordering"
+  adaptive="false"
+  time-dependent="false"
+  xml:lang="en"
+>
+  <qti-response-declaration identifier="RESPONSE" cardinality="ordered" base-type="identifier">
+    <qti-correct-response>
+      <qti-value>order_aaa11111</qti-value>
+      <qti-value>order_bbb22222</qti-value>
+    </qti-correct-response>
+  </qti-response-declaration>
+
+  <qti-item-body>
+    <qti-order-interaction response-identifier="RESPONSE" orientation="vertical" shuffle="true">
+      <qti-simple-choice identifier="order_aaa11111">Mercury</qti-simple-choice>
+      <qti-simple-choice identifier="order_bbb22222">Venus</qti-simple-choice>
+    </qti-order-interaction>
+  </qti-item-body>
+</qti-assessment-item>`;
+
+/**
+ * A text-entry item whose declaration carries no correct response — an open-ended
+ * question, which only surveys accept.
+ */
+export const FREE_RESPONSE_ITEM_DOCUMENT = `<?xml version="1.0" encoding="UTF-8"?>
+<qti-assessment-item
+  xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"
+  identifier="item-free"
+  title="Free Response"
+  adaptive="false"
+  time-dependent="false"
+  xml:lang="en"
+>
+  <qti-response-declaration identifier="RESPONSE" cardinality="single" base-type="string" />
+
+  <qti-item-body>
+    <p>Tell us what you think.</p>
+    <p><qti-text-entry-interaction response-identifier="RESPONSE" /></p>
+  </qti-item-body>
+</qti-assessment-item>`;
+
+export const NO_INTERACTION_ITEM_DOCUMENT = `<?xml version="1.0" encoding="UTF-8"?>
+<qti-assessment-item
+  xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"
+  identifier="item-empty"
+  title="Empty Question"
+  adaptive="false"
+  time-dependent="false"
+  xml:lang="en"
+>
+  <qti-item-body>
+    <p>Just some text.</p>
+  </qti-item-body>
+</qti-assessment-item>`;
+
+/**
+ * A converted legacy question, whose hints the backend carries in a catalog. Indented as
+ * the API serves it, so the parse has to cope with the whitespace inside each card.
+ */
+export const CHOICE_ITEM_DOCUMENT_WITH_HINTS = `<?xml version="1.0" encoding="UTF-8"?>
+<qti-assessment-item
+  xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"
+  identifier="item-hints"
+  title="Hinted Question"
+  adaptive="false"
+  time-dependent="false"
+  xml:lang="en"
+>
+  <qti-response-declaration identifier="RESPONSE" cardinality="single" base-type="identifier">
+    <qti-correct-response>
+      <qti-value>choice-a</qti-value>
+    </qti-correct-response>
+  </qti-response-declaration>
+
+  <qti-item-body>
+    <qti-choice-interaction response-identifier="RESPONSE" max-choices="1">
+      <qti-prompt>Pick one.</qti-prompt>
+      <qti-simple-choice identifier="choice-a">A</qti-simple-choice>
+      <qti-simple-choice identifier="choice-b">B</qti-simple-choice>
+    </qti-choice-interaction>
+  </qti-item-body>
+  <qti-catalog-info>
+    <qti-catalog id="kolibri-hints">
+      <qti-card support="ext:kolibri-hint">
+        <qti-html-content>
+          <p>test</p>
+        </qti-html-content>
+      </qti-card>
+      <qti-card support="ext:kolibri-hint">
+        <qti-html-content>
+          <p>test2 2</p>
+        </qti-html-content>
+      </qti-card>
+      <qti-card support="ext:kolibri-hint">
+        <qti-html-content>
+          <p>test3 3</p>
+        </qti-html-content>
+      </qti-card>
+    </qti-catalog>
+  </qti-catalog-info>
+</qti-assessment-item>`;
+
+/**
+ * A converted question with nothing to answer, which still carries its text in the body and
+ * hints in its catalog. No interaction means no interaction editor, so the only thing an
+ * author can edit here is a hint — and that must not cost the body.
+ */
+export const NO_INTERACTION_ITEM_WITH_HINTS = `<?xml version="1.0" encoding="UTF-8"?>
+<qti-assessment-item
+  xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"
+  identifier="item-no-interaction-hints"
+  title="Answerless Question"
+  adaptive="false"
+  time-dependent="false"
+  xml:lang="en"
+>
+  <qti-item-body>
+    <div><p>What is the capital of France?</p></div>
+  </qti-item-body>
+  <qti-catalog-info>
+    <qti-catalog id="kolibri-hints">
+      <qti-card support="ext:kolibri-hint">
+        <qti-html-content><p>It is on the Seine</p></qti-html-content>
+      </qti-card>
+      <qti-card support="ext:kolibri-hint">
+        <qti-html-content><p>Starts with a P</p></qti-html-content>
+      </qti-card>
+    </qti-catalog>
+  </qti-catalog-info>
+</qti-assessment-item>`;
+
 export const TWO_INTERACTIONS_DOCUMENT = `<?xml version="1.0" encoding="UTF-8"?>
 <qti-assessment-item
   xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0"
diff --git a/contentcuration/contentcuration/frontend/shared/views/QTIEditor/validateItem.js b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/validateItem.js
new file mode 100644
index 0000000000..39200af0f5
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/QTIEditor/validateItem.js
@@ -0,0 +1,80 @@
+import { QuestionType, ValidationError } from './constants';
+import { parseItem } from './serialization/parseItem';
+import { resolveDescriptor } from './interactions/resolveDescriptor';
+
+/**
+ * Validate what is wrong with an item as a whole, rather than with one of its interactions:
+ * whether there is anything to answer, and whether the kind of question it asks is one the
+ * consumer accepts.
+ *
+ * These are the only errors an interaction's editor cannot report. An item with nothing to
+ * answer mounts no editor at all, and whether free responses are acceptable is the
+ * consumer's policy rather than anything the interaction knows — so an editor that is
+ * showing an item still asks this about it.
+ *
+ * Takes what the caller has already read out of the item, so neither the editor nor
+ * validateQtiItem has to parse the XML again to ask.
+ *
+ * @param {object} item
+ * @param {Array} item.interactions - The item's interaction blocks
+ * @param {Array<string|null>} [item.questionTypes] - The question type of each interaction,
+ *   as resolved by the caller
+ * @param {boolean} [item.allowFreeResponse] - Whether a question with no correct answer
+ *   counts as valid. Consumers that score their questions pass false.
+ * @returns {Array<{ code: string }>} Empty when there is nothing wrong with the item itself
+ */
+export function validateItemShape({ interactions, questionTypes = [], allowFreeResponse = true }) {
+  if (!interactions.length) {
+    return [{ code: ValidationError.NO_INTERACTION }];
+  }
+  if (!allowFreeResponse && questionTypes.includes(QuestionType.FREE_RESPONSE)) {
+    return [{ code: ValidationError.FREE_RESPONSE_NOT_ALLOWED }];
+  }
+  return [];
+}
+
+/**
+ * Validate a QTI assessment item from its raw XML, without rendering it.
+ *
+ * @param {string} rawData - Full QTI assessment item XML
+ * @param {object} [options]
+ * @param {boolean} [options.allowFreeResponse] - Whether a free-response question counts
+ *   as valid. Consumers that only accept scorable questions pass false.
+ * @returns {Array<{ code: string, id?: string }>} Empty when the item is valid
+ */
+export function validateQtiItem(rawData, { allowFreeResponse = true } = {}) {
+  if (!rawData) {
+    return [{ code: ValidationError.NO_INTERACTION }];
+  }
+
+  let item;
+  try {
+    item = parseItem(rawData);
+  } catch {
+    return [{ code: ValidationError.PARSE_ERROR }];
+  }
+
+  const resolved = item.interactions.map(interaction => ({
+    ...interaction,
+    ...resolveDescriptor(interaction.bodyXml, interaction.responseDeclarations),
+  }));
+
+  const errors = validateItemShape({
+    interactions: item.interactions,
+    questionTypes: resolved.map(({ questionType }) => questionType),
+    allowFreeResponse,
+  });
+  if (errors.length) {
+    return errors;
+  }
+
+  for (const { descriptor, questionType, error, bodyXml, responseDeclarations } of resolved) {
+    if (error) {
+      errors.push({ code: error });
+      continue;
+    }
+    const state = descriptor.parse(bodyXml, responseDeclarations);
+    errors.push(...descriptor.validate(state, questionType));
+  }
+  return errors;
+}
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue
index 3ebd220b37..bb2eb37666 100644
--- a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/TipTapEditor.vue
@@ -132,6 +132,7 @@
   import { useMathHandling } from './composables/useMathHandling';
   import FormulasMenu from './components/math/FormulasMenu.vue';
   import { preprocessMarkdown } from './utils/markdown';
+  import { resolveImageSrcs, toStoredImageSrcs } from './utils/imageSrc';
   import MobileTopBar from './components/toolbar/MobileTopBar.vue';
   import MobileFormattingBar from './components/toolbar/MobileFormattingBar.vue';
   import { getTipTapEditorStrings } from './TipTapEditorStrings';
@@ -216,7 +217,10 @@
 
       const getContent = () => {
         if (!editor.value || !isReady.value) return '';
-        if (props.format === 'html') return editor.value.getHTML();
+        // Image srcs are resolved for display on the way in, so they are reduced
+        // back to their stored form here — leaving this the one place that reads
+        // content out, whichever form the editor happens to be holding.
+        if (props.format === 'html') return toStoredImageSrcs(editor.value.getHTML());
         if (!editor.value.storage?.markdown) return '';
         return editor.value.storage.markdown.getMarkdown();
       };
@@ -252,7 +256,7 @@
           }
 
           const processedContent =
-            props.format === 'html' ? newValue : preprocessMarkdown(newValue);
+            props.format === 'html' ? resolveImageSrcs(newValue) : preprocessMarkdown(newValue);
 
           if (!editor.value) {
             initializeEditor(processedContent, props.mode, {
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/EditorToolbar.vue b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/EditorToolbar.vue
index c159c85207..cb5cfbffbf 100644
--- a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/EditorToolbar.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/EditorToolbar.vue
@@ -167,6 +167,7 @@
         canClearFormat,
         historyActions,
         alignAction,
+        alignActionHidden,
         textActions,
         listActions,
         insertTools,
@@ -240,9 +241,8 @@
         {
           name: 'align',
           groupActions: [alignAction.value],
-          // Perseus flavoured markdown does not support alignment,
-          // so we disable this for now until we stop using markdown as the primary target
-          hide: true,
+          // Reason on the flag, in useToolbarActions.js.
+          hide: alignActionHidden,
         },
         {
           name: 'clearFormat',
@@ -267,9 +267,6 @@
           role: 'group',
           label: scriptFormatting$(),
           groupActions: scriptActions.value,
-          // Perseus flavoured markdown does not support super and sub script,
-          // so we disable this for now until we stop using markdown as the primary target
-          hide: true,
         },
         {
           name: 'insert',
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/toolbar/MobileFormattingBar.vue b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/toolbar/MobileFormattingBar.vue
index c06e19a990..35bc557d72 100644
--- a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/toolbar/MobileFormattingBar.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/toolbar/MobileFormattingBar.vue
@@ -88,17 +88,16 @@
         :is-active="action.isActive"
         @click="action.handler"
       />
-      <!-- Perseus flavoured markdown does not support alignment,
-        so we disable this for now until we stop using markdown as the primary target
-      <ToolbarDivider />
-      <ToolbarButton
-        :title="alignAction.title"
-        :icon="alignAction.icon"
-        :is-active="alignAction.isActive"
-        @click="alignAction.handler"
-      /> -->
-      <!-- Perseus flavoured markdown does not support super and sub script,
-        so we disable this for now until we stop using markdown as the primary target
+      <!-- Hidden while alignActionHidden is set; see useToolbarActions.js. -->
+      <template v-if="!alignActionHidden">
+        <ToolbarDivider />
+        <ToolbarButton
+          :title="alignAction.title"
+          :icon="alignAction.icon"
+          :is-active="alignAction.isActive"
+          @click="alignAction.handler"
+        />
+      </template>
       <ToolbarDivider />
       <ToolbarButton
         v-for="action in scriptActions"
@@ -107,7 +106,7 @@
         :icon="action.icon"
         :is-active="action.isActive"
         @click="action.handler"
-      /> -->
+      />
       <ToolbarDivider />
       <ToolbarButton
         v-for="tool in insertTools"
@@ -153,7 +152,14 @@
         textFormattingToolbar$,
       } = getTipTapEditorStrings();
 
-      const { textActions, listActions, insertTools } = useToolbarActions(emit);
+      const {
+        textActions,
+        listActions,
+        scriptActions,
+        alignAction,
+        alignActionHidden,
+        insertTools,
+      } = useToolbarActions(emit);
 
       const { canIncreaseFormat, canDecreaseFormat, increaseFormat, decreaseFormat } =
         useFormatControls();
@@ -222,6 +228,9 @@
         toolbarRef,
         textActions,
         listActions,
+        scriptActions,
+        alignAction,
+        alignActionHidden,
         insertTools,
         toggleToolbar,
         canIncreaseFormat,
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/toolbar/ToolbarButton.vue b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/toolbar/ToolbarButton.vue
index b854262680..cf8d992e5e 100644
--- a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/toolbar/ToolbarButton.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/components/toolbar/ToolbarButton.vue
@@ -9,7 +9,7 @@
     :aria-label="title"
     :aria-pressed="isActive ? 'true' : 'false'"
     @mousedown.prevent
-    @click="handleClick"
+    @click.stop="handleClick"
     @keydown="handleKeydown"
   >
     <img
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/composables/useEditor.js b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/composables/useEditor.js
index cd4a75d69f..03bd374d0c 100644
--- a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/composables/useEditor.js
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/composables/useEditor.js
@@ -25,6 +25,12 @@ export function useEditor() {
         StarterKitExtension.configure({
           codeBlock: false, // Disable default code block to use the extended version
           link: false, // Disable default link to use the custom link extension
+          // The QTI 3.0 HTML profile has no <u> or <s>, so the item schema rejects an
+          // item carrying either and the save fails. Dropping the marks rather than only
+          // their toolbar buttons also takes away the keyboard shortcuts and the paste
+          // path, which would otherwise still produce content that cannot be saved.
+          strike: false,
+          underline: false,
         }),
         CodeBlockSyntaxHighlight,
         Small,
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/composables/useToolbarActions.js b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/composables/useToolbarActions.js
index ea53b89f77..42a672d9da 100644
--- a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/composables/useToolbarActions.js
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/composables/useToolbarActions.js
@@ -5,6 +5,25 @@ import { transformPastedHTML } from '../utils/pasteTransform';
 export function useToolbarActions(emit) {
   const editor = inject('editor', null);
 
+  /**
+   * Drop the actions marked `hide`, which every toolbar honours — the desktop one and
+   * the mobile bars alike. Same convention as the hidden groups in EditorToolbar.vue:
+   * the action stays defined, with the reason it is not offered, so restoring it is a
+   * matter of deleting one flag.
+   */
+  const visible = actions => actions.filter(action => !action.hide);
+
+  /*
+   * TextAlign writes `style="text-align: …"`, and the QTI 3.0 HTML profile declares no
+   * style attribute — the item schema admits one only through its lax wildcard, so an
+   * aligned paragraph saves and then ships as non-conformant QTI. The image extension
+   * carries alignment as `data-text-align` instead, which the schema does allow.
+   *
+   * Kept out of `alignAction` so a toolbar can ask whether to offer the control without
+   * evaluating the action, which reads the editor's current selection to pick its icon.
+   */
+  const alignActionHidden = true;
+
   // helper
   const getEffectiveAlignment = editorInstance => {
     if (!editorInstance) return 'left';
@@ -345,36 +364,44 @@ export function useToolbarActions(emit) {
     },
   ]);
 
-  const textActions = computed(() => [
-    {
-      name: 'bold',
-      title: bold$(),
-      icon: require('../../assets/icon-bold.svg'),
-      handler: handleBold,
-      isActive: isMarkActive('bold'),
-    },
-    {
-      name: 'italic',
-      title: italic$(),
-      icon: require('../../assets/icon-italic.svg'),
-      handler: handleItalic,
-      isActive: isMarkActive('italic'),
-    },
-    {
-      name: 'underline',
-      title: underline$(),
-      icon: require('../../assets/icon-underline.svg'),
-      handler: handleUnderline,
-      isActive: isMarkActive('underline'),
-    },
-    {
-      name: 'strikethrough',
-      title: strikethrough$(),
-      icon: require('../../assets/icon-strikethrough.svg'),
-      handler: handleStrikethrough,
-      isActive: isMarkActive('strike'),
-    },
-  ]);
+  const textActions = computed(() =>
+    visible([
+      {
+        name: 'bold',
+        title: bold$(),
+        icon: require('../../assets/icon-bold.svg'),
+        handler: handleBold,
+        isActive: isMarkActive('bold'),
+      },
+      {
+        name: 'italic',
+        title: italic$(),
+        icon: require('../../assets/icon-italic.svg'),
+        handler: handleItalic,
+        isActive: isMarkActive('italic'),
+      },
+      {
+        name: 'underline',
+        title: underline$(),
+        icon: require('../../assets/icon-underline.svg'),
+        handler: handleUnderline,
+        isActive: isMarkActive('underline'),
+        // The QTI 3.0 HTML profile has no <u> or <s>, so the item schema rejects an item
+        // carrying either and the save fails. Both marks are switched off in useEditor.js
+        // as well, since hiding a button leaves its keyboard shortcut behind — offering
+        // these again means undoing both halves.
+        hide: true,
+      },
+      {
+        name: 'strikethrough',
+        title: strikethrough$(),
+        icon: require('../../assets/icon-strikethrough.svg'),
+        handler: handleStrikethrough,
+        isActive: isMarkActive('strike'),
+        hide: true,
+      },
+    ]),
+  );
 
   const listActions = computed(() => [
     {
@@ -414,34 +441,40 @@ export function useToolbarActions(emit) {
     },
   ]);
 
-  const insertTools = computed(() => [
-    {
-      name: 'image',
-      title: insertImage$(),
-      icon: require('../../assets/icon-insertImage.svg'),
-      handler: handleInsertImage,
-    },
-    {
-      name: 'link',
-      title: insertLink$(),
-      icon: require('../../assets/icon-link.svg'),
-      isActive: isMarkActive('link'),
-      handler: handleInsertLink,
-    },
-    {
-      name: 'math',
-      title: mathFormula$(),
-      icon: require('../../assets/icon-formula.svg'),
-      handler: handleMath,
-    },
-    {
-      name: 'code',
-      title: codeBlock$(),
-      icon: require('../../assets/icon-codeblock.svg'),
-      handler: handleCodeBlock,
-      isActive: isMarkActive('codeBlock'),
-    },
-  ]);
+  const insertTools = computed(() =>
+    visible([
+      {
+        name: 'image',
+        title: insertImage$(),
+        icon: require('../../assets/icon-insertImage.svg'),
+        handler: handleInsertImage,
+      },
+      {
+        name: 'link',
+        title: insertLink$(),
+        icon: require('../../assets/icon-link.svg'),
+        isActive: isMarkActive('link'),
+        handler: handleInsertLink,
+        // Legacy conversion unwraps anchors, since one has nothing to navigate to on a
+        // device with no internet access (utils/assessment/qti/convert.py). Hidden so the
+        // editor does not offer what a converted question cannot keep.
+        hide: true,
+      },
+      {
+        name: 'math',
+        title: mathFormula$(),
+        icon: require('../../assets/icon-formula.svg'),
+        handler: handleMath,
+      },
+      {
+        name: 'code',
+        title: codeBlock$(),
+        icon: require('../../assets/icon-codeblock.svg'),
+        handler: handleCodeBlock,
+        isActive: isMarkActive('codeBlock'),
+      },
+    ]),
+  );
 
   const minimizeAction = {
     name: 'minimize',
@@ -495,6 +528,7 @@ export function useToolbarActions(emit) {
     historyActions,
     textActions,
     alignAction,
+    alignActionHidden,
     listActions,
     scriptActions,
     insertTools,
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/utils/imageSrc.js b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/utils/imageSrc.js
new file mode 100644
index 0000000000..b2ade17999
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/TipTapEditor/utils/imageSrc.js
@@ -0,0 +1,70 @@
+/**
+ * Translates image sources between the two forms they take in HTML content.
+ *
+ * Stored content references an image by bare `<checksum>.<ext>` filename, which is
+ * what publishing rewrites into a package's images/ directory (see the backend's
+ * utils/assessment/qti/media.py) and what the QTI Img model accepts — it rejects
+ * absolute paths outright. The browser, though, needs a URL it can load, so the
+ * filename is resolved to its storage URL on the way into the editor and reduced
+ * back to the filename on the way out.
+ */
+import { storageUrl } from 'shared/vuex/file/utils';
+
+// Kept identical to QTI_CHECKSUM_FILEaNAME_REGEX in media.py, which decides on the
+// backend which references publishing is able to resolve.
+const CHECKSUM_FILENAME = /^([a-f0-9]{32})\.([0-9a-z]+)$/;
+
+const IMG_TAG = /<img\b[^>]*>/gi;
+const SRC_ATTRIBUTE = /\bsrc\s*=\s*(["'])(.*?)\1/i;
+
+/**
+ * Rewrite the src of every <img> in an HTML string.
+ *
+ * A targeted substitution rather than a parse-and-serialize round trip, so
+ * everything else about the markup — attribute order, self-closing style,
+ * whitespace — survives untouched.
+ *
+ * @param {string} html
+ * @param {function(string): string} mapSrc
+ * @returns {string}
+ */
+function mapImageSrcs(html, mapSrc) {
+  if (!html) {
+    return html;
+  }
+  return html.replace(IMG_TAG, tag =>
+    tag.replace(SRC_ATTRIBUTE, (attribute, quote, src) => {
+      const mapped = mapSrc(src);
+      return mapped === src ? attribute : `src=${quote}${mapped}${quote}`;
+    }),
+  );
+}
+
+/**
+ * Turn stored `<checksum>.<ext>` sources into loadable storage URLs.
+ *
+ * @param {string} html
+ * @returns {string}
+ */
+export function resolveImageSrcs(html) {
+  return mapImageSrcs(html, src => {
+    const match = CHECKSUM_FILENAME.exec(src);
+    return match ? storageUrl(match[1], match[2]) : src;
+  });
+}
+
+/**
+ * Reduce storage URLs back to the `<checksum>.<ext>` filename that gets stored.
+ *
+ * Sources that are not a checksum filename — a data URI, a remote image — are left
+ * as they are.
+ *
+ * @param {string} html
+ * @returns {string}
+ */
+export function toStoredImageSrcs(html) {
+  return mapImageSrcs(html, src => {
+    const filename = src.split('/').pop();
+    return CHECKSUM_FILENAME.test(filename) ? filename : src;
+  });
+}
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/__tests__/imageSrc.spec.js b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/__tests__/imageSrc.spec.js
new file mode 100644
index 0000000000..54b949c355
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/__tests__/imageSrc.spec.js
@@ -0,0 +1,64 @@
+import { resolveImageSrcs, toStoredImageSrcs } from '../TipTapEditor/utils/imageSrc';
+
+const CHECKSUM = '83ab37e959e03fec7be3e1bf834cb169';
+const FILENAME = `${CHECKSUM}.jpg`;
+const STORAGE_URL = `/content/storage/8/3/${FILENAME}`;
+
+describe('resolveImageSrcs', () => {
+  it('turns a stored filename into its storage URL', () => {
+    expect(resolveImageSrcs(`<img src="${FILENAME}" alt="a" />`)).toBe(
+      `<img src="${STORAGE_URL}" alt="a" />`,
+    );
+  });
+
+  it('keeps the rest of the tag as it was', () => {
+    expect(resolveImageSrcs(`<p>text <img alt="" src='${FILENAME}' width="550"/> more</p>`)).toBe(
+      `<p>text <img alt="" src='${STORAGE_URL}' width="550"/> more</p>`,
+    );
+  });
+
+  it('resolves every image in the content', () => {
+    const html = `<img src="${FILENAME}"><img src="${FILENAME}">`;
+    expect(resolveImageSrcs(html)).toBe(`<img src="${STORAGE_URL}"><img src="${STORAGE_URL}">`);
+  });
+
+  it('leaves an already resolved src alone', () => {
+    expect(resolveImageSrcs(`<img src="${STORAGE_URL}">`)).toBe(`<img src="${STORAGE_URL}">`);
+  });
+
+  it('leaves a src that is not a checksum filename alone', () => {
+    const html = '<img src="data:image/png;base64,AAA"><img src="https://example.com/a.png">';
+    expect(resolveImageSrcs(html)).toBe(html);
+  });
+
+  it('ignores a src outside an img tag', () => {
+    const html = `<video src="${FILENAME}"></video>`;
+    expect(resolveImageSrcs(html)).toBe(html);
+  });
+
+  it('returns empty content unchanged', () => {
+    expect(resolveImageSrcs('')).toBe('');
+  });
+});
+
+describe('toStoredImageSrcs', () => {
+  it('reduces a storage URL to the filename that gets stored', () => {
+    expect(toStoredImageSrcs(`<img src="${STORAGE_URL}" alt="a" />`)).toBe(
+      `<img src="${FILENAME}" alt="a" />`,
+    );
+  });
+
+  it('leaves an already stored src alone', () => {
+    expect(toStoredImageSrcs(`<img src="${FILENAME}">`)).toBe(`<img src="${FILENAME}">`);
+  });
+
+  it('leaves a src that is not a checksum filename alone', () => {
+    const html = '<img src="data:image/png;base64,AAA"><img src="https://example.com/a.png">';
+    expect(toStoredImageSrcs(html)).toBe(html);
+  });
+
+  it('is the inverse of resolveImageSrcs', () => {
+    const html = `<p><img src="${FILENAME}" alt="a" width="550" height="364" /></p>`;
+    expect(toStoredImageSrcs(resolveImageSrcs(html))).toBe(html);
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/__tests__/useEditor.spec.js b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/__tests__/useEditor.spec.js
new file mode 100644
index 0000000000..c7696e042a
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/__tests__/useEditor.spec.js
@@ -0,0 +1,34 @@
+import { useEditor } from '../TipTapEditor/composables/useEditor';
+
+/**
+ * The QTI 3.0 HTML profile has no <u> or <s>, so the item schema rejects an item that
+ * carries either and the save fails. Removing the toolbar buttons is not enough on its
+ * own — the marks have to leave the schema, or a keyboard shortcut or a paste still
+ * produces content that cannot be saved.
+ */
+describe('the editor schema', () => {
+  const createEditor = content => {
+    const { initializeEditor, editor } = useEditor();
+    initializeEditor(content);
+    return editor.value;
+  };
+
+  it('carries no mark for the inline formatting a QTI item cannot hold', () => {
+    const marks = Object.keys(createEditor('<p>text</p>').schema.marks);
+    expect(marks).not.toContain('underline');
+    expect(marks).not.toContain('strike');
+  });
+
+  it('keeps the marks a QTI item can hold', () => {
+    const marks = Object.keys(createEditor('<p>text</p>').schema.marks);
+    expect(marks).toContain('bold');
+    expect(marks).toContain('italic');
+  });
+
+  it('unwraps underline and strikethrough it is handed, keeping the text', () => {
+    const editor = createEditor('<p>a <u>b</u> and <s>c</s></p>');
+    expect(editor.getHTML()).not.toContain('<u>');
+    expect(editor.getHTML()).not.toContain('<s>');
+    expect(editor.getText()).toContain('a b and c');
+  });
+});
diff --git a/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/__tests__/useToolbarActions.spec.js b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/__tests__/useToolbarActions.spec.js
new file mode 100644
index 0000000000..3cb14fbf3b
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/shared/views/TipTapEditor/__tests__/useToolbarActions.spec.js
@@ -0,0 +1,37 @@
+import { useToolbarActions } from '../TipTapEditor/composables/useToolbarActions';
+
+const names = actions => actions.value.map(action => action.name);
+
+/**
+ * The actions themselves stay defined and carry a `hide` flag, so what is worth pinning
+ * is that no toolbar hands them out — the desktop one and both mobile bars read these
+ * same arrays.
+ */
+describe('the toolbar', () => {
+  it('offers no underline or strikethrough, which a QTI item cannot carry', () => {
+    const { textActions } = useToolbarActions(jest.fn());
+    expect(names(textActions)).not.toContain('underline');
+    expect(names(textActions)).not.toContain('strikethrough');
+  });
+
+  it('offers no link, which conversion strips for an offline reader', () => {
+    const { insertTools } = useToolbarActions(jest.fn());
+    expect(names(insertTools)).not.toContain('link');
+  });
+
+  it('offers no alignment, which QTI has no attribute to express', () => {
+    const { alignActionHidden } = useToolbarActions(jest.fn());
+    expect(alignActionHidden).toBe(true);
+  });
+
+  it('offers subscript and superscript, which QTI does support', () => {
+    const { scriptActions } = useToolbarActions(jest.fn());
+    expect(names(scriptActions)).toEqual(expect.arrayContaining(['subscript', 'superscript']));
+  });
+
+  it('still offers the formatting a QTI item can carry', () => {
+    const { textActions, insertTools } = useToolbarActions(jest.fn());
+    expect(names(textActions)).toEqual(expect.arrayContaining(['bold', 'italic']));
+    expect(names(insertTools)).toEqual(expect.arrayContaining(['image', 'math', 'code']));
+  });
+});
diff --git a/contentcuration/contentcuration/tests/test_exportchannel.py b/contentcuration/contentcuration/tests/test_exportchannel.py
index d4ff340e6f..6516117a3e 100644
--- a/contentcuration/contentcuration/tests/test_exportchannel.py
+++ b/contentcuration/contentcuration/tests/test_exportchannel.py
@@ -44,6 +44,7 @@
 from contentcuration import models as cc
 from contentcuration.models import CustomTaskMetadata
 from contentcuration.utils.assessment.qti.archive import hex_to_qti_id
+from contentcuration.utils.assessment.qti.validation import parse_qti_xml
 from contentcuration.utils.celery.tasks import generate_task_signature
 from contentcuration.utils.publish import ChannelIncompleteError
 from contentcuration.utils.publish import convert_channel_thumbnail
@@ -985,6 +986,30 @@ def test_native_qti_perseus_ids_match_assessment_metadata(self):
         self.assertTrue(item_stems)
         self.assertEqual(item_stems, assessment_item_ids)
 
+    def test_native_qti_item_declares_the_node_language(self):
+        """The editor has no language of its own to write, so publishing supplies it.
+
+        The other two paths through the same generator stamp the node's language as they
+        build their items; this asserts the raw_data path does not ship items that declare
+        no language, which a package would otherwise mix with ones that do.
+        """
+        node = cc.ContentNode.objects.get(title="Native QTI Exercise")
+        qti_file = node.files.get(preset_id=format_presets.QTI_ZIP)
+        with qti_file.file_on_disk.open("rb") as file_handle:
+            archive = zipfile.ZipFile(file_handle)
+            item_names = [
+                name
+                for name in archive.namelist()
+                if name.startswith("items/") and name.endswith(".xml")
+            ]
+            self.assertTrue(item_names)
+            for name in item_names:
+                root = parse_qti_xml(archive.read(name)).getroot()
+                self.assertEqual(
+                    root.get("{http://www.w3.org/XML/1998/namespace}lang"),
+                    node.language.lang_code if node.language else "en",
+                )
+
     def test_native_qti_unsupported_interaction_publishes_qti_only(self):
         node = cc.ContentNode.objects.get(title="Native QTI Unsupported Exercise")
         self.assertTrue(node.files.filter(preset_id=format_presets.QTI_ZIP).exists())
diff --git a/contentcuration/contentcuration/tests/utils/qti/fixtures/single_selection_no_answers.xml b/contentcuration/contentcuration/tests/utils/qti/fixtures/single_selection_no_answers.xml
new file mode 100644
index 0000000000..1e1ca2458d
--- /dev/null
+++ b/contentcuration/contentcuration/tests/utils/qti/fixtures/single_selection_no_answers.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<qti-assessment-item xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/imsqtiasi_v3p0 https://purl.imsglobal.org/spec/qti/v3p0/schema/xsd/imsqti_asiv3p0p1_v1p0.xsd" identifier="Kq83vEjRWeJCrze8SNFZ4kA" title="Test Question 1" adaptive="false" time-dependent="false" xml:lang="en-US" tool-name="kolibri" tool-version="0.1">
+    <qti-response-declaration identifier="RESPONSE" cardinality="single" base-type="identifier" />
+    <qti-outcome-declaration identifier="SCORE" cardinality="single" base-type="float" />
+    <qti-item-body>
+        <qti-choice-interaction response-identifier="RESPONSE" shuffle="true" max-choices="1" min-choices="0" orientation="vertical">
+            <qti-prompt>
+                <p>What is 2+2?</p>
+            </qti-prompt>
+            <qti-simple-choice identifier="choice_0" show-hide="show" fixed="false" />
+        </qti-choice-interaction>
+    </qti-item-body>
+    <qti-response-processing template="https://purl.imsglobal.org/spec/qti/v3p0/rptemplates/match_correct" />
+</qti-assessment-item>
diff --git a/contentcuration/contentcuration/tests/utils/qti/test_convert.py b/contentcuration/contentcuration/tests/utils/qti/test_convert.py
index 63d5ec32e2..3de6532f61 100644
--- a/contentcuration/contentcuration/tests/utils/qti/test_convert.py
+++ b/contentcuration/contentcuration/tests/utils/qti/test_convert.py
@@ -117,6 +117,57 @@ def test_true_false(self):
         )
         self.assertTrue(validate_qti_item(result.xml.encode("utf-8")).is_valid)
 
+    def test_single_selection_no_answers(self):
+        item = _make_item(
+            type=exercises.SINGLE_SELECTION,
+            question="What is 2+2?",
+            answers=[],
+            randomize=True,
+            assessment_id="abcdef1234567890abcdef1234567890",
+        )
+
+        result = convert_legacy_assessment_item_to_qti(item)
+
+        self.assertEqual(result.identifier, "Kq83vEjRWeJCrze8SNFZ4kA")
+        self.assertEqual(
+            _normalize_xml(_load_fixture("single_selection_no_answers.xml")),
+            _normalize_xml(result.xml),
+        )
+        self.assertTrue(validate_qti_item(result.xml.encode("utf-8")).is_valid)
+
+    def test_choice_types_with_no_answers_get_one_empty_choice(self):
+        # test_single_selection_no_answers pins SINGLE_SELECTION against the fixture.
+        for question_type in (exercises.MULTIPLE_SELECTION, "true_false"):
+            with self.subTest(question_type=question_type):
+                item = _make_item(
+                    type=question_type,
+                    question="What is 2+2?",
+                    answers=[],
+                    assessment_id="abcdef1234567890abcdef1234567890",
+                )
+
+                result = convert_legacy_assessment_item_to_qti(item)
+
+                self.assertIn(
+                    '<qti-simple-choice identifier="choice_0" show-hide="show" fixed="false" />',
+                    result.xml,
+                )
+                self.assertIn("<p>What is 2+2?</p>", result.xml)
+                self.assertTrue(validate_qti_item(result.xml.encode("utf-8")).is_valid)
+
+    def test_choice_type_with_no_answers_and_no_question(self):
+        item = _make_item(
+            type=exercises.MULTIPLE_SELECTION,
+            question="",
+            answers=[],
+            assessment_id="abcdef1234567890abcdef1234567890",
+        )
+
+        result = convert_legacy_assessment_item_to_qti(item)
+
+        self.assertIn("<qti-prompt />", result.xml)
+        self.assertTrue(validate_qti_item(result.xml.encode("utf-8")).is_valid)
+
     def test_media_reference_survives(self):
         item = _make_item(
             type=exercises.SINGLE_SELECTION,
@@ -239,6 +290,112 @@ def test_free_response_with_maths(self):
         )
 
 
+class MarkdownContentConversionTests(unittest.TestCase):
+    """Markdown a legacy question can hold that the QTI models rejected."""
+
+    def _convert(self, question="Question", answers=None, hints=None):
+        item = _make_item(
+            type=exercises.SINGLE_SELECTION,
+            question=question,
+            answers=answers
+            if answers is not None
+            else [{"answer": "4", "correct": True, "order": 1}],
+            assessment_id="abcdef1234567890abcdef1234567890",
+            hints=hints,
+        )
+        return convert_legacy_assessment_item_to_qti(item)
+
+    def test_links_are_stripped(self):
+        # A QTI item is delivered offline, so the link text survives and the
+        # anchor does not.
+        cases = (
+            ("Read [the docs](https://learningequality.org).", "<p>Read the docs.</p>"),
+            ("Read [the docs](./docs.html).", "<p>Read the docs.</p>"),
+            (
+                "See <https://learningequality.org> for more.",
+                "<p>See https://learningequality.org for more.</p>",
+            ),
+            (
+                'Read <a href="https://learningequality.org">this</a>.',
+                "<p>Read this.</p>",
+            ),
+        )
+        for markdown, expected in cases:
+            with self.subTest(markdown=markdown):
+                result = self._convert(markdown)
+
+                self.assertIn(expected, result.xml)
+                self.assertNotIn("<a ", result.xml)
+                self.assertTrue(validate_qti_item(result.xml.encode("utf-8")).is_valid)
+
+    def test_link_markup_inside_the_anchor_survives(self):
+        result = self._convert("Read [**the docs**](https://learningequality.org).")
+
+        self.assertIn("<p>Read <strong>the docs</strong>.</p>", result.xml)
+
+    def test_link_in_an_answer_is_stripped(self):
+        result = self._convert(
+            answers=[
+                {"answer": "See [here](https://learningequality.org)", "correct": True}
+            ]
+        )
+
+        self.assertIn("<p>See here</p>", result.xml)
+        self.assertNotIn("<a ", result.xml)
+        self.assertTrue(validate_qti_item(result.xml.encode("utf-8")).is_valid)
+
+    def test_link_in_a_hint_is_stripped(self):
+        result = self._convert(
+            hints=[{"hint": "Look at [the docs](https://learningequality.org)"}]
+        )
+
+        self.assertIn("<p>Look at the docs</p>", result.xml)
+        self.assertNotIn("<a ", result.xml)
+        self.assertTrue(validate_qti_item(result.xml.encode("utf-8")).is_valid)
+
+    def test_image_is_not_stripped(self):
+        result = self._convert("![alt](image.png) illustrates it.")
+
+        self.assertIn('<img alt="alt" src="image.png"', result.xml)
+
+    def test_strikethrough_is_stripped(self):
+        # The QTI 3.0 HTML profile has no element for a strikethrough, so the
+        # text survives and the mark does not.
+        result = self._convert("It is ~~not~~ four.")
+
+        self.assertIn("<p>It is not four.</p>", result.xml)
+        self.assertNotIn("<s>", result.xml)
+        self.assertTrue(validate_qti_item(result.xml.encode("utf-8")).is_valid)
+
+    def test_raw_html_marks_are_stripped(self):
+        # Every inline mark the renderer passes through as raw HTML that the QTI
+        # 3.0 HTML profile has no element for.
+        for tag in ("s", "del", "ins", "u", "mark", "strike"):
+            with self.subTest(tag=tag):
+                result = self._convert(f"It is <{tag}>not</{tag}> four.")
+
+                self.assertIn("<p>It is not four.</p>", result.xml)
+                self.assertNotIn(f"<{tag}>", result.xml)
+                self.assertTrue(validate_qti_item(result.xml.encode("utf-8")).is_valid)
+
+    def test_maths_in_a_list_item(self):
+        # Validity is not asserted here or below: rendered MathML carries no
+        # namespace, the same gap test_free_response_with_maths lives with.
+        result = self._convert("- $$x^2$$\n- two")
+
+        self.assertIn('<li><math display="block">', result.xml)
+
+    def test_maths_in_a_table_cell(self):
+        result = self._convert("| a |\n|---|\n| $$x^2$$ |")
+
+        self.assertIn('<td><math display="inline">', result.xml)
+
+    def test_maths_in_an_answer(self):
+        result = self._convert(answers=[{"answer": "$$x^2$$", "correct": True}])
+
+        self.assertIn('><math display="block">', result.xml)
+
+
 class CustomInteractionTests(unittest.TestCase):
     ASSESSMENT_ID = "2b1c3d4e5f60718293a4b5c6d7e8f900"
 
diff --git a/contentcuration/contentcuration/tests/utils/qti/test_media.py b/contentcuration/contentcuration/tests/utils/qti/test_media.py
index 430c1db9f5..39b7e9b021 100644
--- a/contentcuration/contentcuration/tests/utils/qti/test_media.py
+++ b/contentcuration/contentcuration/tests/utils/qti/test_media.py
@@ -1,5 +1,8 @@
+from contentcuration.tests.utils.qti.test_validation import VALID_CHOICE_ITEM
 from contentcuration.utils.assessment.qti.media import get_qti_media_references
 from contentcuration.utils.assessment.qti.media import rewrite_qti_media_paths
+from contentcuration.utils.assessment.qti.media import set_qti_item_language
+from contentcuration.utils.assessment.qti.validation import validate_qti_item
 
 CHECKSUM_A = "a" * 32
 CHECKSUM_B = "b" * 32
@@ -80,3 +83,47 @@ def test_rewrite_ignores_values_not_in_mapping():
     assert result == (
         f'<item><img src="images/{CHECKSUM_A}.png"/><a href="{CHECKSUM_B}.pdf">x</a></item>'
     )
+
+
+ITEM_WITHOUT_LANGUAGE = (
+    '<qti-assessment-item xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0" '
+    'identifier="i" title="t" adaptive="false" time-dependent="false">'
+    "<qti-item-body><p>Body</p></qti-item-body>"
+    "</qti-assessment-item>"
+)
+
+
+def test_set_language_adds_it_when_the_item_has_none():
+    result = set_qti_item_language(ITEM_WITHOUT_LANGUAGE, "es")
+    assert 'xml:lang="es"' in result
+    assert "<qti-item-body><p>Body</p></qti-item-body>" in result
+
+
+def test_set_language_replaces_a_language_the_item_already_had():
+    already = ITEM_WITHOUT_LANGUAGE.replace('title="t"', 'title="t" xml:lang="en"')
+    result = set_qti_item_language(already, "sw")
+    # Rewritten where it stands, so the value is the only thing that differs.
+    assert result == already.replace('xml:lang="en"', 'xml:lang="sw"')
+
+
+def test_set_language_leaves_an_item_already_declaring_it_byte_for_byte():
+    already = ITEM_WITHOUT_LANGUAGE.replace('title="t"', 'title="t" xml:lang="sw"')
+    assert set_qti_item_language(already, "sw") == already
+
+
+def test_set_language_leaves_the_item_alone_without_a_language_to_set():
+    assert set_qti_item_language(ITEM_WITHOUT_LANGUAGE, "") == ITEM_WITHOUT_LANGUAGE
+    assert set_qti_item_language(ITEM_WITHOUT_LANGUAGE, None) == ITEM_WITHOUT_LANGUAGE
+
+
+def test_set_language_only_touches_the_root():
+    nested = ITEM_WITHOUT_LANGUAGE.replace("<p>Body</p>", '<p xml:lang="fr">Body</p>')
+    result = set_qti_item_language(nested, "es")
+    assert '<p xml:lang="fr">Body</p>' in result
+    assert result.count('xml:lang="es"') == 1
+
+
+def test_set_language_keeps_the_item_schema_valid():
+    result = set_qti_item_language(VALID_CHOICE_ITEM, "es")
+    validation = validate_qti_item(result)
+    assert validation.is_valid, validation.errors
diff --git a/contentcuration/contentcuration/tests/utils/qti/test_perseus_derive.py b/contentcuration/contentcuration/tests/utils/qti/test_perseus_derive.py
index 69dcca757d..7cd6e58f91 100644
--- a/contentcuration/contentcuration/tests/utils/qti/test_perseus_derive.py
+++ b/contentcuration/contentcuration/tests/utils/qti/test_perseus_derive.py
@@ -4,6 +4,7 @@
 from le_utils.constants import exercises
 
 from contentcuration.tests.utils.qti.test_validation import _item_xml
+from contentcuration.tests.utils.qti.test_validation import HINTED_EDITOR_ITEM
 from contentcuration.utils.assessment.qti.perseus_derive import derive_perseus_item
 from contentcuration.utils.assessment.qti.perseus_derive import is_perseus_derivable
 
@@ -143,6 +144,20 @@ def test_math_prompt_survives_into_question():
     assert "$$x^2$$" in result.question
 
 
+def test_hints_survive_a_round_trip_through_the_editor():
+    """The hints an author edits in the QTI editor still publish as legacy hints.
+
+    Studio's own conversion writes them into the catalog on read; this asserts the
+    document the editor writes back is still one publishing can read them out of, which
+    is what makes editing a converted question safe.
+    """
+    result = derive_perseus_item(_Item(HINTED_EDITOR_ITEM))
+
+    hints = json.loads(result.hints)
+    assert [h["hint"] for h in hints] == ["test", "test2 2", "test3 3"]
+    assert [h["order"] for h in hints] == [0, 1, 2]
+
+
 def test_hint_derivation():
     item = _Item(
         _choice_item(
diff --git a/contentcuration/contentcuration/tests/utils/qti/test_validation.py b/contentcuration/contentcuration/tests/utils/qti/test_validation.py
index 4589b2b098..4b156cbad1 100644
--- a/contentcuration/contentcuration/tests/utils/qti/test_validation.py
+++ b/contentcuration/contentcuration/tests/utils/qti/test_validation.py
@@ -152,6 +152,100 @@ def test_rejects_item_with_unknown_root_element(self):
         self.assertTrue(result.errors)
 
 
+# Mirrors what the QTI editor emits for a brand new question, before the author has
+# written anything — see createBlankItem.js. Every "New question" click sends this to the
+# sync endpoint, which validates it, so the two have to stay in lockstep. It carries the
+# scoring outcome and the match_correct template, so a question authored here is gradable
+# in the same way as one the legacy conversion produces.
+BLANK_EDITOR_ITEM = (
+    '<?xml version="1.0" encoding="UTF-8"?>\n'
+    '<qti-assessment-item xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0" '
+    'identifier="item_0a8rpumo" title="Question" adaptive="false" time-dependent="false">'
+    '<qti-response-declaration identifier="RESPONSE" cardinality="single" base-type="identifier" />'
+    '<qti-outcome-declaration identifier="SCORE" cardinality="single" base-type="float" />'
+    "<qti-item-body>"
+    '<qti-choice-interaction response-identifier="RESPONSE" max-choices="1" shuffle="false" '
+    'orientation="vertical">'
+    '<qti-simple-choice identifier="choice_oaasu90l" />'
+    "</qti-choice-interaction>"
+    "</qti-item-body>"
+    "<qti-response-processing "
+    'template="https://purl.imsglobal.org/spec/qti/v3p0/rptemplates/match_correct" />'
+    "</qti-assessment-item>"
+)
+
+
+class BlankEditorItemTests(unittest.TestCase):
+    def test_accepts_blank_item_from_editor(self):
+        result = validate_qti_item(BLANK_EDITOR_ITEM)
+        self.assertTrue(result.is_valid)
+        self.assertEqual(result.errors, [])
+
+
+# The exact document the QTI editor writes back for a converted legacy question whose
+# hints it re-serialized - see HintsSection and serialization/hints.js. Assembled from
+# named parts because the schema fixes the order of the item's children, and putting the
+# catalog on the wrong side of the body is the one mistake this shape can make while
+# still looking right.
+_HINTED_ITEM_HEAD = (
+    '<?xml version="1.0" encoding="UTF-8"?>\n'
+    '<qti-assessment-item xmlns="http://www.imsglobal.org/xsd/imsqtiasi_v3p0" '
+    'identifier="item-hints" title="Hinted Question" adaptive="false" '
+    'time-dependent="false" xml:lang="en">'
+    '<qti-response-declaration identifier="RESPONSE" cardinality="single" '
+    'base-type="identifier">'
+    "<qti-correct-response><qti-value>choice-a</qti-value></qti-correct-response>"
+    "</qti-response-declaration>"
+)
+
+_HINTED_ITEM_BODY = (
+    "<qti-item-body>"
+    '<qti-choice-interaction response-identifier="RESPONSE" max-choices="1">'
+    "<qti-prompt>Pick one.</qti-prompt>"
+    '<qti-simple-choice identifier="choice-a">A</qti-simple-choice>'
+    '<qti-simple-choice identifier="choice-b">B</qti-simple-choice>'
+    "</qti-choice-interaction>"
+    "</qti-item-body>"
+)
+
+_HINTED_ITEM_CATALOG = (
+    '<qti-catalog-info><qti-catalog id="kolibri-hints">'
+    '<qti-card support="ext:kolibri-hint">'
+    "<qti-html-content><p>test</p></qti-html-content></qti-card>"
+    '<qti-card support="ext:kolibri-hint">'
+    "<qti-html-content><p>test2 2</p></qti-html-content></qti-card>"
+    '<qti-card support="ext:kolibri-hint">'
+    "<qti-html-content><p>test3 3</p></qti-html-content></qti-card>"
+    "</qti-catalog></qti-catalog-info>"
+)
+
+HINTED_EDITOR_ITEM = (
+    _HINTED_ITEM_HEAD
+    + _HINTED_ITEM_BODY
+    + _HINTED_ITEM_CATALOG
+    + "</qti-assessment-item>"
+)
+
+CATALOG_BEFORE_BODY_ITEM = (
+    _HINTED_ITEM_HEAD
+    + _HINTED_ITEM_CATALOG
+    + _HINTED_ITEM_BODY
+    + "</qti-assessment-item>"
+)
+
+
+class HintedEditorItemTests(unittest.TestCase):
+    def test_accepts_hinted_item_from_editor(self):
+        result = validate_qti_item(HINTED_EDITOR_ITEM)
+        self.assertTrue(result.is_valid)
+        self.assertEqual(result.errors, [])
+
+    def test_rejects_catalog_before_item_body(self):
+        result = validate_qti_item(CATALOG_BEFORE_BODY_ITEM)
+        self.assertFalse(result.is_valid)
+        self.assertIn("qti-item-body", result.errors[0].message)
+
+
 class SchemaReuseTests(unittest.TestCase):
     def test_schema_compiled_once_across_multiple_validate_calls(self):
         _compiled_schema.cache_clear()
diff --git a/contentcuration/contentcuration/tests/utils/test_exercise_creation.py b/contentcuration/contentcuration/tests/utils/test_exercise_creation.py
index c74361a9b3..863398008d 100644
--- a/contentcuration/contentcuration/tests/utils/test_exercise_creation.py
+++ b/contentcuration/contentcuration/tests/utils/test_exercise_creation.py
@@ -1922,7 +1922,12 @@ def test_manifest_structure_single_item(self):
         )
 
     def test_native_qti_item_written_verbatim(self):
-        """The item XML in the zip must byte-match the authored raw_data."""
+        """The item XML in the zip is the authored raw_data, not a rebuild of it.
+
+        Publishing rewrites the root's xml:lang to the node's language, which here is the
+        language the item already declares, so every byte of it — formatting included — has
+        to survive. Stamping an item that declares none is covered in test_exportchannel.
+        """
         raw_data = _item_xml(
             "native_item_1",
             "Native Item",
@@ -1948,9 +1953,8 @@ def test_native_qti_item_written_verbatim(self):
         exercise_file = self.exercise_node.files.get(preset_id=format_presets.QTI_ZIP)
         zip_file = self._validate_qti_zip_structure(exercise_file)
         self.assertIn("items/native_item_1.xml", zip_file.namelist())
-        self.assertEqual(
-            zip_file.read("items/native_item_1.xml").decode("utf-8"), raw_data
-        )
+        item_xml = zip_file.read("items/native_item_1.xml").decode("utf-8")
+        self.assertEqual(item_xml, raw_data)
 
     def test_native_qti_item_media_included_and_addressed(self):
         # fileobj_exercise_image() writes real bytes to storage keyed by their
@@ -1984,8 +1988,10 @@ def test_native_qti_item_media_included_and_addressed(self):
         self.assertIn(f"images/{media_filename}", manifest)
 
         item_xml = zip_file.read("items/native_item_1.xml").decode("utf-8")
+        # The media path is remapped; nothing else about the item changes.
         self.assertEqual(
-            item_xml, raw_data.replace(media_filename, f"images/{media_filename}")
+            item_xml,
+            raw_data.replace(media_filename, f"images/{media_filename}"),
         )
 
     def test_native_qti_item_invalid_raw_data_is_skipped(self):
diff --git a/contentcuration/contentcuration/tests/utils/test_markdown.py b/contentcuration/contentcuration/tests/utils/test_markdown.py
index 0088d4a09e..655f44dbf5 100644
--- a/contentcuration/contentcuration/tests/utils/test_markdown.py
+++ b/contentcuration/contentcuration/tests/utils/test_markdown.py
@@ -267,3 +267,75 @@ def _assert_conversion(self, markdown_text: str, expected: str):
             roundtrip_result.replace("\n", "").strip(),
             expected.replace("\n", "").strip(),
         )
+
+
+class SizedImageTests(unittest.TestCase):
+    """Perseus images, whose size and alignment suffixes are not valid CommonMark."""
+
+    def test_size_suffix_becomes_width_and_height(self):
+        self.assertEqual(
+            render_markdown("![Test](83ab37e959e03fec7be3e1bf834cb169.jpg =550x364)"),
+            '<p><img src="83ab37e959e03fec7be3e1bf834cb169.jpg" alt="Test"'
+            ' width="550" height="364" /></p>\n',
+        )
+
+    def test_image_without_alt_text(self):
+        self.assertEqual(
+            render_markdown("![](cs.png =12x34)"),
+            '<p><img src="cs.png" alt="" width="12" height="34" /></p>\n',
+        )
+
+    def test_align_suffix_is_consumed_but_dropped(self):
+        # Consumed so the image parses at all; dropped because QTI's Img has no
+        # attribute to carry it.
+        self.assertEqual(
+            render_markdown("![a](cs.png align=center)"),
+            '<p><img src="cs.png" alt="a" /></p>\n',
+        )
+
+    def test_size_and_align_together(self):
+        self.assertEqual(
+            render_markdown("![a](cs.png =12x34 align=right)"),
+            '<p><img src="cs.png" alt="a" width="12" height="34" /></p>\n',
+        )
+
+    def test_fractional_size_is_rounded(self):
+        self.assertEqual(
+            render_markdown("![a](cs.png =229.5x287.2)"),
+            '<p><img src="cs.png" alt="a" width="230" height="287" /></p>\n',
+        )
+
+    def test_src_is_reduced_to_the_bare_filename(self):
+        self.assertEqual(
+            render_markdown("![a](images/cs.png =12x34)"),
+            '<p><img src="cs.png" alt="a" width="12" height="34" /></p>\n',
+        )
+
+    def test_image_keeps_its_surrounding_text(self):
+        self.assertEqual(
+            render_markdown("before ![a](cs.png =1x2) after"),
+            '<p>before <img src="cs.png" alt="a" width="1" height="2" /> after</p>\n',
+        )
+
+    def test_alt_text_is_escaped(self):
+        self.assertEqual(
+            render_markdown('![<script>"](cs.png =1x2)'),
+            '<p><img src="cs.png" alt="&lt;script&gt;&quot;"'
+            ' width="1" height="2" /></p>\n',
+        )
+
+    def test_suffixless_image_still_goes_through_the_builtin_rule(self):
+        self.assertEqual(
+            render_markdown("![a](cs.png)"), '<p><img src="cs.png" alt="a" /></p>\n'
+        )
+
+    def test_sized_image_survives_the_model_layer(self):
+        # The converter builds its item body by parsing this HTML into the QTI
+        # models, which take an integer width and reject an absolute src.
+        paragraph = ElementTreeBase.from_string(
+            render_markdown("![a](cs.png =229.5x287 align=center)")
+        )[0]
+        img = paragraph.children[0]
+        self.assertEqual(img.src, "cs.png")
+        self.assertEqual(img.alt, "a")
+        self.assertEqual((img.width, img.height), (230, 287))
diff --git a/contentcuration/contentcuration/tests/viewsets/test_assessmentitem.py b/contentcuration/contentcuration/tests/viewsets/test_assessmentitem.py
index 1f3d1330f8..ee76130ae8 100644
--- a/contentcuration/contentcuration/tests/viewsets/test_assessmentitem.py
+++ b/contentcuration/contentcuration/tests/viewsets/test_assessmentitem.py
@@ -14,6 +14,7 @@
 from contentcuration.tests.viewsets.base import generate_delete_event
 from contentcuration.tests.viewsets.base import generate_update_event
 from contentcuration.tests.viewsets.base import SyncTestMixin
+from contentcuration.utils.assessment.qti.validation import validate_qti_item
 from contentcuration.viewsets.sync.constants import ASSESSMENTITEM
 
 
@@ -35,6 +36,14 @@
     "</qti-choice-interaction>",
 )
 
+CHOICE_ANSWERS = json.dumps(
+    [
+        {"answer": "4", "correct": True, "order": 1},
+        {"answer": "5", "correct": False, "order": 2},
+    ]
+)
+TEXT_ANSWERS = json.dumps([{"answer": "4", "correct": True, "order": 1}])
+
 
 class SyncTestCase(SyncTestMixin, StudioAPITestCase):
     @property
@@ -598,7 +607,9 @@ def test_create_non_qti_assessmentitem_rejects_raw_data_edit(self):
                 assessment_id=assessmentitem["assessment_id"]
             )
 
-    def test_update_non_qti_assessmentitem_rejects_raw_data_edit(self):
+    def test_update_legacy_assessmentitem_converts_it_to_qti(self):
+        # The read path serves legacy items as QTI (see consolidate), so an edit comes
+        # back as QTI raw_data — and the row is converted to match.
         assessmentitem = models.AssessmentItem.objects.create(
             **self.assessmentitem_db_metadata
         )
@@ -613,8 +624,29 @@ def test_update_non_qti_assessmentitem_rejects_raw_data_edit(self):
                 )
             ],
         )
+        self.assertEqual(response.json()["errors"], [])
+        updated = models.AssessmentItem.objects.get(id=assessmentitem.id)
+        self.assertEqual(updated.type, exercises.QTI)
+        self.assertEqual(updated.raw_data, VALID_CHOICE_ITEM)
+
+    def test_update_legacy_assessmentitem_rejects_invalid_qti(self):
+        assessmentitem = models.AssessmentItem.objects.create(
+            **self.assessmentitem_db_metadata
+        )
+        self.client.force_authenticate(user=self.user)
+        response = self.sync_changes(
+            [
+                generate_update_event(
+                    [assessmentitem.contentnode_id, assessmentitem.assessment_id],
+                    ASSESSMENTITEM,
+                    {"raw_data": "<qti-assessment-item><oops>"},
+                    channel_id=self.channel.id,
+                )
+            ],
+        )
         self.assertTrue(response.json()["errors"][0]["errors"]["raw_data"])
         updated = models.AssessmentItem.objects.get(id=assessmentitem.id)
+        self.assertEqual(updated.type, assessmentitem.type)
         self.assertEqual(updated.raw_data, "")
 
     def _create_qti_referenced_files(self, checksums):
@@ -1177,6 +1209,220 @@ def test_delete_assessmentitem(self):
         self.assertEqual(response.status_code, 405, response.content)
 
 
+class DualReadTestCase(StudioAPITestCase):
+    def setUp(self):
+        super(DualReadTestCase, self).setUp()
+        self.channel = testdata.channel()
+        self.user = testdata.user()
+        self.channel.editors.add(self.user)
+        self.node = (
+            self.channel.main_tree.get_descendants()
+            .filter(kind_id=content_kinds.EXERCISE)
+            .first()
+        )
+        self.client.force_authenticate(user=self.user)
+
+    def _create_item(self, node=None, **kwargs):
+        return models.AssessmentItem.objects.create(
+            contentnode=node or self.node, assessment_id=uuid.uuid4().hex, **kwargs
+        )
+
+    def _list_items(self, **query):
+        # The fixture node carries its own assessment items, so key the response
+        # by assessment_id rather than indexing it.
+        response = self.client.get(reverse("assessmentitem-list"), query)
+        self.assertEqual(response.status_code, 200, response.content)
+        return {item["assessment_id"]: item for item in response.json()}
+
+    def _get_item(self, assessment_id):
+        return self._list_items(contentnode=self.node.id)[assessment_id]
+
+    def test_supported_legacy_types_returned_as_qti(self):
+        cases = [
+            (exercises.SINGLE_SELECTION, CHOICE_ANSWERS, "qti-choice-interaction"),
+            (exercises.MULTIPLE_SELECTION, CHOICE_ANSWERS, "qti-choice-interaction"),
+            ("true_false", CHOICE_ANSWERS, "qti-choice-interaction"),
+            (exercises.INPUT_QUESTION, TEXT_ANSWERS, "qti-text-entry-interaction"),
+            (exercises.FREE_RESPONSE, TEXT_ANSWERS, "qti-text-entry-interaction"),
+        ]
+        created = {
+            item_type: self._create_item(
+                type=item_type,
+                question="What is 2+2?",
+                answers=answers,
+                hints=json.dumps([{"hint": "Count.", "order": 1}]),
+            ).assessment_id
+            for item_type, answers, _ in cases
+        }
+
+        items = self._list_items(contentnode=self.node.id)
+
+        for item_type, _, interaction in cases:
+            with self.subTest(type=item_type):
+                item = items[created[item_type]]
+                self.assertEqual(item["type"], exercises.QTI)
+                self.assertTrue(validate_qti_item(item["raw_data"]).is_valid)
+                self.assertIn(interaction, item["raw_data"])
+
+    def test_answerless_choice_item_is_returned_as_valid_qti(self):
+        # The shape the editor writes for every newly added question.
+        assessment_id = self._create_item(type=exercises.SINGLE_SELECTION).assessment_id
+
+        item = self._get_item(assessment_id)
+
+        self.assertEqual(item["type"], exercises.QTI)
+        self.assertTrue(validate_qti_item(item["raw_data"]).is_valid)
+
+    def test_converted_item_has_no_legacy_field_content(self):
+        assessment_id = self._create_item(
+            type=exercises.SINGLE_SELECTION,
+            question="What is 2+2?",
+            answers=CHOICE_ANSWERS,
+            hints=json.dumps([{"hint": "Count.", "order": 1}]),
+        ).assessment_id
+
+        item = self._get_item(assessment_id)
+
+        self.assertEqual(item["question"], "")
+        self.assertEqual(item["answers"], "[]")
+        self.assertEqual(item["hints"], "[]")
+        # The node language is only in the values tuple to feed the conversion.
+        self.assertNotIn("contentnode__language__lang_code", item)
+
+    def test_converted_items_are_tagged_with_their_own_node_language(self):
+        # A contentnode__in read spans several nodes, so each item must pick up its own
+        # node's language. pt-BR's bare lang_code differs from its primary key, so the
+        # assertions also pin which of the two publish tags an item with.
+        self.node.language = models.Language.objects.get(id="pt-BR")
+        self.node.save()
+        other_node = models.ContentNode.objects.create(
+            id=uuid.uuid4().hex,
+            title="Exercise 2",
+            kind_id=content_kinds.EXERCISE,
+            parent=self.node.parent,
+            language=models.Language.objects.get(id="fr"),
+        )
+        first = self._create_item(
+            type=exercises.SINGLE_SELECTION,
+            question="What is 2+2?",
+            answers=CHOICE_ANSWERS,
+        )
+        second = self._create_item(
+            node=other_node,
+            type=exercises.SINGLE_SELECTION,
+            question="What is 3+3?",
+            answers=CHOICE_ANSWERS,
+        )
+
+        items = self._list_items(
+            contentnode__in=f"{self.node.id},{other_node.id}",
+        )
+
+        self.assertIn('xml:lang="pt"', items[first.assessment_id]["raw_data"])
+        self.assertNotIn("pt-BR", items[first.assessment_id]["raw_data"])
+        self.assertIn('xml:lang="fr"', items[second.assessment_id]["raw_data"])
+
+    def test_converted_item_falls_back_to_the_channel_language(self):
+        # What publish does for a node with no language of its own.
+        self.channel.language = models.Language.objects.get(id="pt-BR")
+        self.channel.save()
+        assessment_id = self._create_item(
+            type=exercises.SINGLE_SELECTION,
+            question="What is 2+2?",
+            answers=CHOICE_ANSWERS,
+        ).assessment_id
+
+        item = self._get_item(assessment_id)
+
+        self.assertIn('xml:lang="pt"', item["raw_data"])
+        self.assertNotIn("pt-BR", item["raw_data"])
+
+    def test_converted_item_defaults_to_english_without_any_language(self):
+        self.channel.language = None
+        self.channel.save()
+        assessment_id = self._create_item(
+            type=exercises.SINGLE_SELECTION,
+            question="What is 2+2?",
+            answers=CHOICE_ANSWERS,
+        ).assessment_id
+
+        item = self._get_item(assessment_id)
+
+        self.assertIn('xml:lang="en"', item["raw_data"])
+
+    def test_perseus_question_returned_unchanged(self):
+        raw_data = '{"question": {"content": "raw perseus"}}'
+        assessment_id = self._create_item(
+            type=exercises.PERSEUS_QUESTION, raw_data=raw_data
+        ).assessment_id
+
+        item = self._get_item(assessment_id)
+
+        self.assertEqual(item["type"], exercises.PERSEUS_QUESTION)
+        self.assertEqual(item["raw_data"], raw_data)
+        # A passed-through row must shed the node language too.
+        self.assertNotIn("contentnode__language__lang_code", item)
+
+    def test_native_qti_item_returned_unchanged(self):
+        assessment_id = self._create_item(
+            type=exercises.QTI, raw_data=VALID_CHOICE_ITEM
+        ).assessment_id
+
+        item = self._get_item(assessment_id)
+
+        self.assertEqual(item["type"], exercises.QTI)
+        self.assertEqual(item["raw_data"], VALID_CHOICE_ITEM)
+
+    def test_detail_route_converts(self):
+        assessmentitem = self._create_item(
+            type=exercises.SINGLE_SELECTION,
+            question="What is 2+2?",
+            answers=CHOICE_ANSWERS,
+        )
+
+        response = self.client.get(
+            reverse("assessmentitem-detail", kwargs={"pk": assessmentitem.id})
+        )
+
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response.json()["type"], exercises.QTI)
+        self.assertTrue(validate_qti_item(response.json()["raw_data"]).is_valid)
+
+    def test_unconvertible_item_is_left_legacy_and_the_rest_convert(self):
+        unconvertible = self._create_item(
+            type="not_a_real_type", question="What is 2+2?"
+        )
+        convertible = self._create_item(
+            type=exercises.SINGLE_SELECTION,
+            question="What is 3+3?",
+            answers=CHOICE_ANSWERS,
+        )
+
+        with self.assertLogs(
+            "contentcuration.viewsets.assessmentitem", level="ERROR"
+        ) as logs:
+            items = self._list_items(contentnode=self.node.id)
+
+        self.assertIn(unconvertible.assessment_id, logs.output[0])
+        self.assertEqual(items[unconvertible.assessment_id]["type"], "not_a_real_type")
+        self.assertEqual(items[unconvertible.assessment_id]["question"], "What is 2+2?")
+        self.assertEqual(items[convertible.assessment_id]["type"], exercises.QTI)
+
+    def test_unconvertible_item_is_not_a_404_on_detail_route(self):
+        # Only this route goes through serialize_object(), which turns an error raised
+        # here into "No AssessmentItem matches the given query".
+        assessmentitem = self._create_item(
+            type="not_a_real_type", question="What is 2+2?"
+        )
+
+        response = self.client.get(
+            reverse("assessmentitem-detail", kwargs={"pk": assessmentitem.id})
+        )
+
+        self.assertEqual(response.status_code, 200, response.content)
+        self.assertEqual(response.json()["type"], "not_a_real_type")
+
+
 class ContentIDTestCase(SyncTestMixin, StudioAPITestCase):
     def setUp(self):
         super(ContentIDTestCase, self).setUp()
diff --git a/contentcuration/contentcuration/utils/assessment/markdown.py b/contentcuration/contentcuration/utils/assessment/markdown.py
index c34da5dee1..f11dcf1e07 100644
--- a/contentcuration/contentcuration/utils/assessment/markdown.py
+++ b/contentcuration/contentcuration/utils/assessment/markdown.py
@@ -18,6 +18,52 @@
 INLINE_PATTERN = re.compile(r"^\$\$([\s\S]+?)\$\$")
 BLOCK_PATTERN = re.compile(r"^\$\$([\s\S]+?)\$\$", re.M)
 
+# Perseus extends the CommonMark image with a trailing size and alignment:
+#   ![alt](<checksum>.<ext> =550x364 align=center)
+# Neither suffix is valid CommonMark, so the whole construct fails to parse as an
+# image and markdown-it emits it as literal text. Mirrors IMAGE_REGEX in the
+# editor's TipTapEditor/utils/markdown.js, which reads the same syntax.
+SIZED_IMAGE_PATTERN = re.compile(
+    r"^!\[(?P<alt>[^\]]*)\]\("
+    r"(?P<src>[^\s=)]+)"
+    r"(?:\s*=\s*(?P<width>[0-9.]+)x(?P<height>[0-9.]+))?"
+    r"(?:\s+align=(?P<align>\w+))?"
+    r"\)"
+)
+
+
+def sized_image_func(state: StateInline, silent: bool) -> bool:
+    """Parse a Perseus image with a size and/or alignment suffix."""
+    if not state.src.startswith("![", state.pos):
+        return False
+
+    match = SIZED_IMAGE_PATTERN.match(state.src[state.pos :])
+    # Without a suffix this is an ordinary CommonMark image; leave it to the
+    # built-in rule, which handles reference links and nested labels too.
+    if not match or not (match["width"] or match["align"]):
+        return False
+
+    if not silent:
+        token = state.push("sized_image", "img", 0)
+        # A QTI item references media by bare "<checksum>.<ext>" filename, which
+        # publishing rewrites to the package's images/ directory. Legacy markdown
+        # writes it under the content-storage placeholder, stripped by the time we
+        # get here, so drop any remaining directory the same way the editor does.
+        token.attrs = {
+            "src": match["src"].rsplit("/", 1)[-1],
+            "alt": match["alt"],
+        }
+        if match["width"]:
+            # Perseus allows fractional sizes; HTML's width/height are integers,
+            # as is the Img model these end up in.
+            token.attrs["width"] = str(round(float(match["width"])))
+            token.attrs["height"] = str(round(float(match["height"])))
+        # An align suffix is consumed but dropped: QTI's Img has no attribute to
+        # carry it, and the reverse conversion does not emit one either.
+
+    state.pos += match.end()
+    return True
+
 
 def math_inline_func(state: StateInline, silent: bool) -> bool:
     """Parse inline math: $$expression$$"""
@@ -128,7 +174,21 @@ def texmath_to_mathml_plugin(md: MarkdownIt) -> None:
     md.add_render_rule("math_block", render_math_block)
 
 
-md = MarkdownIt("gfm-like").disable("linkify").use(texmath_to_mathml_plugin)
+def sized_image_plugin(md: MarkdownIt) -> None:
+    """Plugin for Perseus images carrying a size and/or alignment suffix.
+
+    The token renders through the renderer's generic path, which emits the tag and
+    its attributes, so no render rule of its own is needed.
+    """
+    md.inline.ruler.before("image", "sized_image", sized_image_func)
+
+
+md = (
+    MarkdownIt("gfm-like")
+    .disable("linkify")
+    .use(texmath_to_mathml_plugin)
+    .use(sized_image_plugin)
+)
 
 
 def render_markdown(markdown):
diff --git a/contentcuration/contentcuration/utils/assessment/qti/archive.py b/contentcuration/contentcuration/utils/assessment/qti/archive.py
index a420953e77..71e05d2900 100644
--- a/contentcuration/contentcuration/utils/assessment/qti/archive.py
+++ b/contentcuration/contentcuration/utils/assessment/qti/archive.py
@@ -26,6 +26,7 @@
 from contentcuration.utils.assessment.qti.imsmanifest import Resources
 from contentcuration.utils.assessment.qti.media import get_qti_media_references
 from contentcuration.utils.assessment.qti.media import rewrite_qti_media_paths
+from contentcuration.utils.assessment.qti.media import set_qti_item_language
 from contentcuration.utils.assessment.qti.validation import parse_qti_xml
 from contentcuration.utils.assessment.qti.validation import validate_qti_item
 
@@ -106,6 +107,11 @@ def _create_native_qti_item(self, assessment_item) -> Optional[Tuple[str, bytes]
 
         filepath = f"items/{identifier}.xml"
         item_xml, file_dependencies = self._write_qti_media_files(assessment_item)
+        # The other two paths through this generator build their items here and stamp the
+        # node's language as they go; this one is handed raw_data, so it stamps it too.
+        # Otherwise one package declares a language for some items and not others,
+        # depending only on which editor wrote them.
+        item_xml = set_qti_item_language(item_xml, self._node_language())
 
         self._add_resource(
             QTIResource(
diff --git a/contentcuration/contentcuration/utils/assessment/qti/convert.py b/contentcuration/contentcuration/utils/assessment/qti/convert.py
index d363f3735f..c4442fcf4f 100644
--- a/contentcuration/contentcuration/utils/assessment/qti/convert.py
+++ b/contentcuration/contentcuration/utils/assessment/qti/convert.py
@@ -9,6 +9,7 @@
 from typing import Tuple
 
 from le_utils.constants import exercises
+from lxml import etree
 
 from contentcuration.utils.assessment.markdown import render_markdown
 from contentcuration.utils.assessment.qti.assessment_item import AssessmentItem
@@ -85,11 +86,26 @@ class QTIConversionResult:
     file_dependencies: List[str]
 
 
+def _strip_unsupported_markup(markup: str) -> str:
+    """
+    Unwrap every tag a QTI item body cannot carry, keeping its content.
+
+    An anchor has nothing to navigate to on a device with no internet access.
+    The QTI 3.0 HTML profile has no element for the inline marks.
+    Runs on the rendered markup, so tags typed as raw HTML are stripped too.
+    """
+    root = etree.fromstring(f"<root>{markup}</root>")
+    etree.strip_tags(root, "a", "s", "del", "ins", "u", "mark", "strike")
+    return (root.text or "") + "".join(
+        etree.tostring(child, encoding="unicode") for child in root
+    )
+
+
 def _create_html_content_from_text(text: str) -> FlowContentList:
     """Convert text content to QTI HTML flow content."""
     if not text.strip():
         return []
-    markup = render_markdown(text)
+    markup = _strip_unsupported_markup(render_markdown(text))
     return ElementTreeBase.from_string(markup)
 
 
@@ -148,9 +164,14 @@ def _create_choice_interaction_and_response(
 
     prompt = Prompt(children=_create_html_content_from_text(item.question))
 
+    # Every newly added question starts answerless, but the XSD requires at least one
+    # qti-simple-choice. Stand in the single empty choice the QTI editor opens a new
+    # choice interaction with.
+    answers = item.answers or [{}]
+
     choices = []
     correct_values = []
-    for i, answer in enumerate(item.answers):
+    for i, answer in enumerate(answers):
         choice_id = f"choice_{i}"
         choice_content = _create_html_content_from_text(answer.get("answer", ""))
 
diff --git a/contentcuration/contentcuration/utils/assessment/qti/html/__init__.py b/contentcuration/contentcuration/utils/assessment/qti/html/__init__.py
index f28fea09f0..25b919a2cd 100644
--- a/contentcuration/contentcuration/utils/assessment/qti/html/__init__.py
+++ b/contentcuration/contentcuration/utils/assessment/qti/html/__init__.py
@@ -7,6 +7,7 @@
 from contentcuration.utils.assessment.qti.html.breaks import Hr
 from contentcuration.utils.assessment.qti.html.content_types import FlowContent
 from contentcuration.utils.assessment.qti.html.content_types import FlowContentList
+from contentcuration.utils.assessment.qti.html.content_types import FlowGroupList
 from contentcuration.utils.assessment.qti.html.content_types import InlineContent
 from contentcuration.utils.assessment.qti.html.content_types import InlineContentList
 from contentcuration.utils.assessment.qti.html.content_types import InlineGroup
@@ -97,6 +98,7 @@
     # Content type aliases
     "FlowContent",
     "FlowContentList",
+    "FlowGroupList",
     "InlineContent",
     "InlineContentList",
     "InlineGroup",
diff --git a/contentcuration/contentcuration/utils/assessment/qti/html/sequence.py b/contentcuration/contentcuration/utils/assessment/qti/html/sequence.py
index ef81c17d00..2d33291f73 100644
--- a/contentcuration/contentcuration/utils/assessment/qti/html/sequence.py
+++ b/contentcuration/contentcuration/utils/assessment/qti/html/sequence.py
@@ -8,12 +8,12 @@
 from contentcuration.utils.assessment.qti.html.base import BlockContentElement
 from contentcuration.utils.assessment.qti.html.base import HTMLElement
 from contentcuration.utils.assessment.qti.html.content_types import FlowContent
-from contentcuration.utils.assessment.qti.html.content_types import FlowContentList
+from contentcuration.utils.assessment.qti.html.content_types import FlowGroupList
 
 
 class Li(HTMLElement):
     value: Optional[int] = None
-    children: FlowContentList = Field(default_factory=list)
+    children: FlowGroupList = Field(default_factory=list)
 
 
 class OlType(Enum):
@@ -37,11 +37,11 @@ class Ul(BlockContentElement):
 
 class Dt(HTMLElement):
     # There are restrictions on allowed descendants
-    children: FlowContentList = Field(default_factory=list)
+    children: FlowGroupList = Field(default_factory=list)
 
 
 class Dd(HTMLElement):
-    children: FlowContentList = Field(default_factory=list)
+    children: FlowGroupList = Field(default_factory=list)
 
 
 class Dl(BlockContentElement):
diff --git a/contentcuration/contentcuration/utils/assessment/qti/html/table.py b/contentcuration/contentcuration/utils/assessment/qti/html/table.py
index fe5be0e584..1b07f097ce 100644
--- a/contentcuration/contentcuration/utils/assessment/qti/html/table.py
+++ b/contentcuration/contentcuration/utils/assessment/qti/html/table.py
@@ -7,11 +7,11 @@
 
 from contentcuration.utils.assessment.qti.html.base import BlockContentElement
 from contentcuration.utils.assessment.qti.html.base import HTMLElement
-from contentcuration.utils.assessment.qti.html.content_types import FlowContentList
+from contentcuration.utils.assessment.qti.html.content_types import FlowGroupList
 
 
 class Caption(HTMLElement):
-    children: FlowContentList = Field(default_factory=list)
+    children: FlowGroupList = Field(default_factory=list)
 
 
 class Col(HTMLElement):  # Void element
@@ -27,7 +27,7 @@ class Td(HTMLElement):
     colspan: Optional[int] = None
     rowspan: Optional[int] = None
     headers: Optional[str] = None
-    children: FlowContentList = Field(default_factory=list)
+    children: FlowGroupList = Field(default_factory=list)
 
 
 class ThScope(Enum):
@@ -44,7 +44,7 @@ class Th(HTMLElement):
     headers: Optional[str] = None
     scope: Optional[ThScope] = None
     abbr: Optional[str] = None
-    children: FlowContentList = Field(default_factory=list)
+    children: FlowGroupList = Field(default_factory=list)
 
 
 class Tr(HTMLElement):
diff --git a/contentcuration/contentcuration/utils/assessment/qti/interaction_types/simple.py b/contentcuration/contentcuration/utils/assessment/qti/interaction_types/simple.py
index a4dcec2251..0ef6d9c201 100644
--- a/contentcuration/contentcuration/utils/assessment/qti/interaction_types/simple.py
+++ b/contentcuration/contentcuration/utils/assessment/qti/interaction_types/simple.py
@@ -13,7 +13,7 @@
 from contentcuration.utils.assessment.qti.constants import Orientation
 from contentcuration.utils.assessment.qti.constants import ShowHide
 from contentcuration.utils.assessment.qti.fields import QTIIdentifier
-from contentcuration.utils.assessment.qti.html import FlowContentList
+from contentcuration.utils.assessment.qti.html import FlowGroupList
 from contentcuration.utils.assessment.qti.interaction_types.base import BlockInteraction
 from contentcuration.utils.assessment.qti.prompt import Prompt
 
@@ -29,7 +29,7 @@ class SimpleChoice(QTIBase, BaseSequence):
     template_identifier: Optional[str] = None
     show_hide: ShowHide = ShowHide.SHOW
     fixed: bool = False
-    children: FlowContentList = Field(default_factory=list)
+    children: FlowGroupList = Field(default_factory=list)
 
 
 class ChoiceInteraction(BlockInteraction):
diff --git a/contentcuration/contentcuration/utils/assessment/qti/media.py b/contentcuration/contentcuration/utils/assessment/qti/media.py
index 660bd10a6d..6264b6d0e8 100644
--- a/contentcuration/contentcuration/utils/assessment/qti/media.py
+++ b/contentcuration/contentcuration/utils/assessment/qti/media.py
@@ -14,6 +14,9 @@
     + " or ".join(f"@{attribute}" for attribute in QTI_REFERENCE_ATTRIBUTES)
     + " or @srcset]"
 )
+ITEM_ROOT_START_TAG_REGEX = re.compile(r"<qti-assessment-item\b[^>]*>")
+XML_LANG_ATTRIBUTE_REGEX = re.compile(r'\s+xml:lang="[^"]*"')
+
 QTI_MEDIA_ATTRIBUTE_VALUE_REGEX = re.compile(
     r"(?P<attr>" + "|".join(QTI_REFERENCE_ATTRIBUTES + ("srcset",)) + r")"
     r'(?P<eq>\s*=\s*)(?P<quote>["\'])(?P<value>[^"\']*)(?P=quote)'
@@ -76,3 +79,33 @@ def _replace_attribute(match):
         return f"{attribute}{eq}{quote}{value}{quote}"
 
     return QTI_MEDIA_ATTRIBUTE_VALUE_REGEX.sub(_replace_attribute, raw_data)
+
+
+def set_qti_item_language(raw_data, language):
+    """
+    Set ``xml:lang`` on the item root, replacing any value already there.
+
+    The node's language is the one Studio knows to be current, so it wins over whatever an
+    item recorded when it was written — which for an item authored in the QTI editor before
+    it had a language to record is nothing at all.
+
+    Operates as a targeted text substitution on the root start tag, for the same reason
+    ``rewrite_qti_media_paths`` does: every other byte of ``raw_data``, formatting included,
+    is left as the author's editor produced it. An attribute already present is rewritten
+    where it stands rather than moved to the end, so an item that already declares the
+    node's language comes back byte for byte.
+    """
+    if not language:
+        return raw_data
+
+    replacement = f' xml:lang="{language}"'
+
+    def _replace_root(match):
+        tag = match.group(0)
+        if XML_LANG_ATTRIBUTE_REGEX.search(tag):
+            # A function, not a string: a replacement string would read any backslash
+            # in the language tag as a group reference.
+            return XML_LANG_ATTRIBUTE_REGEX.sub(lambda _: replacement, tag, count=1)
+        return f"{tag[:-1].rstrip()}{replacement}>"
+
+    return ITEM_ROOT_START_TAG_REGEX.sub(_replace_root, raw_data, count=1)
diff --git a/contentcuration/contentcuration/viewsets/assessmentitem.py b/contentcuration/contentcuration/viewsets/assessmentitem.py
index e000c67371..4a08ce756c 100644
--- a/contentcuration/contentcuration/viewsets/assessmentitem.py
+++ b/contentcuration/contentcuration/viewsets/assessmentitem.py
@@ -1,7 +1,10 @@
 import json
+import logging
 import re
 
 from django.db import transaction
+from django.db.models import OuterRef
+from django.db.models import Subquery
 from le_utils.constants import exercises
 from le_utils.constants import format_presets
 from rest_framework import serializers
@@ -9,9 +12,11 @@
 from rest_framework.serializers import ValidationError
 
 from contentcuration.models import AssessmentItem
+from contentcuration.models import Channel
 from contentcuration.models import ContentNode
 from contentcuration.models import File
 from contentcuration.models import generate_object_storage_name
+from contentcuration.utils.assessment.qti.ingest import convert_legacy_question_to_qti
 from contentcuration.utils.assessment.qti.media import get_qti_media_references
 from contentcuration.utils.assessment.qti.validation import validate_qti_item
 from contentcuration.viewsets.base import BulkCreateMixin
@@ -25,12 +30,18 @@
 from contentcuration.viewsets.common import UUIDRegexField
 
 
+logger = logging.getLogger(__name__)
+
 exercise_image_filename_regex = re.compile(
     r"\!\[[^]]*\]\(\${placeholder}/([a-f0-9]{{32}}\.[0-9a-z]+)\)".format(
         placeholder=exercises.CONTENT_STORAGE_PLACEHOLDER
     )
 )
 
+# Everything else is a legacy type, converted to QTI on read until the global
+# backfill (#6007) makes that permanent and consolidate() goes away.
+PASSTHROUGH_TYPES = (exercises.QTI, exercises.PERSEUS_QUESTION)
+
 
 class AssessmentItemFilter(RequiredFilterSet):
     contentnode__in = UUIDInFilter(field_name="contentnode")
@@ -125,7 +136,20 @@ def validate(self, data):
         # except Exception in create_from_changes/update_from_changes and
         # reported as "Internal server error" for the whole batch.
         data = super(AssessmentItemSerializer, self).validate(data)
-        if self._item_type == exercises.QTI:
+        item_type = self._item_type
+        if (
+            self.instance is not None
+            and "raw_data" in data
+            and item_type not in PASSTHROUGH_TYPES
+        ):
+            # consolidate() hands every still-legacy item to the client as QTI, so an edit
+            # comes back as QTI raw_data. Accept it and let the row catch up with what the
+            # client was told — the same conversion the global backfill (#6007) will apply
+            # to every item, done one item at a time as authors touch them. The legacy
+            # question/answers/hints columns are left alone; they stop being read as soon
+            # as the type changes, and the backfill clears them.
+            item_type = data["type"] = exercises.QTI
+        if item_type == exercises.QTI:
             legacy_fields = {"question", "answers", "hints"}.intersection(data)
             if legacy_fields:
                 raise ValidationError(
@@ -144,7 +168,7 @@ def validate(self, data):
                 raise ValidationError(
                     {"raw_data": [error.message for error in result.errors]}
                 )
-        elif self._item_type != exercises.PERSEUS_QUESTION and "raw_data" in data:
+        elif item_type != exercises.PERSEUS_QUESTION and "raw_data" in data:
             raise ValidationError(
                 {
                     "raw_data": [
@@ -332,8 +356,49 @@ class AssessmentItemViewSet(BulkCreateMixin, BulkUpdateMixin, ValuesViewset):
         "source_url",
         "randomize",
         "deleted",
+        # Only consumed by consolidate(), which pops them back off. Publish tags an
+        # item with the bare lang_code of its content node's language, falling back to
+        # the channel's (utils/assessment/qti/archive.py), so the read path matches.
+        "contentnode__language__lang_code",
+        "channel_lang_code",
     )
 
     field_map = {
         "contentnode": "contentnode_id",
     }
+
+    def annotate_queryset(self, queryset):
+        return queryset.annotate(
+            channel_lang_code=Subquery(
+                Channel.objects.filter(
+                    main_tree__tree_id=OuterRef("contentnode__tree_id")
+                ).values("language__lang_code")[:1]
+            )
+        )
+
+    def consolidate(self, items, queryset):
+        for item in items:
+            node_language = item.pop("contentnode__language__lang_code")
+            channel_language = item.pop("channel_lang_code")
+            language = node_language or channel_language
+            if item["type"] in PASSTHROUGH_TYPES:
+                continue
+            try:
+                # A new dict, so the language does not leak into the response.
+                result = convert_legacy_question_to_qti(dict(item, language=language))
+            except Exception:
+                # One item Studio cannot represent in QTI must not take out every other
+                # item on the node, so leave it as the legacy row it is; the editor
+                # renders a non-QTI item as unsupported.
+                logger.exception(
+                    "Could not convert assessment item %s to QTI", item["assessment_id"]
+                )
+                continue
+            item.update(
+                type=exercises.QTI,
+                raw_data=result.xml,
+                question="",
+                answers="[]",
+                hints="[]",
+            )
+        return items