diff --git a/.gitignore b/.gitignore
index b020604..a6ca136 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@
 .vscode
 target/
 .DS_Store
+.gitignore
+lib/example_surveyadminservice.yaml
+lib/example_surveygeocoderservice.yaml
diff --git a/lib/example_surveyadminkafkasource.yaml b/lib/example_surveyadminkafkasource.yaml
index e9a7928..6ba3bb4 100644
--- a/lib/example_surveyadminkafkasource.yaml
+++ b/lib/example_surveyadminkafkasource.yaml
@@ -4,7 +4,7 @@ metadata:
   name: geocodetopicsource
 spec:
   bootstrapServers:
-  - my-cluster-kafka-bootstrap.amq-streams-kafka.svc:9092
+  - es1-kafka-bootstrap.cp4i.svc:9092
   sink:
     ref:
       apiVersion: serving.knative.dev/v1
diff --git a/lib/example_surveyadminservice.yaml.template b/lib/example_surveyadminservice.yaml.template
index efbec47..5e99a58 100644
--- a/lib/example_surveyadminservice.yaml.template
+++ b/lib/example_surveyadminservice.yaml.template
@@ -16,7 +16,7 @@ spec:
         imagePullPolicy: Always
         env:
         - name: mp.messaging.connector.liberty-kafka.bootstrap.servers
-          value: my-cluster-kafka-bootstrap.amq-streams-kafka.svc:9092
+          value: es1-kafka-bootstrap.cp4i.svc:9092
         - name: GOOGLE_API_KEY
           value: INSERT_API_KEY
         - name: QRCODE_URL
diff --git a/lib/example_surveygeocoderkafkasource.yaml b/lib/example_surveygeocoderkafkasource.yaml
index ec750e3..72c01cc 100644
--- a/lib/example_surveygeocoderkafkasource.yaml
+++ b/lib/example_surveygeocoderkafkasource.yaml
@@ -4,7 +4,7 @@ metadata:
   name: locationtopicsource
 spec:
   bootstrapServers:
-  - my-cluster-kafka-bootstrap.amq-streams-kafka.svc:9092
+  - es1-kafka-bootstrap.cp4i.svc:9092
   sink:
     ref:
       apiVersion: serving.knative.dev/v1
diff --git a/lib/example_surveygeocoderservice.yaml.template b/lib/example_surveygeocoderservice.yaml.template
index b166a93..2155520 100644
--- a/lib/example_surveygeocoderservice.yaml.template
+++ b/lib/example_surveygeocoderservice.yaml.template
@@ -15,7 +15,7 @@ spec:
         imagePullPolicy: Always
         env:
         - name: mp.messaging.connector.liberty-kafka.bootstrap.servers
-          value: my-cluster-kafka-bootstrap.amq-streams-kafka.svc:9092
+          value: es1-kafka-bootstrap.cp4i.svc:9092
         - name: GOOGLE_API_KEY
           value: INSERT_API_KEY
         securityContext:
diff --git a/lib/example_surveyinputservice.yaml b/lib/example_surveyinputservice.yaml
index d84a8d2..65dc603 100644
--- a/lib/example_surveyinputservice.yaml
+++ b/lib/example_surveyinputservice.yaml
@@ -15,7 +15,7 @@ spec:
         imagePullPolicy: Always
         env:
         - name: mp.messaging.connector.liberty-kafka.bootstrap.servers
-          value: my-cluster-kafka-bootstrap.amq-streams-kafka.svc:9092
+          value: es1-kafka-bootstrap.cp4i.svc:9092
         securityContext:
           allowPrivilegeEscalation: true
           privileged: false
diff --git a/surveyAdminService/pom.xml b/surveyAdminService/pom.xml
index a598ae2..89b9859 100755
--- a/surveyAdminService/pom.xml
+++ b/surveyAdminService/pom.xml
@@ -103,6 +103,16 @@ under the License.
       <artifactId>lucene-core</artifactId>
       <version>${dependency.version.lucene-core}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.10.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-clients</artifactId>
+      <version>2.8.0</version>
+    </dependency>
   </dependencies>
   <build>
     <finalName>${project.artifactId}</finalName>
diff --git a/surveyAdminService/src/main/java/com/example/demo/reactive/CloudEventsProcessor.java b/surveyAdminService/src/main/java/com/example/demo/reactive/CloudEventsProcessor.java
index 392b945..f53cce0 100644
--- a/surveyAdminService/src/main/java/com/example/demo/reactive/CloudEventsProcessor.java
+++ b/surveyAdminService/src/main/java/com/example/demo/reactive/CloudEventsProcessor.java
@@ -24,6 +24,8 @@
 
 import com.example.demo.Configuration;
 import com.example.demo.websockets.GeolocationWebSocket;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.CloudEventData;
