Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r7a07722b14620a94c541b0c18f36172fb69a8ced -re20a7858297a1f13e50e5c923019c2d04787c665
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 7a07722b14620a94c541b0c18f36172fb69a8ced)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision e20a7858297a1f13e50e5c923019c2d04787c665)
@@ -756,6 +756,16 @@
 		
 	}
 	
+	public function getDesignOrder(firstActivityUIID:Number):Array {
+		
+		var orderedActivityArr:Array = new Array();
+		var learnerFirstActivity:Activity = _activeSeq.getLearningDesignModel().activities.get(firstActivityUIID);
+		
+		orderDesign(learnerFirstActivity, orderedActivityArr);
+		
+		return orderedActivityArr;
+	}
+	
 	/**
 	 * get the design in the DesignDataModel and update the Monitor Model accordingly.
 	 * NOTE: Design elements are added to the DDM here.
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as
===================================================================
diff -u -r513ab798375077f65f9b7aff57e47548763ed4ac -re20a7858297a1f13e50e5c923019c2d04787c665
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision 513ab798375077f65f9b7aff57e47548763ed4ac)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision e20a7858297a1f13e50e5c923019c2d04787c665)
@@ -640,8 +640,11 @@
         this._x = p.x;
         this._y = p.y;
 	}
+	
+	public function getModel():MonitorModel {
+		return MonitorModel(model);
+	}
 	
-	
 	/**
 	 * Overrides method in abstract view to ensure cortect type of controller is returned
 	 * @usage   
@@ -657,7 +660,6 @@
     */
     public function defaultController (model:Observable):Controller {
         return new MonitorController(model);
-    }
+    }
 	
-	
 }
\ No newline at end of file
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as
===================================================================
diff -u -rc8a3ab790f64597f8a37e88e5805014136695b16 -re20a7858297a1f13e50e5c923019c2d04787c665
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision c8a3ab790f64597f8a37e88e5805014136695b16)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision e20a7858297a1f13e50e5c923019c2d04787c665)
@@ -103,8 +103,10 @@
 		
 		_tm = ThemeManager.getInstance();
 		_tip = new ToolTip();
+		
 		//Get reference to application and design data model
 		app = ApplicationParent.getInstance();
+		
 		//let it wait one frame to set up the components.
 		//this has to be set b4 the do later :)
 		if(_activity.isGateActivity()){
@@ -147,9 +149,9 @@
 			_autosize = "center";
 		}
 		if (actLabel == undefined){
-			tooltipTitle =  _activity.title
+			tooltipTitle =  _activity.title;
 		}else {
-			tooltipTitle = actLabel
+			tooltipTitle = actLabel;
 		}
 		
 		title_lbl = this.attachMovie("Label", "Label"+_activity.activityID, this.getNextHighestDepth(), {_x:LABEL_X , _y:LABEL_Y, _width:LABEL_W, _height:LABEL_H, autoSize:_autosize, styleName:styleObj});
@@ -186,6 +188,12 @@
 		draw();
 	}
 	
