Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as
===================================================================
diff -u -r86aae1b21277f5fc950a0303361b63fd7adde39c -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	(.../ComplexActivity.as)	(revision 86aae1b21277f5fc950a0303361b63fd7adde39c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	(.../ComplexActivity.as)	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -42,7 +42,9 @@
 	private var _optionsInstructions:String;
 	
 	private var _firstActivityUIID:Number;
+	
 	private var _isSequenceBased:Boolean;
+	private var _noSequences:Number;
 	
 	function ComplexActivity(activityUIID:Number){
 		super(activityUIID);
@@ -169,5 +171,13 @@
 	public function set isSequenceBased(a:Boolean):Void{
 		_isSequenceBased = a;
 	}
+	
+	public function get noSequences():Number{
+		return _noSequences;
+	}
+	
+	public function set noSequences(a:Number):Void{
+		_noSequences = a;
+	}
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63 -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -1064,9 +1064,12 @@
 		var target = null;
 		var sequence = null;
 		
+		var hasBranches:Boolean = false;
+		
 		for(var i=0; i<br.length;i++){
 			if(br[i].targetUIID == UIID || br[i].hubUIID == UIID || br[i].sequenceActivity.activityUIID == UIID){
 				myBranches.push(br[i]);
+				hasBranches = true;
 			}
 			if(target != null && hub != null){
 					break;
@@ -1088,6 +1091,7 @@
 		branchObj.target = target;
 		branchObj.sequence = sequence;
 		branchObj.hub = hub;
+		branchObj.hasBranches = hasBranches;
 		return branchObj;
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r86aae1b21277f5fc950a0303361b63fd7adde39c -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 86aae1b21277f5fc950a0303361b63fd7adde39c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -50,12 +50,13 @@
 	*
 	* @param   cm   The model to modify.
 	*/
-	public function CanvasController (cm:Observable) {
-		super (cm);
+	public function CanvasController(cm:Observable) {
+		super(cm);
 		
 		//have to do an upcast
 		_canvasModel = CanvasModel(getModel());
 		_canvasView = CanvasView(getView());
+
 		_pi = new PropertyInspector();
 		app = Application.getInstance();
 		_isBusy = false;
@@ -150,22 +151,34 @@
 				//if we are on the optional Activity remove this activity from canvas and assign it a parentID of optional activity and place it in the optional activity window.
 				for (var i=0; i<optionalOnCanvas.length; i++){
 					if(ca.activity.activityUIID != optionalOnCanvas[i].activity.activityUIID ){
+						
 						if(ca.hitTest(optionalOnCanvas[i])){
 							if(optionalOnCanvas[i].locked == true){
-								var msg:String = Dictionary.getValue('act_lock_chk');
+								activitySnapBack(ca);
+								var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('act_lock_chk') : Dictionary.getValue('act_seq_lock_chk');
 								LFMessage.showMessageAlert(msg);
-							}else{
-								if(ca.activity.isGateActivity()){
+							} else {
+								if(ca.activity.isGateActivity() && !optionalOnCanvas[i].activity.isSequenceBased){
 									activitySnapBack(ca);
 									var msg:String = Dictionary.getValue('cv_gateoptional_hit_chk');
 									LFMessage.showMessageAlert(msg);
-								}else {
-									if(_canvasModel.getCanvas().ddm.getTransitionsForActivityUIID(ca.activity.activityUIID).hasTrans){
+								} else {
+									if(_canvasModel.getCanvas().ddm.getTransitionsForActivityUIID(ca.activity.activityUIID).hasTrans) {
 										activitySnapBack(ca);
-										var msg:String = Dictionary.getValue('cv_invalid_optional_activity', [ca.activity.title]);
+										var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('cv_invalid_optional_activity', [ca.activity.title]) : Dictionary.getValue('cv_invalid_optional_seq_activity', [ca.activity.title]);
 										LFMessage.showMessageAlert(msg);
-									}else {
-										_canvasModel.addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ca)
+									} else if(_canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID).hasBranches) {
+										activitySnapBack(ca);
+										var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('cv_invalid_optional_activity_no_branches', [ca.activity.title]) : Dictionary.getValue('cv_invalid_optional_seq_activity_no_branches', [ca.activity.title]);
+										LFMessage.showMessageAlert(msg);
+									} else if(optionalOnCanvas[i].activity.isSequenceBased && optionalOnCanvas[i].activity.noSequences <= 0) {
+										activitySnapBack(ca);
+										var msg:String = Dictionary.getValue('ta_iconDrop_optseq_error_msg');
+										LFMessage.showMessageAlert(msg);
+									} else {
+										_canvasModel.addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ca, false);
+										var newChildren:Array = _canvasModel.getCanvas().ddm.getComplexActivityChildren(optionalOnCanvas[i].activity.activityUIID);
+										optionalOnCanvas[i].updateChildren(newChildren);
 									}
 								}
 							}						
@@ -241,19 +254,23 @@
 			}
 			
 			clearAllSelections(optionalOnCanvas, parallelOnCanvas);
+			
 			_canvasModel.selectedItem = ca;	
 			_canvasModel.setDirty();
+			
 			Debugger.log('ca.activity.xCoord:'+ca.activity.xCoord,Debugger.GEN,'activityRelease','CanvasController');
 			
 			
 		} else {
 			if (_canvasModel.isTransitionToolActive()){
 				_canvasModel.getCanvas().stopTransitionTool();
 				_canvasModel.activeView.removeTempTrans();
+				
 				new LFError("You cannot create a Transition between the same Activities","addActivityToTransition",this);
 			}
 			
 			clearAllSelections(optionalOnCanvas, parallelOnCanvas);
+			
 			_canvasModel.selectedItem = ca;
 			_canvasModel.setDirty();
 		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r86aae1b21277f5fc950a0303361b63fd7adde39c -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 86aae1b21277f5fc950a0303361b63fd7adde39c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -24,6 +24,7 @@
 import org.lamsfoundation.lams.common.*;
 import org.lamsfoundation.lams.authoring.cv.*;
 import org.lamsfoundation.lams.authoring.br.BranchConnector;
+import org.lamsfoundation.lams.authoring.br.CanvasBranchView;
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.common.util.*;
 import org.lamsfoundation.lams.common.ui.*;
@@ -33,50 +34,18 @@
 /*
 * Model for the Canvas
 */
-class org.lamsfoundation.lams.authoring.cv.CanvasModel extends Observable {
-	
+class org.lamsfoundation.lams.authoring.cv.CanvasModel extends org.lamsfoundation.lams.authoring.cv.CanvasSuperModel {
+
 	public static var TRANSITION_TOOL:String = "TRANSITION";  //activie tool ID strings definition
 	public static var OPTIONAL_TOOL:String = "OPTIONAL";
 	public static var OPTIONAL_SEQ_TOOL:String = "OPTIONAL_SEQ";
 	public static var GATE_TOOL:String = "GATE";
 	public static var GROUP_TOOL:String = "GROUP";
 	public static var BRANCH_TOOL:String = "BRANCH";
-	private var _defaultGroupingTypeID;
-	private var __width:Number;
-	private var __height:Number;
-	private var __x:Number;
-	private var __y:Number;
-	private var _piHeight:Number;
-	private var infoObj:Object;
 	
-	private var _cv:Canvas;
-	private var _ddm:DesignDataModel;
-	private var optionalCA:CanvasOptionalActivity;
-	
-	//UI State variabls
-	private var _isDirty:Boolean;
-	private var _activeTool:String;
-	private var _selectedItem:Object;  // the currently selected thing - could be activity, transition etc.
-	private var _prevSelectedItem:Object;
-	private var _isDrawingTransition:Boolean;
-	private var _connectionActivities:Array;
-	private var _isDragging:Boolean;
-	private var _importing:Boolean;
-	private var _editing:Boolean;
-	private var _autoSaveWait:Boolean;
-	
-	//these are hashtables of mc refs MOVIECLIPS (like CanvasActivity or CanvasTransition)
-	//each on contains a reference to the emelment in the ddm (activity or transition)
-	private var _activitiesDisplayed:Hashtable;
-	private var _transitionsDisplayed:Hashtable;
-	private var _branchesDisplayed:Hashtable;
-	
-	private var _currentBranchingActivity:Object;
-	private var _activeView:Object;
-	
-	private var _lastBranchActionType:Number;
 	public static var OPEN_FROM_FILE:Number = 0;
 	public static var ADD_FROM_TEMPLATE:Number = 1;
+	
 
 	//These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
@@ -86,97 +55,14 @@
 	/**
 	* Constructor.
 	*/
-	public function CanvasModel (cv:Canvas){
+	public function CanvasModel(cv:Canvas){
+		super(cv);
 		
 		 //Set up this class to use the Flash event delegation model
         EventDispatcher.initialize(this);
-		_cv = cv;
-		_ddm = new DesignDataModel();
-		_activitiesDisplayed = new Hashtable("_activitiesDisplayed");
-		_transitionsDisplayed = new Hashtable("_transitionsDisplayed");
-		_branchesDisplayed = new Hashtable("_branchesDisplayed");
 		
-		_activeTool = "none";
-		_activeView = null;
-		_currentBranchingActivity = null;
-		_lastBranchActionType = null;
-		
-		_autoSaveWait = false;
-		_connectionActivities = new Array();
-		_defaultGroupingTypeID = Grouping.RANDOM_GROUPING;
 	}
-
 	
-	/**
-	* Used by application to set the size
-	* @param width The desired width
-	* @param height the desired height
-	*/
-	public function setSize(width:Number, height:Number):Void{
-		__width = width;
-		__height = height;
-		
-		broadcastViewUpdate("SIZE");
-		
-	}
-	
-	/**
-	* Used by View to get the size
-	* @returns Object containing width(w) & height(h).  obj.w & obj.h
-	*/
-	public function getSize():Object{
-		var s:Object = {};
-		s.w = __width;
-		s.h = __height;
-		return s;
-	}
-	
-	/**
-	* Used by application to set the Position
-	* @param x
-	* @param y
-	*/
-	public function setPosition(x:Number, y:Number):Void{
-		__x=x;
-		__y=y;
-		
-		broadcastViewUpdate("POSITION");
-	}
-	
-	/**
-	* Used by View to get the size
-	* @returns Object containing width(w) & height(h).  obj.w & obj.h
-	*/
-	public function getPosition():Object{
-		var p:Object = {};
-		p.x = __x;
-		p.y = __y;
-		return p;
-	}
-	
-	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 setPIHeight(h:Number){
-		_piHeight = h;
-		Application.getInstance().onResize();
-	}
-	
-	public function getPIHeight(){
-		return _piHeight;
-	}
-	
 	public function setDirty(){
 		_isDirty = true;
 		
@@ -189,70 +75,6 @@
 		refreshDesign();
 	}
 	
-	////////////////////////////////////////////////////////////////////////////////////////////
-	///////////////////////       TRANSITIONS         //////////////////////////////////////////
-	////////////////////////////////////////////////////////////////////////////////////////////
-	
-	/**
-	 * Starts the transition tool
-	 * @usage   
-	 * @return  
-	 */
-	public function startTransitionTool():Void{
-		Debugger.log('Starting transition tool',Debugger.GEN,'startTransitionTool','CanvasModel');			
-		resetTransitionTool();
-		_activeTool = TRANSITION_TOOL;
-	}
-	
-	/**
-	 * Stops it
-	 * @usage   
-	 * @return  
-	 */
-	 
-	public function stopTransitionTool():Void{
-		Debugger.log('Stopping transition tool',Debugger.GEN,'stopTransitionTool','CanvasModel');
-		resetTransitionTool();
-		_activeTool = "none";
-	}
-	
-	public function findOptionalActivities():Array{
-		var actOptional:Array = new Array();
-		var k:Array = _activitiesDisplayed.values();
-		for (var i=0; i<k.length; i++){
-			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){
-				actOptional.push(k[i]);
-			}
-			
-		}
-		return actOptional;
-	}
-	
-	public function findParallelActivities():Array{
-		
-		var actParallel:Array = new Array();
-		var k:Array = _activitiesDisplayed.values();
-		for (var i=0; i<k.length; i++){
-			if (k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
-				actParallel.push(k[i]);
-			}
-			
-		}
-		return actParallel;
-	}
-	
-	public function findTopLevelActivities():Array{
-		var actParent:Array = new Array();
-		var k:Array = _activitiesDisplayed.values();
-		for (var i=0; i<k.length; i++){
-			if (k[i].activity.parentUIID == null){
-				actParent.push(k[i]);
-			}
-			
-		}
-		return actParent;
-	}
-	
 	public function lockAllComplexActivities():Void{
 		Debugger.log("Locking all Complex Activities", Debugger.GEN, "lockAllComplexActivities", "CanvasModel");
 		var k:Array = _activitiesDisplayed.values();
@@ -469,7 +291,7 @@
 		
 		optAct.learningDesignID = _cv.ddm.learningDesignID;
 		optAct.activityTypeID = Activity.OPTIONAL_ACTIVITY_TYPE;
-		optAct.title = Dictionary.getValue('opt_activity_title');
+		optAct.title = (!isSequence) ? Dictionary.getValue('opt_activity_title') : Dictionary.getValue('opt_activity_seq_title');
 		optAct.groupingSupportType = Activity.GROUPING_SUPPORT_OPTIONAL;
 		optAct.activityCategoryID = Activity.CATEGORY_SYSTEM;
 		optAct.yCoord = pos.y;
@@ -498,11 +320,14 @@
 	 * @param   ca       (reference of the canvas activity to which parentID is assigned)
 	 * @return  
 	 */
-	public function addParentToActivity(parentID, ca:Object){
+	public function addParentToActivity(parentID, ca:Object, doRemoveParent:Boolean){
 		ca.activity.parentUIID = parentID;
+		
 		Debugger.log('ParentId of '+ca.activity.activityUIID+ 'Is : '+ca.activity.parentUIID,Debugger.GEN,'addActivityToTransition','CanvasModel');
+		
 		removeActivity(ca.activity.activityUIID);
-		removeActivity(parentID);
+		if(doRemoveParent) removeActivity(parentID);
+		
 		setDirty();
 	}
 	
@@ -519,11 +344,14 @@
 	public function removeOptionalCA(ca:Object, parentID){
 		//lets do a test to see if we got the canvas
 		Debugger.log('Removed Child '+ca.activity.activityUIID+ 'from : '+ca.activity.parentUIID,Debugger.GEN,'removeOptionalCA','CanvasModel');
-		ca.activity.parentUIID = null;
+		
+		ca.activity.parentUIID = (activeView instanceof CanvasBranchView) ? activeView.defaultSequenceActivity.activityUIID : null;
 		ca.activity.orderID = null;
-		ca.activity.parentActivityID = null;
+		ca.activity.parentActivityID = (activeView instanceof CanvasBranchView) ? activeView.defaultSequenceActivity.activityID : null;
+		
 		removeActivity(ca.activity.activityUIID);
 		removeActivity(parentID);
+		
 		setDirty();
 		
 	}
@@ -842,23 +670,7 @@
 		return true;
 	}
 	
-	/**
-	 * Resets the transition tool to its starting state, e.g. if one chas been created or the user released the mouse over an unsuitable clip
-	 * @usage   
-	 */
-	public function resetTransitionTool():Void{
-		//clear the transitions array
-		_connectionActivities = new Array();
-	}
 	
-	public function isTransitionToolActive():Boolean{
-	   if(_activeTool == TRANSITION_TOOL){
-		   return true;
-		}else{
-			return false;
-		}
-	}
-	
 	/**
 	 * Forms a transition	
 	 * @usage   
@@ -931,7 +743,7 @@
 		var ca = _activitiesDisplayed.get(activityUIID);
 		
 		if(sequence.activityUIID != ca.activity.parentUIID) {
-			addParentToActivity(sequence.activityUIID, ca);
+			addParentToActivity(sequence.activityUIID, ca, true);
 		} else {
 			return true;
 		}
@@ -1365,236 +1177,4 @@
 		_lastBranchActionType = null;
 	}
 	
-	public function get currentBranchingActivity():Object {
-		return _currentBranchingActivity;
-	}
-	
-	public function set currentBranchingActivity(a:Object) {
-		_currentBranchingActivity = a;
-	}
-	
-	/**
-    * Notify registered listeners that a data model change has happened
-    */
-    public function broadcastViewUpdate(_updateType,_data){
-        dispatchEvent({type:'viewUpdate',target:this,updateType:_updateType,data:_data});
-    }
-	
-	/**
-	 * Returns a reference to the Activity Movieclip for the UIID passed in.  Gets from _activitiesDisplayed Hashable
-	 * @usage   
-	 * @param   UIID 
-	 * @return  Activity Movie clip
-	 */
-	public function getActivityMCByUIID(UIID:Number):MovieClip{
-		
-		var a_mc:MovieClip = _activitiesDisplayed.get(UIID);
-		return a_mc;
-	}
-
-	//Getters n setters
-	
-	public function getCanvas():Canvas{
-		return _cv;
-	}
-	
-	public function get activitiesDisplayed():Hashtable{
-		return _activitiesDisplayed;
-	}
-	
-	public function get transitionsDisplayed():Hashtable{
-		return _transitionsDisplayed;
-	}
-	
-	public function get branchesDisplayed():Hashtable{
-		return _branchesDisplayed;
-	}
-	
-	
-	public function get isDrawingTransition():Boolean{
-		return _isDrawingTransition;
-	}
-	/**
-	 * 
-	 * @usage   
-	 * @param   newactivetool 
-	 * @return  
-	 */
-	public function set activeTool (newactivetool:String):Void {
-		_activeTool = newactivetool;
-	}
-	
-	/**
-	 * 
-	 * @usage   
-	 * @param   newactivetool 
-	 * @return  
-	 */
-	public function setActiveTool (newactivetool):Void {
-		_activeTool = newactivetool;
-	}
-	/**
-	 * 
-	 * @usage   
-	 * @return  
-	 */
-	public function get activeTool ():String {
-		return _activeTool;
-	}
-	
-	private function setSelectedItem(newselectItem:Object){
-		prevSelectedItem = _selectedItem;
-		_selectedItem = newselectItem;
-		broadcastViewUpdate("SELECTED_ITEM");
-	}
-
-	public function setSelectedItemByUIID(uiid:Number){
-		var selectedCanvasElement;
-		if(_activitiesDisplayed.get(uiid) != null){
-			selectedCanvasElement = _activitiesDisplayed.get(uiid);
-		}else{
-			selectedCanvasElement = _transitionsDisplayed.get(uiid);
-		}
-		setSelectedItem(selectedCanvasElement);
-		
-	}
-	
-	/**
-	 * 
-	 * @usage   
-	 * @param   newselectItem 
-	 * @return  
-	 */
-	public function set selectedItem (newselectItem:Object):Void {
-		setSelectedItem(newselectItem);
-	}
-	
-	public function set prevSelectedItem (oldselectItem:Object):Void {
-		_prevSelectedItem = oldselectItem;
-	}
-	
-	public function get prevSelectedItem():Object {
-		return _prevSelectedItem;
-	}
-	
-	/**
-	 * 
-	 * @usage   
-	 * @return  
-	 */
-	public function get selectedItem ():Object {
-		return _selectedItem;
-	}
-	
-	public function get connectionActivities():Array {
-		return _connectionActivities;
-	}
-	
-	/**
-	 * 
-	 * @usage   
-	 * @return  
-	 */
-	public function get isDragging ():Boolean {
-		return _isDragging;
-	}
-	
-	/**
-	 * 
-	 * @usage   
-	 * @return  
-	 */
-	public function set isDragging (newisDragging:Boolean):Void{
-		_isDragging = newisDragging;
-	}
-	
-	public function get importing():Boolean {
-		return _importing;
-	}
-	
-	public function set importing(importing:Boolean):Void {
-		_importing = importing;
-	}
-	
-	public function get editing():Boolean {
-		return _editing;
-	}
-	
-	public function set editing(editing:Boolean):Void {
-		_editing = editing;
-	}
-	
-	public function get autoSaveWait():Boolean {
-		return _autoSaveWait;
-	}
-	
-	public function set autoSaveWait(autoSaveWait:Boolean):Void {
-		_autoSaveWait = autoSaveWait;
-	}
-	
-	public function set lastBranchActionType(a:Number):Void {
-		_lastBranchActionType = a;
-	}
-	
-	public function get lastBranchActionType():Number {
-		return _lastBranchActionType;
-	}
-	
-	public function findParent(a:Activity, b:Activity):Boolean {
-		if(a.parentUIID == b.activityUIID)
-			return true;
-		else if(a.parentUIID == null)
-			return false;
-		else
-			return findParent(_cv.ddm.getActivityByUIID(a.parentUIID), b);
-    }
-	
-	public function clearAllBranches(a:Activity):Void {
-		var branch_keys:Array = _branchesDisplayed.keys();
-		var act_keys:Array = _activitiesDisplayed.keys();
-		Debugger.log("clearing branches: " + branch_keys.length, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
-		
-			
-		for(var i=0; i<branch_keys.length; i++) {
-			var branch:Branch = _branchesDisplayed.get(branch_keys[i]).branch;
-			
-			Debugger.log("branch: " + branch.branchUIID, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
-		
-			if(branch.sequenceActivity.parentUIID == a.activityUIID) {
-				for(var j=0; j<act_keys.length; j++) {
-					
-					Debugger.log("activity parent: " + _activitiesDisplayed.get(act_keys[i]).activity.parentUIID, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
-					Debugger.log("seq uiid: " + branch.sequenceActivity.activityUIID, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
-					
-					if(_activitiesDisplayed.get(act_keys[i]).activity.parentUIID == branch.sequenceActivity.activityUIID) {
-						_activitiesDisplayed.remove(act_keys[i]);
-					}
-		
-				}
-			}
-		}
-		
-	}
-	
-	public function clearAllElements():Void {
-		var branch_keys:Array = _branchesDisplayed.keys();
-		var act_keys:Array = _activitiesDisplayed.keys();
-		var trans_keys:Array = _transitionsDisplayed.keys();
-		
-		for(var i=0; i<branch_keys.length; i++)
-			_branchesDisplayed.get(branch_keys[i]).removeMovieClip();
-		for(var i=0; i<trans_keys.length; i++)
-			_transitionsDisplayed.get(trans_keys[i]).removeMovieClip();
-		for(var i=0; i<act_keys.length; i++) {
-			if(_activitiesDisplayed.get(act_keys[i]).activity.isBranchingActivity())
-				_activitiesDisplayed.get(act_keys[i]).branchView.removeMovieClip();
-			_activitiesDisplayed.get(act_keys[i]).removeMovieClip();
-			
-		}
-		
-		_branchesDisplayed.clear();
-		_transitionsDisplayed.clear();
-		_activitiesDisplayed.clear();
-		
-	}
 }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -ra51a3578f817472254bb2e84b301122a6d8268cd -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision a51a3578f817472254bb2e84b301122a6d8268cd)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -37,6 +37,9 @@
 * This is the UI / view representation of a complex (Optional) activity
 */
 class org.lamsfoundation.lams.authoring.cv.CanvasOptionalActivity extends MovieClip implements ICanvasActivity{
+
+	public static var ACT_TYPE:Number = 0;
+	public static var SEQ_TYPE:Number = 1;
 
 	private var CHILD_OFFSET_X : Number = 8;
 	private var CHILD_OFFSET_Y : Number = 57;
@@ -50,35 +53,39 @@
 	private var learnerContainer:MovieClip;
 	
 	//this is set by the init object
-	private var _canvasController : CanvasController;
-	private var _canvasView : CanvasView;
-	private var _monitorController : MonitorController;
-	private var _monitorTabView : MonitorTabView;
+	private var _canvasController:CanvasController;
+	private var _canvasView:CanvasView;
+	private var _monitorController:MonitorController;
+	private var _monitorTabView:MonitorTabView;
 	private var _ca = ComplexActivity;
 	
 	//Set by the init obj
-	private var _activity : Activity;
-	private var _children : Array;
-	private var children_mc : Array 
-	private var panelHeight : Number;
-	private var actMinOptions: Number;
-	private var actMaxOptions: Number;
+	private var _activity:Activity;
+	private var _children:Array;
+	private var children_mc:Array 
+	private var panelHeight:Number;
+	private var actMinOptions:Number;
+	private var actMaxOptions:Number;
+	private var noSeqActivities:Number;
 	
 	//refs to screen items:
-	private var container_pnl : Panel;
-	private var header_pnl : Panel;
-	private var act_pnl : Panel;
-	private var title_lbl : Label;
-	private var actCount_lbl : Label;
+	private var container_pnl:Panel;
+	private var header_pnl:Panel;
+	private var act_pnl:Panel;
+	private var title_lbl:Label;
+	private var actCount_lbl:Label;
+	
+	// type
+	private var _type:Number;
 	
 	//locals
-	private var childActivities_mc : MovieClip;
-	private var optionalActivity_mc : MovieClip;
-	private var clickTarget_mc : MovieClip;
-	private var padlockClosed_mc : MovieClip;
-	private var padlockOpen_mc : MovieClip;
-	private var _dcStartTime : Number = 0;
-	private var _doubleClicking : Boolean;
+	private var childActivities_mc:MovieClip;
+	private var optionalActivity_mc:MovieClip;
+	private var clickTarget_mc:MovieClip;
+	private var padlockClosed_mc:MovieClip;
+	private var padlockOpen_mc:MovieClip;
+	private var _dcStartTime:Number = 0;
+	private var _doubleClicking:Boolean;
 	
 	// Only for Monitor Optional Container children
 	private var fromModuleTab:String;
@@ -105,59 +112,114 @@
 		_visibleWidth = container_pnl._width;
 		_ca = new ComplexActivity(_activity.activityUIID)
 		_activity.activityCategoryID = Activity.CATEGORY_SYSTEM;
+		
+		_type = (ComplexActivity(_activity).isSequenceBased) ? SEQ_TYPE : ACT_TYPE;
 		
-		MovieClipUtils.doLater (Proxy.create (this, init));
+		MovieClipUtils.doLater(Proxy.create(this, init));
 	}
 	
 	public function init():Void {
-		clickTarget_mc.onPress = Proxy.create (this, localOnPress);
-		clickTarget_mc.onRelease = Proxy.create (this, localOnRelease);
-		clickTarget_mc.onReleaseOutside = Proxy.create (this, localOnReleaseOutside);
-		
-		actMinOptions = _ca.minOptions;
-		actMaxOptions = _ca.maxOptions;
-		
-		showStatus(false);
-		
-		CHILD_OFFSET_X = 8;
-		CHILD_OFFSET_Y = 57;
-		
-		for (var j=0; j<children_mc.length; j++){
-			children_mc[j].removeMovieClip();
+		switch(_type) {
+			case ACT_TYPE:
+				initActivityType();
+				break;
+			case SEQ_TYPE:
+				initSequenceType();
+				break;
+			default:
+		}
+	}
+	
+	public function initActivityType():Void {
+		
+		clickTarget_mc.onPress = Proxy.create (this, localOnPress);
+		clickTarget_mc.onRelease = Proxy.create (this, localOnRelease);
+		clickTarget_mc.onReleaseOutside = Proxy.create (this, localOnReleaseOutside);
+		
+		actMinOptions = _ca.minOptions;
+		actMaxOptions = _ca.maxOptions;
+		
+		showStatus(false);
+		
+		CHILD_OFFSET_X = 8;
+		CHILD_OFFSET_Y = 57;
+		
+		removeAllChildren();
+		
+		children_mc = new Array();
+		
+		for (var i=0; i < _children.length; i++)		{
+			if(fromModuleTab == "monitorMonitorTab"){
+				children_mc[i] = childActivities_mc.attachMovie ("CanvasActivity", "CanvasActivity"+i, childActivities_mc.getNextHighestDepth (), {_activity:_children [i] , _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer});
+			}else {
+				children_mc[i] = childActivities_mc.attachMovie ("CanvasActivity", "CanvasActivity"+i, childActivities_mc.getNextHighestDepth (), {_activity:_children [i] , _canvasController:_canvasController, _canvasView:_canvasView});
+			}
+			
+			//set the positioning co-ords
+			children_mc[i].activity.xCoord = CHILD_OFFSET_X;
+			children_mc[i].activity.yCoord = CHILD_OFFSET_Y + (i * CHILD_INCRE);
+			
+			children_mc[i]._visible = true;
+
 		}
-		
-		children_mc = new Array();
-		
-		for (var i = 0; i < _children.length; i ++)		{
-			if (fromModuleTab == "monitorMonitorTab"){
-				children_mc [i] = childActivities_mc.attachMovie ("CanvasActivity", "CanvasActivity"+i, childActivities_mc.getNextHighestDepth (), {_activity:_children [i] , _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer});
-			}else {
-				children_mc [i] = childActivities_mc.attachMovie ("CanvasActivity", "CanvasActivity"+i, childActivities_mc.getNextHighestDepth (), {_activity:_children [i] , _canvasController:_canvasController, _canvasView:_canvasView});
-				
+		
+		MovieClipUtils.doLater(Proxy.create(this, draw));
+		
+	}
+	
+	public function initSequenceType():Void {
+		clickTarget_mc.onPress = Proxy.create(this, localOnPress);
+		clickTarget_mc.onRelease = Proxy.create(this, localOnRelease);
+		clickTarget_mc.onReleaseOutside = Proxy.create(this, localOnReleaseOutside);
+		
+		showStatus(false);
+		
+		CHILD_OFFSET_X = 8;
+		CHILD_OFFSET_Y = 57;
+		
+		removeAllChildren();
+		
+		children_mc = new Array();
+		
+		for(var i=0; i < _children.length; i++) {
+			if(_children.isSequenceActivity()) {
+				if(fromModuleTab == "monitorMonitorTab")
+					children_mc[i] = childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer});
+				else
+					children_mc[i] = childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _canvasController:_canvasController, _canvasView:_canvasView});
 			}
-			
-			//set the positioning co-ords
-			children_mc [i].activity.xCoord = CHILD_OFFSET_X;
-			children_mc [i].activity.yCoord = CHILD_OFFSET_Y + (i * CHILD_INCRE);
-			
-			children_mc [i]._visible = true;
-
-		}
-		
-		MovieClipUtils.doLater (Proxy.create (this, draw));
+		}
+		
+		ComplexActivity(_activity).noSequences = _children.length;
+		
+		MovieClipUtils.doLater(Proxy.create(this, draw));
+	}
+	
+	public function removeAllChildren():Void {
+		for(var j=0; j<children_mc.length; j++)
+			children_mc[j].removeMovieClip();
 	}
+	
+	public function updateChildren(newChildren:Array):Void {
+		_visible = false;
+		_children = newChildren;
+		init();
+	}
 	
 	public function refreshChildren():Void {
-		for (var i = 0; i < children_mc.length; i ++)		{
+		for(var i = 0; i < children_mc.length; i ++)		{
 			children_mc[i].setSelected(false);
 		}
+	}
+	
+	public function getLastItem():Number {
+		return Number(children_mc[children_mc.length - 1].activity.activityUIID);
 	}
 	
 	private function showStatus(isVisible:Boolean){
 		completed_mc._visible = isVisible;
 		current_mc._visible = isVisible;
 		todo_mc._visible = isVisible;
-		
 	}
 	
 	public function setSelected(isSelected){}
@@ -217,10 +279,10 @@
 		setStyles();
 		
 		//write text
-		title_lbl.text = _activity.title 		//Dictionary.getValue('opt_activity_title'); //'Optional Activities'
-		//_activity.title = 'Optional Activities';
-		actCount_lbl.text = _children.length +" - "+ Dictionary.getValue('lbl_num_activities'); //" activities";
+		title_lbl.text = _activity.title;
 		
+		actCount_lbl.text = (type == ACT_TYPE) ? Dictionary.getValue('lbl_num_activities', [children_mc.length]) : Dictionary.getValue('lbl_num_sequences', [children_mc.length]);
+		
 		//position the container (this)
 		if(numOfChildren > 1){
 			container_pnl._height = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE);
@@ -377,5 +439,9 @@
 			_canvasController = a;
 		else
 			_monitorController = a;
+	}
+	
+	public function get type():Number {
+		return _type;
 	}
 }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(revision 0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -0,0 +1,502 @@
+/****************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+
+import org.lamsfoundation.lams.common.*;
+import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.authoring.br.BranchConnector;
+import org.lamsfoundation.lams.authoring.br.CanvasBranchView;
+import org.lamsfoundation.lams.authoring.*;
+import org.lamsfoundation.lams.common.util.*;
+import org.lamsfoundation.lams.common.ui.*;
+import org.lamsfoundation.lams.common.dict.*;
+import mx.events.*;
+
+
+/**
+ *
+ * @author
+ * @version
+ **/
+class org.lamsfoundation.lams.authoring.cv.CanvasSuperModel extends Observable {
+	
+	private var _defaultGroupingTypeID;
+	private var __width:Number;
+	private var __height:Number;
+	private var __x:Number;
+	private var __y:Number;
+	private var _piHeight:Number;
+	private var infoObj:Object;
+	
+	private var _cv:Canvas;
+	private var _ddm:DesignDataModel;
+	private var optionalCA:CanvasOptionalActivity;
+	
+	//UI State variabls
+	private var _isDirty:Boolean;
+	private var _activeTool:String;
+	private var _selectedItem:Object;  // the currently selected thing - could be activity, transition etc.
+	private var _prevSelectedItem:Object;
+	private var _isDrawingTransition:Boolean;
+	private var _connectionActivities:Array;
+	private var _isDragging:Boolean;
+	private var _importing:Boolean;
+	private var _editing:Boolean;
+	private var _autoSaveWait:Boolean;
+	
+	//these are hashtables of mc refs MOVIECLIPS (like CanvasActivity or CanvasTransition)
+	//each on contains a reference to the emelment in the ddm (activity or transition)
+	private var _activitiesDisplayed:Hashtable;
+	private var _transitionsDisplayed:Hashtable;
+	private var _branchesDisplayed:Hashtable;
+	
+	private var _currentBranchingActivity:Object;
+	private var _activeView:Object;
+	
+	private var _lastBranchActionType:Number;
+	
+	//These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
+    private var dispatchEvent:Function;     
+    public var addEventListener:Function;
+    public var removeEventListener:Function;
+	
+	public function CanvasSuperModel(cv:Canvas) {
+		
+		_cv = cv;
+		_ddm = new DesignDataModel();
+		_activitiesDisplayed = new Hashtable("_activitiesDisplayed");
+		_transitionsDisplayed = new Hashtable("_transitionsDisplayed");
+		_branchesDisplayed = new Hashtable("_branchesDisplayed");
+		
+		_activeTool = "none";
+		_activeView = null;
+		_currentBranchingActivity = null;
+		_lastBranchActionType = null;
+		
+		_autoSaveWait = false;
+		_connectionActivities = new Array();
+		_defaultGroupingTypeID = Grouping.RANDOM_GROUPING;
+		
+		 //Set up this class to use the Flash event delegation model
+        EventDispatcher.initialize(this);
+		
+	}
+	
+	////////////////////////////////////////////////////////////////////////////////////////////
+	///////////////////////       TRANSITIONS         //////////////////////////////////////////
+	////////////////////////////////////////////////////////////////////////////////////////////
+	
+	/**
+	 * Starts the transition tool
+	 * @usage   
+	 * @return  
+	 */
+	public function startTransitionTool():Void{
+		Debugger.log('Starting transition tool',Debugger.GEN,'startTransitionTool','CanvasModel');			
+		resetTransitionTool();
+		_activeTool = CanvasModel.TRANSITION_TOOL;
+	}
+	
+	/**
+	 * Stops it
+	 * @usage   
+	 * @return  
+	 */
+	 
+	public function stopTransitionTool():Void{
+		Debugger.log('Stopping transition tool',Debugger.GEN,'stopTransitionTool','CanvasModel');
+		resetTransitionTool();
+		_activeTool = "none";
+	}
+	
+	
+	/**
+	 * Resets the transition tool to its starting state, e.g. if one chas been created or the user released the mouse over an unsuitable clip
+	 * @usage   
+	 */
+	public function resetTransitionTool():Void{
+		//clear the transitions array
+		_connectionActivities = new Array();
+	}
+	
+	public function isTransitionToolActive():Boolean{
+	   if(_activeTool == CanvasModel.TRANSITION_TOOL){
+		   return true;
+		}else{
+			return false;
+		}
+	}
+	
+	/**
+    * Notify registered listeners that a data model change has happened
+    */
+    public function broadcastViewUpdate(_updateType,_data){
+        dispatchEvent({type:'viewUpdate',target:this,updateType:_updateType,data:_data});
+    }
+	
+	public function clearAllElements():Void {
+		var branch_keys:Array = _branchesDisplayed.keys();
+		var act_keys:Array = _activitiesDisplayed.keys();
+		var trans_keys:Array = _transitionsDisplayed.keys();
+		
+		for(var i=0; i<branch_keys.length; i++)
+			_branchesDisplayed.get(branch_keys[i]).removeMovieClip();
+		for(var i=0; i<trans_keys.length; i++)
+			_transitionsDisplayed.get(trans_keys[i]).removeMovieClip();
+		for(var i=0; i<act_keys.length; i++) {
+			if(_activitiesDisplayed.get(act_keys[i]).activity.isBranchingActivity())
+				_activitiesDisplayed.get(act_keys[i]).branchView.removeMovieClip();
+			_activitiesDisplayed.get(act_keys[i]).removeMovieClip();
+			
+		}
+		
+		_branchesDisplayed.clear();
+		_transitionsDisplayed.clear();
+		_activitiesDisplayed.clear();
+		
+	}
+	
+	public function clearAllBranches(a:Activity):Void {
+		var branch_keys:Array = _branchesDisplayed.keys();
+		var act_keys:Array = _activitiesDisplayed.keys();
+		Debugger.log("clearing branches: " + branch_keys.length, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
+		
+			
+		for(var i=0; i<branch_keys.length; i++) {
+			var branch:Branch = _branchesDisplayed.get(branch_keys[i]).branch;
+			
+			Debugger.log("branch: " + branch.branchUIID, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
+		
+			if(branch.sequenceActivity.parentUIID == a.activityUIID) {
+				for(var j=0; j<act_keys.length; j++) {
+					
+					Debugger.log("activity parent: " + _activitiesDisplayed.get(act_keys[i]).activity.parentUIID, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
+					Debugger.log("seq uiid: " + branch.sequenceActivity.activityUIID, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
+					
+					if(_activitiesDisplayed.get(act_keys[i]).activity.parentUIID == branch.sequenceActivity.activityUIID) {
+						_activitiesDisplayed.remove(act_keys[i]);
+					}
+		
+				}
+			}
+		}
+		
+	}
+	
+	/**
+	 * Returns a reference to the Activity Movieclip for the UIID passed in.  Gets from _activitiesDisplayed Hashable
+	 * @usage   
+	 * @param   UIID 
+	 * @return  Activity Movie clip
+	 */
+	public function getActivityMCByUIID(UIID:Number):MovieClip{
+		
+		var a_mc:MovieClip = _activitiesDisplayed.get(UIID);
+		return a_mc;
+	}
+
+	/**
+	* Used by application to set the size
+	* @param width The desired width
+	* @param height the desired height
+	*/
+	public function setSize(width:Number, height:Number):Void{
+		__width = width;
+		__height = height;
+		
+		broadcastViewUpdate("SIZE");
+		
+	}
+	
+	/**
+	* Used by View to get the size
+	* @returns Object containing width(w) & height(h).  obj.w & obj.h
+	*/
+	public function getSize():Object{
+		var s:Object = {};
+		s.w = __width;
+		s.h = __height;
+		return s;
+	}
+	
+	/**
+	* Used by application to set the Position
+	* @param x
+	* @param y
+	*/
+	public function setPosition(x:Number, y:Number):Void{
+		__x=x;
+		__y=y;
+		
+		broadcastViewUpdate("POSITION");
+	}
+	
+	/**
+	* Used by View to get the size
+	* @returns Object containing width(w) & height(h).  obj.w & obj.h
+	*/
+	public function getPosition():Object{
+		var p:Object = {};
+		p.x = __x;
+		p.y = __y;
+		return p;
+	}
+	
+	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 findParent(a:Activity, b:Activity):Boolean {
+		if(a.parentUIID == b.activityUIID)
+			return true;
+		else if(a.parentUIID == null)
+			return false;
+		else
+			return findParent(_cv.ddm.getActivityByUIID(a.parentUIID), b);
+    }
+	
+	public function setPIHeight(h:Number){
+		_piHeight = h;
+		Application.getInstance().onResize();
+	}
+	
+	public function getPIHeight(){
+		return _piHeight;
+	}
+	
+	public function findOptionalActivities():Array{
+		var actOptional:Array = new Array();
+		var k:Array = _activitiesDisplayed.values();
+		
+		for (var i=0; i<k.length; i++){
+			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE) {
+				
+				if(k[i].activity.parentUIID == null && (_activeView instanceof CanvasView))
+					actOptional.push(k[i]);
+				else if((_activeView instanceof CanvasBranchView) && findParent(k[i].activity, _activeView.activity))
+					actOptional.push(k[i]);
+					
+				/**if(_activeView instanceof CanvasBranchView)
+					if(!findParent(k[i].activity, _activeView.activity))
+						actOptional.pop();
+				else if(k[i].activity.parentUIID != null)
+					actOptional.pop();
+					*/
+			}
+			
+		}
+		return actOptional;
+	}
+	
+	public function findParallelActivities():Array{
+		
+		var actParallel:Array = new Array();
+		var k:Array = _activitiesDisplayed.values();
+		for (var i=0; i<k.length; i++){
+			if (k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
+				actParallel.push(k[i]);
+			}
+			
+		}
+		return actParallel;
+	}
+	
+	public function findTopLevelActivities():Array{
+		var actParent:Array = new Array();
+		var k:Array = _activitiesDisplayed.values();
+		for (var i=0; i<k.length; i++){
+			if (k[i].activity.parentUIID == null){
+				actParent.push(k[i]);
+			}
+			
+		}
+		return actParent;
+	}
+	
+	public function get currentBranchingActivity():Object {
+		return _currentBranchingActivity;
+	}
+	
+	public function set currentBranchingActivity(a:Object) {
+		_currentBranchingActivity = a;
+	}
+
+	//Getters n setters
+	
+	public function getCanvas():Canvas{
+		return _cv;
+	}
+	
+	public function get activitiesDisplayed():Hashtable{
+		return _activitiesDisplayed;
+	}
+	
+	public function get transitionsDisplayed():Hashtable{
+		return _transitionsDisplayed;
+	}
+	
+	public function get branchesDisplayed():Hashtable{
+		return _branchesDisplayed;
+	}
+	
+	
+	public function get isDrawingTransition():Boolean{
+		return _isDrawingTransition;
+	}
+	/**
+	 * 
+	 * @usage   
+	 * @param   newactivetool 
+	 * @return  
+	 */
+	public function set activeTool(newactivetool:String):Void {
+		_activeTool = newactivetool;
+	}
+	
+	/**
+	 * 
+	 * @usage   
+	 * @param   newactivetool 
+	 * @return  
+	 */
+	public function setActiveTool(newactivetool):Void {
+		_activeTool = newactivetool;
+	}
+	/**
+	 * 
+	 * @usage   
+	 * @return  
+	 */
+	public function get activeTool():String {
+		return _activeTool;
+	}
+	
+	private function setSelectedItem(newselectItem:Object){
+		prevSelectedItem = _selectedItem;
+		_selectedItem = newselectItem;
+		broadcastViewUpdate("SELECTED_ITEM");
+	}
+
+	public function setSelectedItemByUIID(uiid:Number){
+		var selectedCanvasElement;
+		if(_activitiesDisplayed.get(uiid) != null){
+			selectedCanvasElement = _activitiesDisplayed.get(uiid);
+		}else{
+			selectedCanvasElement = _transitionsDisplayed.get(uiid);
+		}
+		
+		setSelectedItem(selectedCanvasElement);
+		
+	}
+
+	/**
+	 * 
+	 * @usage   
+	 * @param   newselectItem 
+	 * @return  
+	 */
+	public function set selectedItem (newselectItem:Object):Void {
+		setSelectedItem(newselectItem);
+	}
+	
+	public function set prevSelectedItem (oldselectItem:Object):Void {
+		_prevSelectedItem = oldselectItem;
+	}
+	
+	public function get prevSelectedItem():Object {
+		return _prevSelectedItem;
+	}
+	
+	/**
+	 * 
+	 * @usage   
+	 * @return  
+	 */
+	public function get selectedItem ():Object {
+		return _selectedItem;
+	}
+	
+	public function get connectionActivities():Array {
+		return _connectionActivities;
+	}
+	
+	/**
+	 * 
+	 * @usage   
+	 * @return  
+	 */
+	public function get isDragging ():Boolean {
+		return _isDragging;
+	}
+	
+	/**
+	 * 
+	 * @usage   
+	 * @return  
+	 */
+	public function set isDragging (newisDragging:Boolean):Void{
+		_isDragging = newisDragging;
+	}
+	
+	public function get importing():Boolean {
+		return _importing;
+	}
+	
+	public function set importing(importing:Boolean):Void {
+		_importing = importing;
+	}
+	
+	public function get editing():Boolean {
+		return _editing;
+	}
+	
+	public function set editing(editing:Boolean):Void {
+		_editing = editing;
+	}
+	
+	public function get autoSaveWait():Boolean {
+		return _autoSaveWait;
+	}
+	
+	public function set autoSaveWait(autoSaveWait:Boolean):Void {
+		_autoSaveWait = autoSaveWait;
+	}
+	
+	public function set lastBranchActionType(a:Number):Void {
+		_lastBranchActionType = a;
+	}
+	
+	public function get lastBranchActionType():Number {
+		return _lastBranchActionType;
+	}
+
+}
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r5a7eca0c6ef2deca52b32c88459666cc9ee12889 -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 5a7eca0c6ef2deca52b32c88459666cc9ee12889)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -94,7 +94,11 @@
 		minAct_stp.addEventListener("change", Delegate.create(this, updateOptionalData));
 		minAct_stp.addEventListener("focusOut", Delegate.create(this, updateOptionalData));
 		maxAct_stp.addEventListener("change", Delegate.create(this, updateOptionalData));
-		maxAct_stp.addEventListener("focusOut", Delegate.create(this, updateOptionalData));
+		maxAct_stp.addEventListener("focusOut", Delegate.create(this, updateOptionalData));
+		
+		noSeqAct_stp.addEventListener("change", Delegate.create(this, updateOptionalSequenceData));
+		noSeqAct_stp.addEventListener("focusOut", Delegate.create(this, updateOptionalSequenceData));
+		
 		days_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange));
 		hours_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange));
 		mins_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange));
@@ -266,7 +270,7 @@
 				showBranchingControls(false);
 				showGeneralInfo(false);
 				showAppliedGroupingControls(false);
-				showOptionalControls(true, !a.readOnly);
+				checkEnableOptionalControls(!a.readOnly);
 				populateGroupingProperties(GroupingActivity(caco));
 				showAppliedGroupingProperties(caco);
 				showOptionalActivityProperties(caco);
@@ -320,7 +324,7 @@
 			showGateControls(false);
 			showGeneralInfo(false);
 			showAppliedGroupingControls(false);
-			showOptionalControls(true, !co.activity.readOnly);
+			checkEnableOptionalControls(!co.activity.readOnly);
 			populateGroupingProperties(GroupingActivity(cca));
 			showAppliedGroupingProperties(cca);
 			showOptionalActivityProperties(cca);
@@ -425,36 +429,75 @@
 		
 	}
 	
-	private function showOptionalActivityProperties(ca:ComplexActivity){
+	private function showOptionalActivityProperties(ca:ComplexActivity){
+		if(ca.isSequenceBased) return showOptionalSequenceActivityProperties(ca);
 	
 		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_optional_title');
+		
 		runOffline_chk.selected = ca.runOffline;
 		defineLater_chk.selected = ca.defineLater;
 		
 		if(ca.minOptions == undefined) {
-			minAct_stp.value = 0
+			minAct_stp.value = 0;
 		} else {
-			minAct_stp.value = ca.minOptions
+			minAct_stp.value = ca.minOptions;
 		}
 		
 		if(ca.maxOptions == undefined) {
-			maxAct_stp.value = 0
+			maxAct_stp.value = 0;
 		} else {
-			maxAct_stp.value = ca.maxOptions
+			maxAct_stp.value = ca.maxOptions;
 		}
 		
 		currentGrouping_lbl.text = "GroupingUIID:"+StringUtils.cleanNull(ca.runOffline.groupingUIID);
 	}
+	
+	private function showOptionalSequenceActivityProperties(ca:ComplexActivity){
+		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('opt_activity_seq_title');
+		
+		runOffline_chk.selected = ca.runOffline;
+		defineLater_chk.selected = ca.defineLater;
+		
+		if(ca.noSequences == undefined)
+			noSeqAct_stp.value = 0;
+		else
+			noSeqAct_stp.value = ca.noSequences;
+	}
 	
 	private function updateOptionalData(){
 		var oa = _canvasModel.selectedItem.activity;
 		var	o = ComplexActivity(oa);
 		
 		o.minOptions = minAct_stp.value;
 		o.maxOptions = maxAct_stp.value;
-		oa.init();
+		
+		var newChildren = _canvasModel.getCanvas().ddm.getComplexActivityChildren(oa.activityUIID);
+		CanvasOptionalActivity(_canvasModel.selectedItem).updateChildren(newChildren);
 		
 		setModified();
+	}
+	
+	private function updateOptionalSequenceData(){
+		var controller = _canvasModel.activeView.getController();
+		if(!controller.isBusy) {
+			controller.setBusy()
+			
+			var oa = _canvasModel.selectedItem.activity;
+			var o = ComplexActivity(oa);
+			
+			if(o.noSequences < noSeqAct_stp.value) {
+				_canvasModel.createNewSequenceActivity(oa);
+			} else {
+				var itemToRemove:Number = CanvasOptionalActivity(_canvasModel.selectedItem).getLastItem();
+				_canvasModel.removeActivity(itemToRemove);
+			}
+				
+			var newChildren:Array = _canvasModel.getCanvas().ddm.getComplexActivityChildren(oa.activityUIID);
+			CanvasOptionalActivity(_canvasModel.selectedItem).updateChildren(newChildren);
+			
+			setModified();
+			controller.clearBusy()
+		}
 	}
 	
 	private function showParallelActivityProperties(ca:ComplexActivity){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r5a7eca0c6ef2deca52b32c88459666cc9ee12889 -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 5a7eca0c6ef2deca52b32c88459666cc9ee12889)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -126,8 +126,10 @@
 	//Complex Activity
 	private var min_lbl:Label;
 	private var max_lbl:Label;
+	private var noSeqAct_lbl:Label;
 	private var minAct_stp:NumericStepper;
 	private var maxAct_stp:NumericStepper;
+	private var noSeqAct_stp:NumericStepper;
 	
 	// Branch Connector
 	private var _pi_defaultBranch_cb:CheckBox;
@@ -192,6 +194,8 @@
 		//Complex Activity
 		min_lbl.text = Dictionary.getValue('pi_min_act');
 		max_lbl.text = Dictionary.getValue('pi_max_act');
+		
+		noSeqAct_lbl.text = Dictionary.getValue('pi_no_seq_act');
 		
 		_group_match_btn.label = Dictionary.getValue('pi_mapping_btn_lbl');
 		_group_naming_btn.label = Dictionary.getValue('pi_group_naming_btn_lbl');
@@ -219,7 +223,8 @@
 		delimitLine._visible = false;
 		_group_match_btn.visible = false;
 		
-		hideAllSteppers(false);
+		hideAllSteppers(false);
+		
 		showGroupingControls(false);
 		showGeneralControls(false);
 		showOptionalControls(false);
@@ -349,27 +354,81 @@
 			title_txt.enabled = e;
 		}
 	} 
+	
+	private function showOptionalSequenceControls(v:Boolean, e:Boolean){
+		desc_lbl.visible = v;
+		desc_txt.visible = v;
+		noSeqAct_lbl.visible = v;
+		noSeqAct_stp.visible = v;
+		
+		if(e != null) {
+			noSeqAct_stp.enabled = e;
+			noSeqAct_lbl.enabled = e;
+			desc_lbl.enabled = e;
+			desc_txt.enabled = e;
+		}
+		
+		grouping_lbl.visible = false;
+
+	}
+	
+	private function showOptionalActivityControls(v:Boolean, e:Boolean){
+		min_lbl.visible = v;	
+		max_lbl.visible = v;
+		minAct_stp.visible = v;
+		maxAct_stp.visible = v;
+		desc_lbl.visible = v;
+		desc_txt.visible = v;
+		
+		if(e != null) {
+			min_lbl.enabled = e;	
+			max_lbl.enabled = e;
+			minAct_stp.enabled = e;
+			maxAct_stp.enabled = e;
+			desc_lbl.enabled = e;
+			desc_txt.enabled = e;
+		}
+		
+		grouping_lbl.visible = false;
+	}
 	
 	private function showOptionalControls(v:Boolean, e:Boolean){
-		
-		min_lbl.visible = v;	
-		max_lbl.visible = v;
-		minAct_stp.visible = v;
-		maxAct_stp.visible = v;
-		desc_lbl.visible = v;
-		desc_txt.visible = v;
-		
-		if(e != null) {
-			min_lbl.enabled = e;	
-			max_lbl.enabled = e;
-			minAct_stp.enabled = e;
-			maxAct_stp.enabled = e;
-			desc_lbl.enabled = e;
-			desc_txt.enabled = e;
-		}
-		
-		grouping_lbl.visible = false;
-		
+		if(!v) {
+			showOptionalActivityControls(v);
+			showOptionalSequenceControls(v);
+		}
+
+	}
+	
+	private function checkEnableOptionalControls(e:Boolean):Void {
+		
+		if(CanvasOptionalActivity(_canvasModel.selectedItem).type == CanvasOptionalActivity.SEQ_TYPE) {
+			if(e != null)
+				noSeqAct_stp.enabled = e;
+			else
+				noSeqAct_stp.enabled = true;
+			
+			MovieClipUtils.doLater(Proxy.create(this,showOptionalControlsLater, true));
+		} else {
+			if(e != null) {
+				minAct_stp.enabled = e;
+				maxAct_stp.enabled = e;
+			} else {
+				minAct_stp.enabled = true;
+				maxAct_stp.enabled = true;
+			}
+			
+			MovieClipUtils.doLater(Proxy.create(this, showOptionalControlsLater, false));
+		}
+		
+	
+	}
+	
+	private function showOptionalControlsLater(isSequence:Boolean):Void {
+		if(isSequence)
+			MovieClipUtils.doLater(Proxy.create(this, showOptionalSequenceControls, true));
+		else
+			MovieClipUtils.doLater(Proxy.create(this, showOptionalActivityControls, true));
 	}
 	
 	private function showGateControls(v:Boolean, e:Boolean){
@@ -406,6 +465,7 @@
 		branchType_lbl.visible = v;
 		branchType_cmb.visible = v;
 		hideAllSteppers(false);
+		
 		var _activityTypeID:Number = _canvasModel.selectedItem.activity.activityTypeID;
 		
 		if(_activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE) {
@@ -799,7 +859,8 @@
 		title_lbl.setStyle('styleName', styleObj);
 		desc_lbl.setStyle('styleName', styleObj);
 		min_lbl.setStyle('styleName', styleObj);
-		max_lbl.setStyle('styleName', styleObj);
+		max_lbl.setStyle('styleName', styleObj);
+		noSeqAct_lbl.setStyle('styleName', styleObj);
 		grouping_lbl.setStyle('styleName', styleObj);
 		currentGrouping_lbl.setStyle('styleName', styleObj);
 		gateType_lbl.setStyle('styleName', styleObj);
@@ -827,6 +888,7 @@
 		endMins_stp.setStyle('styleName', styleObj);
 		minAct_stp.setStyle('styleName', styleObj);
 		maxAct_stp.setStyle('styleName', styleObj);
+		noSeqAct_stp.setStyle('styleName', styleObj);
 		
 		_pi_defaultBranch_cb.setStyle('styleName', styleObj);
 		_define_monitor_cb.setStyle('styleName', styleObj);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as
===================================================================
diff -u -rc5ce2369b6232db2c25a966f7873f695ebf6e485 -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as	(.../TemplateActivity.as)	(revision c5ce2369b6232db2c25a966f7873f695ebf6e485)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as	(.../TemplateActivity.as)	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -354,4 +354,8 @@
 		return _childActivities;
 	}
 	
+	public function get title():String {
+		return title_lbl.text;
+	}
+	
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as
===================================================================
diff -u -r837d613b49df41259866b6caa79fb43d5fe4fb48 -r1aa870575978de0fbe4b5ab485f47d85d9b3c0be
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as	(.../ToolkitController.as)	(revision 837d613b49df41259866b6caa79fb43d5fe4fb48)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as	(.../ToolkitController.as)	(revision 1aa870575978de0fbe4b5ab485f47d85d9b3c0be)
@@ -74,23 +74,27 @@
 		var isCanvasDrop:Boolean = cv.getCanvasModel().activeView.content.hitTest(dragIcon_mc);
 		
 		Debugger.log('isCanvasDrop:'+isCanvasDrop,Debugger.GEN,'iconDrop','ToolkitController');
-		for (var i=0; i<optionalOnCanvas.length; i++){
+		
+		for(var i=0; i<optionalOnCanvas.length; i++){
 			var optionalX:Number = optionalOnCanvas[i].activity.xCoord;
 			var optionalY:Number = optionalOnCanvas[i].activity.yCoord;
 			var optionalWidth:Number = optionalOnCanvas[i]._width
 			var optionalHeight:Number = optionalOnCanvas[i]._height
 			
-			if (iconMouseX >= optionalX && iconMouseX <= (optionalX + optionalWidth)){
-				if (iconMouseY >= optionalY && iconMouseY <= (optionalY + optionalHeight)){
+			if(iconMouseX >= optionalX && iconMouseX <= (optionalX + optionalWidth)){
+				if(iconMouseY >= optionalY && iconMouseY <= (optionalY + optionalHeight)){
 					isCanvasDrop = false;
 					dragIcon_mc.removeMovieClip();
 					
-					if (optionalOnCanvas[i].locked){
-						var msg:String = Dictionary.getValue('act_lock_chk');
+					var ta:TemplateActivity = _toolkitModel.getSelectedTemplateActivity();
+					
+					if(optionalOnCanvas[i].locked){
+						var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('act_lock_chk') : Dictionary.getValue('act_seq_lock_chk');
 						LFMessage.showMessageAlert(msg);
-					}else{
-						var ta:TemplateActivity;
-						ta = _toolkitModel.getSelectedTemplateActivity();
+					} else if(optionalOnCanvas[i].activity.isSequenceBased && optionalOnCanvas[i].activity.noSequences <= 0) {
+						var msg:String = Dictionary.getValue('ta_iconDrop_optseq_error_msg');
+						LFMessage.showMessageAlert(msg);
+					} else {
 						cv.setDroppedTemplateActivity(ta, optionalOnCanvas[i].activity.activityUIID);
 					}
 				}