diff --git a/ts/components/ReviewPoolColumnDetail.vue b/ts/components/ReviewPoolColumnDetail.vue
index 26e4574c..5ac21436 100644
--- a/ts/components/ReviewPoolColumnDetail.vue
+++ b/ts/components/ReviewPoolColumnDetail.vue
@@ -164,6 +164,9 @@ import { Bounds, Contact, Pool, ReviewTask, User } from "@/type/api";
 import type { Location } from "@/type/api";
 import { Camera } from "@/type/map";
 
+interface Emits {
+	(e: "update:modelValue", value: ReviewTaskPoolForm): void;
+}
 export interface ReviewTaskPoolForm {
 	address: string;
 	condition: string;
@@ -179,6 +182,7 @@ interface Props {
 	modelValue: ReviewTaskPoolForm;
 	selectedTask?: ReviewTask;
 }
+const emit = defineEmits<Emits>();
 const mapCamera = ref<Camera>(new Camera());
 const _mapFlyoverCamera = ref<Camera>(new Camera());
 const props = defineProps<Props>();
@@ -186,7 +190,13 @@ const siteOwner = ref<Contact>(new Contact());
 const siteResident = ref<Contact>(new Contact());
 const session = useSessionStore();
 function doPoolLocation(event: MapClickEvent) {
-	console.log("pool location", event);
+	emit("update:modelValue", {
+		address: props.modelValue.address,
+		condition: props.modelValue.condition,
+		location: event.location,
+		owner: props.modelValue.owner,
+		resident: props.modelValue.resident,
+	});
 }
 watch(
 	() => props.mapFlyoverCamera,
diff --git a/ts/view/review/Pool.vue b/ts/view/review/Pool.vue
index 0299ba6c..6a1c9ede 100644
--- a/ts/view/review/Pool.vue
+++ b/ts/view/review/Pool.vue
@@ -96,7 +96,7 @@ body {
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, ref, watch } from "vue";
 import { useStoreReviewTask } from "@/store/review-task";
 import { useSessionStore } from "@/store/session";
 import maplibregl from "maplibre-gl";
@@ -230,8 +230,12 @@ const changes = computed<Changes>(() => {
 	return { updated, unchanged };
 });
 const mapMarkers = computed<Marker[]>(() => {
+	const form = reviewForm.value;
 	const task = selectedTask.value;
-	const loc = task?.pool?.location;
+	const loc =
+		reviewForm.value.location.latitude != 0
+			? reviewForm.value.location
+			: task?.pool?.location;
 	if (!loc) {
 		return [];
 	}
@@ -305,26 +309,6 @@ function updateMap(task: ReviewTask): void {
 	});
 }
 
-// Map Click Handler
-function updatePoolLocation(event: MapClickEvent): void {
-	console.log("map click", selectedTask.value?.id, event);
-
-	/*
-	const map = event.map;
-	const loc = event.location;
-
-	map.SetMarkers([
-		new maplibregl.Marker({
-			color: "#FF0000",
-			draggable: false,
-		}).setLngLat([loc.lng, loc.lat]),
-	]);
-
-	selectedTaskChanges.latitude = event.detail.lat;
-	selectedTaskChanges.longitude = event.detail.lng;
-	*/
-}
-
 // Submit Review
 async function submitReview(action: "committed" | "discarded"): Promise<void> {
 	if (!selectedTask.value || submitting.value) return;
@@ -478,6 +462,12 @@ function initializeMaps(): void {
 	}
 }
 
+watch(
+	() => reviewForm.value,
+	(newReviewForm: ReviewTaskPoolForm) => {
+		console.log("new review form", newReviewForm);
+	},
+);
 // Lifecycle
 onMounted(async () => {
 	initializeMaps();