@@ -55,26 +57,27 @@ public Response geocodeComplete(CloudEvent incoming) {
 		if (LOG.isLoggable(Level.INFO))
 			LOG.info("CloudEventData: " + data);
 
-		String geocodeResults = null;
+		String jsonString = null;
 		try (StringDeserializer deserializer = new StringDeserializer()) {
-			geocodeResults = deserializer.deserialize(null, data.toBytes());
+			jsonString = deserializer.deserialize(null, data.toBytes());
 		}
 
 		if (LOG.isLoggable(Level.INFO))
-			LOG.info("Geocode results: " + geocodeResults);
+			LOG.info("Geocode results: " + jsonString);
 
-		// latitude ' ' longitude ' ' location
-		String latitudeStr = geocodeResults.substring(0, geocodeResults.indexOf(' '));
-		geocodeResults = geocodeResults.substring(geocodeResults.indexOf(' ') + 1);
-		String longitudeStr = geocodeResults.substring(0, geocodeResults.indexOf(' '));
-		geocodeResults = geocodeResults.substring(geocodeResults.indexOf(' ') + 1);
+		JsonObject jsonObj = (new Gson()).fromJson(jsonString, JsonObject.class);
+		String latitudeStr = jsonObj.get("latitude").getAsString();
+		String longitudeStr = jsonObj.get("longitude").getAsString();
+		String location = jsonObj.get("location").getAsString();
+		String color = jsonObj.get("color").getAsString();
+		String key = jsonObj.get("key").getAsString();
 
 		double latitude = Double.parseDouble(latitudeStr);
 		double longitude = Double.parseDouble(longitudeStr);
 		double approximateDistance = SloppyMath.haversinMeters(latitude, longitude, Configuration.getSurveyLatitude(),
 				Configuration.getSuveyLongitude());
 
-		String finalResults = latitude + " " + longitude + " " + approximateDistance + " " + geocodeResults;
+		String finalResults = latitude + " " + longitude + " " + approximateDistance + " " + color + " " + key + " " + location;
 
 		try {
 			GeolocationWebSocket.sendMessageToAllBrowsers(finalResults);
diff --git a/surveyAdminService/src/main/java/com/example/demo/websockets/GeolocationWebSocket.java b/surveyAdminService/src/main/java/com/example/demo/websockets/GeolocationWebSocket.java
index ef7a81c..27a55e6 100644
--- a/surveyAdminService/src/main/java/com/example/demo/websockets/GeolocationWebSocket.java
+++ b/surveyAdminService/src/main/java/com/example/demo/websockets/GeolocationWebSocket.java
@@ -1,10 +1,17 @@
 package com.example.demo.websockets;
 
 import java.io.IOException;
+import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.kafka.clients.CommonClientConfigs;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.serialization.StringSerializer;
+
 import jakarta.websocket.EncodeException;
 import jakarta.websocket.OnClose;
 import jakarta.websocket.OnError;
@@ -51,7 +58,11 @@ public void onBrowserMessage(Session session, String message) {
 			
 			if (LOG.isLoggable(Level.INFO))
 				LOG.info("GeolocationWebSocket received message from " + session.getId() + ": " + message);
+
+			// Send message from websocket to Kafka topic
+			sendToKafka(message, "feedbacktopic");
 		}
+
 	}
 
 	@OnClose
@@ -106,4 +117,18 @@ public static final void sendMessageToAllBrowsers(String text) throws IOExceptio
 			}
 		}
 	}
+
+	private void sendToKafka(String message, String topic) {
+		String bootstrapServer = System.getenv("mp.messaging.connector.liberty-kafka.bootstrap.servers");
+
+		Properties props = new Properties();
+		props.setProperty(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, bootstrapServer);
+		props.setProperty(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+		props.setProperty(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+		KafkaProducer<String, String> producer = new KafkaProducer<String, String>(props);
+		ProducerRecord<String, String> record = new ProducerRecord<String,String>(topic, message);
+		producer.send(record);
+		producer.flush();
+		producer.close();
+	}
 }
diff --git a/surveyAdminService/src/main/webapp/geolocation.jsp b/surveyAdminService/src/main/webapp/geolocation.jsp
index 2f7edce..d4828ef 100644
--- a/surveyAdminService/src/main/webapp/geolocation.jsp
+++ b/surveyAdminService/src/main/webapp/geolocation.jsp
@@ -5,558 +5,578 @@
     <title>Location Survey</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
-	<script src="js/Winwheel.js"></script>
-	<script src="js/TweenMax.min.js"></script>
-    <style>
-    html, body {
-      height: 100vh;
-      margin: 0;
-      font-family: monospace;
-    }
-    
-    .flexContainer {
-      display: flex;
-      flex-direction: column;
-      height: 100%;
-      position: relative;
-    }
-    
-    #spinwheel {
-      position: absolute;
-	  left: 0;
-	  top: 0;
-	  display: none;
-      justify-content: center;
-      align-items: center;
-	  width: 90vw;
-	  height: 90vh;
-	  z-index: 10;
-    }
+        <script src="js/Winwheel.js"></script>
+        <script src="js/TweenMax.min.js"></script>
+      <style>
+        html, body {
+          height: 100vh;
+          margin: 0;
+          font-family: monospace;
+        }
+        
+        .flexContainer {
+          display: flex;
+          flex-direction: column;
+          height: 100%;
+          position: relative;
+        }
+        
+        #spinwheel {
+          position: absolute;
+          left: 0;
+          top: 0;
+          display: none;
+          justify-content: center;
+          align-items: center;
+          width: 90vw;
+          height: 90vh;
+          z-index: 10;
+        }
 
-	#spinwheelCanvasContainer {
-		width: 438px;
-		height: 582px;
-		background-image: url(images/wheel_back.png);
-		background-position: center;
-    	background-repeat: none;
-	}
+            #spinwheelCanvasContainer {
+                width: 438px;
+                height: 582px;
+                background-image: url(images/wheel_back.png);
+                background-position: center;
+                background-repeat: none;
+            }
 
-	#canvas {
-		width: 434px;
-		height: 434px;
-		margin-top: 75px;
-		margin-left: 3px;
-	}
+            #canvas {
+                width: 434px;
+                height: 434px;
+                margin-top: 75px;
+                margin-left: 3px;
+            }
 
-	#spin {
-		text-align: center;
-		text-transform: capitalize;
-		cursor: pointer;
-		position: relative;
-		left: 146px;
-		top: -297px;
-		width: 150px;
-		height: 150px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 30px;
-		color: white;
-	}
-    
-    main {
-      flex: 1;
-      border-top: 1px solid black;
-      border-bottom: 1px solid black;
-    }
-    
-    header {
-    	padding: 10px;
-    }
-    
-    header {
-    	align-self: center;
-    }
-    
-    footer {
-    	max-height: 100px;
-    	overflow: auto;
-    	text-align: center;
-    	width: 100%;
-    }
+            #spin {
+                text-align: center;
+                text-transform: capitalize;
+                cursor: pointer;
+                position: relative;
+                left: 146px;
+                top: -297px;
+                width: 150px;
+                height: 150px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 30px;
+                color: white;
+            }
+        
+        main {
+          flex: 1;
+          border-top: 1px solid black;
+          border-bottom: 1px solid black;
+        }
+        
+        header {
+            padding: 10px;
+        }
+        
+        header {
+            align-self: center;
+        }
+        
+        footer {
+            max-height: 100px;
+            overflow: auto;
+            text-align: center;
+            width: 100%;
+        }
 
