diff --git a/LightWork_Scraper/LightWork_Scraper.pde b/LightWork_Scraper/LightWork_Scraper.pde
index 429105a..aa4ed93 100644
--- a/LightWork_Scraper/LightWork_Scraper.pde
+++ b/LightWork_Scraper/LightWork_Scraper.pde
@@ -9,18 +9,18 @@ int pos;
 float margin =50;
 
 void setup() {
-  size(800, 800, JAVA2D); //wtf
+  size(640, 480, JAVA2D); //wtf
   background(0);
-  
+
   //initialize scraper
-  scrape = new Scraper("mapper-lightwork-filtered-negative.svg"); 
+  scrape = new Scraper("layout.svg"); 
   scrape.init();
   scrape.normCoords();
 
   opc = new OPC(this, "fade1.local", 7890);
   scrape.update();
   opc.showLocations(false);
-  
+
   //display array of points from SVG
   //println(scrape.getArray());
 }
@@ -28,16 +28,26 @@ void setup() {
 void draw() {
   background(0);
   
-  rect(0,0,50,50);
-  //scrape.update();
-  scrape.display();
+  // Test animation
+  //noFill();
+  //strokeWeight(25);
+  //for (int i = 0; i < 100; i+=10) {
+  //  stroke(255-i*2.5*sin(frameCount*0.7), i*2.5*sin(frameCount*0.5), 255*sin(frameCount*0.2));
+  //  ellipse(width/2, height/2, i*100*sin(frameCount*0.02), i*100*sin(frameCount*0.02));
+  //}
+  // End test animation
   
+  
+  //rect(0,0,50,50); //test margin bounds
+  scrape.display();
+
   //simple chase animation
   noStroke();
-  fill(0,0,255);
-  if(pos<=width)pos+=5;
+  fill(255*sin(frameCount*0.1), 255*sin(frameCount*0.3), 255*cos(frameCount*0.6));
+  if (pos<=width)pos+=5;
   else pos=0;
-  rect(pos,0,100,height);
-  
+  rect(pos, 0, 100, height);
+  ellipse(mouseX, mouseY, 30, 30);
   
+
 }
\ No newline at end of file
diff --git a/LightWork_Scraper/Scraper.pde b/LightWork_Scraper/Scraper.pde
index 28de647..c98c0b5 100644
--- a/LightWork_Scraper/Scraper.pde
+++ b/LightWork_Scraper/Scraper.pde
@@ -22,11 +22,10 @@ public class Scraper {
       // Now we can actually get the vertices from each child
       for (int j = 0; j < total; j++) { //using 1 to fix duplicate first point issue temporarily
         PVector v = child.getVertex(j);
-        if(v.x>=0 && v.y>=0){
+
         v.set (v.x, v.y);
         loc.add(v);
         //print(v);
-        }
       }
     }
   }
