diff --git a/include/map/Map.h b/include/map/Map.h
index c431273..c5179b5 100644
--- a/include/map/Map.h
+++ b/include/map/Map.h
@@ -7,6 +7,7 @@
 #include "util.hpp"
 #include "map/Octree.h"
 #include <time.h>
+#include "map/Old_Map.h"
 
 #define _USE_MATH_DEFINES
 #include <math.h>
@@ -15,7 +16,7 @@ class Map {
 public: 
 
 	// Currently takes a 
-	Map(uint32_t dimensions);
+	Map(uint32_t dimensions, Old_Map* array_map);
 
 	// Sets a voxel in the 3D char dataset
 	void setVoxel(sf::Vector3i position, int val);
diff --git a/kernels/ray_caster_kernel.cl b/kernels/ray_caster_kernel.cl
index 61bfba7..3206d7e 100644
--- a/kernels/ray_caster_kernel.cl
+++ b/kernels/ray_caster_kernel.cl
@@ -364,11 +364,11 @@ __kernel void raycaster(
 
 		// Test for out of bounds contions, add fog
 		if (any(voxel >= *map_dim)){
-			//write_imagef(image, pixel, white_light(mix(fog_color, overshoot_color, 1.0 - max(dist / 700.0f, (float)0)), (float3)(lights[7], lights[8], lights[9]), face_mask));
+			write_imagef(image, pixel, white_light(mix(fog_color, overshoot_color, 1.0 - max(dist / 700.0f, (float)0)), (float3)(lights[7], lights[8], lights[9]), face_mask));
 			return;
 		}
 		if (any(voxel < 0)) {
-			//write_imagef(image, pixel, white_light(mix(fog_color, overshoot_color_2, 1.0 - max(dist / 700.0f, (float)0)), (float3)(lights[7], lights[8], lights[9]), face_mask));
+			write_imagef(image, pixel, white_light(mix(fog_color, overshoot_color_2, 1.0 - max(dist / 700.0f, (float)0)), (float3)(lights[7], lights[8], lights[9]), face_mask));
 			return;
 		}
 
diff --git a/src/Application.cpp b/src/Application.cpp
index 7c621ca..5721d12 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -38,7 +38,7 @@ bool Application::init_clcaster() {
 	// Send the data to the GPU
 	raycaster->assign_map(map);
 
-	octree = std::make_shared<Map>(32);
+	octree = std::make_shared<Map>(32, map.get());
 	raycaster->assign_octree(octree);
 
 
diff --git a/src/CLCaster.cpp b/src/CLCaster.cpp
index 7850abb..2583e28 100644
--- a/src/CLCaster.cpp
+++ b/src/CLCaster.cpp
@@ -96,11 +96,11 @@ bool CLCaster::assign_octree(std::shared_ptr<Map> octree) {
 
 	this->octree = octree;
 
-	if (!create_buffer("octree_descriptor_buffer", octree->octree.buffer_size, &octree->octree.descriptor_buffer))
+	if (!create_buffer("octree_descriptor_buffer", octree->octree.buffer_size * sizeof(uint64_t), octree->octree.descriptor_buffer))
 		return false;
-	if (!create_buffer("octree_attachment_lookup_buffer", octree->octree.buffer_size, &octree->octree.attachment_lookup))
+	if (!create_buffer("octree_attachment_lookup_buffer", octree->octree.buffer_size * sizeof(uint32_t), octree->octree.attachment_lookup))
 		return false;
-	if (!create_buffer("octree_attachment_buffer", octree->octree.buffer_size, &octree->octree.attachment_buffer))
+	if (!create_buffer("octree_attachment_buffer", octree->octree.buffer_size * sizeof(uint64_t), octree->octree.attachment_buffer))
 		return false;
 	if (!create_buffer("settings_buffer", sizeof(uint64_t), &octree->octree.root_index))
 		return false;
diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 0efcf38..9ebfb45 100644
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -2,7 +2,7 @@
 #include "Logger.h"
 
 
-Map::Map(uint32_t dimensions) {
+Map::Map(uint32_t dimensions, Old_Map* array_map) {
 
 
 	if ((int)pow(2, (int)log2(dimensions)) != dimensions)
@@ -12,12 +12,26 @@ Map::Map(uint32_t dimensions) {
 
 	// randomly set the voxel data for testing
 	for (uint64_t i = 0; i < dimensions * dimensions * dimensions; i++) {
-		if (i % 2 == 0)
+		if (rand() % 10000 < 3)
 			voxel_data[i] = 1;
 		else
 			voxel_data[i] = 0;
     }
 
+	char* char_array = array_map->get_voxel_data();
+	sf::Vector3i arr_dimensions = array_map->getDimensions();
+
+	for (int x = 0; x < dimensions; x++) {
+		for (int y = 0; y < dimensions; y++) {
+			for (int z = 0; z < dimensions; z++) {
+				
+				char v = char_array[x + arr_dimensions.x * (y + arr_dimensions.z * z)];
+				if (v)
+					voxel_data[x + dimensions * (y + dimensions * z)] = 1;
+			}
+		}
+	}
+
 	sf::Vector3i dim3(dimensions, dimensions, dimensions);
 
 	Logger::log("Generating Octree", Logger::LogLevel::INFO);
diff --git a/src/map/Octree.cpp b/src/map/Octree.cpp
index 9bbc9df..3326839 100644
--- a/src/map/Octree.cpp
+++ b/src/map/Octree.cpp
@@ -322,9 +322,9 @@ bool Octree::Validate(char* data, sf::Vector3i dimensions){
 //    std::cout << (int)GetVoxel(sf::Vector3i(16, 16, 16)) << std::endl;
 
 
-	for (int x = 0; x < OCT_DIM; x++) {
-		for (int y = 0; y < OCT_DIM; y++) {
-			for (int z = 0; z < OCT_DIM; z++) {
+	for (int x = 0; x < dimensions.x; x++) {
+		for (int y = 0; y < dimensions.y; y++) {
+			for (int z = 0; z < dimensions.z; z++) {
 
 				sf::Vector3i pos(x, y, z);
 
@@ -334,6 +334,7 @@ bool Octree::Validate(char* data, sf::Vector3i dimensions){
 				if (arr_val != oct_val) {
 					std::cout << "X: " << pos.x << " Y: " << pos.y << " Z: " << pos.z << "   ";
                     std::cout << (int)arr_val << "  :  " << (int)oct_val << std::endl;
+					return false;
 				}
 
 			}