diff --git a/components/AppImageViewer.vue b/components/AppImageViewer.vue
new file mode 100644
index 0000000..1b9c50b
--- /dev/null
+++ b/components/AppImageViewer.vue
@@ -0,0 +1,38 @@
+<!--
+Wrapper around v-viewer.
+-->
+<script setup lang="ts">
+import { api as viewerApi } from 'v-viewer';
+
+interface Props {
+  // Label shown below the image. Omit to hide the title bar entirely.
+  title?: string;
+}
+
+const props = defineProps<Props>();
+
+const viewerOptions = computed(() => ({
+  navbar: false,
+  zoomRatio: 0.3,
+  title: props.title ? () => props.title : false,
+  toolbar: {
+    zoomIn: true,
+    zoomOut: true,
+    oneToOne: false,
+    reset: false,
+    prev: false,
+    play: false,
+    next: false,
+    rotateLeft: true,
+    rotateRight: true,
+    flipHorizontal: false,
+    flipVertical: false,
+  },
+}));
+
+function show(imageUrl: string) {
+  viewerApi({ images: [imageUrl], options: viewerOptions.value });
+}
+
+defineExpose({ show });
+</script>
diff --git a/components/review/AttributeDiff.vue b/components/review/AttributeDiff.vue
index 41d7d1c..c5b1a7b 100644
--- a/components/review/AttributeDiff.vue
+++ b/components/review/AttributeDiff.vue
@@ -1,7 +1,26 @@
 <template>
   <section class="diff-attributes">
+    <!--
+    For small screens, display a button to view the photo submission. Otherwise
+    we'll display a thumbnail as a separate component (FeatureImage.vue).
+    -->
+    <div
+      v-if="props.imageUrl"
+      class="d-lg-none"
+    >
+      <button
+        class="diff-attributes__photo-btn"
+        type="button"
+        @click="emit('open-photo')"
+      >
+        <app-icon variant="photo_camera" />
+        <span class="diff-attributes__photo-label">View photo submission</span>
+      </button>
+    </div>
+
     <header>
-      <app-icon :variant="elementIcon" />{{ elementType }}
+      <app-icon :variant="elementIcon" />
+      {{ elementType }}
       <strong>#{{ elementId }}</strong>
       {{ elementAction }} by
       <strong>{{ props.diff.new.user }}</strong>