-    h1 {
-    	margin: 0;
-    }
-    
-    #qrcode {
-    	position: absolute;
-    	bottom: 0;
-    	left: 0;
-    	height: auto;
-		<%= "true".equals(request.getParameter("showqr")) ? "" : "display: none;" %>
-    }
-    
-    #sizecontrols {
-    	position: absolute;
-    	bottom: 0;
-    	left: 10px;
-    	display: flex;
-    	flex-direction: row;
-    }
-    
-    .pseudobutton {
-    	cursor: pointer;
-    	font-size: x-small;
-    }
-    </style>
+        h1 {
+            margin: 0;
+        }
+        
+        #qrcode {
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            height: auto;
+            <%= "true".equals(request.getParameter("showqr")) ? "" : "display: none;" %>
+        }
+        
+        #sizecontrols {
+            position: absolute;
+            bottom: 0;
+            left: 10px;
+            display: flex;
+            flex-direction: row;
+        }
+        
+        .pseudobutton {
+            cursor: pointer;
+            font-size: x-small;
+        }
+      </style>
     <script>
-    function increaseQRCode() {
-    	resizeQRCode(true);
-    }
+        function increaseQRCode() {
+            resizeQRCode(true);
+        }
     
-    function decreaseQRCode() {
-    	resizeQRCode(false);
-    }
+        function decreaseQRCode() {
+            resizeQRCode(false);
+        }
     
-    function resizeQRCode(increase) {
-		showQRCode();
-    	var qrcode = document.getElementById("qrcode");
-    	var styles = window.getComputedStyle(qrcode);
-    	var maxWidth = styles.getPropertyValue("width");
-    	if (maxWidth.includes("px")) {
-    		var current = parseInt(maxWidth.substring(0, maxWidth.indexOf("px")));
-    		if (!qrcode.initialWidth) {
-    			qrcode.initialWidth = current;
-    		}
-    		if (increase) {
-    			current = parseInt(current * 1.1);
-    		} else {
-    			current = parseInt(current * 0.9);
-    		}
-    		qrcode.style.setProperty("width", current + "px");
-    	} else {
-    		alert("Unknown max-width format: " + maxWidth);
-    	}
-    }
+        function resizeQRCode(increase) {
+            showQRCode();
+            var qrcode = document.getElementById("qrcode");
+            var styles = window.getComputedStyle(qrcode);
+            var maxWidth = styles.getPropertyValue("width");
+            if (maxWidth.includes("px")) {
+                var current = parseInt(maxWidth.substring(0, maxWidth.indexOf("px")));
+                if (!qrcode.initialWidth) {
+                    qrcode.initialWidth = current;
+                }
+                if (increase) {
+                    current = parseInt(current * 1.1);
+                } else {
+                    current = parseInt(current * 0.9);
+                }
+                qrcode.style.setProperty("width", current + "px");
+            } else {
+                alert("Unknown max-width format: " + maxWidth);
+            }
+        }
     
-    function resetQRCode() {
-		showQRCode();
-    	var qrcode = document.getElementById("qrcode");
-    	if (qrcode.initialWidth) {
-        	qrcode.style.setProperty("width", qrcode.initialWidth + "px");
-    	}
-    }
+        function resetQRCode() {
+            showQRCode();
+            var qrcode = document.getElementById("qrcode");
+            if (qrcode.initialWidth) {
+                qrcode.style.setProperty("width", qrcode.initialWidth + "px");
+            }
+        }
     
-    function makeQRSmall() {
-    	var qrcode = document.getElementById("qrcode");
-    	if (!qrcode.initialWidth) {
-        	var styles = window.getComputedStyle(qrcode);
-        	var maxWidth = styles.getPropertyValue("width");
-        	if (maxWidth.includes("px")) {
-        		var current = parseInt(maxWidth.substring(0, maxWidth.indexOf("px")));
-    			qrcode.initialWidth = current;
-        	}
-    	}
-    	qrcode.style.setProperty("width", "10px");
-    }
+        function makeQRSmall() {
+            var qrcode = document.getElementById("qrcode");
+            if (!qrcode.initialWidth) {
+                var styles = window.getComputedStyle(qrcode);
+                var maxWidth = styles.getPropertyValue("width");
+                if (maxWidth.includes("px")) {
+                    var current = parseInt(maxWidth.substring(0, maxWidth.indexOf("px")));
+                    qrcode.initialWidth = current;
+                }
+            }
+            qrcode.style.setProperty("width", "10px");
+        }
 
-	function hideQRCode() {
-        document.getElementById("qrcode").style.setProperty("display", "none");
-	}
+            function hideQRCode() {
+                document.getElementById("qrcode").style.setProperty("display", "none");
+            }
 
-	function showQRCode() {
-		document.getElementById("qrcode").style.setProperty("display", "inherit");
-	}
+            function showQRCode() {
+                document.getElementById("qrcode").style.setProperty("display", "inherit");
+            }
 
-	function playSound() {
-		if (window.spinSound) {
-			// Stop and rewind the sound if it already happens to be playing.
-			window.spinSound.pause();
-			window.spinSound.currentTime = 0;
+            function playSound() {
+                if (window.spinSound) {
+                    // Stop and rewind the sound if it already happens to be playing.
+                    window.spinSound.pause();
+                    window.spinSound.currentTime = 0;
 
-			// Play the sound.
-			window.spinSound.play();
-		}
-	}
+                    // Play the sound.
+                    window.spinSound.play();
+                }
+            }
     
