Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
===================================================================
diff -u -rc00280fd5bd4810407e1105e5aad52218ff7bf6e -r26ac409edd1315ca7b866156ba035590f30d4716
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as	(.../Branch.as)	(revision c00280fd5bd4810407e1105e5aad52218ff7bf6e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as	(.../Branch.as)	(revision 26ac409edd1315ca7b866156ba035590f30d4716)
@@ -30,7 +30,7 @@
 class Branch extends Transition {
 
 	private var UIID:Number;
-	private var _sequenceActivity:Activity;
+	private var _sequenceActivity:SequenceActivity;
 	
 	private var _direction:Number;
 	private var _targetUIID:Number;
@@ -39,7 +39,7 @@
 	
 	// TODO: add learningDesignID
 
-	public function Branch(activityUIID:Number, _dir:Number, targetUIID:Number, hubUIID:Number, sequenceActivity:Activity, learningDesignID:Number){
+	public function Branch(activityUIID:Number, _dir:Number, targetUIID:Number, hubUIID:Number, sequenceActivity:SequenceActivity, learningDesignID:Number){
 		if(_dir == BranchConnector.DIR_FROM_START)
 			super(null, hubUIID, targetUIID, learningDesignID);
 		else
@@ -64,7 +64,7 @@
 		return UIID;
 	}
 	
-	public function get sequenceActivity():Activity {
+	public function get sequenceActivity():SequenceActivity {
 		return _sequenceActivity;
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -rfac001f56e1427654498b0888139e2dcfff7f6a6 -r26ac409edd1315ca7b866156ba035590f30d4716
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision fac001f56e1427654498b0888139e2dcfff7f6a6)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 26ac409edd1315ca7b866156ba035590f30d4716)
@@ -302,6 +302,7 @@
 		if(r==null){
 			return new LFError("Removing branch failed:"+branchUIID,"removeBranch",this,null);
 		}else{
+			
 			Debugger.log('Removed:'+r.branchUIID,Debugger.GEN,'removeBranch','DesignDataModel');
 			dispatchEvent({type:'ddmUpdate',target:this});
 		}
@@ -337,7 +338,7 @@
 		var success:Boolean = false;
 		//TODO:Validate if design is saved if not notify user
 		success = true;
-		//_global.breakpoint();
+		
 		Debugger.log('Setting design ID:'+design.learningDesignID,Debugger.GEN,'setDesign','DesignDataModel');
 		Debugger.log('Printing the design revieced:...\n'+ObjectUtils.toString(design),Debugger.VERBOSE,'setDesign','DesignDataModel');
 		
@@ -674,7 +675,9 @@
 		if(classActs.length > 0){
 			
 			for(var i=0; i<classActs.length; i++){
-				design.activities[i] = classActs[i].toData();
+				var classAct = classActs[i].toData();
+				if(classAct != null)
+					design.activities.push(classAct);
 			}
 		}
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
===================================================================
diff -u -r7548a5a6349a58e304bfa7b35805978121ccbd87 -r26ac409edd1315ca7b866156ba035590f30d4716
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision 7548a5a6349a58e304bfa7b35805978121ccbd87)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision 26ac409edd1315ca7b866156ba035590f30d4716)
@@ -22,6 +22,9 @@
  */
 
 import org.lamsfoundation.lams.authoring.*;
+import org.lamsfoundation.lams.common.util.StringUtils;
+import org.lamsfoundation.lams.common.Config;
+
 /*
 * This class represents the sequence activity.
 * For reference these are the activity types
@@ -34,10 +37,14 @@
 */
 class SequenceActivity extends ComplexActivity{
 	
+	private var _firstActivityUIID:Number;
+	private var _empty:Boolean;
 	
 	function SequenceActivity(activityUIID:Number){
 		super(activityUIID);
 		_activityTypeID = SEQUENCE_ACTIVITY_TYPE;
+		_firstActivityUIID = null;
+		_empty = true;
 	}
 	
 	/**
@@ -48,6 +55,8 @@
 	 */
 	public function populateFromDTO(dto:Object){
 		super.populateFromDTO(dto);
+		if(StringUtils.isWDDXNull(dto.firstActivityUIID)) _firstActivityUIID = null;
+		else _firstActivityUIID = dto.firstActivityUIID;
 	}
 	
 	/**
@@ -59,6 +68,8 @@
 	 */
 	public function toData():Object{
 		var dto:Object = super.toData();
+		dto.firstActivityUIID = (_firstActivityUIID == null) ? Config.NUMERIC_NULL_VALUE : _firstActivityUIID;
+
 		return dto;
 	}
 	
@@ -74,5 +85,21 @@
 		return sa;
 	}
 
+	public function get firstActivityUIID():Number{
+		return _firstActivityUIID;
+	}
+	
+	public function set firstActivityUIID(a:Number):Void{
+		_firstActivityUIID = a;
+	}
+	
+	public function set empty(b:Boolean):Void{
+		_empty = b;
+	}
+	
+	public function get empty():Boolean{
+		return _empty;
+	}
+
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r9d3bd5bd2814fd52c12c81266be61f30b522ec01 -r26ac409edd1315ca7b866156ba035590f30d4716
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 9d3bd5bd2814fd52c12c81266be61f30b522ec01)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 26ac409edd1315ca7b866156ba035590f30d4716)
@@ -67,7 +67,8 @@
 	private var cHubEnd_mc:MovieClip;
 	
 	private var _branchLayer:MovieClip;