@@ -144,9 +163,11 @@ class TagMap {
 interface Props {
   datasetType: WorkspaceType;
   diff: AdiffAction;
+  imageUrl?: string;
 }
 
 const props = defineProps<Props>();
+const emit = defineEmits(['open-photo']);
 
 const elementId = computed(() => props.diff.new?.id ?? props.diff.old?.id);
 const elementType = computed(() => {
@@ -218,6 +239,13 @@ function tagClass(vals: TagMapItem) {
   overflow: hidden;
   font-size: 0.875em;
 
+  @include media-breakpoint-down(md) {
+    & {
+      min-width: 0;
+      max-width: calc(100vw - 1.2rem);
+    }
+  }
+
   > * {
     background: var(--bs-body-bg);
     box-shadow: var(--bs-box-shadow);
@@ -225,6 +253,32 @@ function tagClass(vals: TagMapItem) {
     margin-bottom: 0.5rem;
   }
 
+  &__photo-btn {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    background: none;
+    border: none;
+    padding: 0.5em;
+    gap: 0.25em;
+    cursor: pointer;
+    text-align: left;
+
+    &:hover .diff-attributes__photo-label {
+      color: var(--bs-link-hover-color);
+    }
+
+    i {
+      margin-top: 0;
+    }
+  }
+
+  &__photo-label {
+    color: var(--bs-link-color);
+    text-decoration: underline;
+    text-underline-offset: 2px;
+  }
+
   header {
     padding: 0.25em 0.5em;
   }
diff --git a/components/review/Details.vue b/components/review/Details.vue
index adde49a..658bc6b 100644
--- a/components/review/Details.vue
+++ b/components/review/Details.vue
@@ -38,6 +38,11 @@ const getChangesetMetadata = (changeset: OsmChangeset) => ({
   'Editor': changeset.tags?.created_by,
   'Source': changeset.tags?.source,
   'Imagery': changeset.tags?.imagery_used,
+  'Review Status': changeset.tags?.reviewed_by
+    ? `Reviewed by ${changeset.tags.reviewed_by}`
+    : changeset.tags?.review_requested === 'yes'
+      ? 'Needs Review'
+      : undefined,
   'Created By': changeset.user,
   'User ID': changeset.uid,
   'Created At': formatShort(changeset.created_at),
diff --git a/components/review/FeatureImage.vue b/components/review/FeatureImage.vue
new file mode 100644
index 0000000..a037636
--- /dev/null
+++ b/components/review/FeatureImage.vue
@@ -0,0 +1,165 @@
+<template>
+  <div class="feature-image">
+    <div class="feature-image__panel">
+      <button
+        v-show="!minimized"
+        class="feature-image__thumb-btn"
+        :disabled="error || !loaded"
+        :title="error ? undefined : 'Click to enlarge'"
+        @click="emit('open')"
+      >
+        <app-spinner v-if="!loaded && !error" />
+        <img
+          v-show="loaded && !error"
+          :src="props.imageUrl"
+          class="feature-image__thumb"
+          alt="Photo submitted with the quest"
+          @load="onLoad"
+          @error="onError"
+        >
+        <span
+          v-if="error"
+          class="feature-image__error"
+        >
+          <app-icon variant="broken_image" />
+          Image unavailable
+        </span>
+      </button>
+
+      <div class="feature-image__caption">
+        <button
+          class="feature-image__toggle"
+          :title="minimized ? 'Expand' : 'Minimize'"
+          @click="minimized = !minimized"
+        >
+          <app-icon :variant="minimized ? 'add' : 'remove'" />
+        </button>
+        <a
+          :href="props.imageUrl"
+          target="_blank"
+          rel="noopener noreferrer"
+          class="feature-image__link"
+        >
+          KartaView
+          <app-icon variant="open_in_new" />
+        </a>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+interface Props {
+  imageUrl: string;
+}
+
+const props = defineProps<Props>();
+const emit = defineEmits(['open']);
+
+const loaded = ref(false);
+const error = ref(false);
+const minimized = ref(false);
+
+watch(() => props.imageUrl, () => {
+  loaded.value = false;
+  error.value = false;
+  minimized.value = false;
+});
+
+function onLoad() {
+  loaded.value = true;
+}
+
+function onError() {
+  error.value = true;
+}
+</script>
+
+<style scoped lang="scss">
+@import "assets/scss/theme.scss";
+
+.feature-image {
+  position: absolute;
+  bottom: 2rem;
+  left: 0.6rem;
+
+  @include media-breakpoint-down(lg) {
+    & { display: none; }
+  }
+
+  &__panel {
+    background: $body-bg;
+    box-shadow: $box-shadow;
+    border-radius: $border-radius;
+    overflow: hidden;
+  }
+
+  &__thumb-btn {
+    display: block;
+    width: 10rem;
+    min-height: 4rem;
+    background: none;
+    border: none;
+    padding: 0;
+    cursor: pointer;
+    line-height: 0;
+
+    &:disabled {
+      cursor: default;
+    }
+  }
+
+  &__thumb {
+    width: 100%;
+    height: auto;
+    display: block;
+  }
+
+  &__error {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    min-height: 4rem;
+    padding: 0.5rem;
+    gap: 0.25rem;
+    font-size: 0.8em;
+    color: $secondary;
+    line-height: 1.2;
+  }
+
+  &__caption {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0.2rem 0.5rem;
+    font-size: 0.75em;
+  }
+
+  &__toggle {
+    background: none;
+    border: none;
+    padding: 0;
+    cursor: pointer;
+    color: $secondary;
+    line-height: 1;
+
+    &:hover {
+      color: $body-color;
+    }
+
+    i {
+      margin-top: 0;
+    }
+  }
+
+  &__link {
+    color: $secondary;
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+}
+</style>
diff --git a/components/review/FilterDropdown.vue b/components/review/FilterDropdown.vue
index 7dfc425..c8a952e 100644
--- a/components/review/FilterDropdown.vue
+++ b/components/review/FilterDropdown.vue
@@ -62,6 +62,16 @@
           Show Resolved
         </label>
       </div>
+      <div class="form-check form-switch">
+        <label class="form-check-label">
+          <input
+            v-model="filter.includeNeedsReview"
+            type="checkbox"
+            class="form-check-input"
+          >
+          Needs Review Only
+        </label>
+      </div>
     </div>
 
     <div class="dropdown-divider" />
diff --git a/components/review/Item.vue b/components/review/Item.vue
index c470c73..9fb0901 100644
--- a/components/review/Item.vue
+++ b/components/review/Item.vue
@@ -19,6 +19,12 @@
         >
           Resolved
         </span>
+        <span
+          v-if="props.item.needsReview"
+          class="badge bg-warning text-dark mx-1"
+        >
+          Needs Review
+        </span>
       </span>
       <span :class="elapsedClasses">
         <app-icon
diff --git a/components/review/Map.vue b/components/review/Map.vue
index 770e0fa..37868a7 100644
--- a/components/review/Map.vue
+++ b/components/review/Map.vue
@@ -81,10 +81,17 @@ const mapRef = useTemplateRef<HTMLDivElement>('map');
 let reviewMap: maplibregl.Map;
 let adiffViewer: typeof MapLibreAugmentedDiffViewer;
 let popup: maplibregl.Popup;
+let resizeObserver: ResizeObserver | undefined;
 
 onMounted(() => {
   initMap();
 });
+
+onUnmounted(() => {
+  resizeObserver?.disconnect();
+  reviewMap?.remove();
+});
+
 watch(() => props.item, drawItem);
 
 function initMap() {
@@ -97,6 +104,9 @@ function initMap() {
       container: mapRef.value,
       style: reviewMapStyle,
     });
+
+    resizeObserver = new ResizeObserver(() => reviewMap?.resize());
+    resizeObserver.observe(mapRef.value);
   }
 }
 
diff --git a/components/review/Overlay.vue b/components/review/Overlay.vue
index cb2c57a..e840c0f 100644
--- a/components/review/Overlay.vue
+++ b/components/review/Overlay.vue
@@ -5,6 +5,8 @@
       v-model:show-discussion="showDiscussion"
       :item="item"
       @edit="props.onEdit"
+      @resolve="$emit('resolve')"
+      @back="emit('back')"
     />
 
     <div class="review-overlay-panels">
@@ -29,6 +31,7 @@ interface Props {
 }
 
 const props = defineProps<Props>();
+const emit = defineEmits(['back', 'resolve']);
 
 const showDetails = ref(false);
 const showDiscussion = ref(false);
@@ -46,7 +49,7 @@ watch(() => props.item, () => {
   position: absolute;
   top: 1rem;
   left: 1rem;
-  margin-right: 1rem;
+  max-width: calc(100vw - 2rem);
 
   .review-overlay-panels {
     max-height: calc(100vh - $navbar-height - 6rem);
diff --git a/components/review/Sidebar.vue b/components/review/Sidebar.vue
index 958d619..b4ecf7a 100644
--- a/components/review/Sidebar.vue
+++ b/components/review/Sidebar.vue
@@ -96,6 +96,8 @@ function refresh() {
 </script>
 
 <style lang="scss">
+@import "assets/scss/theme.scss";
+
 .review-sidebar {
   display: flex;
   flex-direction: column;
@@ -146,5 +148,14 @@ function refresh() {
     border-top: 0;
     border-radius: 0;
   }
+
+  @include media-breakpoint-down(md) {
+    & {
+      flex-basis: auto;
+      min-width: 0;
+      max-width: none;
+      width: 100%;
+    }
+  }
 }
 </style>
diff --git a/components/review/Toolbar.vue b/components/review/Toolbar.vue
index ee3d36a..48b80b0 100644
--- a/components/review/Toolbar.vue
+++ b/components/review/Toolbar.vue
@@ -1,8 +1,21 @@
 <template>
   <nav class="review-toolbar">
-    <span class="border-end pe-3 me-3 text-uppercase ">
-      <span class="fw-bold">{{ props.item.displayType }}:</span>
-      #{{ props.item.id }}
+    <button
+      class="btn btn-sm btn-light border me-3 d-md-none"
+      type="button"
+      title="Back to list"
+      @click="emit('back')"
+    >
+      <app-icon
+        variant="arrow_back"
+        no-margin
+      />
+    </button>
+    <span class="border-end pe-3 me-3">
+      <app-icon
+        :variant="props.item.badgeIcon"
+        :class="typeClass"
+      /><span class="d-none d-sm-inline fw-bold text-uppercase me-1">{{ props.item.displayType }}:</span>#{{ props.item.id }}
     </span>
     <button
       class="btn btn-sm btn-primary"
@@ -66,6 +79,28 @@
         </div>
       </template>
     </BPopover>
+    <BPopover
+      :disabled="isValidator"
+      content="Only validators and owners can resolve changesets reviews"
+      placement="bottom"
+    >
+      <template #target>
+        <div class="d-inline-block ms-2">
+          <button
+            v-show="props.item.isChangeset && props.item.needsReview"
+            class="btn btn-sm btn-success"
+            :disabled="!isValidator"
+            @click="resolveChangeset"
+          >
+            <app-icon
+              variant="check"
+              no-margin
+            />
+            <span class="d-none d-sm-inline ms-2">Mark as Reviewed</span>
+          </button>
+        </div>
+      </template>
+    </BPopover>
   </nav>
 </template>
 
@@ -77,9 +112,12 @@ interface Props {
 }
 
 const props = defineProps<Props>();
+const emit = defineEmits(['back', 'edit', 'resolve']);
+
 const { isValidator } = useWorkspaceRole();
 
-const emit = defineEmits(['edit']);
+const typeClass = computed(() => props.item.badgeClass.replace('bg-', 'text-'));
+
 const showDetails = defineModel<boolean>('showDetails');
 const showDiscussion = defineModel<boolean>('showDiscussion');
 
@@ -87,6 +125,10 @@ function edit() {
   emit('edit');
 }
 
+function resolveChangeset() {
+  emit('resolve');
+}
+
 function toggleDetails() {
   showDetails.value = !showDetails.value;
 }
@@ -97,12 +139,21 @@ function toggleDiscussion() {
 </script>
 
 <style lang="scss">
+@import "assets/scss/theme.scss";
+
 .review-toolbar {
+  display: flex;
+  align-items: center;
   background-color: var(--bs-body-bg);
   border-radius: var(--bs-border-radius);
   padding: 1rem;
   margin-bottom: 0.5rem;
   white-space: nowrap;
   box-shadow: var(--bs-box-shadow-lg);
+  overflow-x: auto;
+
+  @include media-breakpoint-down(sm) {
+    & { padding: 0.5rem; }
+  }
 }
 </style>
diff --git a/components/settings/panel/General.vue b/components/settings/panel/General.vue
index 5ff13a9..4781cbb 100644
--- a/components/settings/panel/General.vue
+++ b/components/settings/panel/General.vue
@@ -8,7 +8,7 @@
         class="mb-3"
       >
         <app-icon variant="info" />
-        Only workspace owners can rename the workspace.
+        Only workspace owners can change workspace settings.
       </b-alert>
       <form @submit.prevent="rename">
         <label class="d-block mb-3">
@@ -28,6 +28,29 @@
           Rename
         </button>
       </form>
+
+      <hr>
+
+      <div class="form-check form-switch">
+        <input
+          id="autoFlagReview"
+          v-model="autoFlagReview"
+          type="checkbox"
+          class="form-check-input"
+          :disabled="!isLead"
+          @change="saveAutoFlagReview"
+        >
+        <label
+          class="form-check-label"
+          for="autoFlagReview"
+        >
+          Auto-flag contributor changesets for review
+        </label>
+      </div>
+      <small class="text-muted">
+        When enabled, changesets created by contributors (non-leads and non-validators)
+        will be automatically flagged for review in the review queue.
+      </small>
     </div>
   </section>
 </template>
@@ -41,6 +64,7 @@ import type { Workspace } from '~/types/workspaces';
 const workspace = inject<Workspace>('workspace')!;
 const { isLead } = useWorkspaceRole();
 const workspaceName = ref(workspace.title);
+const autoFlagReview = ref(workspace.autoFlagReview ?? false);
 
 async function rename() {
   try {
@@ -58,4 +82,17 @@ async function rename() {
     }
   }
 }
+
+async function saveAutoFlagReview() {
+  try {
+    await workspacesClient.updateWorkspace(workspace.id, {
+      autoFlagReview: autoFlagReview.value,
+    });
+    toast.success('Review settings saved.');
+  }
+  catch {
+    autoFlagReview.value = !autoFlagReview.value;
+    toast.error('Failed to save review settings.');
+  }
+}
 </script>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 647bd34..37c9941 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -77,6 +77,7 @@ export default defineNuxtConfig({
         'dayjs/plugin/relativeTime', // CJS
         'maplibre-gl', // CJS
         'papaparse', // CJS
+        'v-viewer',
         'vue-qrcode',
         'vue3-toastify',
       ],
diff --git a/package-lock.json b/package-lock.json
index 1be1e0c..7964d32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,6 +23,7 @@
         "nuxt": "^4.4.8",
         "papaparse": "^5.5.1",
         "qrcode": "^1.5.4",
+        "v-viewer": "^3.0.23",
         "vue": "^3.5.34",
         "vue-qrcode": "^2.2.2",
         "vue-router": "^4.2.5",
@@ -110,6 +111,7 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
       "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.0",
         "@babel/generator": "^7.29.0",
@@ -405,6 +407,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.29.7.tgz",
       "integrity": "sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.29.7"
       },
@@ -612,27 +615,6 @@
       "integrity": "sha512-/B8YJGPzaYq1NbsQmwgP8EZqg40NpTw4ZB3suuI0TplbxKHeK94jeaawLmVhCv+YwUnOpiWEz9U6SeThku/8JQ==",
       "license": "MIT"
     },
-    "node_modules/@emnapi/core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@emnapi/wasi-threads": "1.2.1",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@emnapi/runtime": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
-      "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "tslib": "^2.4.0"
-      }
-    },
     "node_modules/@emnapi/wasi-threads": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz",
@@ -2040,28 +2022,6 @@
         }
       }
     },
-    "node_modules/@nuxt/cli/node_modules/cac": {
-      "version": "6.7.14",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
-      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@nuxt/cli/node_modules/commander": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
-      "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@nuxt/devalue": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@nuxt/devalue/-/devalue-2.0.2.tgz",
@@ -2363,6 +2323,7 @@
       "resolved": "https://registry.npmjs.org/@nuxt/kit/-/kit-3.21.6.tgz",
       "integrity": "sha512-5VOwxUcoM/z6w4c75hQrikHpY+TzjTLZQ+QnuO7KajyGx0IJBLVy1lw25oy79leF+GgyjJJO1cHfUfWeuEDCzA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "c12": "^3.3.4",
         "consola": "^3.4.2",
@@ -2481,6 +2442,7 @@
       "resolved": "https://registry.npmjs.org/@nuxt/schema/-/schema-4.4.8.tgz",
       "integrity": "sha512-igfWuMF0x0Pmx/XwhPwH/bcXgbuwNnjUjqxCAsY6VQhmGKo0e9soJq3Q0ohj+rBkBfX6o2ysTP1/t2M82aK4qA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/shared": "^3.5.35",
         "defu": "^6.1.7",
@@ -2642,23 +2604,6 @@
         "vite": ">=6.0"
       }
     },
-    "node_modules/@nuxt/test-utils/node_modules/crossws": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/crossws/-/crossws-0.4.6.tgz",
-      "integrity": "sha512-/Wxe9Z007EbJ496j88nToZEvyPZ8PY/wjZJ18Agh/GCA9cYHyLbxtrpdFlFzAw3TV20F0SUYGl0g6PzChbwUrg==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "peerDependencies": {
-        "srvx": ">=0.11.5"
-      },
-      "peerDependenciesMeta": {
-        "srvx": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@nuxt/test-utils/node_modules/estree-walker": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
@@ -2891,6 +2836,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.8.0.tgz",
       "integrity": "sha512-hd1Lfh8p545nNz+jq1Ejfz+Mn1hyLuxYn1YzTfFNrxr8urEWMNQLPf1Th8kjOH+HxwawCrtgBp8JpBUR4ZSgww==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@opentelemetry/semantic-conventions": "^1.29.0"
       },
@@ -2939,6 +2885,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.8.0.tgz",
       "integrity": "sha512-mhU4jp+vW0mGbFRd+GeXHvmfA4aDqWjBjLC3pE5XMpLs0IE2ryYb019Ts2AQrOq67gaTF25D91+fgvEHDZEnuQ==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@opentelemetry/core": "2.8.0",
         "@opentelemetry/resources": "2.8.0",
@@ -2956,6 +2903,7 @@
       "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.41.1.tgz",
       "integrity": "sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA==",
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": ">=14"
       }
@@ -4304,6 +4252,7 @@
       "integrity": "sha512-cKA5B6lpFEMyMGjxF54QihfYpB4FkEGH+qZhtArDEG+wezQAJY8Pq6C7T1SjWz+FFzt3TbyoXBQYk/0292TdJA==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "playwright": "1.61.0"
       },
@@ -4325,6 +4274,7 @@
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
       "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -5811,7 +5761,8 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "devOptional": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/node": {
       "version": "26.0.0",
@@ -5819,6 +5770,7 @@
       "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~8.3.0"
       }
@@ -5917,6 +5869,7 @@
       "integrity": "sha512-zORHqO/tuhxY1zWuTvMUqddRxpiFJ72xVfcNoWpqdLjs6lfPbuQBJuW4pk+49/uBMy7Ssr4bzgjiKmmDB1UbZQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.59.4",
         "@typescript-eslint/types": "8.59.4",
@@ -6762,6 +6715,7 @@
       "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.38.tgz",
       "integrity": "sha512-JTqp25l8aFfJYF7/KmsXZjAxJz7T+SjmTJLoXVjHtc2BrSgSiW2n9Aem/cWq1OPe68A8JL06B3eVdhlP0H4TVw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-core": "3.5.38",
         "@vue/shared": "3.5.38"
@@ -6772,6 +6726,7 @@
       "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.38.tgz",
       "integrity": "sha512-DuA2GiZawSEW442iw/9+Fkol8hTgb4Ke5KkhmSry65QA7YuyMbIdy8p0XZRMvNwJdgRz307W8g1CSzdvS4nuNg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/parser": "^7.29.7",
         "@vue/compiler-core": "3.5.38",
@@ -6918,6 +6873,7 @@
       "integrity": "sha512-GDqaqZsA6m2E5vNzej0aYiIb6BX8xV9pNSbbbXKOfEYwg7ZNblVX8suyqmUBThq8VIrgAJNxn+z72hVtUeiWHA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "js-beautify": "^1.14.9",
         "vue-component-type-helpers": "^3.0.0"
@@ -6970,6 +6926,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7394,6 +7351,7 @@
       "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.9.1.tgz",
       "integrity": "sha512-Z0oHEHAFDZkffN8Qc39zNZjQlMDkPJRyyyZieU1VH7u8c5S+qHZ2S8ixdKIAxEjfHO7FJxXmJWgteOghVanIsg==",
       "license": "Apache-2.0",
+      "peer": true,
       "peerDependencies": {
         "bare-abort-controller": "*"
       },
@@ -7574,6 +7532,7 @@
       "resolved": "https://registry.npmjs.org/bootstrap-vue-next/-/bootstrap-vue-next-0.43.9.tgz",
       "integrity": "sha512-bhqdVR9eFgcVMcae0lvbYJBKDR8KwGtSfoBGZa2q01Eg1SMBVwM+rh8qKHwt+YIe9rwU6b0d0KO+sPJMOnyCPQ==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/bootstrap-vue-next"
@@ -7639,6 +7598,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.10.12",
         "caniuse-lite": "^1.0.30001782",
@@ -7973,7 +7933,8 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/citty/-/citty-0.2.2.tgz",
       "integrity": "sha512-+6vJA3L98yv+IdfKGZHBNiGW5KHn22e/JwID0Strsz8h4S/csAu/OuICwxrg44k5MRiZHWIo8XXuJgQTriRP4w==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/cjs-module-lexer": {
       "version": "2.2.0",
@@ -8983,6 +8944,7 @@
       "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -9051,6 +9013,7 @@
       "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -10403,6 +10366,7 @@
       "integrity": "sha512-bKrsQnFNpcjZG0UPsH7UMN7Oyp3AB42LXk2GuiQmu7l4QFxH7lsw5T1eWEtE2+vbIFrTC45sbNSB2pkB8MTfKA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/node": ">=20.0.0",
         "@types/whatwg-mimetype": "^3.0.2",
@@ -11688,6 +11652,12 @@
       "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
       "license": "MIT"
     },
+    "node_modules/lodash-es": {
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
+      "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
+      "license": "MIT"
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -11756,6 +11726,7 @@
       "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.24.0.tgz",
       "integrity": "sha512-ALyFxgtd5R+65UqZ/++lOqwWcC0SNho9c27fYSyLmG7AfnAul2o46F05aDJGPbFU57wos9dgcIySHs0Xe6ia3A==",
       "license": "BSD-3-Clause",
+      "peer": true,
       "dependencies": {
         "@mapbox/jsonlint-lines-primitives": "^2.0.2",
         "@mapbox/point-geometry": "^1.1.0",
@@ -12926,6 +12897,7 @@
       "resolved": "https://registry.npmjs.org/nuxt/-/nuxt-4.4.8.tgz",
       "integrity": "sha512-r/DGE4cNkEDclOw9tbJ18zqu+ix3me+7QCfumPdl5lBXGWgCajskzuq/HzDkHKfIZsn7ACVEjMLRNA2teh++bQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@dxup/nuxt": "^0.4.1",
         "@nuxt/cli": "^3.35.2",
@@ -13384,6 +13356,7 @@
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -13442,6 +13415,7 @@
       "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.133.0.tgz",
       "integrity": "sha512-661RSx+ZcjBmjBYid+Fpp/2F5EbtildpeoZh5HdgnGs+jZ03nqQEQW8yGkt4BGyOC3OMPDQQRl8M5kqD2/g6jw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@oxc-project/types": "^0.133.0"
       },
@@ -13769,6 +13743,7 @@
       "integrity": "sha512-caX7TrY3Ml6egyDX0WUcTHDxodl/b51y5wJOdCEA36QviK/s2g081hvmGs8eaE3DWb6NYZQ6BjO/QkNRPenoPA==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "playwright-core": "cli.js"
       },
@@ -13838,6 +13813,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.12",
         "picocolors": "^1.1.1",
@@ -14394,6 +14370,7 @@
       "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
       "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "dijkstrajs": "^1.0.1",
         "pngjs": "^5.0.0",
@@ -14759,6 +14736,7 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.4.tgz",
       "integrity": "sha512-WHeFSbZYsPu3+bLoNRUuAO+wavNlocOPf3wSHTP7hcFKVnJeWsYlCDbr3mTS14FCizf9ccIxXA8sGL8zKeQN3g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/estree": "1.0.8"
       },