-    function toggleSpinner() {
-		let spinner = document.getElementById("spinwheel");
-		var styles = window.getComputedStyle(spinner);
-		if (styles.getPropertyValue("display") == "none") {
-    		hideQRCode();
-        	spinner.style.setProperty("display", "flex");
+        function toggleSpinner() {
+                let spinner = document.getElementById("spinwheel");
+                var styles = window.getComputedStyle(spinner);
+                if (styles.getPropertyValue("display") == "none") {
+                hideQRCode();
+            spinner.style.setProperty("display", "flex");
 
-			if (!window.spinSound) {
-				try {
-					window.spinSound = new Audio("media/tick.mp3");
-				} catch (e) {
-					console.log(e);
-				}
-			}
+                    if (!window.spinSound) {
+                        try {
+                            window.spinSound = new Audio("media/tick.mp3");
+                        } catch (e) {
+                            console.log(e);
+                        }
+                    }
 
-			// https://github.com/zarocknz/javascript-winwheel
-			let currentColor = 0;
-			const segmentColors = [
-				'#ee1c24',
-				'#3cb878',
-				'#f6989d',
-				'#00aef0',
-				'#f26522',
-				'#e70697',
-				'#fff200',
-				'#f6989d',
-				'#ee1c24',
-				'#3cb878',
-				'#f26522',
-				'#a186be',
-				'#fff200',
-				'#00aef0',
-				'#ee1c24',
-				'#f6989d',
-				'#f26522',
-				'#3cb878',
-				'#a186be',
-				'#fff200',
-				'#00aef0',
-			];
-			let segments = [];
-			let threshold = 0.25;
-			let currentThreshold = threshold;
-			let sourceData = [];
-			if (window.surveyResults) {
-				sourceData = [...window.surveyResults];
-			}
-			if (sourceData.length == 0) {
-				sourceData = [
-					{ name: "New York, NY" },
-					{ name: "Los Angeles, CA" },
-					{ name: "Chicago, IL" },
-					{ name: "San Francisco, CA" },
-					{ name: "London, England" },
-					{ name: "Belin, Germany" },
-					{ name: "Paris, France" },
-					{ name: "Brussels, Belgium" },
-					{ name: "Madrid, Spain" },
-				];
-			}
-			const l = sourceData.length;
-			const maxSegments = 25;
-			for (let i = 0; i < l && i < maxSegments; i++) {
-				if (i / l >= currentThreshold) {
-					currentThreshold += threshold;
-					segments.push({
-						fillStyle: '#ffffff',
-						text: 'TRY AGAIN',
-						textFontSize: 14,
-					});
-				}
-				let fontSize = null;
-				let text = sourceData[i].name;
-				if (text.length > 35) {
-					fontSize = 3;
-				} else if (text.length > 30) {
-					fontSize = 4;
-				} else if (text.length > 25) {
-					fontSize = 5;
-				} else if (text.length > 20) {
-					fontSize = 6;
-				} else if (text.length > 15) {
-					fontSize = 8;
-				} else if (text.length > 10) {
-					fontSize = 9;
-				} else if (text.length > 8) {
-					fontSize = 14;
-				} else {
-					fontSize = 15;
-				}
-				segments.push({
-					fillStyle: segmentColors[currentColor],
-					text: text,
-					textFontSize: fontSize,
-				});
-				if (currentColor == segmentColors.length - 1) {
-					currentColor = 0;
-				} else {
-					currentColor++;
-				}
-			}
-			
-			console.log(segments);
+                    // https://github.com/zarocknz/javascript-winwheel
+                    let currentColor = 0;
+                    const segmentColors = [
+                        '#ee1c24',
+                        '#3cb878',
+                        '#f6989d',
+                        '#00aef0',
+                        '#f26522',
+                        '#e70697',
+                        '#fff200',
+                        '#f6989d',
+                        '#ee1c24',
+                        '#3cb878',
+                        '#f26522',
+                        '#a186be',
+                        '#fff200',
+                        '#00aef0',
+                        '#ee1c24',
+                        '#f6989d',
+                        '#f26522',
+                        '#3cb878',
+                        '#a186be',
+                        '#fff200',
+                        '#00aef0',
+                    ];
+                    let segments = [];
+                    let threshold = 0.25;
+                    let currentThreshold = threshold;
+                    let sourceData = [];
+                    if (window.surveyResults) {
+                        sourceData = [...window.surveyResults];
+                    }
+                    if (sourceData.length == 0) {
+                        sourceData = [
+                            { name: "New York, NY" },
+                            { name: "Los Angeles, CA" },
+                            { name: "Chicago, IL" },
+                            { name: "San Francisco, CA" },
+                            { name: "London, England" },
+                            { name: "Berlin, Germany" },
+                            { name: "Paris, France" },
+                            { name: "Brussels, Belgium" },
+                            { name: "Madrid, Spain" },
+                        ];
+                    }
+                    const l = sourceData.length;
+                    const maxSegments = 25;
+                    for (let i = 0; i < l && i < maxSegments; i++) {
+                        if (i / l >= currentThreshold) {
+                            currentThreshold += threshold;
+                            segments.push({
+                                fillStyle: '#ffffff',
+                                text: 'TRY AGAIN',
+                                textFontSize: 14,
+                            });
+                        }
+                        let fontSize = null;
+                        let text = sourceData[i].name;
+                        if (text.length > 35) {
+                            fontSize = 3;
+                        } else if (text.length > 30) {
+                            fontSize = 4;
+                        } else if (text.length > 25) {
+                            fontSize = 5;
+                        } else if (text.length > 20) {
+                            fontSize = 6;
+                        } else if (text.length > 15) {
+                            fontSize = 8;
+                        } else if (text.length > 10) {
+                            fontSize = 9;
+                        } else if (text.length > 8) {
+                            fontSize = 14;
+                        } else {
+                            fontSize = 15;
+                        }
+                        segments.push({
+                            fillStyle: segmentColors[currentColor],
+                            text: text,
+                            textFontSize: fontSize,
+                        });
+                        if (currentColor == segmentColors.length - 1) {
+                            currentColor = 0;
+                        } else {
+                            currentColor++;
+                        }
+                    }
+            
+                    console.log(segments);
 
-			window.theWheel = new Winwheel({
-                outerRadius: 212,
-                innerRadius: 75,
-                textFontSize: 24,
-                textOrientation: 'vertical',
-                textAlignment: 'outer',
-                numSegments: segments.length,
-                segments: segments,
-                animation: {
-                    type: 'spinToStop',
-                    duration: 20,
-                    spins: 5,
-                    callbackFinished: spinCompleted,
-					callbackSound: playSound,
-					soundTrigger: 'pin',
-                },
-                pins:
-                {
-                    number: segments.length,
-                    fillStyle: 'silver',
-                    outerRadius: 4,
-                }
-            });
+                    window.theWheel = new Winwheel({
+            outerRadius: 212,
+            innerRadius: 75,
+            textFontSize: 24,
+            textOrientation: 'vertical',
+            textAlignment: 'outer',
+            numSegments: segments.length,
+            segments: segments,
+            animation: {
+              type: 'spinToStop',
+              duration: 20,
+              spins: 5,
+              callbackFinished: spinCompleted,
+                            callbackSound: playSound,
+                            soundTrigger: 'pin',
+            },
+            pins: {
+              number: segments.length,
+              fillStyle: 'silver',
+              outerRadius: 4,
+            }
+          });
 
-    	} else {
-        	spinner.style.setProperty("display", "none");
-			showQRCode();
-    	}
-    }
+            } else {
+            spinner.style.setProperty("display", "none");
+                    showQRCode();
+            }
+        }
 
