diff --git a/src/main_zeromq.rs b/src/main_zeromq.rs
index ac8ad3c519..f6687fde87 100644
--- a/src/main_zeromq.rs
+++ b/src/main_zeromq.rs
@@ -14,6 +14,7 @@ use std::thread;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use zeromq::cpu_calculate_point_cloud::PointCloudResult;
 use zeromq::cpu_calculate_point_cloud::calculate_point_cloud2;
+use zeromq::cpu_calculate_point_cloud::calculate_point_cloud3;
 use zeromq::color::Color;
 use zeromq::cpu_transformation::DepthTransformer;
 use zeromq::point::Point;
@@ -91,7 +92,20 @@ fn main() -> AnyhowResult<()> {
   let mut messaging_state = MessagingState::Sending_DataLength;
   let mut color = Color::get_time_based_color();
 
-  let mut points = get_point_cloud(&device, &xy_table, color, &transformer)?;
+  let mut points : Vec<Point> = Vec::new();
+
+  loop {
+    let maybe_points = get_point_cloud(&device, &xy_table, color, &transformer);
+    points = match maybe_points {
+      Err(e) => {
+        println!("Error: {:?}", e);
+        thread::sleep(Duration::from_millis(5000));
+        continue;
+      },
+      Ok(points) => points,
+    };
+    break;
+  };
 
   if !points.is_empty() {
     //print_pointcloud_maxima(&points);
@@ -167,12 +181,21 @@ fn get_point_cloud(device: &Device, xy_table: &Image, color: Color, transformer:
   let capture = device.get_capture(5000)?;
 
   let depth_image = capture.get_depth_image()
-      .ok_or(anyhow!("capture not present"))?;
+      .ok_or(anyhow!("depth image not present"))?;
+
+  let color_image = capture.get_color_image()
+      .ok_or(anyhow!("color image not present"))?;
+
 
   let depth_image2 = transformer.transform(&depth_image)?;
 
   let mut points =
-      calculate_point_cloud2(&depth_image2, &xy_table, color)?;
+      calculate_point_cloud3(
+        &depth_image2,
+        &xy_table,
+        //color,
+        &color_image
+      )?;
 
   //println!("Points: {}", points.len());
 
diff --git a/src/zeromq/cpu_calculate_point_cloud.rs b/src/zeromq/cpu_calculate_point_cloud.rs
index e51526bdd0..e85c3f63cf 100644
--- a/src/zeromq/cpu_calculate_point_cloud.rs
+++ b/src/zeromq/cpu_calculate_point_cloud.rs
@@ -92,3 +92,60 @@ pub fn calculate_point_cloud2(depth_image: &Image, xy_table_image: &Image, color
 
     Ok(points)
 }
+
+#[repr(C, packed)]
+#[derive(Copy, Clone)]
+struct ColorCameraPoint {
+    pub r: u8,
+    pub g: u8,
+    pub b: u8,
+    pub a: u8,
+}
+
+// Directly return as a vector.
+pub fn calculate_point_cloud3(depth_image: &Image, xy_table_image: &Image, color_image: &Image) -> AnyhowResult<Vec<Point>> {
+    let width = depth_image.get_width_pixels();
+    let height = depth_image.get_height_pixels();
+
+    {
+        let xy_width = xy_table_image.get_width_pixels();
+        let xy_height = xy_table_image.get_height_pixels();
+        if width != xy_width || height != xy_height {
+            return Err(anyhow!("Depth image ({}x{}) and XY table ({}x{}) dimensions are not equal!",
+                width, height, xy_width, xy_height));
+        }
+    }
+
+    let xy_table_data = xy_table_image.get_buffer() as *mut k4a_sys::k4a_float2_t;
+    let depth_data = depth_image.get_buffer() as *mut u16; // uint16_t
+    let color_data = color_image.get_buffer() as *mut ColorCameraPoint;
+    //let color_data = color_image.get_buffer() as *mut u32;
+
+    let depth_data_length = (width * height) as isize;
+
+    let mut points = Vec::new();
+
+    for i in 0 .. depth_data_length {
+        unsafe {
+            // TODO: This is missing `isnan` checks.
+            //  if (depth_data[i] != 0 && !isnan(xy_table_data[i].xy.x) && !isnan(xy_table_data[i].xy.y))
+            if (*depth_data.offset(i)) != 0 {
+                let x = (*xy_table_data.offset(i)).xy.x * ((*depth_data.offset(i)) as f32);
+                let y = (*xy_table_data.offset(i)).xy.y * ((*depth_data.offset(i)) as f32);
+                let z = (*depth_data.offset(i)) as f32;
+                let color = (*color_data.offset(i)) as ColorCameraPoint;
+
+                let point_color = Color::Custom {
+                    r: color.r,
+                    b: color.b,
+                    g: color.g,
+                    a: 255
+                };
+
+                points.push(Point::at(x, y, z, point_color));
+            }
+        }
+    }
+
+    Ok(points)
+}