@@ -15040,6 +15018,7 @@
       "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -16146,6 +16125,7 @@
       "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -16347,6 +16327,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "napi-postinstall": "^0.3.4"
       },
@@ -16613,11 +16594,32 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "license": "MIT"
     },
+    "node_modules/v-viewer": {
+      "version": "3.0.23",
+      "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-3.0.23.tgz",
+      "integrity": "sha512-u/Zd/FXTdtdE2k2YeYMf6mU4oL0ILEZ9STHnZT7myyfRwQot68GO3O+6DwxNnHTaATiiAJTrz2MXjaqYKoB7iA==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash-es": "^4.17.23",
+        "viewerjs": "^1.11.6"
+      },
+      "peerDependencies": {
+        "viewerjs": "^1.11.0",
+        "vue": "^3.0.0"
+      }
+    },
+    "node_modules/viewerjs": {
+      "version": "1.11.7",
+      "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.7.tgz",
+      "integrity": "sha512-0JuVqOmL5v1jmEAlG5EBDR3XquxY8DWFQbFMprOXgaBB0F7Q/X9xWdEaQc59D8xzwkdUgXEMSSknTpriq95igg==",
+      "license": "MIT"
+    },
     "node_modules/vite": {
       "version": "7.3.3",
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.3.tgz",
       "integrity": "sha512-/4XH147Ui7OGTjg3HbdWe5arnZQSbfuRzdr9Ec7TQi5I7R+ir0Rlc9GIvD4v0XZurELqA035KVXJXpR61xhiTA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -16937,6 +16939,7 @@
       "integrity": "sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vitest/expect": "4.1.9",
         "@vitest/mocker": "4.1.9",
@@ -17043,6 +17046,7 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.38.tgz",
       "integrity": "sha512-vAMKHfImQlYSy0C+PBue4s3ERZ2xGKfgZg5GXAsLInq1dyh2H78ILVP5sK0KPFPVW4kv+OGCIvBEondcjpZp7A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.38",
         "@vue/compiler-sfc": "3.5.38",
@@ -17087,6 +17091,7 @@
       "integrity": "sha512-Vxi9pJdbN3ZnVGLODVtZ7y4Y2kzAAE2Cm0CZ3ZDRvydVYxZ6VrnBhLikBsRS+dpwj4Jv4UCv21PTEwF5rQ9WXg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
         "eslint-scope": "^8.2.0 || ^9.0.0",
@@ -17126,6 +17131,7 @@
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.6.4.tgz",
       "integrity": "sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vue/devtools-api": "^6.6.4"
       },
