diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index 7c2a072..12d4820 100755
Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ
diff --git a/main.cpp b/main.cpp
index 92ff32f..083d997 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,15 +1,36 @@
 #define OLC_PGE_APPLICATION
 #include "pixelGameEngine.h"
 #include "olcutils.h"
-#include <cassert>
 
 using namespace olc;
+std::map<std::string,bool>blocks;
+std::map<std::string,bool>trappedBlocks;
+int minX=0,maxX=0,minY=0,maxY=0,minZ=0,maxZ=0;
+
+bool escape(int x,int y,int z,std::map<std::string,bool>visited){
+    visited[std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z)]=true;
+    if (x<=minX||x>=maxX||y<=minY||y>=maxY||z<=minZ||z>=maxZ){
+        return true;
+    } else {
+        if (blocks.find(std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z))!=blocks.end()){
+            return false;
+        } 
+        if (visited.find(std::to_string(x+1)+"_"+std::to_string(y)+"_"+std::to_string(z))==visited.end()&&escape(x+1,y,z,visited)||
+            visited.find(std::to_string(x-1)+"_"+std::to_string(y)+"_"+std::to_string(z))==visited.end()&&escape(x-1,y,z,visited)||
+            visited.find(std::to_string(x)+"_"+std::to_string(y+1)+"_"+std::to_string(z))==visited.end()&&escape(x,y+1,z,visited)||
+            visited.find(std::to_string(x)+"_"+std::to_string(y-1)+"_"+std::to_string(z))==visited.end()&&escape(x,y-1,z,visited)||
+            visited.find(std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z+1))==visited.end()&&escape(x,y,z+1,visited)||
+            visited.find(std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z-1))==visited.end()&&escape(x,y,z-1,visited)){
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
 
 int main()
 {
-    std::map<std::string,bool>blocks;
-	std::ifstream file("testinput");
-    int minX=0,maxX=0,minY=0,maxY=0,minZ=0,maxZ=0;
+	std::ifstream file("input");
     int surfaceArea=0;
     while (file.good()){
         std::string line;
@@ -25,9 +46,9 @@ int main()
             std::cout<<x<<","<<y<<","<<z<<std::endl;
             minX=std::min(x,minX);
             maxX=std::max(x,maxX);
-            minY=std::min(y,maxY);
+            minY=std::min(y,minY);
             maxY=std::max(y,maxY);
-            minZ=std::min(z,maxZ);
+            minZ=std::min(z,minZ);
             maxZ=std::max(z,maxZ);
             if (blocks.find(std::to_string(x)+"_"+std::to_string(y-1)+"_"+std::to_string(z))==blocks.end()){
                 surfaceArea++;
@@ -59,26 +80,52 @@ int main()
             } else {
                 surfaceArea--;
             }
-            if (blocks.find(std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z))==blocks.end()){
-                blocks[std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z)]=true;
-            } else {
-                std::cout<<"DUPLICATE FOUND!"<<std::endl;
-                assert(false);
-            }
+            blocks[std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z)]=true;
             std::cout<<surfaceArea<<std::endl;
         }
     }
-    int sum=0;
+    int trappedSurfaceArea=0;
     for (int x=-minX;x<=maxX;x++){
         for (int y=-minY;y<=maxY;y++){
             for (int z=-minZ;z<=maxZ;z++){
-                if (escape(x,y,z)){
-                    sum++;
+                if (!escape(x,y,z,{})){
+                    trappedBlocks[std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z)]=true;
+                    std::cout<<"Block "<<std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z)<<" is trapped"<<std::endl;
+                    if (trappedBlocks.find(std::to_string(x)+"_"+std::to_string(y-1)+"_"+std::to_string(z))==trappedBlocks.end()){
+                        trappedSurfaceArea++;
+                    } else {
+                        trappedSurfaceArea--;
+                    }
+                    if (trappedBlocks.find(std::to_string(x)+"_"+std::to_string(y+1)+"_"+std::to_string(z))==trappedBlocks.end()){
+                        trappedSurfaceArea++;
+                    } else {
+                        trappedSurfaceArea--;
+                    }
+                    if (trappedBlocks.find(std::to_string(x-1)+"_"+std::to_string(y)+"_"+std::to_string(z))==trappedBlocks.end()){
+                        trappedSurfaceArea++;
+                    } else {
+                        trappedSurfaceArea--;
+                    }
+                    if (trappedBlocks.find(std::to_string(x+1)+"_"+std::to_string(y)+"_"+std::to_string(z))==trappedBlocks.end()){
+                        trappedSurfaceArea++;
+                    } else {
+                        trappedSurfaceArea--;
+                    }
+                    if (trappedBlocks.find(std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z-1))==trappedBlocks.end()){
+                        trappedSurfaceArea++;
+                    } else {
+                        trappedSurfaceArea--;
+                    }
+                    if (trappedBlocks.find(std::to_string(x)+"_"+std::to_string(y)+"_"+std::to_string(z+1))==trappedBlocks.end()){
+                        trappedSurfaceArea++;
+                    } else {
+                        trappedSurfaceArea--;
+                    }
                 }
             }   
         }
     }
-    std::cout<<surfaceArea-sum<<std::endl;
+    std::cout<<surfaceArea-trappedSurfaceArea<<std::endl;
 
 	return 0;
 }
diff --git a/testinput b/testinput
index 5da8b3b..d18bf98 100644
--- a/testinput
+++ b/testinput
@@ -10,4 +10,4 @@
 1,2,5
 3,2,5
 2,1,5
-12,13,15
\ No newline at end of file
+2,3,5
\ No newline at end of file