Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r029e69643ff0fb567d2d53ef9e63ba4bd035e50b -rc5ce2369b6232db2c25a966f7873f695ebf6e485
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 029e69643ff0fb567d2d53ef9e63ba4bd035e50b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision c5ce2369b6232db2c25a966f7873f695ebf6e485)
@@ -30,6 +30,8 @@
 import org.lamsfoundation.lams.common.dict.*;
 import org.lamsfoundation.lams.common.mvc.*;
 import org.lamsfoundation.lams.common.CommonCanvasView;
+import org.lamsfoundation.lams.monitoring.mv.MonitorModel;
+import org.lamsfoundation.lams.monitoring.mv.MonitorController;
 
 import mx.controls.*;
 import mx.containers.*;
@@ -48,6 +50,8 @@
 	private var _container:MovieClip;  //The container window that holds the dialog
     
 	private var _cm:CanvasModel;
+	private var _mm:MonitorModel;
+	
     private var _canvasBranchView:CanvasBranchView;
 	private var _canvasBranchingActivity:CanvasActivity;
 	
@@ -95,10 +99,11 @@
         mx.events.EventDispatcher.initialize(this);
 		
 		this._visible = false;
+		
 	}
     
 	/**
-	* Called to initialise Canvas  . CAlled by the Canvas container
+	* Called to initialise Canvas  . Called by the Canvas container
 	*/
 	public function init(m:Observable,c:Controller){
 
@@ -107,17 +112,21 @@
 		//Set up parameters for the grid
 		H_GAP = 10;
 		V_GAP = 10;
-		
-		_cm = CanvasModel(m);
-	   
+
+		_cm = (m instanceof CanvasModel) ? CanvasModel(m) : null;
+		_mm = (m instanceof MonitorModel) ? MonitorModel(m) : null;
+		Debugger.log('_cm:'+_cm, Debugger.CRITICAL,'viewUpdate','CanvasBranchView');
+		Debugger.log('_mm:'+_mm, Debugger.CRITICAL,'viewUpdate','CanvasBranchView');
 	   //register to recive updates form the model
-		_cm.addEventListener('viewUpdate',this);
 		
-		MovieClipUtils.doLater(Proxy.create(this,draw)); 
+		if(_cm != null) _cm.addEventListener('viewUpdate',this);
+		if(_mm != null) _mm.addEventListener('viewUpdate',this);
+		
+		MovieClipUtils.doLater(Proxy.create(this, draw)); 
     }   
 	
 	/**
-    * set the container refernce to the window holding the dialog
+    * set the container reference to the window holding the dialog
     */
     function set container(value:MovieClip){
         _container = value;
@@ -129,45 +138,56 @@
 	 * @param   event
 	 */
 	public function viewUpdate(event:Object):Void{
-		Debugger.log('Recived an Event dispather UPDATE!, updateType:'+event.updateType+', target'+event.target,4,'viewUpdate','CanvasBranchView');
-		var cm:CanvasModel = event.target;
-	   
+		Debugger.log('Received an Event dispatcher UPDATE!, updateType:'+event.updateType+', target'+event.target,4,'viewUpdate','CanvasBranchView');
+		var _model = event.target;
+		Debugger.log("_model instance: " + (_model instanceof MonitorModel), Debugger.CRITICAL, "viewUpdate", "CanvasBranchView");
+		
+		var isCanvasModel:Boolean;
+		var isMonitorModel:Boolean;
+		isMonitorModel = model instanceof MonitorModel;
+		isCanvasModel = model instanceof CanvasModel;
+		
+		
+		Debugger.log('isCanvasModel:'+isCanvasModel, Debugger.CRITICAL,'viewUpdate','CanvasBranchView');
+		Debugger.log('isMonitorModel:'+isMonitorModel,Debugger.CRITICAL,'viewUpdate','CanvasBranchView');
+		
+		
 		switch (event.updateType){ 
 			case 'POSITION':
-                setPosition(cm);
+                setPosition(_model);
                 break;
             case 'SIZE':
-                setSize(cm);
+                setSize(_model);
                 break;
 			case 'ADD_SEQUENCE':
-				addSequence(event.data,cm);
+				addSequence(event.data, _model);
 				break;
             case 'DRAW_ACTIVITY_SEQ':
-                drawActivity(event.data,cm);
+                drawActivity(event.data, _model);
                 break;
 			case 'HIDE_ACTIVITY':
-                hideActivity(event.data,cm);
+                hideActivity(event.data, _model);
                 break;
             case 'REMOVE_ACTIVITY':
-                removeActivity(event.data,cm);
+                removeActivity(event.data, _model);
                 break;
             case 'DRAW_TRANSITION':
-                drawTransition(event.data,cm);
+                drawTransition(event.data, _model);
 				break;
 			case 'DRAW_BRANCH':
-				drawBranch(event.data,cm);
+				drawBranch(event.data, _model);
 				break;
 			case 'REMOVE_BRANCH':
-				removeBranch(event.data,cm);
+				removeBranch(event.data, _model);
 				break;
 			case 'HIDE_TRANSITION':
-                hideTransition(event.data,cm);
+                hideTransition(event.data, _model);
 				break;
 			case 'REMOVE_TRANSITION':
-				removeTransition(event.data,cm);
+				removeTransition(event.data, _model);
 				break;
 			case 'SELECTED_ITEM':
-                highlightActivity(cm);
+                highlightActivity(_model);
                 break;
 			case 'SET_ACTIVE':
 				Debugger.log('setting activie :' + event.updateType + " event.data: " + event.data + " condition: " + (event.data == this),Debugger.CRITICAL,'update','org.lamsfoundation.lams.CanvasBranchView');
@@ -206,7 +226,7 @@
 		
 		bkg_pnl.useHandCursor = false;
 		
-		close_mc = content.attachMovie("collapse_mc", "close_mc", DepthManager.kTop);
+		close_mc = content.attachMovie("collapse_mc", "close_mc", DepthManager.kTopmost);
 		
 		close_mc.onRelease = Proxy.create(this, localOnRelease);
 		close_mc.onReleaseOutside = Proxy.create(this, localOnReleaseOutside);
@@ -215,7 +235,7 @@
 		loadSequenceActivities();
 		
 		setStyles();
-		setSize(_cm);
+		setSize(model);
 		
 		if(_open) {
 			this._visible = true;
@@ -238,17 +258,18 @@
 	}
 	
 	private function loadSequenceActivities() {
-		var sequenceActs:Array = _cm.getCanvas().ddm.getComplexActivityChildren(activity.activityUIID);
+		var sequenceActs:Array = (model instanceof CanvasModel) ? _cm.getCanvas().ddm.getComplexActivityChildren(activity.activityUIID) : _mm.getMonitor().ddm.getComplexActivityChildren(activity.activityUIID);
 		Debugger.log("Sequence Activities length: " + sequenceActs.length, Debugger.CRITICAL, "loadSequenceActivities", "CanvasBranchView");
 		
 		for(var i=0; i<sequenceActs.length;  i++) {
 			Debugger.log('firstActivityUIID:' + activity.firstActivityUIID, Debugger.CRITICAL, "loadSequenceActivities", "CanvasBranchView");
 			
 			if(SequenceActivity(sequenceActs[i]).activityUIID == activity.firstActivityUIID) {
+				// (monitoring) entering this if statement
 				defaultSequenceActivity = SequenceActivity(sequenceActs[i]);
-				_cm.addNewBranch(SequenceActivity(sequenceActs[i]), activity, true);
+				model.addNewBranch(SequenceActivity(sequenceActs[i]), activity, true);
 			} else {
-				_cm.addNewBranch(SequenceActivity(sequenceActs[i]), activity, false);
+				model.addNewBranch(SequenceActivity(sequenceActs[i]), activity, false);
 			}
 			
 		}
@@ -259,7 +280,7 @@
 	}
 	
 	private function createInitialSequenceActivity() {
-		_cm.createNewSequenceActivity(activity);
+		model.createNewSequenceActivity(activity);
 	}
 	
 	public function localOnRelease():Void{
@@ -268,9 +289,9 @@
 	
 	private function open():Void {
 		Debugger.log("calling open: " + _open, Debugger.CRITICAL, "open", " CanvasBranchView");
-		_cm.getCanvas().addBin(this.activityLayer);
+		if(model instanceof CanvasModel) model.getCanvas().addBin(this.activityLayer);
 			
-		setSize(_cm);
+		setSize(model);
 			
 		mx.transitions.TransitionManager.start(this,
 					{type:mx.transitions.Zoom, 
@@ -280,16 +301,19 @@
 	}
 	
 	private function close():Void {
-		_cm.getCanvas().hideBin();
-		_cm.selectedItem = null;
+		if(model instanceof CanvasModel) model.getCanvas().hideBin();
+		model.selectedItem = null;
 		
 		mx.transitions.TransitionManager.start(this,
 					{type:mx.transitions.Zoom, 
 					 direction:1, duration:0.5, easing:mx.transitions.easing.Strong.easeIn});
 					 
-		_cm.getCanvas().closeBranchView();
-		_cm.getCanvas().addBin(_cm.activeView);
-		_cm.broadcastViewUpdate("SIZE");
+		model.getCanvas().closeBranchView();
+		
+		if(model instanceof CanvasModel)
+			model.getCanvas().addBin(model.activeView);
+		
+		model.broadcastViewUpdate("SIZE");
 	}
 	
 	public function localOnReleaseOutside():Void{
@@ -309,45 +333,46 @@
 	 * @param   cm - Refernce to the model
 	 * @return  Boolean - successfullit
 	 */
-	private function drawActivity(a:Activity,cm:CanvasModel):Boolean{
+	private function drawActivity(a:Activity, cm):Boolean{
 		
+		Debugger.log("pnt1", Debugger.CRITICAL, "drawActivity", "CanvasBranchView");
 		if(!cm.isActiveView(this)) return false;
-		
+		Debugger.log("pnt2", Debugger.CRITICAL, "drawActivity", "CanvasBranchView");
 		var cbv = CanvasBranchView(this);
 		var cbc = getController();
 		
-		Debugger.log('I am in drawActivity and Activity typeID :'+a.activityTypeID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');
+		Debugger.log('I am in drawActivity and Activity typeID :'+a.activityTypeID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView');
 		//take action depending on act type
 		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity()){
 			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a,_canvasController:cbc,_canvasBranchView:cbv});
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
-			Debugger.log('Tool or gate activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable:'+newActivity_mc,4,'drawActivity','CanvasView');
+			Debugger.log('Tool or gate activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable:'+newActivity_mc,4,'drawActivity','CanvasBranchView');
 		}
 		else if (a.isGateActivity()){
 			var newActivity_mc = activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kTop,{_activity:a,_canvasController:cbc,_canvasBranchView:cbv});
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
-			Debugger.log('Gate activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable:'+newActivity_mc,4,'drawActivity','CanvasView');
+			Debugger.log('Gate activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable:'+newActivity_mc,4,'drawActivity','CanvasBranchView');
 		}
 		else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE){
 			//get the children
 			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);
 			var newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cbc,_canvasBranchView:cbv, _locked:a.isReadOnly()});
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
-			Debugger.log('Parallel activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');
+			Debugger.log('Parallel activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView');
 		}
 		else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
 			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);
 			var newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly()});
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
-			Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');
+			Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView');
 		}
 		else if(a.isBranchingActivity()) {	
 			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a,_canvasController:cbc,_canvasBranchView:cbv});
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
-			Debugger.log('Branching activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');
+			Debugger.log('Branching activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView');
 	
 		}else{
-			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','CanvasView');
+			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','CanvasBranchView');
 		}
 
 		return true;
