diff --git a/thrimbletrimmer/edit.html b/thrimbletrimmer/edit.html
index 5dab021..c2ab6f6 100644
--- a/thrimbletrimmer/edit.html
+++ b/thrimbletrimmer/edit.html
@@ -235,6 +235,7 @@
 					<option value="mpegts">MPEG-TS (slow, consumes server resources)</option>
 				</select>
 				<a id="download-link">Download Video</a>
+				<a href="#" id="download-frame">Download Current Frame as Image</a>
 			</div>
 
 			<div id="data-correction">
diff --git a/thrimbletrimmer/index.html b/thrimbletrimmer/index.html
index d28cb67..664b772 100644
--- a/thrimbletrimmer/index.html
+++ b/thrimbletrimmer/index.html
@@ -126,6 +126,7 @@
 			</div>
 
 			<a href="#" id="download">Download Video</a>
+			<a href="#" id="download-frame">Download Current Frame as Image</a>
 			<a href="#" id="time-converter-link">Convert Times</a>
 			<form id="time-converter" class="hidden">
 				<h2>Time Converter</h2>
diff --git a/thrimbletrimmer/scripts/common.js b/thrimbletrimmer/scripts/common.js
index a43ec03..dd8cd83 100644
--- a/thrimbletrimmer/scripts/common.js
+++ b/thrimbletrimmer/scripts/common.js
@@ -419,3 +419,37 @@ function videoPlayerTimeFromVideoHumanTime(videoHumanTime) {
 
 	return hours * 3600 + minutes * 60 + seconds;
 }
+
+function getSegmentList() {
+	return globalPlayer.latencyController.levelDetails.fragments;
+}
+
+function dateTimeFromVideoPlayerTime(videoPlayerTime) {
+	const segmentList = getSegmentList();
+	let segmentStartTime;
+	let segmentStartISOTime;
+	for (const segment of segmentList) {
+		const segmentEndTime = segment.start + segment.duration;
+		if (videoPlayerTime >= segment.start && videoPlayerTime < segmentEndTime) {
+			segmentStartTime = segment.start;
+			segmentStartISOTime = segment.rawProgramDateTime;
+			break;
+		}
+	}
+	if (segmentStartISOTime === undefined) {
+		return null;
+	}
+	const wubloaderDateTime = DateTime.fromISO(segmentStartISOTime);
+	const offset = videoPlayerTime - segmentStartTime;
+	return wubloaderDateTime.plus({ seconds: offset });
+}
+
+function downloadFrame() {
+	const videoElement = document.getElementById("video");
+	const dateTime = dateTimeFromVideoPlayerTime(videoElement.currentTime);
+	const url = `/frame/${globalStreamName}/source.png?timestamp=${wubloaderTimeFromDateTime(dateTime)}`;
+	// Avoid : as it causes problems on Windows
+	const filename = `${dateTime.toFormat("yyyy-LL-dd'T'HH-mm-ss.SSS")}.png`;
+	// TODO REPLACE WITH CORRECT CALL
+	console.log(`Would download ${url} as ${filename}`);
+}
diff --git a/thrimbletrimmer/scripts/edit.js b/thrimbletrimmer/scripts/edit.js
index b94b191..7c5a022 100644
--- a/thrimbletrimmer/scripts/edit.js
+++ b/thrimbletrimmer/scripts/edit.js
@@ -220,6 +220,10 @@ window.addEventListener("DOMContentLoaded", async (event) => {
 		updateDownloadLink();
 	});
 
+	document.getElementById("download-frame").addEventListener("click", (_event) => {
+		downloadFrame();
+	});
+
 	document.getElementById("manual-link-update").addEventListener("click", (_event) => {
 		const manualLinkDataContainer = document.getElementById("data-correction-manual-link");
 		manualLinkDataContainer.classList.toggle("hidden");
@@ -1431,26 +1435,6 @@ function videoPlayerTimeFromWubloaderTime(wubloaderTime) {
 	return null;
 }
 
-function dateTimeFromVideoPlayerTime(videoPlayerTime) {
-	const segmentList = getSegmentList();
-	let segmentStartTime;
-	let segmentStartISOTime;
-	for (const segment of segmentList) {
-		const segmentEndTime = segment.start + segment.duration;
-		if (videoPlayerTime >= segment.start && videoPlayerTime < segmentEndTime) {
-			segmentStartTime = segment.start;
-			segmentStartISOTime = segment.rawProgramDateTime;
-			break;
-		}
-	}
-	if (segmentStartISOTime === undefined) {
-		return null;
-	}
-	const wubloaderDateTime = DateTime.fromISO(segmentStartISOTime);
-	const offset = videoPlayerTime - segmentStartTime;
-	return wubloaderDateTime.plus({ seconds: offset });
-}
-
 function videoPlayerTimeFromDateTime(dateTime) {
 	const segmentList = getSegmentList();
 	for (const segment of segmentList) {
@@ -1496,7 +1480,3 @@ function wubloaderTimeFromVideoHumanTime(videoHumanTime) {
 	}
 	return wubloaderTimeFromVideoPlayerTime(videoPlayerTime);
 }
-
-function getSegmentList() {
-	return globalPlayer.latencyController.levelDetails.fragments;
-}
diff --git a/thrimbletrimmer/scripts/stream.js b/thrimbletrimmer/scripts/stream.js
index 20b6555..4551606 100644
--- a/thrimbletrimmer/scripts/stream.js
+++ b/thrimbletrimmer/scripts/stream.js
@@ -28,6 +28,10 @@ window.addEventListener("DOMContentLoaded", async (event) => {
 		updateTimeSettings();
 	});
 
+	document.getElementById("download-frame").addEventListener("click", (_event) => {
+		downloadFrame();
+	});
+
 	const timeConversionForm = document.getElementById("time-converter");
 	timeConversionForm.addEventListener("submit", (event) => {
 		event.preventDefault();