Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -r8d349cf9c3cc04c755c9295d4d55992bf64283bd -r630afd3318d7c0a12ea203eacfbf4406b26ec128
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 8d349cf9c3cc04c755c9295d4d55992bf64283bd)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 630afd3318d7c0a12ea203eacfbf4406b26ec128)
@@ -26,6 +26,7 @@
 import org.lamsfoundation.lams.common.util.ui.*;
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.monitoring.mv.*;
 import org.lamsfoundation.lams.common.style.*
 
 import com.polymercode.Draw;
@@ -50,13 +51,16 @@
 	//this is set by the init object
 	private var _canvasController:CanvasController;
 	private var _canvasView:CanvasView;
+	private var _monitorController:MonitorController;
+	private var _monitorView:MonitorView;
 	private var _tm:ThemeManager;
 	//TODO:This should be ToolActivity
 	private var _activity:Activity;
 	
 	private var _isSelected:Boolean;
 	private var app:Application;
-	//locals
+	//locals
+	private var _module:String;
 	private var icon_mc:MovieClip;
 	private var icon_mcl:MovieClipLoader;
 	private var bkg_pnl:MovieClip;
@@ -104,8 +108,12 @@
 	
 	public function init(initObj):Void{
 		if(initObj){
-			_canvasView = initObj.canvasView;
-			_canvasController = initObj.canvasController;
+			_canvasView = initObj._canvasView;
+			_canvasController = initObj._canvasController;
+			if (_module == "monitoring"){
+				_monitorView = initObj._monitorView;
+				_monitorController = initObj._monitorController;
+			}
 			_activity = initObj.activity;
 		}
 		
@@ -311,6 +319,9 @@
 				//Debugger.log('DoubleClicking: '+_canvasModel.activeTool,Debugger.GEN,'onPress','CanvasActivity');
 				if (app.controlKeyPressed != "transition"){
 					_doubleClicking = true;
+					if (_module == "monitoring"){
+						_monitorController.activityDoubleClick(this);
+					}
 					_canvasController.activityDoubleClick(this);
 				}
 				/*
@@ -328,7 +339,9 @@
 				_doubleClicking = false;
 				
 				//Debugger.log('_canvasController:'+_canvasController,Debugger.GEN,'onPress','CanvasActivity');
-				
+				if (_module == "monitoring"){
+					_monitorController.activityClick(this);
+				}
 				_canvasController.activityClick(this);
 				
 				
@@ -360,14 +373,19 @@
 		if(!_doubleClicking){
 			Debugger.log('Releasing:'+this,Debugger.GEN,'onRelease','CanvasActivity');
 				trace("Activity ID is: "+this.activity.activityUIID)	
+			if (_module == "monitoring"){
+				_monitorController.activityRelease(this);
+			}
 			_canvasController.activityRelease(this);
 		}
 		
 	}
 	
 	private function onReleaseOutside():Void{
 		Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','CanvasActivity');
-
+		if (_module == "monitoring"){
+			_monitorController.activityReleaseOutside(this);
+		}
 		_canvasController.activityReleaseOutside(this);
 	}
 	
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
diff -u -r4abba0b1e3cc74822817e3e3de4512b4808f38cc -r630afd3318d7c0a12ea203eacfbf4406b26ec128
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 4abba0b1e3cc74822817e3e3de4512b4808f38cc)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	(.../CanvasParallelActivity.as)	(revision 630afd3318d7c0a12ea203eacfbf4406b26ec128)
@@ -26,6 +26,7 @@
 import org.lamsfoundation.lams.common.ui.*;
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.monitoring.mv.*;
 import mx.controls.*;
 import mx.managers.*
 
@@ -43,7 +44,8 @@
 	//this is set by the init object
 	private var _canvasController:CanvasController;
 	private var _canvasView:CanvasView;
-	
+	private var _monitorController:MonitorController;
+	private var _monitorView:MonitorView;
 	//Set by the init obj
 	private var _activity:Activity;
 	private var _children:Array;
@@ -113,8 +115,8 @@
 		child2.yCoord = CHILD2_OFFSET_Y;
 	
 		//so now it is placed on in the IDE and we just call init
-		child1_mc.init({activity:child1,canvasController:_canvasController,canvasView:_canvasView});
-		child2_mc.init({activity:child2,canvasController:_canvasController,canvasView:_canvasView});
+		child1_mc.init({activity:child1,_canvasController:_canvasController,_canvasView:_canvasView});
+		child2_mc.init({activity:child2,_canvasController:_canvasController,_canvasView:_canvasView});
 		
 		//let it wait one frame to set up the components.
 		//childActivities_mc.createChildAtDepth("Bin",DepthManager.kTop);