-	private var _defaultSequenceActivity:Activity;
+	private var _defaultSequenceActivity:SequenceActivity;
+	private var _fingerprint:MovieClip;
 	
 	/**
 	* Constructor
@@ -76,6 +77,7 @@
 		_canvasBranchView = this;
 		_tm = ThemeManager.getInstance();
 		defaultSequenceActivity = null;
+		fingerprint = null;
 		
 		//Init for event delegation
         mx.events.EventDispatcher.initialize(this);
@@ -223,16 +225,20 @@
 	
 	private function loadSequenceActivities() {
 		var sequenceActs:Array;
-		Debugger.log('loading sequence activities:',Debugger.CRITICAL,'loadSequenceActivities','org.lamsfoundation.lams.CanvasBranchView');
 		
-		if((sequenceActs = _cm.getCanvas().ddm.getComplexActivityChildren(activity.activityUIID)).length <= 0) {
-			Debugger.log('creating init seq activity:' + sequenceActs,Debugger.CRITICAL,'loadSequenceActivities','org.lamsfoundation.lams.CanvasBranchView');
-			createInitialSequenceActivity();
-		} else {
-			// TODO: make the last create sequence activity in array (order id) the default?
-			var children:Array = _cm.getCanvas().ddm.getComplexActivityChildren(activity.activityUIID);
-			defaultSequenceActivity = children[children.length-1];
+		if((sequenceActs = _cm.getCanvas().ddm.getComplexActivityChildren(activity.activityUIID)).length > 0) {
+			for(var i=0; i<sequenceActs.length;  i++) {
+				if(SequenceActivity(sequenceActs[i]).firstActivityUIID != null) {
+					defaultSequenceActivity = SequenceActivity(sequenceActs[i]);
+				}
+				
+				_cm.addNewBranch(SequenceActivity(sequenceActs[i]));
+			}
 		}
+		
+		if(defaultSequenceActivity == null)
+			createInitialSequenceActivity();
+
 	}
 	
 	private function createInitialSequenceActivity() {
@@ -265,8 +271,9 @@
 		
 	}
 	
-	private function addSequence(a:Activity, cm:CanvasModel):Boolean{
+	private function addSequence(a:SequenceActivity, cm:CanvasModel):Boolean{
 		defaultSequenceActivity = a;
+		
 		return true;
 	}
 	
@@ -402,8 +409,8 @@
 		var cbv = CanvasBranchView(this);
 		var cbc = getController();
 		
+		if(b.direction == BranchConnector.DIR_FROM_START) b.sequenceActivity.firstActivityUIID = b.targetUIID;
 		var newBranch_mc:MovieClip = branchLayer.createChildAtDepth("BranchConnector",DepthManager.kTop,{_branch:b,_canvasController:cbc,_canvasBranchView:cbv});
-		
 		cm.branchesDisplayed.put(b.branchUIID,newBranch_mc);
 		Debugger.log('drawn a branch:'+b.branchUIID+','+newBranch_mc,Debugger.GEN,'drawBranch','CanvasView');
 		
@@ -462,6 +469,7 @@
 	 */
 	private function removeBranch(b:Branch,cm:CanvasModel){
 		if(!cm.isActiveView(this)) return false;
+		if(b.direction == BranchConnector.DIR_FROM_START) b.sequenceActivity.firstActivityUIID = null;
 		
 		var r = cm.branchesDisplayed.remove(b.branchUIID);
 		r.removeMovieClip();
@@ -539,11 +547,11 @@
 		return _canvasBranchingActivity.activity;
 	}
 	