@@ -17142,6 +17148,7 @@
       "integrity": "sha512-Rzh/G2MmNlMSAMTiQEjDrsb4dgB/jbtEM47rVN2NtidF1dfb/q4w4QvpQBtW5+y3y5H27Hjh7deVwk+YB02fNg==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@volar/typescript": "2.4.28",
         "@vue/language-core": "3.3.5"
diff --git a/package.json b/package.json
index cac167c..9b59ce3 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "nuxt": "^4.4.8",
     "papaparse": "^5.5.1",
     "qrcode": "^1.5.4",
+    "v-viewer": "^3.0.23",
     "vue": "^3.5.34",
     "vue-qrcode": "^2.2.2",
     "vue-router": "^4.2.5",
diff --git a/pages/workspace/[id]/export/tdei.vue b/pages/workspace/[id]/export/tdei.vue
index 6ad7e75..b87b43d 100644
--- a/pages/workspace/[id]/export/tdei.vue
+++ b/pages/workspace/[id]/export/tdei.vue
@@ -126,6 +126,75 @@
                 required
               >
             </label>
+            <div class="form-check form-switch mt-3">
+              <label class="form-check-label">
+                <input
+                  v-model="includeChangesets"
+                  type="checkbox"
+                  class="form-check-input"
+                >
+                Export change history
+              </label>
+            </div>
+            <div class="form-text mt-1">
+              Attaches a <code>changeset.zip</code> to the export which
+              contains a <code>manifest.json</code> summary metadata file
+              and a <code>changesets/</code> directory with one
+              <code>{id}.json</code> file per change history entry.
+              <p class="mb-0 mt-1">Required to certify the export for ADA compliance.</p>
+            </div>
+            <div
+              v-if="includeChangesets"
+              class="mt-3"
+            >
+              <div class="form-check form-switch">
+                <label class="form-check-label">
+                  <input
+                    v-model="includeRawOsc"
+                    type="checkbox"
+                    class="form-check-input"
+                  >
+                  Include raw osmChange XML files
+                </label>
+              </div>
+              <div class="form-text mt-1">
+                Adds an <code>{id}.osc</code> file alongside each
+                <code>{id}.json</code> containing unprocessed
+                <a
+                  href="https://wiki.openstreetmap.org/wiki/OsmChange"
+                  target="_blank"
+                >osmChange XML</a>
+                for use with third-party OpenStreetMap tools.
+              </div>
+              <div class="form-check form-switch mt-3">
+                <label class="form-check-label">
+                  <input
+                    v-model="includeAdaCertification"
+                    type="checkbox"
+                    class="form-check-input"
+                  >
+                  Certify for ADA compliance
+                </label>
+              </div>
+              <div class="form-text mt-1">
+                Adds an attestation to the changeset manifest confirming that
+                this dataset's measurements accurately reflect field conditions
+                and were collected according to your agency's methodology. Your
+                agency determines the specific criteria. This is a data
+                integrity sign-off, not a separate legal credential.
+              </div>
+              <div
+                v-if="includeAdaCertification"
+                class="mt-3 border rounded p-3 bg-light small"
+              >
+                <dl class="row mb-0">
+                  <dt class="col-sm-4 text-muted">Certified by</dt>
+                  <dd class="col-sm-8 mb-1">{{ certifiedByName }}</dd>
+                  <dt class="col-sm-4 text-muted">Date</dt>
+                  <dd class="col-sm-8 mb-0">{{ certifiedAt }}</dd>
+                </dl>
+              </div>
+            </div>
           </fieldset>
           <div class="card-footer">
             <template v-if="context.active">
@@ -169,6 +238,7 @@
 <script setup lang="ts">
 import { osmClient, tdeiClient, tdeiUserClient, workspacesClient } from '~/services/index';
 import { TdeiExporter, TdeiExporterContext } from '~/services/export/tdei'
+import type { TdeiDatasetMetadataDatasetDetail } from '~/types/tdei';
 import { toast } from 'vue3-toastify';
 import 'vue3-toastify/dist/index.css';
 
@@ -200,6 +270,11 @@ const oldMetadata = workspace.tdeiMetadata ? JSON.parse(workspace.tdeiMetadata)
 
 const datasetName = ref(workspace.title);
 const datasetVersion = ref(oldMetadata.metadata?.dataset_detail?.version);