-	function spin() {
-		window.theWheel.stopAnimation(false);
-		window.theWheel.rotationAngle = 0;
-		window.theWheel.draw();
-		window.theWheel.startAnimation();
-	}
+            function spin() {
+                window.theWheel.stopAnimation(false);
+                window.theWheel.rotationAngle = 0;
+                window.theWheel.draw();
+                window.theWheel.startAnimation();
+            }
 
-	function spinCompleted(segment) {
-		alert(segment.text);
-	}
+            function spinCompleted(segment) {
+                alert(segment.text);
+            }
 
-	function farthestDistance() {
-		let search = window.surveyResults;
-		if (!search) {
-			search = [{
-    		    latitude: 40.7127753,
-    		    longitude: -74.0059728,
-    		    distance: 4057156,
-    		    name: "New York, NY",
-    		}];
-		}
+            function farthestDistance() {
+                let search = window.surveyResults;
+                if (!search) {
+                    search = [{
+                latitude: 40.7127753,
+                longitude: -74.0059728,
+                distance: 4057156,
+                name: "New York, NY",
+                }];
+                }
 
-		let farthest = null;
-		for (let surveyResult of search) {
-			if (farthest) {
-				if (surveyResult.distance > farthest.distance) {
-					farthest = surveyResult;
-				}
-			} else {
-				farthest = surveyResult;
-			}
-		}
-		let kilometers = farthest.distance / 1000;
-		let miles = kilometers * 0.621371;
-		let suffix = " miles";
-		let distance = miles;
-		<%
-		  if ("true".equals(request.getParameter("km"))) {
-		%>
-		distance = kilometers;
-		suffix = " kilometers";
-		<%
-		  }
-		%>
-		alert("Farthest location: " + farthest.name + " at " + distance.toLocaleString(undefined, { maximumFractionDigits: 0 }) + suffix);
-	}
-	</script>
+                let farthest = null;
+                for (let surveyResult of search) {
+                    if (farthest) {
+                        if (surveyResult.distance > farthest.distance) {
+                            farthest = surveyResult;
+                        }
+                    } else {
+                        farthest = surveyResult;
+                    }
+                }
+                let kilometers = farthest.distance / 1000;
+                let miles = kilometers * 0.621371;
+                let suffix = " miles";
+                let distance = miles;
+                <%
+                  if ("true".equals(request.getParameter("km"))) {
+                %>
+                        distance = kilometers;
+                        suffix = " kilometers";
+                <%
+                  }
+                %>
+                alert("Farthest location: " + farthest.name + " at " + distance.toLocaleString(undefined, { maximumFractionDigits: 0 }) + suffix);
+            }
+        </script>
   </head>
   <body>
     <div class="flexContainer">
-    	<header>
-    		<h1>Location Survey</h1>
-    	</header>
-    	<main id="map">
-    	</main>
-	    <footer>
-	    	<p id="results">&nbsp;</p>
-	    </footer>
-	    <img id="qrcode" src="qrcode.png" width="<%= com.example.demo.Configuration.QRCODE_WIDTH %>" />
-	    <div id="sizecontrols">
-	      <span class="pseudobutton" onclick="increaseQRCode()" title="Increase QR Code Size">+</span>
-	      &nbsp;
-	      <span class="pseudobutton" onclick="decreaseQRCode()" title="Decrease QR Code Size">-</span>
-	      &nbsp;
-	      <span class="pseudobutton" onclick="resetQRCode()" title="Reset QR Code Size">↺</span>
-	      &nbsp;
-	      <span class="pseudobutton" onclick="makeQRSmall()" title="Minimize QR Code Size">🔍</span>
-	      &nbsp;
-	      <span class="pseudobutton" onclick="toggleSpinner()" title="Toggle Spinner">⥁</span>
-	      &nbsp;
-	      <span class="pseudobutton" onclick="farthestDistance()" title="Farthest Distance">📏</span>
-	    </div>
+        <header>
+            <h1>Location Survey</h1>
+        </header>
+        <main id="map">
+        </main>
+        <footer>
+            <p id="results">&nbsp;</p>
+        </footer>
+        <img id="qrcode" src="qrcode.png" width="<%= com.example.demo.Configuration.QRCODE_WIDTH %>" />
+        <div id="sizecontrols">
+          <span class="pseudobutton" onclick="increaseQRCode()" title="Increase QR Code Size">+</span>
+          &nbsp;
+          <span class="pseudobutton" onclick="decreaseQRCode()" title="Decrease QR Code Size">-</span>
+          &nbsp;
+          <span class="pseudobutton" onclick="resetQRCode()" title="Reset QR Code Size">↺</span>
+          &nbsp;
+          <span class="pseudobutton" onclick="makeQRSmall()" title="Minimize QR Code Size">🔍</span>
+          &nbsp;
+          <span class="pseudobutton" onclick="toggleSpinner()" title="Toggle Spinner">⥁</span>
+          &nbsp;
+          <span class="pseudobutton" onclick="farthestDistance()" title="Farthest Distance">📏</span>
+        </div>
     </div>