-	public function get defaultSequenceActivity():Activity {
+	public function get defaultSequenceActivity():SequenceActivity {
 		return _defaultSequenceActivity;
 	}
 	
-	public function set defaultSequenceActivity(a:Activity):Void{
+	public function set defaultSequenceActivity(a:SequenceActivity):Void{
 		_defaultSequenceActivity = a;
 	}
 	
@@ -555,6 +563,15 @@
 		_branchLayer = a;
 	}
 	
+	public function get fingerprint():MovieClip {
+		return _fingerprint;
+	}
+	
+	public function set fingerprint(a:MovieClip):Void{
+		if(a == startHub || a == endHub)
+			_fingerprint = a;
+	}
+	
 	/**
 	 * Overrides method in abstract view to ensure cortect type of controller is returned
 	 * @usage   
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r9d3bd5bd2814fd52c12c81266be61f30b522ec01 -r26ac409edd1315ca7b866156ba035590f30d4716
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 9d3bd5bd2814fd52c12c81266be61f30b522ec01)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 26ac409edd1315ca7b866156ba035590f30d4716)
@@ -67,11 +67,12 @@
 	    
 		//if transition tool active
 	    if(_canvasModel.isTransitionToolActive()){
-		   
+		    
 			var transitionTarget = createValidTransitionTarget(ca, true);
 		    if(transitionTarget instanceof LFError){
 				transitionTarget.showErrorAlert(null); 
-		   }else{
+		    }else{
+				_canvasModel.activeView.fingerprint = transitionTarget;
 			   	var td = _canvasModel.addActivityToConnection(transitionTarget);
 				_canvasModel.activeView.initDrawTempTrans();
 			}
@@ -325,6 +326,7 @@
 				_canvasModel.getCanvas().stopTransitionTool();
 				LFError(transitionTarget).showErrorAlert(null);
 			} else {
+				_canvasModel.activeView.fingerprint = transitionTarget;
 				var td = _canvasModel.addActivityToConnection(transitionTarget);
 						
 				_canvasModel.resetTransitionTool();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r9d3bd5bd2814fd52c12c81266be61f30b522ec01 -r26ac409edd1315ca7b866156ba035590f30d4716
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 9d3bd5bd2814fd52c12c81266be61f30b522ec01)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 26ac409edd1315ca7b866156ba035590f30d4716)
@@ -565,6 +565,13 @@
 		}
 	}
 	
+	public function addNewBranch(sequence:SequenceActivity):Void {
+		if(sequence.firstActivityUIID != null) {
+			var b:Branch = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_FROM_START, _cv.ddm.getActivityByUIID(sequence.firstActivityUIID).activityUIID, activeView.startHub.activity.activityUIID, sequence, _cv.ddm.learningDesignID);
+			_cv.ddm.addBranch(b);
+		}
+	}
+	
 	public function addActivityToConnection(ca:Object):Object{
 		var activity:Activity;
 		//check we have not added too many
@@ -609,7 +616,6 @@
 			return new LFError("You cannot create a Branch between the same Activities","addActivityToTransition",this);
 		}
 		
-		
 		if(_connectionActivities.length == 2){
 			/*********************************************
 			* TODO: REQUIRE NORMAL BRANCH CLIENT_SIDE VALIDATION
@@ -621,15 +627,14 @@
 			}
 			
 			//lets make the connection
-			var b:Object = (toAct == activeView.endHub.activity.activityUIID || fromAct == activeView.endHub.activity.activityUIID) ? createBranchEndConnector(_connectionActivities) 
-								: createBranchStartConnector(_connectionActivities);
+			var b:Object = (activeView.fingerprint == activeView.endHub) ? createBranchEndConnector(_connectionActivities) : createBranchStartConnector(_connectionActivities);
 
 			Debugger.log('No validation errors, creating branch.......' + b,Debugger.GEN,'addActivityToBranch','CanvasModel');
 				
 			//add it to the DDM
 			if(b instanceof LFError) {
 				return b;
-			} else {
+			} else if(b != null){
 				var success:Object = _cv.ddm.addBranch(Branch(b));
 			}
 			
@@ -765,9 +770,9 @@
 	 * @param   transitionActs An array of transition activities. Must only contain 2
 	 * @return  
 	 */
-	private function createTransition(transitionActs:Array):Transition{
-		var fromAct:Activity = transitionActs[0];
-		var toAct:Activity = transitionActs[1];
+	private function createTransition(transActivities:Array):Transition{
+		var fromAct:Activity = transActivities[0];
+		var toAct:Activity = transActivities[1];
 		
 		var t:Transition = new Transition(_cv.ddm.newUIID(),fromAct.activityUIID,toAct.activityUIID,_cv.ddm.learningDesignID);
 		
@@ -779,23 +784,25 @@
 	 * @param   transitionActs An array of transition activities. Must only contain 2
 	 * @return  
 	 */
-	private function createBranchStartConnector(transitionActs:Array):Object{
-		var fromAct:Activity = transitionActs[0];
-		var toAct:Activity = transitionActs[1];
+	private function createBranchStartConnector(branchActivities:Array):Object{
 		
-		var sequence:Activity = _cv.ddm.getActivityByUIID(toAct.parentUIID);
+		var fromAct:Activity = branchActivities[0];
+		var toAct:Activity = branchActivities[1];
+		
+		var sequence:SequenceActivity = SequenceActivity(_cv.ddm.getActivityByUIID(toAct.parentUIID));
+		var branchesSize:Number = _cv.ddm.getBranchesForActivityUIID(sequence.activityUIID).myBranches.length;
 			
 		/** Basic validation for Branch(s)/Branch Connector(s) */
-		if(fromAct == activeView.endHub.activity) {
-			return new LFError("Cannot create a branch from the end point or hub");
+		if(toAct.activityUIID == activeView.startHub.activity.activityUIID) {
+			return new LFError("Branch Connector must be drawn from the Hub to an Activity");
 		} else if(_cv.ddm.getTransitionsForActivityUIID(toAct.activityUIID).into != null) {
 			return new LFError("Cannot create start-branch connection to Activity with inward Transition.", "createBranchStartConnector", this);
-		} else if(_cv.ddm.getBranchesForActivityUIID(sequence.activityUIID).myBranches.length > 0) {
+		} else if(branchesSize > 0) {
 			return new LFError("Cannot create start-branch connection to Activity in a already connected Sequence.", "createBranchStartConnector", this);
 		} else {
-			var b:Branch = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_FROM_START, toAct.activityUIID, activeView.startHub.activity.activityUIID, activeView.defaultSequenceActivity, _cv.ddm.learningDesignID);
-			createNewSequenceActivity(activeView.activity);
+			var b = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_FROM_START, toAct.activityUIID, activeView.startHub.activity.activityUIID, activeView.defaultSequenceActivity, _cv.ddm.learningDesignID);
 			
+			createNewSequenceActivity(activeView.activity);
 			return b;
 		}
 	}
@@ -805,14 +812,16 @@
 	 * @param   transitionActs An array of transition activities. Must only contain 2
 	 * @return  
 	 */
-	private function createBranchEndConnector(transitionActs:Array):Object{
-		var fromAct:Activity = transitionActs[0];
-		var toAct:Activity = transitionActs[1];
+	private function createBranchEndConnector(branchActivities:Array):Object{
+		var fromAct:Activity = branchActivities[0];
+		var toAct:Activity = branchActivities[1];
 		
-		var sequence:Activity = _cv.ddm.getActivityByUIID(fromAct.parentUIID);
+		var sequence:SequenceActivity = SequenceActivity(_cv.ddm.getActivityByUIID(fromAct.parentUIID));
 		
 		/** Basic validation for Branch(s)/Branch Connector(s) */
-		if(_cv.ddm.getTransitionsForActivityUIID(fromAct.activityUIID).out != null) {
+		if(fromAct.activityUIID == activeView.endHub.activity.activityUIID) {
+			return new LFError("Cannot create branch from end-point.");
+		} else if(_cv.ddm.getTransitionsForActivityUIID(fromAct.activityUIID).out != null) {
 			return new LFError("Cannot create end-branch connection to Activity with outward Transition", "createBranchEndConnector", this);
 		} else if(_cv.ddm.getBranchesForActivityUIID(sequence.activityUIID).myBranches.length <= 0) {
 			return new LFError("Cannot create end-branch connection to an unconnected Sequence.", "createBranchStartConnector", this);
@@ -1374,6 +1383,10 @@
 		return _selectedItem;
 	}
 	
+	public function get connectionActivities():Array {
+		return _connectionActivities;
+	}
+	
 	/**
 	 * 
 	 * @usage