diff --git a/kdtest/Menu.pde b/kdtest/Menu.pde
index be75e9f..1d53879 100644
--- a/kdtest/Menu.pde
+++ b/kdtest/Menu.pde
@@ -1,42 +1,73 @@
 class Menu{
+  ArrayList<Button> _buttonList;
   Selector _selector; 
   Menu(){
     _selector = new Selector();
+    _buttonList = new ArrayList<Button>();
+    makeButtons();
   }
   
-  void activate(int button){
-    _selector.setSelectMode(button);
+  void activate(int button){ _selector.setSelectMode(button); }
+  
+  void makeButtons(){
+   _buttonList.add(new Button(0,0,0)); //adds the first button
+   for( int i = 1; i < 4; i++){ _buttonList.add(new Button(0,i*25+1,i)); }
   }
   
   int onaButton(int x, int y){
-    if( 0<x && x<=60 && y>0  && y<=25){ return 1; }
-    else if( 0<x && x<=60 && y>25 && y<=51){ return 2; }
-    else if( 0<x && x<=60 && y>51 && y<=77){ return 3; }
-    else if( 0<x && x<=60 && y>77 && y<=103){ return 4; }
-    else { return 0; }  
+    int i;
+    for( i = 0; i < 4; i++){
+      if(_buttonList.get(i).isInside(x,y)) { return i; }
+    }
+    return 99;
   }
 
   void draw(){
     pushStyle();
-    rect(0,0,60,25,0,7,7,0);//rect button
-    rect(15,20,5,10);//rect icon
-    rect(0,26,60,25,0,7,7,0);//circle button
-    ellipseMode(CORNER);
-    ellipse(0.0,26.0,60.0,25.0);//circle icon
-    rect(0,52,60,25,0,7,7,0);//NN button
-    ellipse(0.0,52.0,60.0,25.0);//NN icon
-    rect(0,78,60,25,0,7,7,0);//InserPoint button
+    for(int i=0; i<4; i++){ _buttonList.get(i).draw(); }
     popStyle();
     _selector.draw();
   }
   
   void mousePressed(){
     int button = onaButton(mouseX,mouseY);
-    if( button != 0 ){ activate(button); }
+    println("%d \n",button);
+    if( button != 99 ){ activate(button); } //99 is an arbitrary invalid _id value
     else{ _selector.mousePressed(); }
   }
   
   void mouseDragged(){ _selector.stretchSelection(); }
-  
   void mouseReleased(){ _selector.resetSelection(); }
-}
\ No newline at end of file
+}
+
+class Button{
+ int _x1, _y1, _x2, _y2, _id;
+  Button(int x,int y, int id){
+   _x1 = x;
+   _y1 = y;
+   _x2 = 60;
+   _y2 = 24;
+   _id = id;
+  } 
+  
+  boolean isInside(int x, int y){
+    if( x>=_x1 && x<=_x2 && y>_y1 && y<=_y1+_y2){ return true; }
+    else{ return false; }
+  }
+  
+  void draw(){
+      rect(_x1,_y1,_x2,_y2,0,7,7,0);//basic button shape
+      switch(_id){
+       case 0: rect(_x1+_x2/2,_y1+5,10,10);//rect icon
+       break;
+       case 1: ellipseMode(CORNER);
+               //ellipse(0.0,26.0,60.0,25.0);//circle icon
+       break;
+       case 2: //ellipse(0.0,52.0,60.0,25.0);//NN icon
+       break;
+       case 3:
+       break;
+       default:
+     }
+   }
+}
diff --git a/kdtest/Selector.pde b/kdtest/Selector.pde
index 328f721..bd53f9d 100644
--- a/kdtest/Selector.pde
+++ b/kdtest/Selector.pde
@@ -1,5 +1,6 @@
 class Selector{
-  float _startX,_startY, _endX, _endY, _state;
+  int _startX,_startY, _endX, _endY;
+  float _state;
   float _a, _b, _radius;
   boolean _selecting, _animating, _searching;
   int _select_mode;
@@ -11,7 +12,7 @@ class Selector{
     _searching = false;
     _a = 0;
     _b = 0;
-    _select_mode = 1;
+    _select_mode = 0; //default is rectangular select
     _endX = -1;
     _endY = -1;
   }
@@ -22,15 +23,15 @@ class Selector{
   _startX = mouseX;
   _startY = mouseY;  
   switch(_select_mode){
-   case 1:  _selecting = true; //rectangular selection
+   case 0:  _selecting = true; //rectangular selection
             break;  
-   case 2:  _selecting = true; //ellipse selection
+   case 1:  _selecting = true; //ellipse selection
             break;
-   case 3:  _searching = true; //nearest neighbor search
+   case 2:  _searching = true; //nearest neighbor search
             _state = 0.0;
             _animating = true;
             break;
-   case 4:  Point p = cam.transform(new Point(mouseX, mouseY)); //place point
+   case 3:  Point p = cam.transform(new Point(mouseX, mouseY)); //place point
             pointList.add(p);
             pot.insert(p);
   }
@@ -39,9 +40,12 @@ class Selector{
   void resetSelection(){//triggered on mouseReleased()
     if(_selecting){  //selecting with rect or circle
       switch(_select_mode){
-       case 1: //_tree.rectQuery(cam.transform(new Point(_startX,_startY)),cam.transform(new Point(_endX,_endY)));
-       break;
-       case 2: //_tree.circleQuery(cam.transform(new Point(_a,_b)),
+        case 0: 
+        Point p1 = cam.transform(new Point(_startX, _startY));
+        Point p2 = cam.transform(new Point(_endX, _endY));
+        //pot._tree.query(new BoundingBox(p1._x, p1._y, p2._x, p2._y));
+        break;
+        case 1: //_tree.circleQuery(cam.transform(new Point(_a,_b)),
       }
       _selecting = false;
       _startX = -1;
@@ -56,6 +60,7 @@ class Selector{
     _a = 0;
     _b = 0;
   }
+  
   void stretchSelection(){
     if(_selecting){
       _endX = mouseX-_startX;
@@ -69,9 +74,9 @@ class Selector{
       fill(c_HILITE);
       if(_selecting){
         switch(_select_mode){
-          case 1:  rect(_startX,_startY,_endX,_endY);
+          case 0:  rect(_startX,_startY,_endX,_endY);
                    break;
-          case 2:  _a = mouseX-_startX;
+          case 1:  _a = mouseX-_startX;
                    _b = mouseY-_startY;
                    _radius = sqrt(_a*_a+_b*_b);
                    ellipseMode(RADIUS);
@@ -95,4 +100,4 @@ class Selector{
       _searching = false;
     }
   }  
-}
\ No newline at end of file
+}
diff --git a/kdtest/Tree.pde b/kdtest/Tree.pde
index cc4102b..7b7486c 100644
--- a/kdtest/Tree.pde
+++ b/kdtest/Tree.pde
@@ -159,15 +159,18 @@ class KdTree {
 }
 
 class TreeContainer {
-  KdTree tree;
+  KdTree _tree;
   TreeContainer(){ 
-    tree = null;
+    _tree = null;
   }
   
   void insert(Point p){
-  if(tree != null) { tree.insert(p); }
-  else { tree = new KdTree (p, true, 0, new BoundingBox(-width/2,width/2,-height/2,height/2));}
+  if(_tree != null) { _tree.insert(p); }
+  else { _tree = new KdTree (p, true, 0, new BoundingBox(-width/2,width/2,-height/2,height/2));}
   }
+  
+  KdTree getTree(){ return _tree;}
+  void clearTree(){ _tree = null; }
    
-   void draw(){ tree.draw(); }
-}
\ No newline at end of file
+   void draw(){ _tree.draw(); }
+}
diff --git a/kdtest/kdtest.pde b/kdtest/kdtest.pde
index d5acf30..5904869 100644
--- a/kdtest/kdtest.pde
+++ b/kdtest/kdtest.pde
@@ -1,7 +1,7 @@
 Console con;
 Camera cam;
 Mode statusLine;
-KdTree tree;
+//KdTree tree;
 TreeContainer pot;//or tree
 Menu menu;
 
@@ -43,7 +43,7 @@ void draw() {
   pushMatrix();
     cam.update();
     if(drawGnoman) GnomanDraw(200);
-    if(drawTree && tree != null) {
+    if(drawTree && pot.getTree() != null) {
       pot.draw();
     }
     for(Point p: pointList) {
@@ -92,7 +92,7 @@ void keyPressed() {
     case 'c':
     case 'C':
       pointList.clear();
-      tree = null;
+      pot.clearTree();
       break;
     case 'h':
     case 'H':
@@ -109,7 +109,7 @@ void keyPressed() {
     case '1':
       BoundingBox test2 = new BoundingBox(-width/2,width/2,-height/2,height/2);
       test2.draw();
-      ArrayList<Point> pl = tree.query(test2);
+      ArrayList<Point> pl = pot.getTree().query(test2);
       println(pl.size());
       break;
   } 
@@ -137,9 +137,7 @@ void drawHelpMenu() {
     popStyle();
 }
 
-void checkSelect() {
-
-}
+void checkSelect() {}
 
 void GnomanDraw(int r) {
   pushStyle();
@@ -162,4 +160,4 @@ void mouseDragged() {
 void mouseReleased() {
   if(mouseButton == LEFT){ menu.mouseReleased(); }
   if(mouseButton == RIGHT){ cam.mouseReleased(); }
-}
\ No newline at end of file
+}
diff --git a/kdtest/web-export/kdtest.pde b/kdtest/web-export/kdtest.pde
index 9b4819e..c57040e 100644
--- a/kdtest/web-export/kdtest.pde
+++ b/kdtest/web-export/kdtest.pde
@@ -1,31 +1,39 @@
 Console con;
 Camera cam;
 Mode statusLine;
+KdTree tree;
+TreeContainer pot;//or tree
+Menu menu;
 
 ArrayList<Point> pointList;
 
-boolean drawCon, drawHelp;
+boolean drawCon, drawHelp, drawTree, drawGnoman;
 float epsilon = 0.000001;
 int G_mode;
 // 1 = SCALE
 // 2 = PAN
 // 3 = ROTATE
-// 4 = PLACE
+// 4 = PLACE [removed]
 // 5 = SELECT
 
 void setup() {
   size(800,800);
   background(120);
   ellipseMode(CENTER);
-  
+  menu = new Menu();
   con = new Console();
   cam = new Camera();
   statusLine = new Mode();
+  pot = new TreeContainer();
 
   pointList = new ArrayList<Point>();
+  //tree = null;
 
   drawCon = false;
   drawHelp = true;
+  drawGnoman = true;
+  drawTree = true;
+
   G_mode = 1;
 }
 
@@ -34,12 +42,16 @@ void draw() {
   
   pushMatrix();
     cam.update();
-    drawGnoman(200);
+    if(drawGnoman) GnomanDraw(200);
+    if(drawTree && tree != null) {
+      pot.draw();
+    }
     for(Point p: pointList) {
       p.draw();
     }
   popMatrix();
   
+  menu.draw();
   if(drawCon) con.draw();
   
   if (drawHelp) {
@@ -80,11 +92,26 @@ void keyPressed() {
     case 'c':
     case 'C':
       pointList.clear();
+      tree = null;
       break;
     case 'h':
     case 'H':
       drawHelp = !drawHelp;
       break;
+    case 'r':
+    case 'R':
+      drawTree = !drawTree;
+      break;
+    case 'e':
+    case 'E':
+      drawGnoman = !drawGnoman;
+      break;
+    case '1':
+      BoundingBox test2 = new BoundingBox(-width/2,width/2,-height/2,height/2);
+      test2.draw();
+      ArrayList<Point> pl = tree.query(test2);
+      println(pl.size());
+      break;
   } 
 }
 
@@ -114,7 +141,7 @@ void checkSelect() {
 
 }
 
-void drawGnoman(int r) {
+void GnomanDraw(int r) {
   pushStyle();
   stroke(c_gnoman);
   line(-r,0,r,0);
@@ -123,19 +150,18 @@ void drawGnoman(int r) {
 }
 
 void mousePressed() {
-  if(G_mode == 4) {
-    pointList.add(cam.transform(new Point(mouseX, mouseY)));
-  }
-  cam.mousePressed();
-  con.print("Pressed");
+  if(mouseButton == LEFT){ menu.mousePressed(); }
+  if(mouseButton == RIGHT){ cam.mousePressed(); }
 }
 
 void mouseDragged() {
-  cam.mouseDragged();
+  if(mouseButton == LEFT){ menu.mouseDragged(); }
+  if(mouseButton == RIGHT){ cam.mouseDragged(); }
 }
 
 void mouseReleased() {
-  cam.mouseReleased();
+  if(mouseButton == LEFT){ menu.mouseReleased(); }
+  if(mouseButton == RIGHT){ cam.mouseReleased(); }
 }
 class Camera { 
   float _x;
@@ -181,11 +207,12 @@ class Camera {
         difX /= (float)(width);
         difY /= (float)(height);
         _scale = epsilon + abs((1 - 4*(difX + difY)) * _oldScale); 
-        con.print(" " + _scale);
+        _x = _oldX * _scale;
+        _y = _oldY * _scale; 
         break;
       case 2:
-        difX *= _scale;
-        difY *= _scale;
+        difX *= 1.0/_scale;
+        difY *= 1.0/_scale;
 //        _x = cos(_angle)*difX - sin(_angle)*difY + _oldX;
 //        _y = sin(_angle)*difX + cos(_angle)*difY + _oldY;  
         _x = _oldX + difX;
@@ -247,6 +274,70 @@ class Console {
     popStyle();
   }
 }
+class Menu{
+  ArrayList<Button> buttonList;
+  Selector _selector; 
+  Menu(){
+    _selector = new Selector();
+  }
+  
+  void activate(int button){
+    _selector.setSelectMode(button);
+  }
+  
+  int onaButton(int x, int y){
+    if( 0<x && x<=60 && y>0  && y<=25){ return 1; }
+    else if( 0<x && x<=60 && y>25 && y<=51){ return 2; }
+    else if( 0<x && x<=60 && y>51 && y<=77){ return 3; }
+    else if( 0<x && x<=60 && y>77 && y<=103){ return 4; }
+    else { return 0; }  
+  }
+  
+  void makeButtons(){
+   
+    
+  }
+
+  void draw(){
+    pushStyle();
+    rect(0,0,60,25,0,7,7,0);//rect button
+    rect(15,20,5,10);//rect icon
+    rect(0,26,60,25,0,7,7,0);//circle button
+    ellipseMode(CORNER);
+    ellipse(0.0,26.0,60.0,25.0);//circle icon
+    rect(0,52,60,25,0,7,7,0);//NN button
+    ellipse(0.0,52.0,60.0,25.0);//NN icon
+    rect(0,78,60,25,0,7,7,0);//InserPoint button
+    popStyle();
+    _selector.draw();
+  }
+  
+  void mousePressed(){
+    int button = onaButton(mouseX,mouseY);
+    if( button != 0 ){ activate(button); }
+    else{ _selector.mousePressed(); }
+  }
+  
+  void mouseDragged(){ _selector.stretchSelection(); }
+  
+  void mouseReleased(){ _selector.resetSelection(); }
+}
+
+class Button{
+ int _x1, _y1, _x2, _y2, _id;
+  Button(int x1,int y1, int x2, int y2, int id){
+   _x1 = x1;
+   _y1 = y1;
+   _x2 = x2;
+   _y2 = y2;
+   _id = id;
+  } 
+  
+  int insideButton(int x, int y){
+    if( 0<_x1 && _x2<=60 && _y1>0  && _y2<=25){ return 1; }
+    return 0;
+  }
+}
 class Mode {
   int _h = 30;
   int _w = 60;
@@ -258,9 +349,11 @@ class Mode {
 
   void draw() {
     pushStyle();
-      fill(c);
-      rect(0,height,_w,height-_h);
-      fill(0);
+      fill(c_statusBackground);
+      rect(0, height - 35, width, 35);
+      fill(c_statusMode);
+      rect(-10,height -35, 140, 35, 10);
+      fill(c_statusBackground);
       textSize(30);
       String s = new String();
       switch(G_mode) {
@@ -276,8 +369,13 @@ class Mode {
         case 4:
           s = "PLACE";
           break;
+        case 5:
+          s = "SELECT";
+          break;
       }
-      text(s,10, height-_h);
+      text(s, 5, height - 5);
+      fill(c_statusText);
+      text("Point Count: " + pointList.size(), 150, height - 5);
     popStyle(); 
   }
 }
@@ -335,38 +433,152 @@ class Point {
 // Pallete
 color c_WHITE = color (255, 255, 255);
 color c_BLACK = color (0, 0, 0);
+color c_PROCBLUE = color (5,13,22);
+color c_LIGHTBLUE = color (0, 215, 255);
+color c_YELLOW = color (215, 255, 0);
+color c_HILITE = color (251, 255, 20, 100);//selector filling
 
 // Screen Color
-color c_background = color (50, 50, 50);
-color c_gnoman = color (255, 130, 130);
+color c_background = color (26, 26, 26);
+color c_gnoman = c_LIGHTBLUE;
 
 // Menu Colors
 color c_modeText = c_BLACK;
 color c_modeBackground = color (200,200,200,200);
 
 // Help Colors
-color c_helpBackground = color (5,13,22);
+color c_helpBackground = c_PROCBLUE;
 color c_helpStroke = c_BLACK;
 color c_helpText = c_WHITE;
 int   i_helpStrokeWidth = 2;
 
+// Status Colors
+color c_statusMode = c_YELLOW;
+color c_statusBackground = c_PROCBLUE;
+color c_statusText = c_WHITE;
+
 // Point
 color c_pointStroke = c_BLACK;
 color c_pointDefault = c_WHITE;
 color c_pointSelect = color (100, 255, 100);
 
 // Help Strings
-int i_helpStrings = 8;
+int i_helpStrings = 10;
 String[] s_helpStrings = {
    "h: Toggle Help",
    "t: Toggle Console",
+   "r: Toggle Tree",
+   "e: Toggle Gnoman",
    "f: Scale",
    "d: Pan",
    "s: Rotate",
-   "a: Place Points",
+   "a: Place Point",
    "g: Select Point",
    "c: Clear Points"
 };
+class Selector{
+  int _startX,_startY, _endX, _endY;
+  float _state;
+  float _a, _b, _radius;
+  boolean _selecting, _animating, _searching;
+  int _select_mode;
+  Point point;
+  
+  Selector(){
+    _selecting = false;
+    _animating = false;
+    _searching = false;
+    _a = 0;
+    _b = 0;
+    _select_mode = 1;
+    _endX = -1;
+    _endY = -1;
+  }
+  
+  void setSelectMode(int mode){ _select_mode = mode; }
+  
+  void mousePressed(){//triggered on mousePressed()
+  _startX = mouseX;
+  _startY = mouseY;  
+  switch(_select_mode){
+   case 1:  _selecting = true; //rectangular selection
+            break;  
+   case 2:  _selecting = true; //ellipse selection
+            break;
+   case 3:  _searching = true; //nearest neighbor search
+            _state = 0.0;
+            _animating = true;
+            break;
+   case 4:  Point p = cam.transform(new Point(mouseX, mouseY)); //place point
+            pointList.add(p);
+            pot.insert(p);
+  }
+}
+  
+  void resetSelection(){//triggered on mouseReleased()
+    if(_selecting){  //selecting with rect or circle
+      switch(_select_mode){
+        case 1: 
+        Point p1 = new Point(_startX, _startY);
+        Point p2 = new Point(_endX, _endY);
+        pot.tree.query(new BoundingBox(p1._x, p1._y, p2._x, p2._y));
+        println("TESTING");
+        break;
+        case 2: //_tree.circleQuery(cam.transform(new Point(_a,_b)),
+      }
+      _selecting = false;
+      _startX = -1;
+      _startY = -1;
+    }
+    else{
+      //_tree.neighborQuery(cam.transform(new Point(_a,_b)),
+      _searching = false;
+    }
+    _endX = -1;
+    _endY = -1;    
+    _a = 0;
+    _b = 0;
+  }
+  void stretchSelection(){
+    if(_selecting){
+      _endX = mouseX-_startX;
+      _endY = mouseY-_startY;
+    }
+  }
+
+  void draw(){
+      pushStyle();
+      stroke(color(100,100,100));
+      fill(c_HILITE);
+      if(_selecting){
+        switch(_select_mode){
+          case 1:  rect(_startX,_startY,_endX,_endY);
+                   break;
+          case 2:  _a = mouseX-_startX;
+                   _b = mouseY-_startY;
+                   _radius = sqrt(_a*_a+_b*_b);
+                   ellipseMode(RADIUS);
+                   ellipse(_startX,_startY,_radius,_radius);
+                   line(_startX,_startY,mouseX,mouseY);
+                   break;
+      }
+    }
+  if(_animating){ neighborAnimation(); }
+  popStyle();
+  }
+    
+  void neighborAnimation(){
+    float elapsedTime = constrain(1f/frameRate, 16f/1000f, 32f/1000f);
+    _state += max( 8 * elapsedTime *  sin(_state*PI), 0.01);
+    float r = _state * 100;
+    ellipseMode(RADIUS);
+    ellipse(_startX,_startY,r,r);
+    if(_state > 1.0) { 
+      _animating = false;
+      _searching = false;
+    }
+  }  
+}
 int lineSideTest (float ax0, float ay0, float ax1, float ay1, float px, float py) {
   float val = (ax1 - ax0) * (py - ay0) - (ay1 * ay0) * (px - ax0);
   if (val == 0) {
@@ -378,3 +590,197 @@ int lineSideTest (float ax0, float ay0, float ax1, float ay1, float px, float py
   }
 }
 
+boolean contains(BoundingBox a, BoundingBox b)
+{//does a contain b?
+  return b.x1 >= a.x1 && b.x2 <= a.x2 && b.y1 >= a.y1 && b.y2 <= a.y2; 
+}
+
+boolean intersects(BoundingBox a, BoundingBox b)
+{
+  return ((a.x1 <= b.x2 && a.x1 >= b.x1) || (a.x1 <= b.x2 && a.x1 >= b.x1)) &&((a.y1 <= b.y2 && a.y1 >= b.y1) || (a.y1 <= b.y2 && a.y1 >= b.y1));
+}
+
+boolean inBox(Point p, BoundingBox a)
+{
+  return p._x >= a.x1 && p._x <= a.x2 && p._y >= a.y1 && p._y <= a.y2;
+}
+//random helper function I don't know where to put
+ArrayList<Point> merge(ArrayList<Point> a, ArrayList<Point> b) {
+  for(Point p : b)
+    a.add(p);
+  return a;
+}
+class BoundingBox {
+  float x1, x2, y1, y2;
+  public BoundingBox(float _x1, float _x2, float _y1, float _y2)
+  {
+    x1 = _x1;
+    x2 = _x2;
+    y1 = _y1;
+    y2 = _y2;
+  }
+  void draw()
+  {
+    pushStyle();
+    stroke(0);
+    line(x1, y1, x2, y1); 
+    line(x1, y2, x2, y2);
+    line(x1, y1, x1, y2);
+    line(x2, y1, x2, y2);
+    popStyle();
+  }
+}
+
+class KdTree {
+  KdTree _left, _right;
+  Point _loc;
+  int _depth;
+  color _c;
+  boolean _dir; // Vertical->True, Horizontal->False
+  BoundingBox _bb;
+  
+  public KdTree(Point p, boolean vert, int depth, BoundingBox bb) {
+    _loc = p;
+    _dir = vert;
+    _depth = depth;
+    _c = colorize(depth);
+
+    _left = null;
+    _right = null;
+    _bb = bb;
+  }
+  
+  
+  void insert(Point p) {
+    KdTree parent = search(p);
+    
+    if(parent._dir) {            // If parent is vertical
+      if(parent._loc._x > p._x) {
+        parent._left = new KdTree(p, !parent._dir, parent._depth + 1, new BoundingBox(parent._bb.x1, parent._loc._x, parent._bb.y1, parent._bb.y2));
+      } else {
+        parent._right = new KdTree(p, !parent._dir, parent._depth + 1, new BoundingBox(parent._loc._x, parent._bb.x2, parent._bb.y1, parent._bb.y2));
+      }
+    } else {
+      if(parent._loc._y > p._y) {
+        parent._left = new KdTree(p, !parent._dir, parent._depth + 1, new BoundingBox(parent._bb.x1, parent._bb.x2, parent._bb.y1, parent._loc._y));
+      } else {
+        parent._right = new KdTree(p, !parent._dir, parent._depth + 1, new BoundingBox(parent._bb.x1, parent._bb.x2, parent._loc._y, parent._bb.y2));
+      }
+    }
+  }
+
+  KdTree search(Point p) {
+    if(_dir) {                   // If vertical
+      if(p._x < _loc._x) {       // If p is to the left of _loc
+        if(_left != null) {
+          return _left.search (p);
+        } else {
+          return this;
+        }
+      } else {                    // Then p is to the right of _loc
+        if(_right != null) {
+          return _right.search (p);
+        } else {
+          return this;
+        } 
+      }
+    } else {                      // If Horizontal
+      if(p._y < _loc._y) {        // If p is under _loc
+        if(_left != null) {
+          return _left.search(p);
+        } else {
+          return this;
+        }
+      } else {                   // Then p is over _loc
+        if(_right != null) {
+          return _right.search(p);
+        } else {
+          return this;
+        }
+      }
+    }
+  }
+
+  ArrayList<Point> report() {
+    ArrayList<Point> rightRes = new ArrayList<Point>();
+    ArrayList<Point> leftRes = new ArrayList<Point>();
+
+    if(isLeaf()) {
+      leftRes.add(_loc);
+      return leftRes;
+    }
+    if(_left != null)
+      leftRes = _left.report();    
+    if(_right != null)
+      rightRes = _right.report();
+    return merge(rightRes, leftRes);
+  }
+  
+  ArrayList<Point> query(BoundingBox range) {
+    ArrayList<Point> rightRes = new ArrayList<Point>();
+    ArrayList<Point> leftRes = new ArrayList<Point>();
+    
+    if(isLeaf() && inBox(_loc, range)) {
+      rightRes.add(_loc);
+      return rightRes;
+    }
+    
+    if(_left != null) {
+      if(contains(range, _left._bb)) {
+        leftRes = _left.report();
+      }
+      else if(intersects(_left._bb, range)) {
+        leftRes = _left.query(range);
+      }
+    }
+    
+    if(_right != null) {
+      if(contains(range, _right._bb)) {
+        rightRes = _right.report();
+      }
+      else if(intersects(_right._bb, range)) {
+        rightRes = _right.query(range);
+      }
+    }
+    return merge(rightRes, leftRes);
+  }
+  
+  boolean isLeaf() {
+    return _left==null && _right==null;
+  }
+  
+  void draw() {
+    _bb.draw();
+    pushStyle();
+    stroke(_c);
+    if (_left != null) {
+      line(_loc._x, _loc._y, _left._loc._x, _left._loc._y);
+      _left.draw();
+    }
+    if (_right != null) {
+      line(_loc._x, _loc._y, _right._loc._x, _right._loc._y);
+      _right.draw();
+    }
+    popStyle();
+  }
+
+  color colorize (int depth) {
+    float d = depth * 0.2;
+    return color((int)255*cos(d) * cos(d), (int)255*abs(sin(d + PI)), (int)255*abs(sin(d+0.5)));
+  }
+}
+
+class TreeContainer {
+  KdTree tree;
+  TreeContainer(){ 
+    tree = null;
+  }
+  
+  void insert(Point p){
+  if(tree != null) { tree.insert(p); }
+  else { tree = new KdTree (p, true, 0, new BoundingBox(-width/2,width/2,-height/2,height/2));}
+  }
+   
+   void draw(){ tree.draw(); }
+}
+