diff --git a/src/helpers/constants.js b/src/helpers/constants.js
index 9a4987625..4b10b14da 100644
--- a/src/helpers/constants.js
+++ b/src/helpers/constants.js
@@ -116,12 +116,18 @@ const OFFENCE_CATEGORY = {
   MIXED: 'mixed',
 };
 
+const TASK_QT_MAP = {};
+TASK_QT_MAP[TASK_TYPE.CRITICAL_ANALYSIS] = QUALIFYING_TEST.TYPE.CRITICAL_ANALYSIS;
+TASK_QT_MAP[TASK_TYPE.SITUATIONAL_JUDGEMENT] = QUALIFYING_TEST.TYPE.SITUATIONAL_JUDGEMENT;
+TASK_QT_MAP[TASK_TYPE.SCENARIO] = QUALIFYING_TEST.TYPE.SCENARIO;
+
 export {
   STATUS,
   EXERCISE_STAGE,
   APPLICATION_STATUS,
   APPLICATION_SUCCESS_STATUSES,
   TASK_TYPE,
+  TASK_QT_MAP,
   SHORTLISTING,
   QUALIFYING_TEST,
   QUALIFYING_TEST_RESPONSE,
diff --git a/src/store/qualifyingTest/qualifyingTest.js b/src/store/qualifyingTest/qualifyingTest.js
index b2a96300b..a44f201e5 100644
--- a/src/store/qualifyingTest/qualifyingTest.js
+++ b/src/store/qualifyingTest/qualifyingTest.js
@@ -21,6 +21,9 @@ export default {
     bindQTs: firestoreAction(({ bindFirestoreRef, state }, params) => {
       let firestoreRef = collection
         .where('vacancy.id', '==', params.exerciseId);
+      if (params.type) {
+        firestoreRef = firestoreRef.where('type', '==', params.type);
+      }
       firestoreRef = tableQuery(state.records, firestoreRef, params);
       return bindFirestoreRef('records', firestoreRef, { serialize: vuexfireSerialize });
     }),
diff --git a/src/views/Exercise/Reports/MeritList.vue b/src/views/Exercise/Reports/MeritList.vue
index ffaef2497..30158f2df 100644
--- a/src/views/Exercise/Reports/MeritList.vue
+++ b/src/views/Exercise/Reports/MeritList.vue
@@ -294,7 +294,7 @@ export default {
       // Default sort by total score (initially)
       columns.push({ title: 'Total Score', sort: 'totalScore', direction: 'desc', default: true, class: 'text-center' });
       columns.push({ title: 'Female' });
-      columns.push({ title: 'BAME' });
+      columns.push({ title: 'Ethnic minority' });
       columns.push({ title: 'Solicitor' });
       columns.push({ title: 'Disability' });
       return columns;
diff --git a/src/views/Exercise/Tasks/Task/Data/AddMarkingSchemeItem.vue b/src/views/Exercise/Tasks/Task/Data/AddMarkingSchemeItem.vue
new file mode 100644
index 000000000..5bd1b1574
--- /dev/null
+++ b/src/views/Exercise/Tasks/Task/Data/AddMarkingSchemeItem.vue
@@ -0,0 +1,82 @@
+<template>
+  <Form
+    @save="save"
+    @cancel="cancel"
+  >
+    <Select
+      id="type"
+      v-model="formData.type"
+      label="Please select a type"
+      required
+    >
+      <option
+        v-for="type in types"
+        :key="type.value"
+        :value="type.value"
+      >
+        {{ type.title }}
+      </option>
+    </Select>
+
+    <TextField
+      id="title"
+      v-model="formData.title"
+      type="text"
+      label="Title"
+      required
+    />
+    <TextField
+      id="ref"
+      v-model="formData.ref"
+      type="text"
+      label="Ref"
+      required
+    />
+    <Checkbox
+      id="exclude-from-score"
+      v-model="formData.excludeFromScore"
+    >
+      Exclude from score?
+    </Checkbox>
+  </Form>
+</template>
+
+<script>
+import Form from '@/components/Page/Form';
+import Select from '@jac-uk/jac-kit/draftComponents/Form/Select';
+import TextField from '@jac-uk/jac-kit/draftComponents/Form/TextField';
+import Checkbox from '@jac-uk/jac-kit/draftComponents/Form/Checkbox';
+
+export default {
+  name: 'SelectPanel',
+  components: {
+    Form,
+    Select,
+    TextField,
+    Checkbox,
+  },
+  extends: Form,
+  data() {
+    return {
+      types: [
+        {
+          value: 'grade',
+          title: 'Grade',
+        },
+        {
+          value: 'bool',
+          title: 'Boolean',
+        },
+        {
+          value: 'number',
+          title: 'Number',
+        },
+        // {
+        //   value: 'select',
+        //   title: 'Choice',
+        // },
+      ],
+    };
+  },
+};
+</script>
diff --git a/src/views/Exercise/Tasks/Task/Data/Initialised.vue b/src/views/Exercise/Tasks/Task/Data/Initialised.vue
index 7e5f76c42..a855f7129 100644
--- a/src/views/Exercise/Tasks/Task/Data/Initialised.vue
+++ b/src/views/Exercise/Tasks/Task/Data/Initialised.vue
@@ -1,3 +1,161 @@
 <template>
-  <p>[ Data entry: configure settings - e.g. marking scheme ]</p>
+  <div>
+    <div class="govuk-grid-row">
+      <div class="govuk-grid-column-one-half">
+        <h1 class="govuk-heading-l">
+          {{ type | lookup }}
+        </h1>
+      </div>
+      <div class="text-right govuk-grid-column-one-half">
+        <ActionButton
+          class="govuk-!-margin-bottom-1"
+          type="primary"
+          @click="btnContinue"
+        >
+          Continue
+        </ActionButton>
+      </div>
+    </div>
+    <p class="govuk-body-l govuk-!-margin-bottom-4">
+      Please check the marking scheme is correct then press Continue
+    </p>
+
+    <div
+      v-for="group in markingScheme"
+      :key="group.ref"
+    >
+      <Table
+        data-key="ref"
+        :data="group.children"
+        :columns="[
+          { title: $options.filters.lookup(group.ref) },
+          { title: '' },
+          { title: '' },
+        ]"
+        local-data
+      >
+        <template #row="{row, index}">
+          <TableCell>
+            {{ row.ref | lookup }}
+          </TableCell>
+          <TableCell>
+            {{ row.type | lookup }}
+          </TableCell>
+          <TableCell>
+            <ActionButton
+              class="govuk-!-margin-bottom-0"
+              @click="btnRemove(group, index)"
+            >
+              Remove
+            </ActionButton>
+          </TableCell>
+        </template>
+      </Table>
+
+      <button
+        type="button"
+        class="govuk-button govuk-button--secondary govuk-!-margin-bottom-0"
+        @click="btnAdd(group)"
+      >
+        Add
+      </button>
+    </div>
+
+    <Modal ref="modalAddMarkingSchemeItem">
+      <TitleBar>
+        Add to marking scheme
+      </TitleBar>
+      <AddMarkingSchemeItem
+        class="govuk-!-margin-6"
+        @save="btnSave"
+        @cancel="btnCancelAdd"
+      />
+    </Modal>
+  </div>
 </template>
+
+<script>
+import { beforeRouteEnter, btnNext } from '../helper';
+import ActionButton from '@jac-uk/jac-kit/draftComponents/ActionButton';
+import Table from '@jac-uk/jac-kit/components/Table/Table';
+import TableCell from '@jac-uk/jac-kit/components/Table/TableCell';
+import Modal from '@jac-uk/jac-kit/components/Modal/Modal';
+import TitleBar from '@/components/Page/TitleBar';
+import AddMarkingSchemeItem from './AddMarkingSchemeItem';
+import { functions } from '@/firebase';
+
+export default {
+  components: {
+    ActionButton,
+    Table,
+    TableCell,
+    Modal,
+    TitleBar,
+    AddMarkingSchemeItem,
+  },
+  beforeRouteEnter: beforeRouteEnter,
+  props: {
+    type: {
+      required: true,
+      type: String,
+    },
+  },
+  data() {
+    const task = this.$store.getters['tasks/getTask'](this.type);
+    return {
+      markingScheme: task.markingScheme,
+      tableColumns: [
+        { title: 'Criteria' },
+        { title: 'Type' },
+        { title: '' },
+      ],
+      currentGroup: null,
+    };
+  },
+  computed: {
+    exercise() {
+      return this.$store.state.exerciseDocument.record;
+    },
+    task() {
+      return this.$store.getters['tasks/getTask'](this.type);
+    },
+  },
+  watch: {
+    task() {
+      this.markingScheme = this.task.markingScheme;
+    },
+  },
+  methods: {
+    btnNext,
+    async btnContinue() {
+      await functions.httpsCallable('updateTask')({
+        exerciseId: this.exercise.id,
+        type: this.type,
+      });
+      this.btnNext();
+    },
+    async btnRemove(group, rowIndex) {
+      group.children.splice(rowIndex, 1);
+      await this.$store.dispatch('task/update', { exerciseId: this.exercise.id, type: this.type, data: { markingScheme: this.markingScheme } } );
+      return true;
+    },
+    btnAdd(group) {
+      this.currentGroup = group;
+      this.$refs.modalAddMarkingSchemeItem.openModal();
+    },
+    async btnSave({ type, title, ref, excludeFromScore }) {
+      const newItem = {};
+      newItem.type = type;
+      newItem.title = title;
+      newItem.ref = ref;
+      if (excludeFromScore) newItem.excludeFromScore = excludeFromScore;
+      this.currentGroup.children.push(newItem);
+      await this.$store.dispatch('task/update', { exerciseId: this.exercise.id, type: this.type, data: { markingScheme: this.markingScheme } } );
+      this.$refs.modalAddMarkingSchemeItem.closeModal();
+    },
+    btnCancelAdd() {
+      this.$refs.modalAddMarkingSchemeItem.closeModal();
+    },
+  },
+};
+</script>
diff --git a/src/views/Exercise/Tasks/Task/New.vue b/src/views/Exercise/Tasks/Task/New.vue
index 385470cde..8b7e4beb8 100644
--- a/src/views/Exercise/Tasks/Task/New.vue
+++ b/src/views/Exercise/Tasks/Task/New.vue
@@ -12,11 +12,17 @@
 import { beforeRouteEnter, getExpectedRouteName } from './helper';
 import { TASK_TYPE } from '@/helpers/constants';
 import defaultView from './New/default';
+import expired from './New/expired';
+import expiredQT from './New/expiredQT';
 import qualifyingTest from './New/qualifyingTest';
+import { isDateInFuture } from '@jac-uk/jac-kit/helpers/date';
+import { getTimelineTasks } from '@/helpers/exerciseHelper';
 
 export default {
   components: {
     defaultView,
+    expired,
+    expiredQT,
     qualifyingTest,
   },
   beforeRouteEnter: beforeRouteEnter,
@@ -27,12 +33,34 @@ export default {
     },
   },
   computed: {
+    exercise() {
+      return this.$store.state.exerciseDocument.record;
+    },
+    timelineTasks() {
+      return getTimelineTasks(this.exercise, this.type);
+    },
+    taskIsOverdue() {
+      const timelineTask = this.timelineTasks[0];
+      if (!timelineTask) return false;
+      return !isDateInFuture(timelineTask.date);
+    },
     newView() {
-      switch (this.type) {
-      case TASK_TYPE.QUALIFYING_TEST:
-        return 'qualifyingTest';
-      default:
-        return 'defaultView';
+      if (this.taskIsOverdue) {
+        switch (this.type) {
+        case TASK_TYPE.CRITICAL_ANALYSIS:
+        case TASK_TYPE.SITUATIONAL_JUDGEMENT:
+        case TASK_TYPE.SCENARIO:
+          return 'expiredQT';
+        default:
+          return 'expired';
+        }
+      } else {
+        switch (this.type) {
+        case TASK_TYPE.QUALIFYING_TEST:
+          return 'qualifyingTest';
+        default:
+          return 'defaultView';
+        }
       }
     },
   },
diff --git a/src/views/Exercise/Tasks/Task/New/default.vue b/src/views/Exercise/Tasks/Task/New/default.vue
index d03f3f20a..27bd1f075 100644
--- a/src/views/Exercise/Tasks/Task/New/default.vue
+++ b/src/views/Exercise/Tasks/Task/New/default.vue
@@ -27,6 +27,23 @@
       Only '{{ entryStatus | lookup }}' applications will be included
     </Checkbox>
 
+    <div
+      v-if="taskIsOverdue"
+      class="govuk-warning-text"
+    >
+      <span
+        class="govuk-warning-text__icon"
+        aria-hidden="true"
+      >!</span>
+      <strong class="govuk-warning-text__text">
+        <span class="govuk-warning-text__assistive">Warning</span>
+        This task is overdue. Please change dates on the <RouterLink
+          :to="{ name: 'exercise-details-timeline' }"
+          class="govuk-link"
+        >timeline</RouterLink> if you wish to carry out the task.<br> Alternatively press continue to enter results data only.
+      </strong>
+    </div>
+
     <ActionButton
       class="govuk-!-margin-bottom-0"
       type="primary"
@@ -45,6 +62,7 @@ import { taskEntryStatus, previousTaskType, getTimelineTasks } from '@/helpers/e
 import ActionButton from '@jac-uk/jac-kit/draftComponents/ActionButton';
 import Checkbox from '@jac-uk/jac-kit/draftComponents/Form/Checkbox';
 import { functions } from '@/firebase';
+import { isDateInFuture } from '@jac-uk/jac-kit/helpers/date';
 
 export default {
   components: {
@@ -78,6 +96,10 @@ export default {
     isQualifyingTest() {
       return this.type === TASK_TYPE.QUALIFYING_TEST;
     },
+    taskIsOverdue() {
+      const timelineTask = this.timelineTasks[0];
+      return !isDateInFuture(timelineTask.date);
+    },
     totalApplications() {
       if (!this.exercise) return 0;
       if (!this.exercise._applicationRecords) return 0;
@@ -109,10 +131,14 @@ export default {
   methods: {
     btnNext,
     async btnInitialise() {
-      await functions.httpsCallable('createTask')({
+      const params = {
         exerciseId: this.exercise.id,
         type: this.type,
-      });
+      };
+      if (this.taskIsOverdue) {
+        params.dataOnly = true;
+      }
+      await functions.httpsCallable('createTask')(params);
       this.btnNext();
     },
   },
diff --git a/src/views/Exercise/Tasks/Task/New/expired.vue b/src/views/Exercise/Tasks/Task/New/expired.vue
new file mode 100644
index 000000000..0e5ec503d
--- /dev/null
+++ b/src/views/Exercise/Tasks/Task/New/expired.vue
@@ -0,0 +1,27 @@
+<template>
+  <div>
+    <h1 class="govuk-heading-l">
+      {{ type | lookup }}
+    </h1>
+    <div class="govuk-warning-text">
+      <span
+        class="govuk-warning-text__icon"
+        aria-hidden="true"
+      >!</span>
+      <strong class="govuk-warning-text__text">
+        <span class="govuk-warning-text__assistive">Warning</span>
+        This task is overdue. Please change dates on the <RouterLink
+          :to="{ name: 'exercise-details-timeline' }"
+          class="govuk-link"
+        >timeline</RouterLink> if you wish to carry out the task.
+      </strong>
+    </div>
+  </div>
+</template>
+
+<script>
+import defaultView from './default';
+export default {
+  extends: defaultView,
+};
+</script>
diff --git a/src/views/Exercise/Tasks/Task/New/expiredQT.vue b/src/views/Exercise/Tasks/Task/New/expiredQT.vue
new file mode 100644
index 000000000..1ddebd9d6
--- /dev/null
+++ b/src/views/Exercise/Tasks/Task/New/expiredQT.vue
@@ -0,0 +1,94 @@
+<template>
+  <div>
+    <h1 class="govuk-heading-l">
+      {{ type | lookup }}
+    </h1>
+    <div
+      class="govuk-inset-text"
+    >
+      It looks like the {{ type | lookup }} has already been completed.
+    </div>
+
+    <RadioGroup
+      id="selected-qt"
+      v-model="formData.selectedQT"
+      label="Please choose the completed live test"
+      required
+      :messages="{
+        required: 'Please choose one of the following options'
+      }"
+    >
+      <RadioItem
+        v-for="qualifyingTest in qualifyingTests"
+        :key="qualifyingTest.id"
+        :value="qualifyingTest.id"
+        :label="qualifyingTest.title"
+      />
+    </RadioGroup>
+
+    <Checkbox
+      id="update-status"
+      v-model="formData.allowStatusUpdates"
+      label="Allow application status updates"
+      hint="When this is checked, this task will be allowed to update the status of applications"
+    >
+      Yes - allow this task to update application status
+    </Checkbox>
+
+    <ActionButton
+      class="govuk-!-margin-bottom-0"
+      type="primary"
+      :disabled="!formData.selectedQT"
+      @click="btnContinue"
+    >
+      Continue
+    </ActionButton>
+  </div>
+</template>
+
+<script>
+import defaultView from './default';
+import RadioGroup from '@jac-uk/jac-kit/draftComponents/Form/RadioGroup';
+import RadioItem from '@jac-uk/jac-kit/draftComponents/Form/RadioItem';
+import Checkbox from '@jac-uk/jac-kit/draftComponents/Form/Checkbox';
+import { QUALIFYING_TEST } from '@jac-uk/jac-kit/helpers/constants';
+import { TASK_QT_MAP } from '@/helpers/constants';
+import { functions } from '@/firebase';
+
+export default {
+  components: {
+    RadioGroup,
+    RadioItem,
+    Checkbox,
+  },
+  extends: defaultView,
+  data() {
+    return {
+      formData: {
+        selectedQT: '',
+        allowStatusUpdates: true,
+      },
+    };
+  },
+  computed: {
+    qualifyingTests() {
+      return this.$store.getters['qualifyingTest/getCompletedQTs'].filter(qualifyingTest => qualifyingTest.mode !== QUALIFYING_TEST.MODE.DRY_RUN);
+    },
+  },
+  created() {
+    this.$store.dispatch('qualifyingTest/bindQTs', { exerciseId: this.exercise.id, type: TASK_QT_MAP[this.type] });
+  },
+  methods: {
+    async btnContinue() {
+      const params = {
+        exerciseId: this.exercise.id,
+        type: this.type,
+        qualifyingTestId: this.formData.selectedQT,
+        allowStatusUpdates: this.formData.allowStatusUpdates,
+      };
+      await functions.httpsCallable('createTaskForExistingQT')(params);
+      this.btnNext();
+    },
+  },
+};
+</script>