-	<div id="spinwheel">
-		<div id="spinwheelCanvasContainer">
-			<canvas id="canvas" width="434" height="434">
-				<p style="background-color: white; color: red;" align="center">Please use a browser that supports the canvas element</p>
-			</canvas>
-			<div id="spin" onclick="spin()">Spin</div>
-		</div>
-	</div>
+        <div id="spinwheel">
+            <div id="spinwheelCanvasContainer">
+                <canvas id="canvas" width="434" height="434">
+                    <p style="background-color: white; color: red;" align="center">Please use a browser that supports the canvas element</p>
+                </canvas>
+                <div id="spin" onclick="spin()">Spin</div>
+            </div>
+        </div>
     <script>
       function appendResults(str) {
-    	  str = str + " (" + new Date().toLocaleTimeString() + ")";
-    	  var results = document.getElementById("results");
-    	  if (results.initialized) {
-    		  results.innerHTML = str + "<br />" + results.innerHTML;
-    	  } else {
-    		  results.innerHTML = str;
-    		  results.initialized = true;
-    	  }
+          str = str + " (" + new Date().toLocaleTimeString() + ")";
+          var results = document.getElementById("results");
+          if (results.initialized) {
+              results.innerHTML = str + "<br />" + results.innerHTML;
+          } else {
+              results.innerHTML = str;
+              results.initialized = true;
+          }
       }
       
       function pingWebSocket() {
-    	  if (window.ws && window.wsready) {
-    		  window.ws.send("PING");
-    	  }
+          if (window.ws && window.wsready) {
+              window.ws.send("PING");
+          }
       }
       
       function tryReconnectWebSocket() {
-    	  window.reconnecting = true;
-    	  openWebSocket();
+          window.reconnecting = true;
+          openWebSocket();
       }
       
       function openWebSocket() {
-    	  try {
-        	  if ('WebSocket' in window || 'MozWebSocket' in window) {
-        		  if (!window.wsconnecting) {
-	        		  window.wsconnecting = true;
-	        		  
-	            	  var websocketUrl = window.location.protocol === 'https:' ? "wss://" : "ws://";
-	            	  websocketUrl += window.location.host + "/GeolocationWebSocket";
-	            	  console.log("Initiating web socket to " + websocketUrl);
-	            	  
-	            	  if (window.reconnecting) {
-	            		  appendResults("Reconnecting...");
-	            	  }
-	            	  
-	                  window.ws = new WebSocket(websocketUrl);
-	                  
-	                  window.ws.onopen = function () {
-	                	  console.log("WebSocket successfully opened");
-	                	  
-	                	  window.wsready = true;
-	                	  window.wsconnecting = false;
-	                	  
-	                	  appendResults("<%= com.example.demo.Configuration.isGoogleAPIKeyConfigured() ? "Connected" : "Error: GOOGLE_API_KEY not specified" %>");
-	                	  
-	                	  // Some environments aggressively clean up idle sockets
-	                	  // and WebSockets are not immune, so we just send
-	                	  // a dummy ping message periodicaly
-	                	  setInterval(pingWebSocket, 15000);
-	                  };
-	
-	                  window.ws.onmessage = function (evt) {
-	                	  console.log("WebSocket received message");
-	                	  console.log(evt);
-	                	  handleResult(evt.data);
-	                  };
-	
-	                  window.ws.onerror = function (evt) {
-	                	  window.ws = null;
-	                	  window.wsready = false;
-	                	  window.wsconnecting = false;
-	                	  console.log("WebSocket error");
-	                	  console.log(evt);
-	                	  handleResult("ERROR: WebSocket received an error");
-	                	  setTimeout(tryReconnectWebSocket, 5000);
-	                  };
-	
-	                  window.ws.onclose = function (evt) {
-	                	  window.ws = null;
-	                	  window.wsready = false;
-	                	  window.wsconnecting = false;
-	                	  console.log("WebSocket close");
-	                	  console.log(evt);
-	                	  
-	                	  // https://www.rfc-editor.org/rfc/rfc6455#section-7.4.1
-	                	  appendResults("Warning: WebSocket closed (" + evt.code + ")");
-	                	  
-	                	  // A close can either happen as the browser is refreshing or navigating
-	                	  // away, which is normal, or for some problematic reason.
-	                	  // To avoid handling the former case, we only try re-starting the
-	                	  // connection after a bit of time.
-	                	  setTimeout(tryReconnectWebSocket, 5000);
-	                  };        			  
-        		  }
-              } else {
-        		  appendResults("ERROR: WebSockets not supported or not enabled in this browser.");
-        	  }
-          } catch (e) {
-        	  handleException(e);
-          }
+          try {
+            if ('WebSocket' in window || 'MozWebSocket' in window) {
+                if (!window.wsconnecting) {
+                    window.wsconnecting = true;
+                      
+                var websocketUrl = window.location.protocol === 'https:' ? "wss://" : "ws://";
+                websocketUrl += window.location.host + "/GeolocationWebSocket";
+                console.log("Initiating web socket to " + websocketUrl);
+                      
+                if (window.reconnecting) {
+                  appendResults("Reconnecting...");
+                }
+                      
+                window.ws = new WebSocket(websocketUrl);
+                      
+                window.ws.onopen = function () {
+                  console.log("WebSocket successfully opened");
+                          
+                  window.wsready = true;
+                  window.wsconnecting = false;
+                          
+                  appendResults("<%= com.example.demo.Configuration.isGoogleAPIKeyConfigured() ? "Connected" : "Error: GOOGLE_API_KEY not specified" %>");
+                          
+                  // Some environments aggressively clean up idle sockets
+                  // and WebSockets are not immune, so we just send
+                  // a dummy ping message periodicaly
+                  setInterval(pingWebSocket, 15000);
+                };
+    
+                window.ws.onmessage = function (evt) {
+                  console.log("WebSocket received message");
+                  console.log(evt);
+                  handleResult(evt.data);
+                };
+    
+                window.ws.onerror = function (evt) {
+                  window.ws = null;
+                  window.wsready = false;
+                  window.wsconnecting = false;
+                  console.log("WebSocket error");
+                  console.log(evt);
+                  handleResult("ERROR: WebSocket received an error");
+                    setTimeout(tryReconnectWebSocket, 5000);
+                };
+    
+                window.ws.onclose = function (evt) {
+                  window.ws = null;
+                  window.wsready = false;
+                  window.wsconnecting = false;
+                  console.log("WebSocket close");
+                  console.log(evt);
+                          
+                  // https://www.rfc-editor.org/rfc/rfc6455#section-7.4.1
+                  appendResults("Warning: WebSocket closed (" + evt.code + ")");
+                          
+                  // A close can either happen as the browser is refreshing or navigating
+                  // away, which is normal, or for some problematic reason.
+                  // To avoid handling the former case, we only try re-starting the
+                  // connection after a bit of time.
+                  setTimeout(tryReconnectWebSocket, 5000);
+                };
+
+                }
+          } else {
+                appendResults("ERROR: WebSockets not supported or not enabled in this browser.");
+            }
+        } catch (e) {
+            handleException(e);
+        }
       }
       
       async function handleResult(str) {
-    	  var i = str.indexOf(' ');
-    	  if (i != -1) {
-	    	  const { AdvancedMarkerElement } = await google.maps.importLibrary("marker");
-	    	  const { InfoWindow } = await google.maps.importLibrary("maps")
+          var i = str.indexOf(' ');
+          if (i != -1) {
+              const { AdvancedMarkerElement, PinElement } = await google.maps.importLibrary("marker");
+              const { InfoWindow } = await google.maps.importLibrary("maps")
+
+              var latitude = parseFloat(str.substring(0, i));
+              str = str.substring(i + 1);
+              i = str.indexOf(' ');
+              var longitude = parseFloat(str.substring(0, i));
+              str = str.substring(i + 1);
+              i = str.indexOf(' ');
+              var distance = parseFloat(str.substring(0, i));
+              str = str.substring(i + 1);
+                  i = str.indexOf(' ');
+                  var color = str.substring(0, i); 
+                  str = str.substring(i + 1);
+                  i = str.indexOf(' ');
+                  var key = str.substring(0, i); 
+                  str = str.substring(i + 1);
+                  var markerZIndex = 1;
+                  if(color == "red") {
+                      markerZIndex = 10;
+                  }
+              
+              if (!window.surveyResults) {
+                  window.surveyResults = [];
+              }
+              window.surveyResults.push({
+                latitude: latitude,
+                longitude: longitude,
+                distance: distance,
+                name: str,
+              });
+              
+              if (str.indexOf("received an error") == -1) {
+                  if(key != "--") {
+                      appendResults("Key: " + key + " @ " + str);    
+                  } else {
+                      appendResults("Welcome: " + str);    
+                  }           
+              } else {
+                  appendResults(str);
+              }
+              
+              const pin = new PinElement({
+                    background: color,
+                    glyphColor: color,
+                    borderColor: color
+              });
 
-	    	  var latitude = parseFloat(str.substring(0, i));
-    		  str = str.substring(i + 1);
-    		  i = str.indexOf(' ');
-    		  var longitude = parseFloat(str.substring(0, i));
-    		  str = str.substring(i + 1);
-    		  i = str.indexOf(' ');
-    		  var distance = parseFloat(str.substring(0, i));
-    		  str = str.substring(i + 1);
-    		  
-    		  if (!window.surveyResults) {
-    			  window.surveyResults = [];
-    		  }
-    		  window.surveyResults.push({
-    		    latitude: latitude,
-    		    longitude: longitude,
-    		    distance: distance,
-    		    name: str,
-    		  });
-    		  
-    		  if (str.indexOf("received an error") == -1) {
-            	  appendResults("Welcome: " + str);
-    		  } else {
-            	  appendResults(str);
-    		  }
-        	  
-        	  const marker = new AdvancedMarkerElement({
-       		    map: window.map,
-       		    position: { lat: latitude, lng: longitude },
-       		    title: str,
-       		  });
-        	  
-        	  const infowindow = new google.maps.InfoWindow({
-       		    content: str,
-       		  });
-        	  
-        	  marker.addListener("click", () => {
-       		    infowindow.open({
-       		      anchor: marker,
-       		      map,
-       		    });
-       		  });
-    	  }
+            const marker = new AdvancedMarkerElement({
+                map: window.map,
+                position: { lat: latitude, lng: longitude },
+                title: key,
+                content: pin.element,
+                zIndex: markerZIndex
+            });
+              
+            const infowindow = new google.maps.InfoWindow({
+                 content: str,
+               });
+              
+            marker.addListener("click", () => {
+              window.ws.send(marker.title);
+              window.alert("Key sent for processing: " + marker.title);
+            });
+          }
       }
       
       function handleException(e) {
-    	  appendResults("ERROR: " + e);
+          appendResults("ERROR: " + e);
       }
       
       async function initMap() {
-    	  try {
-	    	  const { Map } = await google.maps.importLibrary("maps");
+          try {
+              const { Map } = await google.maps.importLibrary("maps");
 
-	    	  window.map = new Map(document.getElementById("map"), {
-	    		    center: { lat: 39.02035726090001, lng: -36.31471803232274 },
-	    		    zoom: 3,
-	    		    mapId: "locationSurvey",
-	    	  });
-	    	  
-	    	  openWebSocket();
-    	  } catch (e) {
-    		  handleException(e);
-    	  }
+              window.map = new Map(document.getElementById("map"), {
+                  center: { lat: 39.02035726090001, lng: -36.31471803232274 },
+                  zoom: 3,
+                  mapId: "locationSurvey",
+              });
+              
+              openWebSocket();
+          } catch (e) {
+              handleException(e);
+          }
       }
       
       // Load Google Maps JS API