+const includeChangesets = ref(false);
+const includeRawOsc = ref(false);
+const includeAdaCertification = ref(false);
+const certifiedByName = osmClient.auth.displayName ?? '';
+const certifiedAt = new Date().toISOString().slice(0, 10);
 
 async function upload() {
   const allFieldsProvided = String(datasetName.value ?? '').trim()
@@ -213,7 +288,7 @@ async function upload() {
   }
 
   // TODO: enable metadata customization
-  const metadata = {
+  const metadata: TdeiDatasetMetadataDatasetDetail = {
     name: datasetName.value,
     version: datasetVersion.value,
     description: oldMetadata.description ?? '',
@@ -225,7 +300,17 @@ async function upload() {
     dataset_area: oldMetadata.dataset_area
   };
 
-  const jobId = await exporter.upload(workspace, metadata);
+  const jobId = await exporter.upload(workspace, metadata, {
+    includeChangesets: includeChangesets.value,
+    includeRawOsc: includeRawOsc.value,
+    adaCertification: includeChangesets.value && includeAdaCertification.value
+      ? {
+          certifiedBy: osmClient.auth.subject,
+          certifiedByName,
+          certifiedAt,
+        }
+      : undefined,
+  });
 
   if (jobId) {
     // TODO: show a more helpful message
diff --git a/pages/workspace/[id]/review.vue b/pages/workspace/[id]/review.vue
index 894c79c..d43131b 100644
--- a/pages/workspace/[id]/review.vue
+++ b/pages/workspace/[id]/review.vue
@@ -11,7 +11,7 @@
 <template>
   <section
     class="review-page"
-    fluid
+    :class="{ 'detail-open': currentItem }"
   >
     <review-sidebar
       v-model:item="currentItem"
@@ -51,22 +51,40 @@
         v-if="currentItem"
         :item="currentItem"
         @edit="openEditor"
+        @resolve="resolveCurrentChangeset"
+        @back="currentItem = undefined"
       />
       <review-attribute-diff
         v-if="currentDiff && reviewList.workspace"
         :dataset-type="reviewList.workspace.type"
         :diff="currentDiff"
+        :image-url="currentImageUrl"
+        @open-photo="showImage"
+      />
+      <review-feature-image
+        v-if="currentImageUrl"
+        :image-url="currentImageUrl"
+        @open="showImage"
+      />
+      <app-image-viewer
+        ref="imageViewer"
+        title="Photo Submission"
       />
     </section>
   </section>
 </template>
 
 <script setup lang="ts">
+import { toast } from 'vue3-toastify';
+
 import { reviewManager, workspacesClient } from '~/services/index';
+import { kartaViewImageUrl, convertKartaViewUrl } from '~/util/kartaview';
 
 import type ReviewMap from '~/components/review/Map.vue';
+import type AppImageViewer from '~/components/AppImageViewer.vue';
 import type { ReviewListItem } from '~/services/review.ts';
 import type { AdiffAction } from '~/types/adiff';
+import type { OsmChangeset } from '~/types/osm';
 
 const route = useRoute();
 const workspaceId = Number(route.params.id);
@@ -78,18 +96,31 @@ const reviewList = reviewManager.getList(workspaceId);
 const filter = reactive(reviewManager.getFilter());
 
 const map = useTemplateRef<InstanceType<typeof ReviewMap>>('map');
+const imageViewer = useTemplateRef<InstanceType<typeof AppImageViewer>>('imageViewer');
 
 const loading = ref(false);
 const loadingMap = ref(false);
 const currentItem = ref<ReviewListItem | undefined>();
 const currentDiff = ref<AdiffAction | undefined>();
 
+const currentImageUrl = computed(() => {
+  const raw = kartaViewImageUrl(currentDiff.value?.new?.tags)
+    ?? kartaViewImageUrl(currentDiff.value?.old?.tags);
+  return raw ? convertKartaViewUrl(raw) : undefined;
+});
+
 refresh();
 
 watch(currentItem, () => {
   currentDiff.value = undefined;
 });
 
+function showImage() {
+  if (currentImageUrl.value) {
+    imageViewer.value?.show(currentImageUrl.value);
+  }
+}
+
 async function refresh() {
   if (loading.value) {
     return;
@@ -105,6 +136,29 @@ async function refresh() {
   }
 }
 
+async function resolveCurrentChangeset() {
+  if (!currentItem.value?.isChangeset) {
+    return;
+  }
+
+  const changesetId = currentItem.value.id;
+
+  try {
+    await workspacesClient.resolveChangeset(workspaceId, changesetId);
+
+    const changeset = currentItem.value.data as OsmChangeset;
+    delete changeset.tags.review_requested;
+    changeset.tags.reviewed_by = String(changesetId);
+
+    toast.success('Changeset marked as reviewed.');
+
+    await refresh();
+  }
+  catch {
+    toast.error('Failed to resolve changeset.');
+  }
+}
+
 async function openEditor() {
   if (!map.value) {
     return;
@@ -121,6 +175,8 @@ async function openEditor() {
 </script>
 
 <style lang="scss">
+@import "assets/scss/theme.scss";
+
 .review-page {
   display: flex;
   height: 100%;
@@ -147,5 +203,16 @@ async function openEditor() {
   .review-notice {
     background-color: var(--bs-body-bg);
   }
+
+  @include media-breakpoint-down(md) {
+    & {
+      .map-container { display: none; }
+    }
+
+    &.detail-open {
+      .review-sidebar { display: none; }
+      .map-container { display: block; }
+    }
+  }
 }
 </style>
diff --git a/plugins/v-viewer.client.ts b/plugins/v-viewer.client.ts
new file mode 100644
index 0000000..0d7d1b1
--- /dev/null
+++ b/plugins/v-viewer.client.ts
@@ -0,0 +1,6 @@
+import VueViewer from 'v-viewer';
+import 'viewerjs/dist/viewer.css';
+
+export default defineNuxtPlugin((nuxtApp) => {
+  nuxtApp.vueApp.use(VueViewer);
+});
diff --git a/scripts/ci.sh b/scripts/ci.sh
new file mode 100755
index 0000000..ad1da68
--- /dev/null
+++ b/scripts/ci.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+#
+# Local mirror of the GitHub Actions CI pipeline (.github/workflows/ci.yml).
+#
+# Runs the same quality gates CI does — lint, typecheck, unit tests, and e2e
+# tests — against your working tree. Like CI, every step runs even when an
+# earlier one fails (CI uses `if: ${{ !cancelled() }}`), so you get every
+# failure in a single pass. The script exits non-zero if any step failed.
+#
+# Usage:
+#   scripts/ci.sh              # run the full pipeline
+#   SKIP_INSTALL=1 scripts/ci.sh   # skip `npm ci` (reuse existing node_modules)
+#
+# Run from anywhere; it cd's to the repo root.
+
+set -uo pipefail
+
+# Resolve repo root so the script works from any directory.
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$ROOT"
+
+# Track failures without aborting, mirroring CI's `!cancelled()` behavior.
+FAILED=()
+
+run_step() {
+  local name="$1"
+  shift
+  echo ""
+  echo "==> ${name}"
+  if "$@"; then
+    echo "--- ${name}: PASS"
+  else
+    echo "--- ${name}: FAIL"
+    FAILED+=("${name}")
+  fi
+}
+
+# Install dependencies. `npm ci` runs `nuxt prepare` via postinstall, which
+# generates the .nuxt types + eslint typegen that lint and typecheck rely on.
+# A failed install is fatal — nothing downstream can run without it.
+if [[ "${SKIP_INSTALL:-0}" != "1" ]]; then
+  echo "==> Install dependencies (npm ci)"
+  if ! npm ci; then
+    echo "--- Install dependencies: FAIL (aborting)"
+    exit 1
+  fi
+else
+  echo "==> Install dependencies: SKIPPED (SKIP_INSTALL=1)"
+fi
+
+run_step "Lint" npm run lint
+run_step "Type check" npm run typecheck
+run_step "Unit tests" npm test
+
+# Ensure the Playwright chromium browser is present before running e2e.
+run_step "Install Playwright browser" npx playwright install --with-deps chromium
+run_step "E2E tests" npm run test:e2e
+
+echo ""
+if [[ ${#FAILED[@]} -eq 0 ]]; then
+  echo "==> All checks passed."
+  exit 0
+else
+  echo "==> The following checks FAILED:"
+  for step in "${FAILED[@]}"; do
+    echo "  - ${step}"
+  done
+  exit 1
+fi
diff --git a/scripts/fix-lint.sh b/scripts/fix-lint.sh
new file mode 100755
index 0000000..4a7bfab
--- /dev/null
+++ b/scripts/fix-lint.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+#
+# Autofix lint/formatting errors in the working tree.
+#
+# Runs ESLint's `--fix` (exposed as `npm run lint:fix`), which rewrites files
+# in place to resolve the auto-fixable subset of lint errors (semicolons,
+# trailing commas, import order, etc.). Errors ESLint can't fix automatically
+# are still reported and need manual fixes.
+#
+# Usage:
+#   scripts/fix-lint.sh
+#
+# Run from anywhere; it cd's to the repo root.
+
+set -uo pipefail
+
+ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$ROOT"
+
+echo "==> ESLint --fix"
+npm run lint:fix
+eslint_status=$?
+
+echo ""
+if [[ $eslint_status -eq 0 ]]; then
+  echo "==> Autofix complete. Remaining errors (if any) need manual fixes."
+else
+  echo "==> ESLint reported errors it could not autofix — run 'npm run lint' to see them."
+fi
+
+exit $eslint_status
diff --git a/services/changesets.ts b/services/changesets.ts
index 49d6c1e..df2bfb6 100644
--- a/services/changesets.ts
+++ b/services/changesets.ts
@@ -1,27 +1,17 @@
 import type { OsmApiClient } from '~/services/osm';
-import { OSMCHANGE_ACTION_TYPES } from '~/types/osm';
+import type { WorkspacesClient } from '~/services/workspaces';
 import { LruIndexedDbCache } from '~/services/cache';
 
+import { OSMCHANGE_ACTION_TYPES } from '~/types/osm';
+
 import type { LocalCache } from '~/services/cache';
 import type {
   OsmChange,
   OsmChangeset,
-  OsmElement,
-  OsmNode,
-  OsmElementType,
 } from '~/types/osm';
-import type {
-  AdiffAction,
-  AdiffElement,
-  AdiffNode,
-  AdiffWay,
-  AdiffWayNodeRef,
-  AugmentedDiff,
-} from '~/types/adiff';
+import type { AugmentedDiff } from '~/types/adiff';
 import type { WorkspaceId } from '~/types/workspaces';
 
-const ADIFF_ACTION_TYPES = OSMCHANGE_ACTION_TYPES;
-
 export type OsmChangeCacheKey = { workspaceId: WorkspaceId; changesetId: number };
 export const OsmChangeDb = LruIndexedDbCache<OsmChangeCacheKey, OsmChange>;
 export type AugmentedDiffCacheKey = { workspaceId: WorkspaceId; changesetId: number };
@@ -83,15 +73,18 @@ export class AugmentedDiffCache {
 
 export class ChangesetManager {
   readonly #osmClient: OsmApiClient;
+  readonly #workspacesClient: WorkspacesClient;
   readonly #oscCache: OsmChangeCache;
-  readonly #adiffCache: AugmentedDiffCache; ;
+  readonly #adiffCache: AugmentedDiffCache;
 
   constructor(
     osmClient: OsmApiClient,
+    workspacesClient: WorkspacesClient,
     oscCache: OsmChangeCache,
     adiffCache: AugmentedDiffCache,
   ) {
     this.#osmClient = osmClient;
+    this.#workspacesClient = workspacesClient;
     this.#oscCache = oscCache;
     this.#adiffCache = adiffCache;
 
@@ -142,308 +135,17 @@ export class ChangesetManager {
 
   async getAdiff(workspaceId: WorkspaceId, changeset: OsmChangeset): Promise<AugmentedDiff> {
     if (changeset.open) {
-      // Skip the cache--someone may add more to this changeset:
-      return await this.#buildAdiff(workspaceId, changeset.osmChange);
+      // Skip the cache — open changesets may still receive edits:
+      return await this.#workspacesClient.getChangesetAdiff(workspaceId, changeset.id);
     }
 
     let adiff = await this.#adiffCache.get(workspaceId, changeset.id);
 
     if (!adiff) {
-      adiff = await this.#buildAdiff(workspaceId, changeset.osmChange);
+      adiff = await this.#workspacesClient.getChangesetAdiff(workspaceId, changeset.id);
       await this.#adiffCache.set(workspaceId, changeset.id, adiff);
     }
 
     return adiff;
   }
-
-  async #buildAdiff(workspaceId: WorkspaceId, osmChange: OsmChange): Promise<AugmentedDiff> {
-    const builder = new ChangesetAdiffBuilder(this.#osmClient, workspaceId);
-
-    return await builder.build(osmChange);
-  }
-}
-
-function isNode(element: AdiffElement): element is AdiffNode {
-  return element.type === 'node';
-}
-
-function isWay(element: AdiffElement): element is AdiffWay {
-  return element.type === 'way';
-}
-
-function osmToAdiff(element: OsmElement): AdiffElement {
-  const adiff: AdiffElement = {
-    ...(element as AdiffElement),
-    visible: element.visible ?? true,
-    tags: { ...element.tags },
-  };
-
-  if ('nodes' in adiff && 'nodes' in element) {
-    adiff.nodes = element.nodes?.map(ref => ({ ref, lat: 0, lon: 0 }));
-  }
-
-  return adiff;
-}
-
-function nodeToRef(node: OsmNode): AdiffWayNodeRef {
-  return { ref: node.id, lat: node.lat, lon: node.lon };
-}
-
-function splitIdVersion(idVersion: string): [number, number] {
-  const idVersionParts = idVersion.split('v');
-  const id = Number(idVersionParts[0]);
-  const version = Number(idVersionParts[1]);
-
-  return [id, version];
-}
-
-type OsmElementVersionMap = Map<number, OsmElement>;
-type OsmElementMap = Map<number, OsmElementVersionMap>;
-type OsmTypeMap = {
-  [K in OsmElementType]: {
-    fromChangesetIds: Set<number>;
-    versions: OsmElementMap;
-  }
-};
-
-class AdiffElementCache {
-  readonly #typeMap: OsmTypeMap;
-
-  constructor() {
-    this.#typeMap = {
-      node: { fromChangesetIds: new Set(), versions: new Map() },
-      way: { fromChangesetIds: new Set(), versions: new Map() },
-      relation: { fromChangesetIds: new Set(), versions: new Map() },
-    };
-  }
-
-  remember(element: OsmElement, fromChangeset: boolean = false) {
-    this.getVersions(element.type, element.id).set(element.version, element);
-
-    if (fromChangeset) {
-      this.#typeMap[element.type].fromChangesetIds.add(element.id);
-    }
-  }
-
-  getVersions(type: OsmElementType, id: number): OsmElementVersionMap {
-    let versionMap = this.#typeMap[type].versions.get(id);
-
-    if (!versionMap) {
-      versionMap = new Map();
-      this.#typeMap[type].versions.set(id, versionMap);
-    }
-
-    return versionMap;
-  }
-
-  getVersion<T extends OsmElement>(
-    type: T['type'],
-    id: number,
-    version: number,
-  ): T | undefined {
-    return this.#typeMap[type].versions.get(id)?.get(version) as T;
-  }
-
-  getLatestVersion<T extends OsmElement>(type: T['type'], id: number): T | undefined {
-    const versionMap = this.#typeMap[type].versions.get(id);
-
-    if (!versionMap) {
-      return undefined;
-    }
-
-    return versionMap.get(Math.max(...versionMap.keys())) as T;
-  }
-
-  isInChangeset(type: OsmElementType, id: number): boolean {
-    return this.#typeMap[type].fromChangesetIds.has(id);
-  }
-}
-
-class ChangesetAdiffBuilder {
-  readonly #osmClient: OsmApiClient;
-  readonly #workspaceId: WorkspaceId;
-  readonly #cache: AdiffElementCache;
-  readonly #actions: AdiffAction[];
-
-  constructor(osmClient: OsmApiClient, workspaceId: WorkspaceId) {
-    this.#osmClient = osmClient;
-    this.#workspaceId = workspaceId;
-    this.#cache = new AdiffElementCache();
-    this.#actions = [];
-  }
-
-  async build(osmChange: OsmChange): Promise<AugmentedDiff> {
-    const actions: AdiffAction[] = [];
-    const promises = [];
-
-    for (const type of ADIFF_ACTION_TYPES) {
-      for (const element of osmChange[type] ?? []) {
-        actions.push({ type, old: undefined, new: osmToAdiff(element) });
-        this.#cache.remember(element, true);
-      }
-    }
-
-    for (const action of actions) {
-      this.#actions.push(action);
-
-      if (action.type !== 'create') {
-        promises.push(
-          this.#getPreviousElement(action.new).then(e => action.old = e),
-        );
-      }
-
-      promises.push(this.#expandReferences(action));
-    }
-
-    await Promise.all(promises);
-
-    return { actions: this.#actions };
-  }
-
-  #expandReferences(action: AdiffAction): Promise<void> {
-    if (isNode(action.new)) {
-      return this.#expandNodeReferences(action.new);
-    }
-
-    return this.#expandWayReferences(action.new);
-  }
-
-  async #expandNodeReferences(node: AdiffNode): Promise<void> {
-    const ways = await this.#fetchWays(node);
-
-    for (const way of ways) {
-      if (this.#cache.isInChangeset('way', way.id)) {
-        continue;
-      }
-
-      const old = { ...way, nodes: [...way.nodes ?? []], tags: { ...way.tags } };
-      const action: AdiffAction = { type: 'modify', old, new: way };
-
-      while (action.old && action.old.changeset > node.changeset) {
-        action.old = await this.#getPreviousElement(action.old);
-      }
-
-      if (action.old === old) {
-        await this.#resolveWayNodes(old, old.changeset);
-      }
-
-      this.#actions.push(action);
-    }
-  }
-
-  async #expandWayReferences(way: AdiffWay): Promise<void> {
-    await this.#resolveWayNodes(way, way.changeset);
-  }
-
-  async #resolveWayNodes(element: AdiffWay, changesetId: number) {
-    const resolvedNodes: AdiffWayNodeRef[] = [];
-    let nodeIds: (string | number)[] = element.nodes?.map(r => r.ref) ?? [];
-
-    while (nodeIds.length > 0) {
-      const refs = await this.#fetchNodes(nodeIds);
-      nodeIds = [];
-
-      for (const node of refs) {
-        if (node.changeset <= changesetId) {
-          resolvedNodes.push(nodeToRef(node));
-        }
-        else {
-          nodeIds.push(`${node.id}v${node.version - 1}`);
-        }
-      }
-    }
-
-    element.nodes = resolvedNodes;
-  }
-
-  async #fetchNodes(nodeIds: (string | number)[]): Promise<OsmNode[]> {
-    const refs: OsmNode[] = [];
-    const pendingIds = [];
-
-    for (const nodeId of nodeIds) {
-      if (Number.isFinite(nodeId)) {
-        const node = this.#cache.getLatestVersion<OsmNode>('node', nodeId as number);
-
-        if (node) {
-          refs.push(node);
-        }
-        else {
-          pendingIds.push(nodeId);
-        }
-      }
-      else {
-        const [id, version] = splitIdVersion(nodeId as string);
-        const node = this.#cache.getVersion<OsmNode>('node', id, version);
-
-        if (node) {
-          refs.push(node);
-        }
-        else {
-          pendingIds.push(nodeId);
-        }
-      }
-    }
-
-    if (pendingIds.length > 0) {
-      const nodes = await this.#osmClient.getNodes(this.#workspaceId, pendingIds);
-
-      for (const node of nodes) {
-        refs.push(node);
-        this.#cache.remember(node);
-      }
-    }
-
-    return refs;
-  }
-
-  async #fetchWays(node: AdiffElement): Promise<AdiffWay[]> {
-    let ways = await this.#osmClient.getWaysForNode(this.#workspaceId, node.id);
-    const resolvedWays = [];
-
-    while (ways.length > 0) {
-      const pendingWayIds = [];
-
-      for (const way of ways) {
-        if (way.changeset <= node.changeset) {
-          const adiffWay = osmToAdiff(way) as AdiffWay;
-          await this.#resolveWayNodes(adiffWay, node.changeset);
-          resolvedWays.push(adiffWay);
-        }
-        else {
-          pendingWayIds.push(`${way.id}v${way.version - 1}`);
-        }
-      }
-
-      if (pendingWayIds.length > 0) {
-        ways = await this.#osmClient.getWays(this.#workspaceId, pendingWayIds);
-      }
-      else {
-        ways.length = 0;
-      }
-    }
-
-    return resolvedWays;
-  }
-
-  async #getPreviousElement(element: AdiffElement): Promise<AdiffElement> {
-    const version = element.version - 1;
-    let prevElement = this.#cache.getVersion(element.type, element.id, version);
-
-    if (!prevElement) {
-      prevElement = await this.#osmClient.getElement(
-        this.#workspaceId,
-        element.type,
-        element.id,
-        version);
-      this.#cache.remember(prevElement);
-    }
-
-    const adiffElement = osmToAdiff(prevElement);
-
-    if (isWay(adiffElement)) {
-      await this.#resolveWayNodes(adiffElement, element.changeset - 1);
-    }
-
-    return adiffElement;
-  }
 }
diff --git a/services/export/tdei.ts b/services/export/tdei.ts
index b74e1db..1461e1d 100644
--- a/services/export/tdei.ts
+++ b/services/export/tdei.ts
@@ -1,13 +1,37 @@
+import parseOsmChangeXml from '@osmcha/osmchange-parser';
+import { BlobWriter, TextReader, ZipWriter } from '@zip.js/zip.js';
 import type { OsmApiClient } from '~/services/osm';
 import { buildPathwaysCsvArchive, openTdeiPathwaysArchive } from '~/services/pathways';
 import type { TdeiClient } from '~/services/tdei';
 import { TdeiClientError, TdeiConversionError } from '~/services/tdei';
+import type { TdeiDatasetMetadataDatasetDetail } from '~/types/tdei';
 import type { Workspace } from '~/types/workspaces';
 import * as geojson from '~/util/geojson'
 
+export class TdeiExporterValidationError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'TdeiExporterValidationError';
+  }
+}
+
+interface AdaCertificationInfo {
+  certifiedBy: string;
+  certifiedByName: string;
+  certifiedAt: string;
+}
+
+interface ExportOptions {
+  includeChangesets?: boolean;
+  includeRawOsc?: boolean;
+  adaCertification?: AdaCertificationInfo;
+}
+
 const status = {
   idle: 'Idle',
+  validate: 'Validating...',
   bbox: 'Finding workspace bounds...',
+  collectChangesets: 'Collecting changesets...',
   exportOsm: 'Fetching workspace data...',
   convertOsm: 'Converting workspace data...',
   checkDerived: 'Checking previous dataset...',
@@ -55,34 +79,60 @@ export class TdeiExporter {
     return this._context;
   }
 
-  async upload(workspace: Workspace, metadata: any): Promise<string | undefined> {
+  async upload(
+    workspace: Workspace,
+    metadata: TdeiDatasetMetadataDatasetDetail,
+    options: ExportOptions = {}
+  ): Promise<string | undefined> {
     this._context.reset();
     this._context.active = true;
 
     try {
-      return await this._run(workspace, metadata);
+      return await this._run(workspace, metadata, options);
     } catch (e: any) {
-      if (this._context.status === status.convertOsm) {
-        this._context.error = 'Conversion job failed: ';
-      } else if (this._context.status === status.upload) {
-        this._context.error = 'TDEI rejected the upload: ';
+      if (e instanceof TdeiExporterValidationError) {
+        this._context.error = e.message;
       } else {
-        this._context.error = 'Unexpected error: ';
-      }
-
-      if (e instanceof TdeiClientError) {
-        this._context.error += await e.response.text();
-      } else if (e instanceof TdeiConversionError) {
-        this._context.error += e.job.message;
-      } else {
-        this._context.error += e.toString();
+        if (this._context.status === status.collectChangesets) {
+          this._context.error = 'Failed to collect changesets: ';
+        } else if (this._context.status === status.convertOsm) {
+          this._context.error = 'Conversion job failed: ';
+        } else if (this._context.status === status.upload) {
+          this._context.error = 'TDEI rejected the upload: ';
+        } else {
+          this._context.error = 'Unexpected error: ';
+        }
+
+        if (e instanceof TdeiClientError) {
+          this._context.error += await e.response.text();
+        } else if (e instanceof TdeiConversionError) {
+          this._context.error += e.job.message;
+        } else {
+          this._context.error += e.toString();
+        }
       }
     } finally {
       this._context.active = false;
     }
   }
 
-  async _run(workspace: Workspace, metadata: any): Promise<string> {
+  private _validate(workspace: Workspace): asserts workspace is Workspace & { tdeiServiceId: string } {
+    if (!workspace.tdeiProjectGroupId) {
+      throw new TdeiExporterValidationError('This workspace does not have a TDEI project group assigned.');
+    }
+    if (!workspace.tdeiServiceId) {
+      throw new TdeiExporterValidationError('This workspace does not have a TDEI service assigned. Please select a service before exporting.');
+    }
+  }
+
+  private async _run(
+    workspace: Workspace,
+    metadata: TdeiDatasetMetadataDatasetDetail,
+    options: ExportOptions
+  ): Promise<string> {
+    this._context.status = status.validate;
+    this._validate(workspace);
+
     if (!metadata.dataset_area) {
       this._context.status = status.bbox;
       const bbox = await this._osmClient.getWorkspaceBbox(workspace.id);
@@ -95,14 +145,25 @@ export class TdeiExporter {
       }
     }
 
+    let changesetArchive: Blob | undefined;
+
+    if (options.includeChangesets || options.adaCertification) {
+      this._context.status = status.collectChangesets;
+      changesetArchive = await this._buildChangesetArchive(
+        workspace,
+        options.includeRawOsc ?? false,
+        options.adaCertification
+      );
+    }
+
     if (workspace.type === 'pathways') {
-      return await this._exportPathwaysToTdei(workspace, metadata);
+      return await this._exportPathwaysToTdei(workspace, metadata, changesetArchive);
     }
 
-    return await this._exportOswToTdei(workspace, metadata);
+    return await this._exportOswToTdei(workspace, metadata, changesetArchive);
   }
 
-  async _exportOswToTdei(workspace: Workspace, metadata: any): Promise<string> {
+  async _exportOswToTdei(workspace: Workspace, metadata: any, changesetArchive?: Blob): Promise<string> {
     const tdeiServiceId = this._requireServiceId(workspace);
 
     this._context.status = status.exportOsm;
@@ -117,7 +178,8 @@ export class TdeiExporter {
       workspace.tdeiProjectGroupId,
       tdeiServiceId,
       oswZip,
-      { dataset_detail: metadata }
+      { dataset_detail: metadata },
+      changesetArchive
     );
 
     this._context.status = status.complete;
@@ -125,7 +187,7 @@ export class TdeiExporter {
     return jobId
   }
 
-  async _exportPathwaysToTdei(workspace: Workspace, metadata: any): Promise<string> {
+  async _exportPathwaysToTdei(workspace: Workspace, metadata: any, changesetArchive?: Blob): Promise<string> {
     const tdeiServiceId = this._requireServiceId(workspace);
 
     this._context.status = status.exportOsm;
@@ -142,7 +204,8 @@ export class TdeiExporter {
       workspace.tdeiProjectGroupId,
       tdeiServiceId,
       csvZip,
-      { dataset_detail: metadata }
+      { dataset_detail: metadata },
+      changesetArchive
     );
 
     this._context.status = status.complete;
@@ -195,4 +258,56 @@ export class TdeiExporter {
 
     return await openTdeiPathwaysArchive(dataset, false, false);
   }
+
+  private async _buildChangesetArchive(workspace: Workspace, includeRawOsc: boolean, adaCertification?: AdaCertificationInfo): Promise<Blob> {
+    const changesets = await this._osmClient.listChangesets(workspace.id);
+
+    const manifest = {
+      workspace: {
+        id: workspace.id,
+        title: workspace.title,
+        description: workspace.description,
+        type: workspace.type,
+        tdeiProjectGroupId: workspace.tdeiProjectGroupId,
+        tdeiServiceId: workspace.tdeiServiceId,
+        tdeiRecordId: workspace.tdeiRecordId,
+        createdAt: workspace.createdAt,
+        createdBy: workspace.createdBy,
+        createdByName: workspace.createdByName,
+      },
+      exportedAt: new Date().toISOString(),
+      includesRawOsmChange: includeRawOsc,
+      adaCertification: adaCertification ?? null,
+      changesets,
+    };
+
+    const files = new Map<string, string>();
+    files.set('manifest.json', JSON.stringify(manifest, null, 2));
+
+    // Provide the more-friendly JSON format by default. A super user can opt-
+    // in to the osmChange format if they wish to use those with OSM tooling:
+    //
+    await Promise.all(changesets.map(async (cs) => {
+      const osc = await this._osmClient.downloadOsmChange(workspace.id, cs.id);
+      const osmChange = parseOsmChangeXml(osc);
+
+      files.set(`changesets/${cs.id}.json`, JSON.stringify(osmChange));
+
+      if (includeRawOsc) {
+        files.set(`changesets/${cs.id}.osc`, osc);
+      }
+    }));
+
+    const blobWriter = new BlobWriter('application/zip');
+    const zipWriter = new ZipWriter(blobWriter);
+
+    await Promise.all(
+      [...files].map(
+        ([name, content]) => zipWriter.add(name, new TextReader(content))
+      )
+    );
+    await zipWriter.close();
+
+    return await blobWriter.getData();
+  }
 }
diff --git a/services/index.ts b/services/index.ts
index 2d18714..7d1d300 100644
--- a/services/index.ts
+++ b/services/index.ts
@@ -42,6 +42,7 @@ const adiffCacheDb = new AugmentedDiffDb('adiff-cache', adiffCacheTtl, adiffKeyp
 
 export const changesetManager = new ChangesetManager(
   osmClient,
+  workspacesClient,
   new OsmChangeCache(oscCacheDb),
   new AugmentedDiffCache(adiffCacheDb));
 export const reviewManager = new ReviewManager(
diff --git a/services/osm.ts b/services/osm.ts
index 94d1787..e17887a 100644
--- a/services/osm.ts
+++ b/services/osm.ts
@@ -396,16 +396,18 @@ export class OsmApiClient extends BaseHttpClient implements ICancelableClient {
     return changeset;
   }
 
-  async getOsmChange(workspaceId: WorkspaceId, changesetId: number): Promise<OsmChange>
-  {
+  async downloadOsmChange(workspaceId: WorkspaceId, changesetId: number): Promise<string> {
     const response = await this._get(`changeset/${changesetId}/download`, {
       headers: {
         'Accept': 'application/xml',
         'X-Workspace': String(workspaceId),
       },
     });
+    return await response.text();
+  }
 
-    const osmChange = parseOsmChangeXml(await response.text());
+  async getOsmChange(workspaceId: WorkspaceId, changesetId: number): Promise<OsmChange> {
+    const osmChange = parseOsmChangeXml(await this.downloadOsmChange(workspaceId, changesetId));
 
     for (const type of OSMCHANGE_ACTION_TYPES) {
       for (const element of osmChange[type] ?? []) {
diff --git a/services/review.ts b/services/review.ts
index d5634bb..4b7c560 100644
--- a/services/review.ts
+++ b/services/review.ts
@@ -44,6 +44,8 @@ export class ReviewListItem {
 
   get isResolved(): boolean {
     switch (this.type) {
+      case $CHANGESET:
+        return !!(this.data as OsmChangeset).tags?.reviewed_by;
       case $FEEDBACK:
         return (this.data as TdeiFeedback).status !== 'open';
       case $NOTE:
@@ -53,6 +55,10 @@ export class ReviewListItem {
     return false;
   }
 
+  get needsReview(): boolean {
+    return this.isChangeset && (this.data as OsmChangeset).tags?.review_requested === 'yes';
+  }
+
   get displayType(): string {
     switch (this.type) {
       case $CHANGESET:
@@ -116,7 +122,7 @@ export class ReviewListItem {
   get badgeClass(): string {
     switch (this.type) {
       case $CHANGESET:
-        return 'bg-dark';
+        return this.needsReview ? 'bg-warning text-dark' : 'bg-dark';
       case $FEEDBACK:
         return 'bg-danger';
       case $NOTE:
@@ -151,6 +157,7 @@ export class ReviewListFilter {
   includeFeedback: boolean = true;
   includeNotes: boolean = true;
   includeResolved: boolean = false;
+  includeNeedsReview: boolean = false;
   startDate: Date | undefined;
   endDate: Date | undefined;
   text: string | undefined;
@@ -173,6 +180,12 @@ export class ReviewListFilter {
     if (this.text && !changeset.tags?.comment?.includes(this.text)) {
       return false;
     }
+    if (!this.includeResolved && changeset.tags?.reviewed_by) {
+      return false;
+    }
+    if (this.includeNeedsReview && changeset.tags?.review_requested !== 'yes') {
+      return false;
+    }
 
     return true;
   }
diff --git a/services/tdei.ts b/services/tdei.ts
index b23f00e..b6bb982 100644
--- a/services/tdei.ts
+++ b/services/tdei.ts
@@ -16,6 +16,7 @@ import type {
   TdeiProjectGroup,
   TdeiService,
   TdeiDatasetSummary,
+  TdeiDatasetMetadata,
   TdeiUserItem,
 } from '~/types/tdei.ts';
 
@@ -286,12 +287,17 @@ export class TdeiClient extends BaseHttpClient implements ICancelableClient {
     projectGroupId: string,
     serviceId: string,
     dataset: Blob,
-    metadata: any
-  ) {
+    metadata: TdeiDatasetMetadata,
+    changeset?: Blob
+  ): Promise<string> {
     const body = new FormData();
     body.append('dataset', new File([dataset], 'dataset.zip', { type: 'application/x-zip-compressed' }));
     body.append('metadata', new File([JSON.stringify(metadata)], 'metadata.json', { type: 'application/json' }));
 
+    if (changeset) {
+      body.append('changeset', new File([changeset], 'changeset.zip', { type: 'application/x-zip-compressed' }));
+    }
+
     let resource = `osw/upload/${projectGroupId}/${serviceId}`;
 
     if ((tdeiRecordId?.length ?? 0) > 0) {
@@ -310,12 +316,17 @@ export class TdeiClient extends BaseHttpClient implements ICancelableClient {
     projectGroupId: string,
     serviceId: string,
     dataset: Blob,
-    metadata: any
-  ) {
+    metadata: TdeiDatasetMetadata,
+    changeset?: Blob
+  ): Promise<string> {
     const body = new FormData();
     body.append('dataset', new File([dataset], 'dataset.zip', { type: 'application/x-zip-compressed' }));
     body.append('metadata', new File([JSON.stringify(metadata)], 'metadata.json', { type: 'application/json' }));
 
+    if (changeset) {
+      body.append('changeset', new File([changeset], 'changeset.zip', { type: 'application/x-zip-compressed' }));
+    }
+
     let resource = `gtfs-pathways/upload/${projectGroupId}/${serviceId}`;
 
     if ((tdeiRecordId?.length ?? 0) > 0) {
diff --git a/services/workspaces.ts b/services/workspaces.ts
index e9c25e8..3a906d1 100644
--- a/services/workspaces.ts
+++ b/services/workspaces.ts
@@ -10,6 +10,7 @@ import { compareStringAsc } from '~/util/compare';
 import type { ICancelableClient } from '~/services/loading';
 import type { OsmApiClient } from '~/services/osm';
 import type { TdeiAuthStore, TdeiClient } from '~/services/tdei';
+import type { AugmentedDiff } from '~/types/adiff';
 import type { BoundingBox } from '~/types/bbox';
 import type { ImagerySettings } from '~/types/imagery';
 import type {
@@ -234,6 +235,16 @@ export class WorkspacesClient extends BaseHttpClient implements ICancelableClien
     await this.#newApi._delete(`workspaces/${id}/users/${userUuid}`);
   }
 
+  async resolveChangeset(workspaceId: WorkspaceId, changesetId: number): Promise<void> {
+    await this.#newApi._put(`workspaces/${workspaceId}/changesets/${changesetId}/resolve`);
+  }
+
+  async getChangesetAdiff(workspaceId: WorkspaceId, changesetId: number): Promise<AugmentedDiff> {
+    const response = await this.#newApi._get(`workspaces/${workspaceId}/changesets/${changesetId}/adiff`);
+
+    return await response.json();
+  }
+
   #setAuthHeader() {
     if (this.#tdeiClient.auth.complete) {
       this._requestHeaders.Authorization = 'Bearer ' + this.auth.accessToken;
diff --git a/types/tdei.ts b/types/tdei.ts
index 1839fc7..c0d744c 100644
--- a/types/tdei.ts
+++ b/types/tdei.ts
@@ -1,5 +1,85 @@
 export type TdeiRoleAssignment = string;
 
+//
+// Dataset metadata schema
+// https://raw.githubusercontent.com/TaskarCenterAtUW/TDEI-osw-datasvc-ts/master/schema/metadata.schema.json
+//
+
+export interface TdeiDatasetMetadataDatasetDetail {
+  name: string;
+  version: string;
+  collected_by: string;
+  collection_date: string;
+  data_source: '3rdParty' | 'TDEITools' | 'InHouse';
+  schema_version: string;
+  description?: string | null;
+  custom_metadata?: Record<string, unknown> | null;
+  valid_from?: string | null;
+  valid_to?: string | null;
+  collection_method?: 'manual' | 'transform' | 'generated' | 'AV' | 'others' | null;
+  dataset_area?: object | null;
+}
+
+export interface TdeiDatasetMetadataDataProvenance {
+  full_dataset_name: string;
+  other_published_locations?: string | null;
+  dataset_update_frequency_months?: number | null;
+  schema_validation_run?: boolean | null;
+  schema_validation_run_description?: string | null;
+  allow_crowd_contributions?: boolean | null;
+  location_inaccuracy_factors?: string | null;
+}
+
+export interface TdeiDatasetMetadataDatasetSummary {
+  collection_name?: string | null;
+  department_name?: string | null;
+  city?: string | null;
+  region?: string | null;
+  county?: string | null;
+  key_limitations?: string | null;
+  release_notes?: string | null;
+  challenges?: string | null;
+}
+
+export interface TdeiDatasetMetadataMaintenance {
+  official_maintainer?: string[] | null;
+  last_updated?: string | null;
+  update_frequency?: string | null;
+  authorization_chain?: string | null;
+  maintenance_funded?: boolean | null;
+  funding_details?: string | null;
+}
+
+export interface TdeiDatasetMetadataMethodology {
+  point_data_collection_device?: string | null;
+  node_locations_and_attributes_editing_software?: string | null;
+  data_collected_by_people?: boolean | null;
+  data_collectors?: string | null;
+  data_captured_automatically?: boolean | null;
+  automated_collection?: string | null;
+  data_collectors_organization?: string | null;
+  data_collector_compensation?: string | null;
+  preprocessing_location?: string | null;
+  preprocessing_by?: string | null;
+  preprocessing_steps?: string | null;
+  data_collection_preprocessing_documentation?: boolean | null;
+  documentation_uri?: string | null;
+  validation_process_exists?: boolean | null;
+  validation_process_description?: string | null;
+  validation_conducted_by?: string | null;
+  excluded_data?: string | null;
+  excluded_data_reason?: string | null;
+}
+
+/** Full upload metadata envelope sent to the TDEI API. */
+export interface TdeiDatasetMetadata {
+  dataset_detail: TdeiDatasetMetadataDatasetDetail;
+  data_provenance?: TdeiDatasetMetadataDataProvenance;
+  dataset_summary?: TdeiDatasetMetadataDatasetSummary;
+  maintenance?: TdeiDatasetMetadataMaintenance;
+  methodology?: TdeiDatasetMetadataMethodology;
+}
+
 /** Shape returned by the TDEI project-group-roles API */
 export interface TdeiProjectGroupApiResponse {
   tdei_project_group_id: string;
@@ -32,13 +112,7 @@ export interface TdeiDatasetApiResponse {
     tdei_service_id: string;
     service_name?: string;
   };
-  metadata: {
-    dataset_detail: {
-      name: string;
-      version?: string;
-      dataset_area?: object;
-    };
-  };
+  metadata: TdeiDatasetMetadata;
 }
 
 export interface TdeiDatasetItem {
diff --git a/types/workspaces.ts b/types/workspaces.ts
index 11f1196..d59e0d3 100644
--- a/types/workspaces.ts
+++ b/types/workspaces.ts
@@ -17,6 +17,7 @@ export interface Workspace {
   createdByName: string;
   externalAppAccess: WorkspaceAppAccess;
   kartaViewToken?: string;
+  autoFlagReview?: boolean;
   role?: WorkspaceRole;
 }
 
@@ -36,6 +37,7 @@ export interface WorkspacePatch {
   title?: string;
   description?: string;
   externalAppAccess?: WorkspaceAppAccess;
+  autoFlagReview?: boolean;
 }
 
 export type QuestSettingsType = 'NONE' | 'JSON' | 'URL';
diff --git a/util/kartaview.ts b/util/kartaview.ts
new file mode 100644
index 0000000..49981ce
--- /dev/null
+++ b/util/kartaview.ts
@@ -0,0 +1,27 @@
+import type { OsmTags } from '~/types/osm';
+
+export const KARTAVIEW_URL_TAG = 'ext:kartaview_url';
+const KARTAVIEW_CDN_PREFIX = 'https://cdn.kartaview.org/pr:sharp/';
+
+/**
+ * Extracts a KartaView image URL from an element's tags if present.
+ */
+export function kartaViewImageUrl(tags: OsmTags | undefined): string | undefined {
+  const value = tags?.[KARTAVIEW_URL_TAG]?.trim();
+  return value || undefined;
+}
+
+/**
+ * Converts a legacy KartaView/OpenStreetCam storage URL to the new CDN-proxied
+ * form. Returns CDN URLs already in the new form unchanged.
+ */
+export function convertKartaViewUrl(url: string): string {
+  if (url.startsWith(KARTAVIEW_CDN_PREFIX)) {
+    return url;
+  }
+  const cleanUrl = url.trim();
+  const bytes = new TextEncoder().encode(cleanUrl);
+  const binaryStr = Array.from(bytes, b => String.fromCharCode(b)).join('');
+  const base64 = btoa(binaryStr).replace(/=+$/, '');
+  return `${KARTAVIEW_CDN_PREFIX}${base64}`;
+}