diff --git a/C++ProjectTemplate b/C++ProjectTemplate
index c1aa29d..7c06d62 100755
Binary files a/C++ProjectTemplate and b/C++ProjectTemplate differ
diff --git a/input b/input
new file mode 100644
index 0000000..6641009
--- /dev/null
+++ b/input
@@ -0,0 +1,141 @@
+noop
+noop
+addx 5
+noop
+noop
+addx 1
+addx 3
+addx 2
+addx 4
+addx 3
+noop
+addx 2
+addx 1
+noop
+noop
+addx 4
+noop
+addx 1
+addx 2
+addx 5
+addx 3
+noop
+addx -1
+addx -37
+addx 37
+addx -34
+addx 7
+noop
+addx -2
+addx 2
+noop
+noop
+noop
+addx 5
+addx 2
+noop
+addx 3
+addx 15
+addx -8
+addx -9
+addx 21
+addx -9
+addx 5
+addx 2
+addx 3
+addx -2
+addx -38
+noop
+addx 3
+addx 37
+addx -33
+addx 5
+noop
+noop
+addx 5
+noop
+noop
+addx 5
+noop
+addx -1
+addx 1
+addx 5
+noop
+noop
+addx 5
+noop
+noop
+noop
+addx 1
+addx 2
+noop
+addx 3
+addx -36
+noop
+noop
+noop
+addx 6
+addx 21
+addx -17
+addx 18
+addx -8
+addx -7
+addx 2
+addx 5
+addx -8
+addx 13
+addx -2
+addx 7
+noop
+addx -2
+addx 5
+addx 2
+addx 1
+noop
+addx -38
+addx 4
+addx 3
+noop
+addx 34
+addx -29
+addx -2
+addx 10
+addx -3
+addx 2
+addx 3
+noop
+addx -22
+addx 2
+addx 23
+addx 7
+noop
+noop
+addx 3
+noop
+addx 2
+addx -18
+addx 19
+addx -38
+addx 5
+addx 2
+noop
+addx 1
+addx 4
+addx 1
+noop
+noop
+addx 2
+addx 5
+addx 2
+noop
+addx 1
+noop
+addx 2
+addx 8
+addx -1
+addx -30
+addx 31
+addx 2
+addx 5
+addx -35
+noop
diff --git a/main.cpp b/main.cpp
index 8ab7e53..d53bdc6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,86 +4,54 @@
 
 using namespace olc;
 