@@ -35,13 +34,18 @@ public class Scraper {
   void normCoords()
   {
     float[] norm = new float[4];
-    norm = getMinMaxCoords();
+    norm = getMinMaxCoords(loc);
 
     int index=0;
 
+    //println(loc);
+
     for (PVector temp : loc) {
-      temp.set (map(temp.x, norm[0], norm[2], 0, 1), map(temp.y, norm[1], norm[3], 0, 1));
-      loc.set(index, temp);
+      if (temp.x>0 && temp.y>0) {
+        temp.set (map(temp.x, norm[0], norm[2], 0.001, 1), map(temp.y, norm[1], norm[3], 0.001, 1));
+        loc.set(index, temp);
+        
+      }
       index++;
     }
   }
@@ -55,18 +59,21 @@ public class Scraper {
 
     //draw based on coords in arraylist. enhanced arraylist loop
     for (PVector temp : loc) { 
-      ellipse(map(temp.x, 0, 1, margin, width-margin), map(temp.y, 0, 1, margin, height-margin), 10, 10);
+      if (!(temp.x == 0.0) && !(temp.y == 0.0)) {
+        ellipse(map(temp.x, 0, 1, margin, width-margin), map(temp.y, 0, 1, margin, height-margin), 10, 10);
+      } 
     }
-
   }
 
   //set led coords in opc client
-  void update() {
+  void update() { //<>//
     int index =0;
     for (PVector temp : loc) {
       opc.led(index, (int)map(temp.x, 0, 1, margin, width-margin), (int)map(temp.y, 0, 1, margin, height-margin));
       index++;
     }
+
+    println(loc.size());
   }
 
   ArrayList getArray() {
@@ -74,14 +81,25 @@ public class Scraper {
   }
 
   //deterimines bounding box of points in SVG for normalizing
-  float[] getMinMaxCoords() {
-    float xArr[] = new float[loc.size()];
-    float yArr[] = new float[loc.size()];
+  float[] getMinMaxCoords(ArrayList<PVector> points) {
+    ArrayList<PVector> pointsCopy = new ArrayList<PVector>(points);
+
+    for (int i=pointsCopy.size()-1; i>=0; i--) {
+      PVector temp = pointsCopy.get(i);
+      if (temp.x==0 && temp.y==0) {
+        pointsCopy.remove(i);
+      }
+    }
+
+    float xArr[] = new float[pointsCopy.size()];
+    float yArr[] = new float[pointsCopy.size()];
 
     int index =0;
-    for (PVector temp : loc) { 
+    for (PVector temp : pointsCopy) { 
+
       xArr[index] = temp.x;
       yArr[index] = temp.y;
+
       index++;
     }
 
diff --git a/LightWork_Scraper/data/lightwork_map_complete.svg b/LightWork_Scraper/data/lightwork_map_complete.svg
new file mode 100644
index 0000000..a2b1053
--- /dev/null
+++ b/LightWork_Scraper/data/lightwork_map_complete.svg
@@ -0,0 +1,3 @@
+<svg height="480px" viewBox="0 0 640 480" width="640px" x="0px" xmlns="http://www.w3.org/2000/svg" lnslink="http://www.w3.org/1999link" y="0px">
+<path d=" M111,98 L110,114 L109,131 L108,149 L107,166 L105,184 L105,201 L104,219 L122,219 L142,218 L160,218 L179,217 L205,217 L206,199 L206,181 L206,163 L207,146 L207,129 L208,95 L0,0 L0,0 L238,253 L258,253 L277,252 L297,251 L315,247 L327,233 L330,215 L328,197 L329,179 L328,162 L328,145 L328,128 L309,129 L291,129 L273,129 L256,136 L242,148 L235,164 L236,182 L243,198 L257,210 L275,216 L293,215 L310,207 L366,214 L363,197 L364,179 L363,162 L363,144 L360,94 L361,111 L362,127 L378,135 L394,128 L413,128 L430,132 L444,144 L453,160 L455,178 L456,195 L457,214 L0,0 L467,125 L482,93 L484,108 L521,126 L504,125 L486,126 L487,142 L489,160 L490,177 L496,194 L509,208 L526,213 L0,0 L462,262 L464,279 L465,296 L528,295 L514,304 L499,314 L483,323 L467,313 L468,332 L470,351 L471,369 L473,388 L484,343 L500,354 L515,365 L531,376 L546,387 L0,0 L0,0 L441,296 L423,297 L407,305 L391,297 L392,315 L393,333 L393,351 L395,371 L396,390 L364,342 L362,361 L353,376 L338,389 L320,394 L301,392 L285,385 L273,370 L266,353 L266,335 L272,317 L284,304 L301,296 L318,294 L336,299 L350,310 L361,325 L0,0 L0,0 L251,299 L242,314 L232,330 L223,345 L212,361 L202,378 L191,393 L181,379 L0,0 L212,300 L204,315 L193,330 L182,346 L173,362 L162,378 L151,394 L143,378 L133,362 L125,347 L116,332 L107,317 L99,302 L137,301 L146,316 L154,332 L164,346 L0,0" fill="#ffffff" fill-opacity="1" stroke="#ffffff" stroke-opacity="1" stroke-width="1.0"/>
+</svg>