diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index 780dadb..891f6ec 100755
Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ
diff --git a/main.cpp b/main.cpp
index 35f0099..28ceb30 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,3 +1,4 @@
+#include <cmath>
 #define OLC_PGE_APPLICATION
 #include "pixelGameEngine.h"
 #include "olcutils.h"
@@ -50,44 +51,143 @@ int main()
             std::cout<<std::endl;
         }
     }
-    int targetY=2000000;
-    int sum=0;
-    std::vector<std::pair<int,int>>ranges;
+    const int MAX_VAL=4000000;
+    std::cout<<"Computing coords..."<<std::endl;
     for (Sensor s:sensors){
-        int distance=std::abs(s.pos.y-targetY);
-        if (distance<s.radius){
-            //In range.
-            std::cout<<"Sensor "<<s.pos<<" in range of Y "<<targetY<<" Radius: "<<s.radius<<std::endl;
-            int rangeSize=s.radius*2-distance*2+1;
-            std::cout<<"Leaves a range of "<<rangeSize<<std::endl;
-            int minX=(s.pos.x-rangeSize/2);
-            int maxX=(s.pos.x+rangeSize/2);
-            std::cout<<"Range is from "<<minX<<" ~ "<<maxX<<std::endl;
-            for (int i=0;i<ranges.size();i++){
-                if (ranges[i].first<=minX&&ranges[i].second>=maxX){
-                    maxX=minX-1;
-                    break;
-                }
-                if (ranges[i].first>minX&&ranges[i].second<maxX){
-                    sum-=ranges[i].second-ranges[i].first+1;
-                    std::cout<<"  --> Removed Range "<<ranges[i].first<<" ~ "<<ranges[i].second<<std::endl;
-                    ranges.erase(ranges.begin()+i--);
-                }
-                if (ranges[i].first<=maxX&&ranges[i].second>=maxX){
-                    maxX=ranges[i].first-1;
-                }
-                if (ranges[i].first<=minX&&ranges[i].second>=minX){
-                    minX=ranges[i].second+1;
+        int y=0;
+        for (int x=-s.radius;x<=s.radius;x++){
+            if (x!=-s.radius){
+                if (x<=0){
+                    y-=1;
+                }
+                if (x>0){
+                    y+=1;
+                }
+            }
+            if (std::abs(x)+std::abs(y)==s.radius){
+                vi2d targetPos={x,y};
+                if (x<0){
+                    targetPos.x--;
+                }
+                if (x>0){
+                    targetPos.x++;
+                }
+                if (x==0){
+                    if (y>0){
+                        targetPos.y++;
+                    }
+                    if (y<0){
+                        targetPos.y--;
+                    }
+                }
+                if (s.pos.x+targetPos.x>=0&&s.pos.x+targetPos.x<=MAX_VAL&&
+                    s.pos.y+targetPos.y>=0&&s.pos.y+targetPos.y<=MAX_VAL){
+                    vi2d target=s.pos+targetPos;
+                    for (Sensor ss:sensors){
+                        if (std::abs(target.x-ss.pos.x)+std::abs(target.y-ss.pos.y)<=ss.radius){
+                            goto next;
+                        }
+                    }
+                    std::cout<<"Target location found w/no signal! "<<target<<std::endl;
+                    std::cout<<"  Tuning frequency:"<<(long)target.x*4000000l+(long)target.y<<std::endl;
+                }
+                targetPos={x,y};
+                if (y<0){
+                    targetPos.y--;
+                }
+                if (y>0){
+                    targetPos.y++;
+                }
+                if (y==0){
+                    if (x>0){
+                        targetPos.x++;
+                    }
+                    if (x<0){
+                        targetPos.x--;
+                    }
+                }
+                if (s.pos.x+targetPos.x>=0&&s.pos.x+targetPos.x<=MAX_VAL&&
+                    s.pos.y+targetPos.y>=0&&s.pos.y+targetPos.y<=MAX_VAL){
+                    vi2d target=s.pos+targetPos;
+                    for (Sensor ss:sensors){
+                        if (std::abs(target.x-ss.pos.x)+std::abs(target.y-ss.pos.y)<=ss.radius){
+                            goto next;
+                        }
+                    }
+                    std::cout<<"Target location found w/no signal! "<<target<<std::endl;
+                    std::cout<<"  Tuning frequency:"<<(long)target.x*4000000l+(long)target.y<<std::endl;
+                }
+                next:;
+            }
+        }
+        y=0;
+        for (int x=-s.radius;x<=s.radius;x++){
+            if (x!=-s.radius){
+                if (x<=0){
+                    y+=1;
+                }
+                if (x>0){
+                    y-=1;
                 }
             }
-            if (maxX>=minX){
-                std::cout<<"  --> Range is truncated to "<<minX<<" ~ "<<maxX<<std::endl;
-                sum+=maxX-minX+1;
-                ranges.push_back({minX,maxX});
+            if (std::abs(x)+std::abs(y)==s.radius){
+                vi2d targetPos={x,y};
+                if (x<0){
+                    targetPos.x--;
+                }
+                if (x>0){
+                    targetPos.x++;
+                }
+                if (x==0){
+                    if (y>0){
+                        targetPos.y++;
+                    }
+                    if (y<0){
+                        targetPos.y--;
+                    }
+                }
+                if (s.pos.x+targetPos.x>=0&&s.pos.x+targetPos.x<=MAX_VAL&&
+                    s.pos.y+targetPos.y>=0&&s.pos.y+targetPos.y<=MAX_VAL){
+                    vi2d target=s.pos+targetPos;
+                    for (Sensor ss:sensors){
+                        if (std::abs(target.x-ss.pos.x)+std::abs(target.y-ss.pos.y)<=ss.radius){
+                            goto next2;
+                        }
+                    }
+                    std::cout<<"Target location found w/no signal! "<<target<<std::endl;
+                    std::cout<<"  Tuning frequency:"<<(long)target.x*4000000l+(long)target.y<<std::endl;
+                }
+                targetPos={x,y};
+                if (y<0){
+                    targetPos.y--;
+                }
+                if (y>0){
+                    targetPos.y++;
+                }
+                if (y==0){
+                    if (x>0){
+                        targetPos.x++;
+                    }
+                    if (x<0){
+                        targetPos.x--;
+                    }
+                }
+                if (s.pos.x+targetPos.x>=0&&s.pos.x+targetPos.x<=MAX_VAL&&
+                    s.pos.y+targetPos.y>=0&&s.pos.y+targetPos.y<=MAX_VAL){
+                    vi2d target=s.pos+targetPos;
+                    for (Sensor ss:sensors){
+                        if (std::abs(target.x-ss.pos.x)+std::abs(target.y-ss.pos.y)<=ss.radius){
+                            goto next2;
+                        }
+                    }
+                    std::cout<<"Target location found w/no signal! "<<target<<std::endl;
+                    std::cout<<"  Tuning frequency:"<<(long)target.x*4000000l+(long)target.y<<std::endl;
+                }
+                next2:;
             }
         }
+        std::cout<<"  Sensor "<<s.pos<<" complete..."<<std::endl;
     }
-    std::cout<<"Sum: "<<sum-1<<std::endl;
 
 	return 0;
 }
diff --git a/part1 b/part1
new file mode 100644
index 0000000..35f0099
--- /dev/null
+++ b/part1
@@ -0,0 +1,93 @@
+#define OLC_PGE_APPLICATION
+#include "pixelGameEngine.h"
+#include "olcutils.h"
+
+using namespace olc;
+
+struct Sensor{
+    vi2d pos;
+    int radius;
+};
+
+int main()
+{
+	std::ifstream file("input");
+    std::vector<Sensor>sensors;
+    while (file.good()){
+        std::string line;
+        std::getline(file,line);
+        std::cout<<line<<std::endl;
+        int prevMarker=0;
+        int marker=line.find(' ',prevMarker);
+        vi2d sensorPos={-999,-999};
+        vi2d beaconPos={-999,-999};
+        if (line.length()>0){
+            while (prevMarker!=std::string::npos){
+                std::string word=line.substr(prevMarker,marker-prevMarker);
+                prevMarker=marker;
+                marker=line.find(' ',prevMarker+1);
+                if (word[1]=='x'){
+                    if (sensorPos.x==-999){
+                        sensorPos.x=std::atoi(word.substr(word.find('=')+1,word.find(',')-word.find('=')-1).c_str());
+                        std::cout<<"Sensor X: "<<sensorPos.x<<std::endl;
+                    } else {
+                        beaconPos.x=std::atoi(word.substr(word.find('=')+1,word.find(',')-word.find('=')-1).c_str());
+                        std::cout<<"Beacon X: "<<beaconPos.x<<std::endl;
+                    }
+                } else
+                if (word[1]=='y'){
+                    if (sensorPos.y==-999){
+                        sensorPos.y=std::atoi(word.substr(word.find('=')+1,word.find(',')-word.find('=')-1).c_str());
+                        std::cout<<"Sensor Y: "<<sensorPos.y<<std::endl;
+                    } else {
+                        beaconPos.y=std::atoi(word.substr(word.find('=')+1,word.find(',')-word.find('=')-1).c_str());
+                        std::cout<<"Beacon Y: "<<beaconPos.y<<std::endl;
+                    }
+                }
+            }
+            sensors.push_back({sensorPos,std::abs(beaconPos.x-sensorPos.x)+std::abs(beaconPos.y-sensorPos.y)});
+            std::cout<<"Sensor -> Beacon Radius: "<<sensors[sensors.size()-1].radius<<std::endl;
+            std::cout<<std::endl;
+        }
+    }
+    int targetY=2000000;
+    int sum=0;
+    std::vector<std::pair<int,int>>ranges;
+    for (Sensor s:sensors){
+        int distance=std::abs(s.pos.y-targetY);
+        if (distance<s.radius){
+            //In range.
+            std::cout<<"Sensor "<<s.pos<<" in range of Y "<<targetY<<" Radius: "<<s.radius<<std::endl;
+            int rangeSize=s.radius*2-distance*2+1;
+            std::cout<<"Leaves a range of "<<rangeSize<<std::endl;
+            int minX=(s.pos.x-rangeSize/2);
+            int maxX=(s.pos.x+rangeSize/2);
+            std::cout<<"Range is from "<<minX<<" ~ "<<maxX<<std::endl;
+            for (int i=0;i<ranges.size();i++){
+                if (ranges[i].first<=minX&&ranges[i].second>=maxX){
+                    maxX=minX-1;
+                    break;
+                }
+                if (ranges[i].first>minX&&ranges[i].second<maxX){
+                    sum-=ranges[i].second-ranges[i].first+1;
+                    std::cout<<"  --> Removed Range "<<ranges[i].first<<" ~ "<<ranges[i].second<<std::endl;
+                    ranges.erase(ranges.begin()+i--);
+                }
+                if (ranges[i].first<=maxX&&ranges[i].second>=maxX){
+                    maxX=ranges[i].first-1;
+                }
+                if (ranges[i].first<=minX&&ranges[i].second>=minX){
+                    minX=ranges[i].second+1;
+                }
+            }
+            if (maxX>=minX){
+                std::cout<<"  --> Range is truncated to "<<minX<<" ~ "<<maxX<<std::endl;
+                sum+=maxX-minX+1;
+                ranges.push_back({minX,maxX});
+            }
+        }
+    }
+    std::cout<<"Sum: "<<sum-1<<std::endl;
+
+	return 0;
+}