+	public function destroy():Void {
+		title_lbl.removeMovieClip();
+		this._visible = false;
+		this.removeMovieClip();
+	}
+	
 	/**
 	 * Does the work of laying out the screen assets.
 	 * Depending on type of Activity different bits will be shown
@@ -303,6 +311,7 @@
 			}
 			
 			_dcStartTime = now;
+			
 			hideToolTip();
 	
 	}
@@ -311,14 +320,30 @@
 	private function onRelease():Void{
 		if(!_doubleClicking){
 			Debugger.log('Releasing:'+this,Debugger.GEN,'onRelease','LearnerActivity');
-				trace("Activity ID is: "+this.activity.activityID)	
+			Debugger.log('Is sequence:'+this.activity.isSequenceActivity(),Debugger.GEN,'onRelease','LearnerActivity');
+				
+				if(this.activity.isSequenceActivity()) {
+					// insert sequence design into learner complex activity
+					Debugger.log('parent :'+this._parent._parent, Debugger.CRITICAL,'onRelease','LearnerActivity');
+					
+					var activeSequence = LearnerComplexActivity(this._parent._parent).getActiveSequence();
+					if(activeSequence == this.activity) {
+						// close current active sequence
+						LearnerComplexActivity(this._parent._parent).removeAllChildrenAndInputSequence(null);
+					} else {
+						// open sequence
+						LearnerComplexActivity(this._parent._parent).removeAllChildrenAndInputSequence(this.activity);
+					}
+				}
+				
 				controller.activityRelease(this);
 		}
 		
 	}
 	
 	private function onReleaseOutside():Void{
 		Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','LearnerActivity');
+		
 		controller.activityReleaseOutside(this);
 	}
 	
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
===================================================================
diff -u -r541d55b0149199f4ce28c91fa171d33d2350d268 -re20a7858297a1f13e50e5c923019c2d04787c665
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 541d55b0149199f4ce28c91fa171d33d2350d268)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision e20a7858297a1f13e50e5c923019c2d04787c665)
@@ -29,12 +29,12 @@
 import org.lamsfoundation.lams.authoring.SequenceActivity;
 import org.lamsfoundation.lams.authoring.DesignDataModel;
 import org.lamsfoundation.lams.authoring.cv.ICanvasActivity;
-import org.lamsfoundation.lams.learner.ls.LessonModel;
-import org.lamsfoundation.lams.learner.ls.LessonController;
+import org.lamsfoundation.lams.learner.ls.*;
 import org.lamsfoundation.lams.learner.Application;
 import org.lamsfoundation.lams.monitoring.mv.MonitorModel;
 import org.lamsfoundation.lams.monitoring.mv.MonitorController;
-import org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView;
+import org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView;
+import org.lamsfoundation.lams.monitoring.mv.tabviews.LessonTabView;
 import org.lamsfoundation.lams.common.style. *;
 
 import mx.controls. *;
@@ -51,11 +51,14 @@
 	
 	private var LABEL_W:Number = 130;
 	private var LABEL_H:Number = 22;
+	
+	private var count:Number;
 	
 	//this is set by the init object
 	private var _controller:AbstractController;
 	private var _view:AbstractView;
-	private var _tip:ToolTip;
+	private var _tip:ToolTip;
+	
 	//Set by the init obj
 	private var _activity : Activity;
 	private var _children : Array;
@@ -100,8 +103,8 @@
 		complexActivity_mc = this;
 		activeSequence = null;
 		
-		app = ApplicationParent.getInstance();
-	
+		app = ApplicationParent.getInstance();
+		
 		_visible = false;
 		
 		_tm = ThemeManager.getInstance();
@@ -150,9 +153,11 @@
 		MovieClipUtils.doLater(Proxy.create(this, draw));
 	}
 	
-	private function drawChildren(children:Array, container:Array):Void {
-		var childCoordY=0;
+	private function drawChildren(children:Array, container:Array, _count:Number):Void {
+		count = (_count != null) ? _count : 0;
 		
+		var childCoordY:Number = 0;
+		
 		for(var i=0; i<children.length; i++) {
 			var progStatus:String = Progress.compareProgressData(learner, children[i].activityID);
 			Debugger.log("progStatus: " + progStatus, Debugger.CRITICAL, "drawChildren", "LearnerComplexActivity");
@@ -163,21 +168,30 @@
 			//set the positioning co-ords
 			//learnerAct.activityStatus = progStatus;
 			
-			learnerAct._y = (i*21);
-			childCoordY = this._y + ((i+1)*21)+29 ;
+			learnerAct._y = (count*21);
+			
+			childCoordY = this._y + ((count+1)*21) + 29;
+			
 			learnerAct._visible = true;
 			
 			Debugger.log('x: ' + learnerAct._x + ' y: ' +  learnerAct._y, Debugger.CRITICAL, 'drawChildren', 'LearnerComplexActivity');
         
-			var parentAct:Activity = Application(app).getLesson().model.learningDesignModel.getActivityByUIID(Activity(children[i]).parentUIID);
+			var parentAct:Activity = model.learningDesignModel.getActivityByUIID(Activity(children[i]).parentUIID);
 			
-			if(activity.isBranchingActivity() && parentAct.isSequenceActivity()) {
+			if((activity.isBranchingActivity() && parentAct.isSequenceActivity()) || (activity.isOptionsWithSequencesActivity() && parentAct.isSequenceActivity())) {
 				/** TODO: Use for Sequence in Optional */
