diff --git a/field.cpp b/field.cpp
index 37b34bc80f..b4a9351a46 100644
--- a/field.cpp
+++ b/field.cpp
@@ -55,8 +55,8 @@ void field_add(float* add, float *pos)
     if ((index >= 0) && (index < FIELD_ELEMENTS))
     {
         field[index].val.x += add[0];
-        field[index].val.y += add[0];
-        field[index].val.z += add[0];
+        field[index].val.y += add[1];
+        field[index].val.z += add[2];
     }
 }
 
@@ -107,9 +107,10 @@ void field_simulate(float dt) {
             field[i].val += add;
         }
         else {
-            field[i].val.x += (randFloat() - 0.5)*0.01*FIELD_SCALE;
-            field[i].val.y += (randFloat() - 0.5)*0.01*FIELD_SCALE;
-            field[i].val.z += (randFloat() - 0.5)*0.01*FIELD_SCALE;
+            field[i].val *= 0.999;
+            //field[i].val.x += (randFloat() - 0.5)*0.01*FIELD_SCALE;
+            //field[i].val.y += (randFloat() - 0.5)*0.01*FIELD_SCALE;
+            //field[i].val.z += (randFloat() - 0.5)*0.01*FIELD_SCALE;
         }
         
     }      
diff --git a/interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate b/interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate
index 076c36d919..c10b834c5c 100644
Binary files a/interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate and b/interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/interface.xcodeproj/xcuserdata/philip.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/interface.xcodeproj/xcuserdata/philip.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
index 3f3c486751..d8e15f635a 100644
--- a/interface.xcodeproj/xcuserdata/philip.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
+++ b/interface.xcodeproj/xcuserdata/philip.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -3,19 +3,6 @@
    type = "1"
    version = "1.0">
    <FileBreakpoints>
-      <FileBreakpoint
-         shouldBeEnabled = "No"
-         ignoreCount = "0"
-         continueAfterRunningActions = "No"
-         filePath = "main.cpp"
-         timestampString = "374020144.685254"
-         startingColumnNumber = "9223372036854775807"
-         endingColumnNumber = "9223372036854775807"
-         startingLineNumber = "320"
-         endingLineNumber = "320"
-         landmarkName = "init(void)"
-         landmarkType = "7">
-      </FileBreakpoint>
       <FileBreakpoint
          shouldBeEnabled = "No"
          ignoreCount = "0"
diff --git a/main.cpp b/main.cpp
index a472c69190..fe3e696381 100644
--- a/main.cpp
+++ b/main.cpp
@@ -116,11 +116,11 @@ ParticleSystem balls(10,
 #define RENDER_FRAME_MSECS 10
 #define SLEEP 0
 
-#define NUM_TRIS 100000  
+#define NUM_TRIS 200000  
 struct {
     float vertices[NUM_TRIS * 3];
-    float normals [NUM_TRIS * 3];
-    float colors  [NUM_TRIS * 3];
+//    float normals [NUM_TRIS * 3];
+//    float colors  [NUM_TRIS * 3];
     float vel     [NUM_TRIS * 3];
     glm::vec3 vel1[NUM_TRIS];
     glm::vec3 vel2[NUM_TRIS];
@@ -167,8 +167,6 @@ int accel_x, accel_y;
 
 int speed;
 
-float mag_imbalance = 0.f;
-
 //  
 //  Serial I/O channel mapping:
 //  
@@ -312,14 +310,14 @@ void init(void)
         tris.vertices[i*3 + 2] = verts[j].z;
         
         // reuse pos for the normal
-        glm::normalize((pos += glm::cross(verts[1] - verts[0], verts[2] - verts[0])));
-        tris.normals[i*3] = pos.x;
-        tris.normals[i*3+1] = pos.y;
-        tris.normals[i*3+2] = pos.z;
+        //glm::normalize((pos += glm::cross(verts[1] - verts[0], verts[2] - verts[0])));
+        //tris.normals[i*3] = pos.x;
+        //tris.normals[i*3+1] = pos.y;
+        //tris.normals[i*3+2] = pos.z;
         
         //  Moving - white
         tris.element[i] = 1;
-        tris.colors[i*3] = 1.0;  tris.colors[i*3+1] = 1.0; tris.colors[i*3+2] = 1.0;
+        //tris.colors[i*3] = 1.0;  tris.colors[i*3+1] = 1.0; tris.colors[i*3+2] = 1.0;
         tris.vel[i*3] = (randFloat() - 0.5)*VEL_SCALE;
         tris.vel[i*3+1] = (randFloat() - 0.5)*VEL_SCALE;
         tris.vel[i*3+2] = (randFloat() - 0.5)*VEL_SCALE;
@@ -364,7 +362,7 @@ void update_tris()
 {
     int i, j;
     float field_val[3];
-    
+    float field_contrib[3];
     for (i = 0; i < NUM_TRIS; i++)
     {
         if (tris.element[i] == 1)          //  If moving object, move and drag
@@ -391,6 +389,13 @@ void update_tris()
             tris.vel[i*3] += field_val[0];
             tris.vel[i*3+1] += field_val[1];
             tris.vel[i*3+2] += field_val[2];
+            
+            // Add a tiny bit of energy back to the field
+            const float FIELD_COUPLE = 0.0000001;
+            field_contrib[0] = tris.vel[i*3]*FIELD_COUPLE;
+            field_contrib[1] = tris.vel[i*3+1]*FIELD_COUPLE;
+            field_contrib[2] = tris.vel[i*3+2]*FIELD_COUPLE;
+            field_add(field_contrib, &tris.vertices[i*3]);
         }
 
         // bounce at edge of world