diff --git a/.changeset/rude-lamps-invent.md b/.changeset/rude-lamps-invent.md
new file mode 100644
index 0000000..62229a5
--- /dev/null
+++ b/.changeset/rude-lamps-invent.md
@@ -0,0 +1,5 @@
+---
+"@fedimod/fires-server": patch
+---
+
+Implement ability to assign labels and internal comment during import
diff --git a/components/fires-server/app/controllers/admin/imports_controller.ts b/components/fires-server/app/controllers/admin/imports_controller.ts
index c8a01dd..f064e39 100644
--- a/components/fires-server/app/controllers/admin/imports_controller.ts
+++ b/components/fires-server/app/controllers/admin/imports_controller.ts
@@ -1,4 +1,5 @@
 import Dataset from '#models/dataset'
+import Label from '#models/label'
 import { ImportFileService } from '#services/import_file_service'
 import {
   importFileValidator,
@@ -35,6 +36,7 @@ export default class ImportsController {
 
     const data = await request.validateUsing(importFileValidator)
     const dataset = await Dataset.findOrFail(data.dataset)
+    const labels = await Label.query().orderBy('deprecatedAt', 'desc').orderBy('id', 'desc')
 
     if (!data.file.isValid || !data.file.tmpPath) {
       session.flash('notification', {
@@ -63,6 +65,10 @@ export default class ImportsController {
       unchanged: results.unchanged,
       missing: results.missing,
       defaultType: data.defaultType,
+      labels: labels.filter((l) => l.deprecatedAt === null).map((label) => label.serialize()),
+      deprecatedLabels: labels
+        .filter((l) => l.deprecatedAt !== null)
+        .map((label) => label.serialize()),
     })
   }
 
diff --git a/components/fires-server/app/validators/admin/imports.ts b/components/fires-server/app/validators/admin/imports.ts
index b3b944f..2ee94ef 100644
--- a/components/fires-server/app/validators/admin/imports.ts
+++ b/components/fires-server/app/validators/admin/imports.ts
@@ -4,6 +4,26 @@ import Label from '#models/label'
 import vine from '@vinejs/vine'
 import { entityKeyActor, entityKeyDomain } from '#validators/admin/dataset_change'
 
+const labelsValidator = vine.createRule(
+  async (value, _options, field) => {
+    if (!field.isValid) {
+      return
+    }
+
+    if (!Array.isArray(value)) {
+      field.report('Invalid labels value', 'invalid_type', field)
+      return
+    }
+
+    const labels = await Label.findMany(value)
+    if (value.length !== labels.length) {
+      field.report('Invalid labels', 'invalid', field)
+      return
+    }
+  },
+  { isAsync: true }
+)
+
 export const importValidator = vine.compile(
   vine.object({
     dataset: vine
@@ -59,13 +79,15 @@ export const performImportValidator = vine.compile(
             type: vine.enum(['recommendation', 'advisory', 'retraction']),
             recommended_policy: vine.enum(DatasetChange.policies),
             labels: vine
-              .array(
-                vine.string().exists({
-                  table: Label.table,
-                  column: 'id',
-                })
-              )
+              .array(vine.string())
+              .parse((value) => {
+                if (typeof value === 'string') {
+                  return value.split(/,\s*/)
+                }
+                return value
+              })
               .distinct()
+              .use(labelsValidator())
               .optional(),
             comment: vine.string().optional(),
             entity_kind: vine.enum(DatasetChange.entities),
diff --git a/components/fires-server/resources/scripts/admin.js b/components/fires-server/resources/scripts/admin.js
index ed15dba..83603c1 100644
--- a/components/fires-server/resources/scripts/admin.js
+++ b/components/fires-server/resources/scripts/admin.js
@@ -1,5 +1,6 @@
 // @ts-nocheck
 import './lib/copyable'
+import './admin/import'
 
 function addTranslation() {
   const template = document.getElementById('new-translation')
diff --git a/components/fires-server/resources/scripts/admin/import.js b/components/fires-server/resources/scripts/admin/import.js
new file mode 100644
index 0000000..d75c623
--- /dev/null
+++ b/components/fires-server/resources/scripts/admin/import.js
@@ -0,0 +1,140 @@
+;(() => {
+  const reviewForm = document.getElementById('import-review')
+  const manageLabelsDialog = document.getElementById('import-manage-labels')
+  if (!(reviewForm instanceof HTMLFormElement && manageLabelsDialog instanceof HTMLDialogElement)) {
+    return
+  }
+
+  const html = document.documentElement
+
+  const isOpenClass = 'modal-is-open'
+
+  /**
+   * @type {HTMLDialogElement|null}
+   */
+  let visibleModal = null
+
+  /**
+   *
+   * @param {HTMLDialogElement} modal
+   */
+  const openModal = (modal) => {
+    html.classList.add(isOpenClass)
+    modal.showModal()
+    visibleModal = modal
+  }
+
+  /**
+   *
+   * @param {HTMLDialogElement} modal
+   */
+  const closeModal = (modal) => {
+    handleClose(modal)
+    modal.close('cancel')
+  }
+  /**
+   * @param {HTMLDialogElement} modal
+   */
+  const handleClose = (modal) => {
+    html.classList.remove(isOpenClass)
+    visibleModal = null
+  }
+
+  document.addEventListener('keydown', (event) => {
+    if (event.key === 'Escape' && visibleModal) {
+      closeModal(visibleModal)
+    }
+  })
+
+  document.addEventListener('click', (event) => {
+    if (!event.target || !(event.target instanceof HTMLButtonElement)) return
+
+    // open modal button
+    if (!visibleModal && event.target.dataset.row) {
+      event.preventDefault()
+
+      const row = event.target.dataset.row
+      const rowComment = event.target.dataset.rowComment
+      const labelInput = document.getElementById(`${row}-labels`)
+      const commentInput = document.getElementById(`${row}-comment`)
+
+      if (!(labelInput instanceof HTMLInputElement)) {
+        return
+      }
+
+      const labels = labelInput.value.split(',').filter((v) => v !== '')
+
+      manageLabelsDialog.querySelectorAll('input[type="checkbox"]').forEach((input) => {
+        if (!(input instanceof HTMLInputElement)) return
+        if (labels.includes(input.value)) {
+          input.setAttribute('checked', 'checked')
+          input.checked = true
+        } else {
+          input.removeAttribute('checked')
+          input.checked = false
+        }
+      })
+
+      const commentTextarea = manageLabelsDialog.querySelector('input[name="comment"]')
+      if (commentTextarea instanceof HTMLInputElement && commentInput instanceof HTMLInputElement) {
+        commentTextarea.value = commentInput.value ?? ''
+      }
+
+      const rowCommentSection = manageLabelsDialog.querySelector('#manage-row-comment')
+      const rowCommentField = manageLabelsDialog.querySelector('#manage-row-comment-text')
+      if (rowCommentField instanceof HTMLParagraphElement) {
+        if (!rowComment) {
+          rowCommentSection?.classList.add('d-hidden')
+        } else {
+          rowCommentSection?.classList.remove('d-hidden')
+          rowCommentField.innerText = rowComment
+        }
+      }
+
+      manageLabelsDialog.dataset.row = row
+      openModal(manageLabelsDialog)
+    }
+
+    // close modal button
+    if (visibleModal && event.target.getAttribute('rel') === 'prev') {
+      closeModal(visibleModal)
+    }
+  })
+
+  manageLabelsDialog.addEventListener('close', (event) => {
+    handleClose(manageLabelsDialog)
+    if (!event.currentTarget || !(event.currentTarget instanceof HTMLDialogElement)) return
+    if (event.currentTarget.returnValue == 'cancel') {
+      return
+    }
+
+    const form = manageLabelsDialog.getElementsByTagName('form')[0]
+    const formData = new FormData(form)
+
+    const comment = formData.get('comment')?.toString()
+    const labels = Array.from(formData.getAll('labels[]'))
+    const row = manageLabelsDialog.dataset.row
+    const labelInput = document.getElementById(`${row}-labels`)
+    const commentInput = document.getElementById(`${row}-comment`)
+
+    if (!(labelInput instanceof HTMLInputElement) || !(commentInput instanceof HTMLInputElement)) {
+      return
+    }
+
+    labelInput.value = labels.join(',')
+    if (comment) {
+      commentInput.value = comment
+    } else {
+      commentInput.value = ''
+    }
+
+    console.log(`Set ${row} to ${labelInput.value}`)
+  })
+
+  manageLabelsDialog.querySelector('#cancel')?.addEventListener('click', () => {
+    if (visibleModal === manageLabelsDialog) {
+      manageLabelsDialog.dataset.row = undefined
+      closeModal(visibleModal)
+    }
+  })
+})()
diff --git a/components/fires-server/resources/styles/app.scss b/components/fires-server/resources/styles/app.scss
index 6825207..8c3cdcc 100644
--- a/components/fires-server/resources/styles/app.scss
+++ b/components/fires-server/resources/styles/app.scss
@@ -163,6 +163,10 @@ p.lead {
   margin-bottom: calc(var(--pico-typography-spacing-vertical) * 2);
 }
 
+blockquote > p:last-child {
+  margin-bottom: 0;
+}
+
 .d-hidden {
   display: none;
 }
@@ -200,6 +204,10 @@ button.inline {
   margin-left: calc(var(--pico-spacing) * 2);
 }
 
+.mb-0 {
+  margin-bottom: 0 !important;
+}
+
 dl.labels dt {
   font-size: 1.4rem;
   font-weight: bold;
@@ -313,7 +321,8 @@ input:is([type='file']) {
   }
 }
 
-[role='group']:has(+ .form-hint) {
+[role='group']:has(+ .form-hint),
+:is(h1, h2, h3, h4, h5, h6):has(+ .form-hint) {
   margin-bottom: 0;
 
   & + .form-hint {
@@ -543,3 +552,32 @@ select[disabled] {
   pointer-events: none;
   cursor: pointer;
 }
+
+dialog article {
+  padding: 0;
+
+  header,
+  footer {
+    margin: 0;
+    padding: var(--pico-block-spacing-vertical) var(--pico-block-spacing-horizontal);
+    background: var(--pico-color-slate-850);
+    border: none;
+  }
+
+  header {
+    position: sticky;
+    top: 0px;
+  }
+
+  form {
+    padding: var(--pico-block-spacing-vertical) var(--pico-block-spacing-horizontal);
+  }
+
+  footer {
+    position: sticky;
+    bottom: 0px;
+    // Negative to account for form > footer
+    margin: var(--pico-block-spacing-vertical) calc(var(--pico-block-spacing-horizontal) * -1);
+    margin-bottom: calc(var(--pico-block-spacing-vertical) * -1);
+  }
+}
diff --git a/components/fires-server/resources/views/admin/imports/_review_header_row.edge b/components/fires-server/resources/views/admin/imports/_review_header_row.edge
index 9a50989..62c2c8d 100644
--- a/components/fires-server/resources/views/admin/imports/_review_header_row.edge
+++ b/components/fires-server/resources/views/admin/imports/_review_header_row.edge
@@ -2,7 +2,8 @@
   <strong>Change Type</strong>
   <strong>Kind</strong>
   <strong>Key</strong>
-  <strong>Recommended Policy</strong>
+  <strong>Policy</strong>
+  <span></span>  {{--  Edit button --}}
   @if(retraction)
     <span></span>
   @endif
diff --git a/components/fires-server/resources/views/admin/imports/_review_row.edge b/components/fires-server/resources/views/admin/imports/_review_row.edge
index 28ceed9..cf7b5d3 100644
--- a/components/fires-server/resources/views/admin/imports/_review_row.edge
+++ b/components/fires-server/resources/views/admin/imports/_review_row.edge
@@ -1,4 +1,4 @@
-<div class="grid row">
+<div class="grid row" id="changes-{{ index }}">
   <input
     type="hidden"
     name="changes[{{ index }}][entity_kind]"
@@ -20,11 +20,20 @@
 
   <input
     type="hidden"
+    id="changes-{{ index }}-comment"
     name="changes[{{ index }}][comment]"
     value="{{ record.comment }}"
     {{ html.attrs({ disabled: noUpdate }) }}
   />
 
+  <input
+    type="hidden"
+    id="changes-{{ index }}-labels"
+    name="changes[{{ index }}][labels]"
+    value=""
+    {{ html.attrs({ disabled: noUpdate }) }}
+  />
+
   <select
     name="changes[{{ index }}][type]"
     class="form-control"
@@ -73,6 +82,9 @@
       {{ record.recommendedPolicy }}
     @endif
   </span>
+  @unless(noUpdate)
+    <button class="manage-labels" data-row="changes-{{ index }}" data-row-comment="{{ record.comment }}">Edit</button>
+  @end
   @if(retraction)
     <button class="remove-row" type="button">Ignore</button>
   @endif
diff --git a/components/fires-server/resources/views/admin/imports/review.edge b/components/fires-server/resources/views/admin/imports/review.edge
index 4304a84..0ac0b40 100644
--- a/components/fires-server/resources/views/admin/imports/review.edge
+++ b/components/fires-server/resources/views/admin/imports/review.edge
@@ -82,9 +82,7 @@
             from the dataset, mark them as retractions, otherwise ignore them:
           </p>
 
-          @if(missing.length)
-            @!component('admin/imports/_review_header_row', { retraction: true })
-          @endif
+          @!component('admin/imports/_review_header_row', { retraction: true })
           <div class="rows">
             {{-- This gets shown dynamically with javascript --}}
             <div id="no-missing-record" class="d-hidden text-center">
@@ -131,4 +129,68 @@
       <button type="submit">Import</button>
     </form>
   @endslot
+  
+  @slot('modals')
+    <dialog id="import-manage-labels">
+      <article>
+        <header>
+          <button aria-label="Close" rel="prev"></button>
+          <p>
+            <strong>Manage labels & comment</strong>
+          </p>
+        </header>
+        <form method="dialog">
+          <div id="manage-row-comment">
+            <h5>
+              Row Comment
+            </h5>
+            <blockquote>
+              <p id="manage-row-comment-text">
+              </p>
+            </blockquote>
+          </div>
+
+          <h5>
+            <label for="manage-comment">Labels</label>
+          </h5>
+          <fieldset name="labels" class="columns">
+            @each(label in labels)
+              <label for="labels-{{ label.id }}">
+                <input type="checkbox" id="labels-{{ label.id }}" name="labels[]" value="{{ label.id }}" />&nbsp;{{ label.name }}
+              </label>
+            @else
+              <p>
+                You need to create labels first before you can assign them.
+              </p>
+            @end
+          </fieldset>
+          @if(deprecatedLabels.length)
+            <h6 class="mt-0">
+              Deprecated Labels
+            </h6>
+            <fieldset name="labels" class="columns">
+              @each(label in deprecatedLabels)
+                <label for="labels-{{ label.id }}">
+                  <input type="checkbox" id="labels-{{ label.id }}" name="labels[]" value="{{ label.id }}" />&nbsp;{{ label.name }}
+                </label>
+              @end
+            </fieldset>
+          @end
+          
+          <h5>
+            <label for="manage-comment">Internal Comment</label>
+          </h5>
+          <small class="form-hint">This comment is not publicly visible, and purely for your own information.</small>
+          <input type="text" name="comment" value="" class="form-control mb-2" />
+
+          <footer>
+            <div class="button-group">
+              <button id="cancel" type="reset">Cancel</button>
+              <button id="submit" type="submit">Update</button>
+            </div>
+          </footer>
+        </form>
+      </article>
+    </dialog>
+  @endslot
 @end
diff --git a/components/fires-server/resources/views/components/layouts/admin.edge b/components/fires-server/resources/views/components/layouts/admin.edge
index 6861d16..69373c1 100644
--- a/components/fires-server/resources/views/components/layouts/admin.edge
+++ b/components/fires-server/resources/views/components/layouts/admin.edge
@@ -58,5 +58,8 @@
       </main>
       @!component('components/footer')
     </div>
+    @if ($slots.modals)
+      {{{ await $slots.modals() }}}
+    @endif
   </body>
 </html>