+				Debugger.log("setting line visibility: " + i, Debugger.CRITICAL, "drawChildren", "LearnerComplexActivity");
 				learnerAct.lineTopVisible = (i != 0) ? false : true;
 				learnerAct.lineBottomVisible = (i == children.length-1) ? true : false;
 			}
 			
 			container.push(learnerAct);
+			count++;
+			
+			if(learnerAct.activity == activeSequence) {
+				var actOrder:Array = model.getDesignOrder(activeSequence.firstActivityUIID);
+				drawChildren(actOrder, container, count);
+			}
 		}
 		
 	}
@@ -222,7 +236,9 @@
 				&& Progress.compareProgressData(learner, _children[i].activityID) == 'completed_mc')
 				
 		}*/
+		
 		Debugger.log("refreshing children: " + children_mc.length, Debugger.CRITICAL, "checkIfSequenceActive", "LearnerComplexActivity");
+		
 		for(var i=0; i<children_mc.length; i++) {
 			children_mc[i].refresh();
 	
@@ -235,32 +251,38 @@
 	}
 	
 	private function removeAllChildren():Void {
+		
+		Debugger.log("removing children len: " + children_mc.length, Debugger.CRITICAL, "removeAllChildren", "LearnerComplexActivity");
+		
 		for(var i=0; i<children_mc.length;i++){
-			children_mc[i].removeMovieClip();
+			Debugger.log("removing children: " + children_mc[i].activity.activityUIID, Debugger.CRITICAL, "removeAllChildren", "LearnerComplexActivity");
+			LearnerActivity(children_mc[i]).destroy();
 		}
+		
+		children_mc = new Array();
 	}
 	
 	/** TODO: Use for Sequence in Optional */
 	private function removeAllChildrenAndLoadSequences(activity:Activity):Void {
 		activeSequence = null;
+		removeAllChildren();
+		
 		children_mc = new Array();
 		
-		removeAllChildren();
 		drawChildren(_children, children_mc);
 		
 		MovieClipUtils.doLater(Proxy.create(this, draw));
 	}
 	
 	/** TODO: Use for Sequence in Optional */
-	private function removeAllChildrenAndInputSequence(activity:SequenceActivity):Void {
+	public function removeAllChildrenAndInputSequence(activity:SequenceActivity):Void {
 		activeSequence = activity;
-		children_mc = new Array();
-		
-		var actOrder:Array = Application(app).getLesson().model.getDesignOrder(activity.firstActivityUIID);
-		
+		redrawComplex();
+	}
+	
+	private function redrawComplex():Void {
 		removeAllChildren();
-		drawChildren(actOrder, children_mc);
-		
+		drawChildren(_children, children_mc);
 		MovieClipUtils.doLater(Proxy.create(this, draw));
 	}
 	
@@ -511,5 +533,9 @@
 	
 	public function get learnerID():Number{
 		return learner.getLearnerId();
+	}
+	
+	public function getActiveSequence():SequenceActivity {
+		return activeSequence;
 	}
 }
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r541d55b0149199f4ce28c91fa171d33d2350d268 -re20a7858297a1f13e50e5c923019c2d04787c665
Binary files differ
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rbfb4d9a9b1992d55a06627289b169c9188ab12ff -re20a7858297a1f13e50e5c923019c2d04787c665
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rbfb4d9a9b1992d55a06627289b169c9188ab12ff -re20a7858297a1f13e50e5c923019c2d04787c665
Binary files differ