diff --git a/TODO b/TODO
index f89bd93..de4625b 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,13 @@
 
 - Update recording mechanism to request buffers when they're getting full
 
+- Update GUI threading to become controller independant, allowing a
+ControllerUpdater instance run in the UI thread, updating each Controller
+subclass instance. This affords OSC user-interfaces, as well a the GUI, as well
+as future controllers.
+    - thread per Controller
+    - deriving from TimeManager etc not possible, should they be functions in
+      Controller, so that moving a class from RT to non-RT won't = code change
 
 === IN PROGRESS
 
diff --git a/src/controller/apc.cxx b/src/controller/apc.cxx
index d240476..856abda 100644
--- a/src/controller/apc.cxx
+++ b/src/controller/apc.cxx
@@ -38,6 +38,13 @@ void AkaiAPC::fxTrackSend(int t, int send, float v)
 {
   unsigned char data[3];
   data[0] = 176 + t;
+  
+  if ( data[0] >= 184)
+  {
+    // master track
+    return;
+  }
+  
   switch( send )
   {
     case SEND_REV:
diff --git a/src/timemanager.hxx b/src/timemanager.hxx
index 969a222..50a47a0 100644
--- a/src/timemanager.hxx
+++ b/src/timemanager.hxx
@@ -51,7 +51,7 @@ class TimeManager
     
     void registerObserver(TimeObserver* o)
     {
-      cout << "registerObserver() " << o << endl;
+      //cout << "registerObserver() " << o << endl;
       observers.push_back(o);
       o->setFpb( fpb );
     }