--- a/src/vtkplot.cpp
+++ b/src/vtkplot.cpp
@@ -44,73 +44,9 @@
 #include <sstream>
 #include <iomanip> 
 
-namespace kwantix{
-
-class CommandSubclass : public vtkCommand
-{
-public:
-  static CommandSubclass *New()
-  {
-    return new CommandSubclass;
-  }
- 
-  void Execute(vtkObject *caller, unsigned long eventId, 
-               void *callData)
-  {
-    vtkRenderWindowInteractor *iren = 
-      static_cast<vtkRenderWindowInteractor*>(caller);
- 
-    this->ProgrammableFilter->Modified();
- 
-    iren->Render();
- 
-  }
- 
-  vtkSmartPointer<vtkProgrammableFilter> ProgrammableFilter;
- 
-};
+#include <boost/function.hpp>
 
-template<typename RBF>
-void vtkplot::AdjustPoints(void* arguments)
-{
-  vtkProgrammableFilter* programmableFilter = 
-    static_cast<vtkProgrammableFilter*>(arguments);
-  arguments = programmableFilter + 1;
-  
-  auto u = static_cast< const interpolator<RBF>& > (arguments);
-  
-  vtkPoints* inPts = programmableFilter->GetPolyDataInput()->GetPoints();
-  vtkIdType numPts = inPts->GetNumberOfPoints();
-  vtkSmartPointer<vtkPoints> newPts =
-    vtkSmartPointer<vtkPoints>::New();
-  newPts->SetNumberOfPoints(numPts);
- 
-  vtkSmartPointer<vtkDoubleArray> newScalars 
-    = vtkSmartPointer<vtkDoubleArray>::New();
-
-  static double t = 0;
-
-  //auto& vals = u.at();
-
-  for(vtkIdType i = 0; i < numPts; i++)
-  {
-    double p[3];
-    inPts -> GetPoint(i,p);
-    //p[2] = F(p[0],p[1],t);
-    newPts -> SetPoint(i,p);
-    newScalars -> InsertTuple(i, &p[2]);
-	}
-
-  t += 0.05;
- 
-  programmableFilter->
-    GetPolyDataOutput()->CopyStructure(programmableFilter->GetPolyDataInput());
-
-  programmableFilter->GetPolyDataOutput()->SetPoints(newPts);
-  programmableFilter
-    ->GetPolyDataOutput()
-    ->GetPointData() -> SetScalars(newScalars);
-}
+namespace kwantix{
 
 template<typename RBF>
 vtkplot::vtkplot(const interpolator<RBF>& u, 
@@ -120,14 +56,36 @@
   if(u.thebvp -> get_domain() -> get_dimension() != 2)
   {
     badArgument exc;
-    exc.reason = "This class only works on interpolators whose domain lies in R^2";
+    exc.reason = 
+      "Class vtkplot only works on interpolators whose " 
+      "domain lies in R^2";
     exc.line = __LINE__;
     exc.file = __FILE__;
     throw exc;
   }
+  
   SetupPipeline(u, offscreen);
 }
 
+void vtkplot::set_offscreen(bool offscreen_in)
+{
+  offscreen = offscreen_in;
+  InitOffscreen();
+}
+
+template<typename RBF>
+void vtkplot::update_values(const interp_values& vals_in)
+{
+  vals = vals_in;
+  programmableFilter -> Modified();
+}
+
+void vtkplot::trampoline(void* this_ptr)
+{
+  vtkplot* instance = static_cast<vtkplot*>(this_ptr);
+  instance -> AdjustPoints();
+}
+
 template<typename RBF>
 void vtkplot::SetupPipeline(const interpolator<RBF>& u)
 {
@@ -163,11 +121,9 @@
 
   InitOffscreen();
 
-  vtkSmartPointer<vtkProgrammableFilter> programmableFilter = 
-    vtkSmartPointer<vtkProgrammableFilter>::New();
+  programmableFilter = vtkSmartPointer<vtkProgrammableFilter>::New();
   programmableFilter->SetInput(delaunay -> GetOutput());
-  programmableFilter->SetExecuteMethod(AdjustPoints<RBF>, programmableFilter, u);
-
+  programmableFilter->SetExecuteMethod(trampoline, this);
 
   //Normals for Gourad shading
   vtkSmartPointer<vtkPolyDataNormals> normals 
@@ -199,10 +155,8 @@
 	contActor->SetMapper(contMapper);
  
   // a renderer and render window
-	vtkSmartPointer<vtkRenderer> ren1 =
-    vtkSmartPointer<vtkRenderer>::New();
-	vtkSmartPointer<vtkRenderWindow> renWin 
-    = vtkSmartPointer<vtkRenderWindow>::New();
+	ren1 =  vtkSmartPointer<vtkRenderer>::New();
+	renWin = vtkSmartPointer<vtkRenderWindow>::New();
   if(offscreen)
   {
     renWin->SetOffScreenRendering(1);
@@ -218,23 +172,14 @@
   iren->Initialize();
   iren->CreateRepeatingTimer(10);
  
-  vtkSmartPointer<CommandSubclass> timerCallback = 
-    vtkSmartPointer<CommandSubclass>::New();
-  timerCallback->ProgrammableFilter = programmableFilter;
- 
-  iren->AddObserver ( vtkCommand::TimerEvent, timerCallback );
-
 	// add the actors to the scene
 	ren1->SetBackground(0.0,0.0,0.0);
   ren1->GetActiveCamera()->SetViewUp(0,0,1);
-  ren1->GetActiveCamera()->SetPosition(1, 0, 1);
+  ren1->GetActiveCamera()->SetPosition(1, 1, 1);
   ren1->GetActiveCamera()->SetParallelProjection(1);
 	ren1->AddActor(contActor);
   ren1->ResetCamera();
  
-  // render an image (lights and cameras are created automatically)
-	renWin->Render();
-
   if(offscreen)
   {
     for(size_t i = 0; i < 1000; i++)
@@ -263,6 +208,9 @@
   }
   else
   {
+
+    // render an image (lights and cameras are created automatically)
+    renWin->Render();
     //The style
     vtkSmartPointer<vtkInteractorStyleTerrain> terrain_style 
       = vtkSmartPointer<vtkInteractorStyleTerrain>::New();
@@ -273,7 +221,6 @@
     // begin mouse interaction
     iren->Start(); 
   }
-  return delaunay;
 }
 
 void vtkplot::InitOffscreen()
@@ -290,6 +237,46 @@
   imaging_factory->SetUseMesaClasses( offscreen );
 }
 
+void vtkplot::AdjustPoints()
+{
+ 
+  if(vals.get_hash() != hash)
+  {
+    badArgument exc;
+    exc.reason = 
+      "Can't update vtkplot with data from a different " 
+      "interpolation domain.";
+    exc.line = __LINE__;
+    exc.file = __FILE__;
+    throw exc;
+  }
+  
+  vtkPoints* inPts = programmableFilter->GetPolyDataInput()->GetPoints();
+  vtkIdType numPts = inPts->GetNumberOfPoints();
+  vtkSmartPointer<vtkPoints> newPts =
+    vtkSmartPointer<vtkPoints>::New();
+  newPts->SetNumberOfPoints(numPts);
+ 
+  vtkSmartPointer<vtkDoubleArray> newScalars 
+    = vtkSmartPointer<vtkDoubleArray>::New();
+
+  for(vtkIdType i = 0; i < numPts; i++)
+  {
+    double p[3];
+    inPts -> GetPoint(i,p);
+    p[2] = vals(i+1);
+    newPts -> SetPoint(i,p);
+    newScalars -> InsertTuple(i, &p[2]);
+	}
+
+  programmableFilter->
+    GetPolyDataOutput()->CopyStructure(programmableFilter->GetPolyDataInput());
+
+  programmableFilter->GetPolyDataOutput()->SetPoints(newPts);
+  programmableFilter
+    ->GetPolyDataOutput()
+    ->GetPointData() -> SetScalars(newScalars);
+}
 
 } //namespace kwantix