diff --git a/histogram.cpp b/histogram.cpp
new file mode 100644
index 0000000..5150ad4
--- /dev/null
+++ b/histogram.cpp
@@ -0,0 +1,78 @@
+#include "histogram.h"
+
+static void
+find_minmax(const std::vector<double>& numbers, double& min, double& max){
+    min = numbers[0];
+    max = numbers[0];
+
+    for (double x : numbers) {
+        if (x < min) {
+            min = x;
+        }
+        else if (x > max) {
+            max = x;
+        }
+    }
+}
+
+
+std::vector<size_t>
+make_histogram(const std::vector<double>& numbers, size_t bin_count){
+
+    std::vector<size_t> bins(bin_count);
+
+    double min, max;
+    find_minmax(numbers, min, max);
+
+    double bin_size = (max - min) / bin_count;
+
+    for (size_t i = 0; i < numbers.size(); i++) {
+        bool found = false;
+        for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
+            auto lo = min + j * bin_size;
+            auto hi = min + (j + 1) * bin_size;
+            if ((lo <= numbers[i]) && (numbers[i] < hi)) {
+                bins[j]++;
+                found = true;
+            }
+        }
+        if (!found) {
+            bins[bin_count - 1]++;
+        }
+    }
+    return bins;
+}
+/*#include "histogram.h"
+using namespace std;
+static void
+find_minmax(std::vector<double>& numbers, double& min, double& max){
+    min = numbers[0];
+    max = numbers[0];
+    for (double x : numbers) {
+        if (x < min) {
+            min = x;
+        }
+        else if (x > max) {
+            max = x;
+        }
+    }
+}
+
+std::vector<size_t>
+make_histogram(std::vector<double>& numbers, size_t bin_count) {
+    double min, max;
+    find_minmax(numbers, min, max);
+
+    std::vector<size_t> bins(bin_count, 0);
+    double bin_size = (max - min) / bin_count;
+
+    for (double number : numbers) {
+        size_t bin_index = bin_count - 1;  // default to last bin
+        if (number < max) {
+            bin_index = static_cast<size_t>((number - min) / bin_size);
+        }
+        bins[bin_index]++;
+    }
+
+    return bins;
+}*/
diff --git a/histogram.h b/histogram.h
new file mode 100644
index 0000000..a4a8a88
--- /dev/null
+++ b/histogram.h
@@ -0,0 +1,11 @@
+#ifndef HISTOGRAM_H_INCLUDED
+#define HISTOGRAM_H_INCLUDED
+
+#include <vector>
+
+std::vector<size_t>
+make_histogram(const std::vector<double>& numbers, size_t bin_count);
+
+
+
+#endif // HISTOGRAM_H_INCLUDED
diff --git a/main.cpp b/main.cpp
index c2cb61a..e774cdf 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
 using namespace std;
 
 const size_t SCREEN_WIDTH = 80;
@@ -29,7 +30,7 @@ input_data(){
 
     return in;
 }
-
+/*
 void
 find_minmax(vector<double>& numbers, double& min, double& max){
     min = numbers[0];
@@ -60,9 +61,10 @@ vector<size_t> make_histogram(vector<double>& numbers, size_t bin_count) {
     }
 
     return bins;
-}
+}*/
 
-void show_histogram_text(const vector<size_t>& bins){
+void
+show_histogram_text(const vector<size_t>& bins){
     size_t i;
     size_t height = 0;
     size_t max_count = 0;