diff --git a/surveyGeocoderService/src/main/java/com/example/demo/reactive/CloudEventsProcessor.java b/surveyGeocoderService/src/main/java/com/example/demo/reactive/CloudEventsProcessor.java
index 84640de..7e83001 100644
--- a/surveyGeocoderService/src/main/java/com/example/demo/reactive/CloudEventsProcessor.java
+++ b/surveyGeocoderService/src/main/java/com/example/demo/reactive/CloudEventsProcessor.java
@@ -1,14 +1,17 @@
 package com.example.demo.reactive;
 
+import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.eclipse.microprofile.reactive.messaging.Channel;
 import org.eclipse.microprofile.reactive.messaging.Emitter;
-import org.eclipse.microprofile.reactive.messaging.Message;
 
 import com.example.demo.Geocoder;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.maps.errors.ApiException;
 import com.google.maps.model.PlaceDetails;
 
 import io.cloudevents.CloudEvent;
@@ -47,11 +50,31 @@ public Response locationInput(CloudEvent incoming) {
 		if (LOG.isLoggable(Level.INFO))
 			LOG.info("CloudEventData: " + data);
 
-		String location = null;
+		String jsonString = null;
 		try (StringDeserializer deserializer = new StringDeserializer()) {
-			location = deserializer.deserialize(null, data.toBytes());
+			jsonString = deserializer.deserialize(null, data.toBytes());
 		}
 
+		JsonObject jsonObj = (new Gson()).fromJson(jsonString, JsonObject.class);
+    String location = null;
+    String color = null;
+    String key = null;
+    if(jsonObj.has("location")) {
+      location = jsonObj.get("location").getAsString();
+    } else {
+      location = "unknown";
+    }
+    if(jsonObj.has("color")) {
+      color = jsonObj.get("color").getAsString();
+    } else {
+      color = "grey";
+    }
+    if(jsonObj.has("key")) {
+    	key = jsonObj.get("key").getAsString();
+    } else {
+    	key = "--";
+    }
+
 		if (LOG.isLoggable(Level.INFO))
 			LOG.info("Input location: " + location);
 
@@ -69,22 +92,24 @@ public Response locationInput(CloudEvent incoming) {
 			if (LOG.isLoggable(Level.INFO))
 				LOG.info("Geocoded point: " + latitude + "," + longitude);
 			
-			emitter.send(Message.of(latitude + " " + longitude + " " + location));
+			String jsonMessage = 
+				"{" +
+					"\"latitude\": "  + "\"" + latitude  + "\"," + 
+					"\"longitude\": " + "\"" + longitude + "\"," + 
+					"\"location\": "  + "\"" + location  + "\"," + 
+					"\"color\": "     + "\"" + color     + "\","  + 
+					"\"key\": "       + "\"" + key       + "\""  + 
+				"}";
+
+			emitter.send(jsonMessage);
 
 			result = Response.ok().build();
 
-		} catch (Throwable e) {
+		} catch (ApiException | InterruptedException | IOException e) {
 			if (LOG.isLoggable(Level.SEVERE))
 				LOG.log(Level.SEVERE, ERROR_FAILED_GEOCODING, e);
 
-			// Not much to do with an error as we don't have a way to notify
-			// the user, so we log it above and just return success.
-			// 
-			// TODO, we could emit an alternative message consumed by the admin
-			// application that shows some sort of message in the scrolling
-			// informational view.
-			result = Response.ok().build();			
-			//result = Response.serverError().entity(ERROR_FAILED_GEOCODING + ": " + e.getMessage()).build();
+			result = Response.serverError().entity(ERROR_FAILED_GEOCODING + ": " + e.getMessage()).build();
 		}
 
 		if (LOG.isLoggable(Level.FINER))
diff --git a/surveyInputService/src/main/java/com/example/demo/servlets/LocationSurvey.java b/surveyInputService/src/main/java/com/example/demo/servlets/LocationSurvey.java
index 8565f73..da6a516 100644
--- a/surveyInputService/src/main/java/com/example/demo/servlets/LocationSurvey.java
+++ b/surveyInputService/src/main/java/com/example/demo/servlets/LocationSurvey.java
@@ -39,8 +39,11 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
 
 		if (textInput1 != null && textInput1.length() > 0) {
 
+			String jsonMessage = "{\"location\": \""+ textInput1  +"\", \"color\": \"blue\"}";
+
 			// Input is good! Publish to Kafka
-			emitter.send(Message.of(textInput1));
+			emitter.send(Message.of(jsonMessage));
+
 
 			writeResponse(response, """
 					      <h1>Thank you!</h1>