-class Example : public olc::PixelGameEngine
-{
-public:
-	Example()
-	{
-		sAppName = "Example";
-	}
-
-public:
-    bool RayVsRect(const vf2d ray_origin, const vf2d ray_dir, const olc::utils::geom2d::rect<float> target, vf2d&contact_point, vf2d&contact_normal, float&t_hit_near){
-
-        contact_normal = { 0, 0 };
-        contact_point = { 0, 0 };
-
-        vf2d t_near = {(target.pos.x - ray_origin.x) / ray_dir.x, (target.pos.y - ray_origin.y) / ray_dir.y};
-        vf2d t_far = {(target.pos.x + target.size.x - ray_origin.x) / ray_dir.x, (target.pos.y + target.size.y - ray_origin.y) / ray_dir.y};
-
-        if (t_near.x > t_far.x) {float b; b = t_near.x; t_near.x = t_far.x; t_far.x = b;};
-        if (t_near.y > t_far.y) {float b; b = t_near.y; t_near.y = t_far.y; t_far.y = b;};
-
-        if (t_near.x > t_far.y || t_near.y > t_far.x) return false;
-
-        t_hit_near = fmax(t_near.x, t_near.y);
-        float t_hit_far = fmin(t_far.x, t_far.y);
-
-        if (t_hit_far < 0) return false;
-
-        contact_point.x = ray_origin.x + t_hit_near * ray_dir.x; 
-        contact_point.y = ray_origin.y + t_hit_near * ray_dir.y;
-
-        if (t_near.x > t_near.y)
-            if ( 1.0f / ray_dir.x < 0)
-                contact_normal = { 1, 0 };
-            else
-                contact_normal = { -1, 0};
-        else 
-        if ( t_near.x < t_near.y)
-            if ( 1.0f / ray_dir.y < 0)
-                contact_normal = { 0, 1 };
-            else
-                contact_normal = { 0, -1 };
-        
-        return true;
-
-        
+void incrementClock(int&clockCycle,int&reg,int&sum){
+    if (clockCycle%40>=reg-1&&clockCycle%40<=reg+1){
+        std::cout<<'#';
+    } else {
+        std::cout<<'.';
+    }
+    clockCycle++;
+    if (clockCycle%40==0){
+        std::cout<<std::endl;
     }
-    vf2d originPoint={16,16};
-	bool OnUserCreate() override
-	{
-		// Called once at the start, so create things here
-		return true;
-	}
-
-	bool OnUserUpdate(float fElapsedTime) override
-	{
-        vf2d velocity={(GetKey(D).bHeld-GetKey(A).bHeld)*20*fElapsedTime,(GetKey(S).bHeld-GetKey(W).bHeld)*20*fElapsedTime};
-        vf2d contact_point;
-        vf2d contact_normal;
-        float t_hit_near;
-
-		Clear(Pixel(64,64,255));
-        if (!olc::utils::geom2d::overlaps(olc::utils::geom2d::circle<float>{originPoint+velocity,5},olc::utils::geom2d::rect<float>{{32,32},{64,32}})) {
-            originPoint+=velocity;
-            DrawCircle(originPoint,5);
-        } else {
-            DrawCircle(originPoint,5,RED);
-        }
-        DrawLine(originPoint,GetMousePos());
-
-        DrawRect({32,32},{64,32},RayVsRect(originPoint, GetMousePos()-originPoint, olc::utils::geom2d::rect<float>{{32,32},{64,32}},contact_point,contact_normal,t_hit_near)&&t_hit_near<1?YELLOW:WHITE);
-		return true;
-	}
-};
 
+}
 
 int main()
 {
-	Example demo;
-	if (demo.Construct(128, 120, 8, 8))
-		demo.Start();
+	std::ifstream file("input");
+    int clockCycle=0;
+    bool noop=true;
+    int reg=1;
+    int amtToAdd=0;
+    int sum=0;
+    int crt=0;
+    while (file.good()){
+        std::string line;
+        std::getline(file,line);
+        if (line.length()>0){
+            std::string command=line.substr(0,line.find(' '));
+            if (command=="noop"){
+                noop=true;
+                //std::cout<<"noop"<<std::endl;
+            } else {
+                int amt=std::atoi(line.substr(line.find(' ')+1,std::string::npos).c_str());
+                //std::cout<<amt<<std::endl;
+                amtToAdd=amt;
+                noop=false;
+            }
+            if (noop){
+                incrementClock(clockCycle,reg,sum);
+            } else {
+                for (int i=0;i<2;i++){
+                    incrementClock(clockCycle,reg,sum);
+                }
+                reg+=amtToAdd;
+            }
+        }
+        //std::cout<<line<<std::endl;
+    }
+    //std::cout<<"Sum: "<<sum<<std::endl;
 
 	return 0;
 }
diff --git a/part1 b/part1
new file mode 100644
index 0000000..2052395
--- /dev/null
+++ b/part1
@@ -0,0 +1,55 @@
+#define OLC_PGE_APPLICATION
+#include "pixelGameEngine.h"
+#include "olcutils.h"
+
+using namespace olc;
+
+void incrementClock(int&clockCycle,int&reg,int&sum){
+    clockCycle++;
+    if (clockCycle==20||
+    clockCycle==60||
+    clockCycle==100||
+    clockCycle==140||
+    clockCycle==180||
+    clockCycle==220){
+        sum+=clockCycle*reg;
+    }
+}
+
+int main()
+{
+	std::ifstream file("input");
+    int clockCycle=0;
+    bool noop=true;
+    int reg=1;
+    int amtToAdd=0;
+    int sum=0;
+    while (file.good()){
+        std::string line;
+        std::getline(file,line);
+        if (line.length()>0){
+            std::string command=line.substr(0,line.find(' '));
+            if (command=="noop"){
+                noop=true;
+                //std::cout<<"noop"<<std::endl;
+            } else {
+                int amt=std::atoi(line.substr(line.find(' ')+1,std::string::npos).c_str());
+                //std::cout<<amt<<std::endl;
+                amtToAdd=amt;
+                noop=false;
+            }
+            if (noop){
+                incrementClock(clockCycle,reg,sum);
+            } else {
+                for (int i=0;i<2;i++){
+                    incrementClock(clockCycle,reg,sum);
+                }
+                reg+=amtToAdd;
+            }
+        }
+        std::cout<<line<<std::endl;
+    }
+    std::cout<<"Sum: "<<sum<<std::endl;
+
+	return 0;
+}
diff --git a/smolinput b/smolinput
new file mode 100644
index 0000000..fd7eba8
--- /dev/null
+++ b/smolinput
@@ -0,0 +1,3 @@
+noop
+addx 3
+addx -5
\ No newline at end of file
diff --git a/testinput b/testinput
new file mode 100644
index 0000000..94cd0a8
--- /dev/null
+++ b/testinput
@@ -0,0 +1,146 @@
+addx 15
+addx -11
+addx 6
+addx -3
+addx 5
+addx -1
+addx -8
+addx 13
+addx 4
+noop
+addx -1
+addx 5
+addx -1
+addx 5
+addx -1
+addx 5
+addx -1
+addx 5
+addx -1
+addx -35
+addx 1
+addx 24
+addx -19
+addx 1
+addx 16
+addx -11
+noop
+noop
+addx 21
+addx -15
+noop
+noop
+addx -3
+addx 9
+addx 1
+addx -3
+addx 8
+addx 1
+addx 5
+noop
+noop
+noop
+noop
+noop
+addx -36
+noop
+addx 1
+addx 7
+noop
+noop
+noop
+addx 2
+addx 6
+noop
+noop
+noop
+noop
+noop
+addx 1
+noop
+noop
+addx 7
+addx 1
+noop
+addx -13
+addx 13
+addx 7
+noop
+addx 1
+addx -33
+noop
+noop
+noop
+addx 2
+noop
+noop
+noop
+addx 8
+noop
+addx -1
+addx 2
+addx 1
+noop
+addx 17
+addx -9
+addx 1
+addx 1
+addx -3
+addx 11
+noop
+noop
+addx 1
+noop
+addx 1
+noop
+noop
+addx -13
+addx -19
+addx 1
+addx 3
+addx 26
+addx -30
+addx 12
+addx -1
+addx 3
+addx 1
+noop
+noop
+noop
+addx -9
+addx 18
+addx 1
+addx 2
+noop
+noop
+addx 9
+noop
+noop
+noop
+addx -1
+addx 2
+addx -37
+addx 1
+addx 3
+noop
+addx 15
+addx -21
+addx 22
+addx -6
+addx 1
+noop
+addx 2
+addx 1
+noop
+addx -10
+noop
+noop
+addx 20
+addx 1
+addx 2
+addx 2
+addx -6
+addx -11
+noop
+noop
+noop
\ No newline at end of file