@@ -362,7 +387,7 @@
 	 * @return  true if successful
 	 */
 	
-	private function hideActivity(a:Activity, cm:CanvasModel):Boolean {
+	private function hideActivity(a:Activity, cm):Boolean {
 		if(!cm.isActiveView(this)) return false;
 		
 		var cbv = CanvasBranchView(this);
@@ -387,7 +412,7 @@
 	 * @param   cm - Refernce to the model
 	 * @return  Boolean - successfull
 	 */
-	private function removeActivity(a:Activity,cm:CanvasModel):Boolean{
+	private function removeActivity(a:Activity,cm):Boolean{
 		if(!cm.isActiveView(this)) return false;
 		
 		var r = cm.activitiesDisplayed.remove(a.activityUIID);
@@ -404,7 +429,7 @@
 	 * @param   cm  the canvas model.
 	 * @return  
 	 */
-	private function drawTransition(t:Transition, cm:CanvasModel):Boolean{
+	private function drawTransition(t:Transition, cm):Boolean{
 		if(!isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayer) && !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayer)) return false;
 		
 		var cbv = CanvasBranchView(this);
@@ -427,7 +452,7 @@
 	 * @param   cm  the canvas model.
 	 * @return  
 	 */
-	private function drawBranch(b:Branch, cm:CanvasModel):Boolean{
+	private function drawBranch(b:Branch, cm):Boolean{
 		
 		if(!cm.isActiveView(this)) return false;
 		
@@ -462,7 +487,7 @@
 	 * @return  true if successful
 	 */
 	
-	private function hideTransition(t:Transition, cm:CanvasModel):Boolean{
+	private function hideTransition(t:Transition, cm):Boolean{
 		if(!cm.isActiveView(this)) return false;
 		
 		var cbv = CanvasBranchView(this);
@@ -482,7 +507,7 @@
 	 * @param   cm  The canvas model
 	 * @return  
 	 */
-	private function removeTransition(t:Transition,cm:CanvasModel){
+	private function removeTransition(t:Transition,cm){
 		if(!cm.isActiveView(this)) return false;
 		
 		var r = cm.transitionsDisplayed.remove(t.transitionUIID);
@@ -499,7 +524,7 @@
 	 * @param   cm  The canvas model
 	 * @return  
 	 */
-	private function removeBranch(b:Branch,cm:CanvasModel){
+	private function removeBranch(b:Branch,cm){
 		if(!cm.isActiveView(this)) return false;
 		if(b.direction == BranchConnector.DIR_FROM_START) b.sequenceActivity.firstActivityUIID = null;
 		else if(b.direction == BranchConnector.DIR_TO_END) b.sequenceActivity.stopAfterActivity = true;
@@ -514,14 +539,16 @@
 	/**
     * Sets the size of the canvas on stage, called from update
     */
-	private function setSize(cm:CanvasModel):Void{
+	private function setSize(cm):Void{
 		var ba = cm.currentBranchingActivity;
 		
 		var s:Object = cm.getSize();
 		
 		var cx:Number = ba._x + ba.getVisibleWidth()/2;
 		var cy:Number = ba._y + ba.getVisibleHeight()/2;
 		
+		var isCanvasModel = cm instanceof CanvasModel;
+		
 		s.w -= 2*hSpace;
 		s.h -= 2*vSpace;
 		
@@ -533,7 +560,7 @@
 		grid_mc = Grid.drawGrid(gridLayer,Math.round(s.w),Math.round(s.h),V_GAP,H_GAP);
 		
 		//position bin in canvas.  
-		if(cm.activeView == this) {
+		if(cm.activeView == this && isCanvasModel) {
 			var bin = cm.getCanvas().bin;
 			bin._x = (s.w - bin._width) - 10;
 			bin._y = (s.h - bin._height) - 10;
@@ -548,7 +575,7 @@
     * Sets the position of the canvas on stage, called from update
     * @param cm Canvas model object 
     */
-	private function setPosition(cm:CanvasModel):Void{
+	private function setPosition(cm):Void{
         var ba = cm.currentBranchingActivity;
 		
 		var cx:Number = ba._x + ba.getVisibleWidth()/2;
@@ -624,24 +651,44 @@
 	}
 	
 	/**
-	 * Overrides method in abstract view to ensure cortect type of controller is returned
+	 * Overrides method in abstract view to ensure correct type of controller is returned
 	 * @usage   
 	 * @return  CanvasController
 	 */
-	public function getController():CanvasController{
+	public function getController():Object {
 		var c:Controller = super.getController();
-		return CanvasController(c);
+	/*	Debugger.log("ApplicationParent.module: "+ApplicationParent.module, Debugger.CRITICAL,'getController','CanvasBranchView');
+		if (ApplicationParent.module == "monitoring") {
+			Debugger.log("We are in the montioring module", Debugger.CRITICAL,'getController','CanvasBranchView');
+			return MonitorController(c);
+		}
+		else if (ApplicationParent.module == "authoring") {
+			Debugger.log("We are in the montioring module", Debugger.CRITICAL,'getController','CanvasBranchView');
+			return CanvasController(c);
+		}
+		else {
+			Debugger.log("Unkown module", Debugger.CRITICAL,'getController','CanvasBranchView');
+			return null;
+		}*/
+
+		return (c instanceof CanvasController) ? CanvasController(c) : MonitorController(c);
 	}
 	
 	/**
     * Returns the default controller for this view .
 	* Overrides AbstractView.defaultController()
     */
-    public function defaultController (model:Observable):Controller {
-        return new CanvasController(model);
+    public function defaultController (model):Object {
+        return (model instanceof CanvasModel) ? new CanvasController(model) : new MonitorModel(model);
     }
 	
 	public function setOpen(a:Boolean):Void {
 		_open = a;
 	}
+	
+	public function get model():Object {
+		if(_cm) return _cm;
+		if(_mm) return _mm;
+		return null;
+	}
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -rfdfbd30f964c4c55025249ddf7d0277b66af3806 -rc5ce2369b6232db2c25a966f7873f695ebf6e485
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision fdfbd30f964c4c55025249ddf7d0277b66af3806)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision c5ce2369b6232db2c25a966f7873f695ebf6e485)
@@ -426,8 +426,10 @@
 		}
 		
 		if(setupBranchView)
-			_canvasModel.openBranchActivityContent(this, false);
-					
+			if(_module == "monitoring")
+				mm.openBranchActivityContent(this, false);
+			else
+				_canvasModel.openBranchActivityContent(this, false);
 	}
 
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as
===================================================================
diff -u -rd7823922f404944822957e6c051bc0f1335a76de -rc5ce2369b6232db2c25a966f7873f695ebf6e485
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as	(.../TemplateActivity.as)	(revision d7823922f404944822957e6c051bc0f1335a76de)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as	(.../TemplateActivity.as)	(revision c5ce2369b6232db2c25a966f7873f695ebf6e485)
@@ -201,6 +201,7 @@
 	*/
 	private function draw():Void{
 		var toolTitle:String = _mainActivity.title
+		Debugger.log("_mainActivity.title: "+_mainActivity.title, Debugger.CRITICAL, "draw", "TemplateActivity");
 		if (toolTitle.length > 15){
 			toolTitle = toolTitle.substr(0, 15)+"..."
 		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
===================================================================
diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -rc5ce2369b6232db2c25a966f7873f695ebf6e485
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision 60db93c549c96bad95e890f34add10c4ef9d3d2e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision c5ce2369b6232db2c25a966f7873f695ebf6e485)
@@ -28,6 +28,7 @@
 import org.lamsfoundation.lams.authoring.DesignDataModel;
 import org.lamsfoundation.lams.authoring.Activity;
 import org.lamsfoundation.lams.authoring.cv.CanvasActivity;
+import org.lamsfoundation.lams.authoring.br.CanvasBranchView;
 import org.lamsfoundation.lams.common.ui.*;
 import org.lamsfoundation.lams.common.util.*;
 import org.lamsfoundation.lams.common.dict.*;
@@ -435,6 +436,26 @@
 		}
 	}
 	
+	public function openBranchView(ba, visible:Boolean){
+		
+		var cx:Number = ba._x + ba.getVisibleWidth()/2;
+		var cy:Number = ba._y + ba.getVisibleHeight()/2;
+		var isVisible:Boolean = (visible == null) ? true : visible;
+		
+		var _branchView_mc:MovieClip = MovieClip(monitorView.getMonitorTabView()).createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba, _open:isVisible});	
+		var branchView:CanvasBranchView = CanvasBranchView(_branchView_mc);
+		branchView.init(monitorModel,undefined);
+		
+		//Add listener to view so that we know when it's loaded
+        branchView.addEventListener('load', Proxy.create(this,viewLoaded));
+		
+		monitorModel.addObserver(branchView);
+		
+		ba.branchView = branchView;
+		
+	}
+	
+	
 	/**
 	 * Open the Help page for the selected Tool (Canvas) Activity
 	 *  
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
diff -u -rfdfbd30f964c4c55025249ddf7d0277b66af3806 -rc5ce2369b6232db2c25a966f7873f695ebf6e485
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision fdfbd30f964c4c55025249ddf7d0277b66af3806)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision c5ce2369b6232db2c25a966f7873f695ebf6e485)
@@ -39,6 +39,8 @@
 import mx.core.*
 import mx.events.*
 import mx.effects.*
+
+import org.lamsfoundation.lams.authoring.cv.CanvasModel;
 
 /**
 * Controller for the sequence library
@@ -281,42 +283,50 @@
 	}
    
 	public function activityDoubleClick(ca:Object, forTabView:String, learnerID:Number):Void{
-		var _learnerID:Number;
-		var URLToSend:String;
-		setBusy()
 		
-	    if (forTabView == "MonitorTabView"){
-			URLToSend = _root.serverURL+_root.monitoringURL+'getActivityMonitorURL&activityID='+ca.activity.activityID+'&lessonID='+_root.lessonID;
-			URLToSend += '&contentFolderID='+MonitorModel(getModel()).getSequence().contentFolderID
-		}else {
-			if (learnerID != null){
-				_learnerID = learnerID;
+		Debugger.log("ca.activity.isBranchingActivity(): "+ca.activity.isBranchingActivity(), Debugger.GEN, "activityDoubleClick", "MonitorController");
+		if(ca.activity.isBranchingActivity()) {
+			_monitorModel.openBranchActivityContent(ca, true);
+		}
+		else {
+					
+			var _learnerID:Number;
+			var URLToSend:String;
+			setBusy();
+			
+			if (forTabView == "MonitorTabView"){
+				URLToSend = _root.serverURL+_root.monitoringURL+'getActivityMonitorURL&activityID='+ca.activity.activityID+'&lessonID='+_root.lessonID;
+				URLToSend += '&contentFolderID='+MonitorModel(getModel()).getSequence().contentFolderID
 			}else {
-				_learnerID = ca.learnerID;
+				if (learnerID != null){
+					_learnerID = learnerID;
+				}else {
+					_learnerID = ca.learnerID;
+				}
+				if (forTabView == "MonitorTabViewLearner"){
+					Debugger.log('activityDoubleClick CanvasActivity:'+ca.activityID,Debugger.GEN,'activityDoubleClick','MonitorController');
+					URLToSend = _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+ca.activityID+'&userID='+_learnerID+'&lessonID='+_root.lessonID;
+				}else {
+					URLToSend = _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+ca.activity.activityID+'&userID='+_learnerID+'&lessonID='+_root.lessonID;
+				}
 			}
-			if (forTabView == "MonitorTabViewLearner"){
-				Debugger.log('activityDoubleClick CanvasActivity:'+ca.activityID,Debugger.GEN,'activityDoubleClick','MonitorController');
-				URLToSend = _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+ca.activityID+'&userID='+_learnerID+'&lessonID='+_root.lessonID;
-			}else {
-				URLToSend = _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+ca.activity.activityID+'&userID='+_learnerID+'&lessonID='+_root.lessonID;
-			}
-		}
 
-		Debugger.log('Opening url (ca.activityID) :'+URLToSend+" Opening url (ca.activityID)"+URLToSend,Debugger.CRITICAL,'openToolActivityContent','MonitorModel');
-		if (forTabView != "MonitorTabView" && forTabView != "MonitorTabViewLearner"){
-			if (ca.activityStatus == undefined){
-		
-				var alertMSG:String = Dictionary.getValue('al_doubleclick_todoactivity',[ca.learnerName, ca.activity.title]);
-				getURL("javascript:alert('"+alertMSG+"');");
-				
+			Debugger.log('Opening url (ca.activityID) :'+URLToSend+" Opening url (ca.activityID)"+URLToSend,Debugger.CRITICAL,'openToolActivityContent','MonitorModel');
+			if (forTabView != "MonitorTabView" && forTabView != "MonitorTabViewLearner"){
+				if (ca.activityStatus == undefined){
+			
+					var alertMSG:String = Dictionary.getValue('al_doubleclick_todoactivity',[ca.learnerName, ca.activity.title]);
+					getURL("javascript:alert('"+alertMSG+"');");
+					
+				}else {
+					JsPopup.getInstance().launchPopupWindow(URLToSend, 'MonitorLearnerActivity', 600, 800, true, true, false, false, false);
+				}
 			}else {
 				JsPopup.getInstance().launchPopupWindow(URLToSend, 'MonitorLearnerActivity', 600, 800, true, true, false, false, false);
 			}
-		}else {
-			JsPopup.getInstance().launchPopupWindow(URLToSend, 'MonitorLearnerActivity', 600, 800, true, true, false, false, false);
-		}
 
-	   clearBusy()
+		   clearBusy();
+	   }
 	}
    
    
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -rc5ce2369b6232db2c25a966f7873f695ebf6e485
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 60db93c549c96bad95e890f34add10c4ef9d3d2e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision c5ce2369b6232db2c25a966f7873f695ebf6e485)
@@ -23,10 +23,14 @@
 
 import org.lamsfoundation.lams.monitoring.*;
 import org.lamsfoundation.lams.monitoring.mv.*;
-import org.lamsfoundation.lams.authoring.Activity;
+import org.lamsfoundation.lams.authoring.Activity;
+import org.lamsfoundation.lams.authoring.Branch;
+import org.lamsfoundation.lams.authoring.BranchingActivity;
 import org.lamsfoundation.lams.authoring.Transition
 import org.lamsfoundation.lams.authoring.GateActivity;
-import org.lamsfoundation.lams.authoring.DesignDataModel;
+import org.lamsfoundation.lams.authoring.DesignDataModel;
+import org.lamsfoundation.lams.authoring.SequenceActivity;
+import org.lamsfoundation.lams.authoring.br.BranchConnector;
 import org.lamsfoundation.lams.common.Sequence;
 import org.lamsfoundation.lams.common.util.Observable;
 import org.lamsfoundation.lams.common.util.*;
@@ -71,6 +75,9 @@
 	private var _monitor:Monitor;
 	private var _selectedItem:Object;  // the currently selected thing - could be activity, transition etc.
 	private var _prevSelectedItem:Object;
+	
+	private var _currentBranchingActivity:Object;
+	private var _activeView:Object;
 	
 	// add model data
 	private var _activeSeq:Sequence;
@@ -121,6 +128,8 @@
 		isDesignDrawn = true;
 		_staffLoaded = false;
 		_learnersLoaded = false;
+		
+		_activeView = null;
 		
 		_activitiesDisplayed = new Hashtable("_activitiesDisplayed");
 		_transitionsDisplayed = new Hashtable("_transitionsDisplayed");
@@ -359,14 +368,13 @@
 	 * @return  
 	 */
 	public function clearDesign(tabID:Number, learner:Object){
-		
 		if (learner != null || learner != undefined){
 			var drawLearner:Object = new Object();
 			drawLearner = learner;
 		}
 	
 		//porobbably need to get a bit more granular
-		Debugger.log('Running',Debugger.GEN,'refreshDesign','MonitorModel');
+		Debugger.log('Running',Debugger.GEN,'clearDesign','MonitorModel');
 		var mmActivity_keys:Array = _activitiesDisplayed.keys();
 		var longest = mmActivity_keys.length;
 		
@@ -377,7 +385,7 @@
 		//loop through and remove activities
 		for(var i=0;i<longest;i++){
 			var keyToCheck:Number = indexArray[i];
-			var mm_activity:Activity = _activitiesDisplayed.get(keyToCheck).activity;			
+			var mm_activity:Activity = _activitiesDisplayed.get(keyToCheck).activity;
 			broadcastViewUpdate("REMOVE_ACTIVITY",mm_activity, getSelectedTab());
 		}
 		
@@ -402,7 +410,52 @@
 		return learnerTabActArr;
 	}
 	
+	public function set activeView(a:Object):Void{
+		_activeView = a;
+		
+		broadcastViewUpdate("SET_ACTIVE", a);
+	}
 	
+	public function get activeView():Object {
+		return _activeView;
+	}
+	
+	public function isActiveView(view:Object):Boolean {
+		return (activeView == view);
+	}
+	
+	public function addNewBranch(sequence:SequenceActivity, branchingActivity:BranchingActivity, isDefault:Boolean):Void {
+		Debugger.log("ok now i should be invoked", Debugger.CRITICAL, "addNewBranch", "MonitorModel");
+		Debugger.log("sequence.firstActivityUIID: "+sequence.firstActivityUIID, Debugger.CRITICAL, "addNewBranch", "MonitorModel");
+				
+		if(sequence.firstActivityUIID != null) {
+			var b:Branch = new Branch(app.getMonitor().ddm.newUIID(), BranchConnector.DIR_FROM_START, app.getMonitor().ddm.getActivityByUIID(sequence.firstActivityUIID).activityUIID, branchingActivity.activityUIID, sequence, app.getMonitor().ddm.learningDesignID);
+			app.getMonitor().ddm.addBranch(b);
+		
+			Debugger.log("sequence.stopAfterActivity: "+sequence.stopAfterActivity, Debugger.CRITICAL, "addNewBranch", "MonitorModel");
+			// TODO: review
+			if(!sequence.stopAfterActivity) {
+				b = new Branch(app.getMonitor().ddm.newUIID(), BranchConnector.DIR_TO_END, app.getMonitor().ddm.getActivityByUIID(this.getLastActivityUIID(sequence.firstActivityUIID)).activityUIID, branchingActivity.activityUIID, sequence, app.getMonitor().ddm.learningDesignID);
+			
+				app.getMonitor().ddm.addBranch(b);
+			}
+			
+			if(isDefault)
+				branchingActivity.defaultBranch = b;
+		}
+		
+		setDirty();
+	}
+	
+	private function getLastActivityUIID(activityUIID:Number):Number {
+		
+		// get next activity from transition
+		var transObj = app.getMonitor().ddm.getTransitionsForActivityUIID(activityUIID);
+		Debugger.log("transObj: "+transObj, Debugger.CRITICAL, "getLastActivityUIID", "MonitorModel");
+		
+		return (transObj.out == null) ? activityUIID : getLastActivityUIID(transObj.out.toUIID);
+	}
+	
 	private function orderDesign(activity:Activity, order:Array):Void{
 		order.push(activity);
 		
@@ -459,7 +512,7 @@
 		for(var i=0;i<indexArray.length;i++){
 			var keyToCheck:Number = indexArray[i].activityUIID;
 			var ddm_activity:Activity = _activeSeq.getLearningDesignModel().activities.get(keyToCheck);
-			
+			Debugger.log("ddm_activity.title: "+ddm_activity.title, Debugger.GEN, "drawDesign", "MonitorModel");
 			if(!(ddm_activity.parentActivityID > 0 || ddm_activity.parentUIID > 0) && !isDesignDrawn){
 				broadcastViewUpdate("DRAW_ACTIVITY", ddm_activity, tabID, drawLearner);
 			} else {
@@ -677,6 +730,23 @@
 		getURL(URLToSend,"_blank");		
 	}
 	
+	public function openBranchActivityContent(ba, visible:Boolean):Void {
+		currentBranchingActivity = ba;
+		Debugger.log("openBranchActivityContent invoked", Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
+		if(visible == null) visible = true;
+		Debugger.log("visible: " + visible, Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
+		
+		if(ba.branchView != null) {
+			Debugger.log("INIF openBranchActivityContent", Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
+			activeView = (visible) ? ba.branchView : activeView;
+			// for monitoring activeView = ba.branchView
+			ba.branchView.setOpen(visible);
+			ba.branchView.open();
+		} else { 
+			Debugger.log("INELSE openBranchActivityContent", Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
+			_monitor.openBranchView(currentBranchingActivity, visible); }
+	}
+	
 
 	public function setDirty(){
 		_isDirty = true;
@@ -947,6 +1017,14 @@
 	public function set isDragging (newisDragging:Boolean):Void{
 		_isDragging = newisDragging;
 	}
-	
 	
+	
+	public function get currentBranchingActivity():Object {
+		return _currentBranchingActivity;
+	}
+	
+	public function set currentBranchingActivity(a:Object) {
+		_currentBranchingActivity = a;
+	}
+	
 }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as
===================================================================
diff -u -r9d7f901384476ec697233e55cbd7ab643a0f3bfd -rc5ce2369b6232db2c25a966f7873f695ebf6e485
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as	(.../MonitorView.as)	(revision 9d7f901384476ec697233e55cbd7ab643a0f3bfd)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as	(.../MonitorView.as)	(revision c5ce2369b6232db2c25a966f7873f695ebf6e485)
@@ -401,6 +401,10 @@
 		return lessonTabView;
 	}
 	
+	public function getMonitorTabView():MonitorTabView{
+		return monitorTabView;
+	}
+	
 	/**
 	 * Overrides method in abstract view to ensure correct type of controller is returned
 	 * @usage   
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
diff -u -r6d8883713aa3ab5ee1cd28432101f70cfbf0d201 -rc5ce2369b6232db2c25a966f7873f695ebf6e485
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision 6d8883713aa3ab5ee1cd28432101f70cfbf0d201)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision c5ce2369b6232db2c25a966f7873f695ebf6e485)
@@ -215,6 +215,10 @@
 						mm.drawDesign(infoObj.tabID);
 						
 					}
+					break;
+				case 'SET_ACTIVE' :
+					Debugger.log('setting active :' + infoObj.updateType + " event.data: " + infoObj.data + " condition: " + (infoObj.data == this),Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorTabView');
+					transparentCover._visible = (infoObj.data == this) ? false : true;
 					break;
 				default :
 					Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorTabView');
@@ -231,12 +235,17 @@
 
 		gridLayer = this.createEmptyMovieClip("_gridLayer_mc", this.getNextHighestDepth());
 		
-		transitionLayer = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
+		transitionLayer = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
+		//branchLayer = this.createEmptyMovieClip("_branchLayer_mc", this.getNextHighestDepth());
+		
 		activityComplexLayer = this.createEmptyMovieClip("_activityComplexLayer_mc", this.getNextHighestDepth());
 		activityLayer = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
 		
 		// creates learner icon on initial draw
 		_learnerContainer_mc = this.createEmptyMovieClip("_learnerContainer_mc", this.getNextHighestDepth());
+				
+		transparentCover = this.attachMovie("Panel", "_transparentCover_mc", this.getNextHighestDepth(), {_visible: false, enabled: false, _alpha: 50});
+		transparentCover.onPress = null;
 		
 		var s:Object = mm.getSize();
 		
@@ -340,7 +349,7 @@
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
 			newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kBottom,{_activity:a,_children:children,_monitorController:mc,_monitorTabView:mtv,fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc});	
 		} else if(a.isBranchingActivity()){	
-			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc});
+			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:true});
 		} else {
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView');
 		}
@@ -416,6 +425,8 @@
 	private function drawTransition(t:Transition,mm:MonitorModel):Boolean{
 		var mtv = MonitorTabView(this);
 		var mc = getController();
+		
+		if(!isActivityOnLayer(mm.activitiesDisplayed.get(t.fromUIID), this.activityLayer) && !isActivityOnLayer(mm.activitiesDisplayed.get(t.toUIID), this.activityLayer)) return false;
 		
 		var newTransition_mc:MovieClip = transitionLayer.createChildAtDepth("MonitorTransition",DepthManager.kTop,{_transition:t,_monitorController:mc,_monitorTabView:mtv});
 		
@@ -457,6 +468,7 @@
 	private function setStyles():Void{
 		var styleObj = _tm.getStyleObject('CanvasPanel');
 		bkg_pnl.setStyle('styleName',styleObj);
+		transparentCover.setStyle('styleName', styleObj);
 	}
 	
 	/**
@@ -482,7 +494,7 @@
 		
 		bkg_pnl.setSize(cvWidth,cvHeight);
 		bkg_pnl.redraw(true);
-						
+		
 		//Create the grid.  The grid is re-drawn each time the canvas is resized.
 		var grid_mc = Grid.drawGrid(gridLayer,Math.round(cvWidth),Math.round(cvHeight), V_GAP, H_GAP);
 		gridLayer.redraw(true);