Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r87b20aa68aff94feca9cc3aee00d40c2781aa009 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r87b20aa68aff94feca9cc3aee00d40c2781aa009 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
===================================================================
diff -u -r7548a5a6349a58e304bfa7b35805978121ccbd87 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision 7548a5a6349a58e304bfa7b35805978121ccbd87)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -85,7 +85,10 @@
 	public static var OPTIONAL_ACTIVITY_TYPE:Number = 7;
 	public static var SEQUENCE_ACTIVITY_TYPE:Number = 8;
 	public static var SYSTEM_GATE_ACTIVITY_TYPE:Number = 9;
-	public static var BRANCHING_ACTIVITY_TYPE:Number = 10;
+	public static var CHOOSEN_BRANCHING_ACTIVITY_TYPE:Number = 10;
+	public static var GROUP_BRANCHING_ACTIVITY_TYPE:Number = 11;
+	public static var TOOL_BRANCHING_ACTIVITY_TYPE:Number = 12;
+	
 	/******************************************************************/
 	
 	/**
@@ -203,9 +206,20 @@
 		return types;
 	}
 	
+	/**
+	 * Created an array of activity types to be can be used as a dataprovider
+	 * @usage   
+	 * @return  
+	 */
+	public static function getBranchingActivityTypes():Array{
+		var types:Array = [];
+		types.addItem({label: Dictionary.getValue('choosen_branch_act_lbl'), data: CHOOSEN_BRANCHING_ACTIVITY_TYPE});
+		types.addItem({label: Dictionary.getValue('group_branch_act_lbl'), data: GROUP_BRANCHING_ACTIVITY_TYPE});
+		types.addItem({label: Dictionary.getValue('tool_branch_act_lbl'), data: TOOL_BRANCHING_ACTIVITY_TYPE});
+		return types;
+	}
 	
 	
-	
 	//helper methods
 	
 	
@@ -247,8 +261,12 @@
 	}
 	
 	public function isBranchingActivity():Boolean{
-		if (_activityTypeID == BRANCHING_ACTIVITY_TYPE){
+		if (_activityTypeID == CHOOSEN_BRANCHING_ACTIVITY_TYPE || 
+			_activityTypeID == GROUP_BRANCHING_ACTIVITY_TYPE ||
+			_activityTypeID == TOOL_BRANCHING_ACTIVITY_TYPE){
 			return true;
+		} else {
+			return false;
 		}
 	}
 	/**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
===================================================================
diff -u -r979518a0ef7152e3de292b985b041385de5501c2 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision 979518a0ef7152e3de292b985b041385de5501c2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -31,19 +31,19 @@
 */
 class BranchingActivity extends ComplexActivity {
 	
-	private var _startXCoord:Number;
-	private var _startYCoord:Number;
-	private var _endXCoord:Number;
-	private var _endYCoord:Number;
-	
 	private static var DEFAULT_STARTX:Number = 0;
 	private static var DEFAULT_STARTY:Number = 0;
 	private static var DEFAULT_ENDX:Number = 0;
 	private static var DEFAULT_ENDY:Number = 0;
 	
-	function BranchingActivity(activityUIID:Number){
+	private var _startXCoord:Number;
+	private var _startYCoord:Number;
+	private var _endXCoord:Number;
+	private var _endYCoord:Number;
+	
+	function BranchingActivity(activityUIID:Number, activityTypeID:Number){
 		super(activityUIID);
-		_activityTypeID = BRANCHING_ACTIVITY_TYPE;
+		_activityTypeID = activityTypeID;
 		
 		_startXCoord = DEFAULT_STARTX;
 		_startYCoord = DEFAULT_STARTY;
@@ -63,7 +63,7 @@
 		_startXCoord = dto.startXCoord;
 		_startYCoord = dto.startYCoord;
 		_endXCoord = dto.endXCoord;
-		_endYCoord = dto.endXCoord;
+		_endYCoord = dto.endYCoord;
 		
 	}
 	
@@ -76,7 +76,6 @@
 	 */
 	public function toData():Object{
 		var dto:Object = super.toData();
-		
 		if(_startXCoord) dto.startXCoord = _startXCoord;
 		if(_startYCoord) dto.startYCoord = _startYCoord;
 		if(_endXCoord) dto.endXCoord = _endXCoord;
@@ -85,6 +84,14 @@
 		return dto;
 	}
 	
+	public function set type(a:Number):Void{
+		_activityTypeID = a;
+	}
+	
+	public function get type():Number {
+		return _activityTypeID;
+	}
+	
 	public function set startXCoord(a:Number):Void{
 		_startXCoord = Math.round(a);
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r26ac409edd1315ca7b866156ba035590f30d4716 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 26ac409edd1315ca7b866156ba035590f30d4716)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -408,7 +408,9 @@
 				newGroupActivity.populateFromDTO(dto);
 				_activities.put(newGroupActivity.activityUIID,newGroupActivity);
 			
-			} else if(dto.activityTypeID == Activity.BRANCHING_ACTIVITY_TYPE){
+			} else if(dto.activityTypeID == Activity.CHOOSEN_BRANCHING_ACTIVITY_TYPE || 
+					  dto.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE ||
+					  dto.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE){
 				var newBranchActivity:BranchingActivity = new BranchingActivity(dto.activityUIID);
 				newBranchActivity.populateFromDTO(dto);
 				_activities.put(newBranchActivity.activityUIID,newBranchActivity);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivity.as
===================================================================
diff -u -rd7823922f404944822957e6c051bc0f1335a76de -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivity.as	(.../GateActivity.as)	(revision d7823922f404944822957e6c051bc0f1335a76de)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivity.as	(.../GateActivity.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -49,6 +49,7 @@
 	function GateActivity(activityUIID:Number,activityTypeID){
 		super(activityUIID);
 		_activityTypeID = activityTypeID;
+		
 		//defaults to class
 		_gateActivityLevelID = GATE_ACTIVITY_LEVEL_LEARNER;
 		_activityCategoryID = CATEGORY_SYSTEM;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
===================================================================
diff -u -r26ac409edd1315ca7b866156ba035590f30d4716 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision 26ac409edd1315ca7b866156ba035590f30d4716)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -37,7 +37,9 @@
 */
 class SequenceActivity extends ComplexActivity{
 	
+	
 	private var _firstActivityUIID:Number;
+	
 	private var _empty:Boolean;
 	
 	function SequenceActivity(activityUIID:Number){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r87b20aa68aff94feca9cc3aee00d40c2781aa009 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 87b20aa68aff94feca9cc3aee00d40c2781aa009)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -315,7 +315,7 @@
 			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');
 		}
-		else if(a.activityTypeID==Activity.BRANCHING_ACTIVITY_TYPE){	
+		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');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r979518a0ef7152e3de292b985b041385de5501c2 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 979518a0ef7152e3de292b985b041385de5501c2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -279,7 +279,7 @@
 						_canvasModel.setPIHeight(_pi.piFullHeight());
 						
 					}
-				} else if(ca.activity.activityTypeID == Activity.BRANCHING_ACTIVITY_TYPE) {
+				} else if(ca.activity.isBranchingActivity()) {
 					Debugger.log('activityDoubleClick CanvasBranchActivity:'+ca.activity.activityUIID,Debugger.CRITICAL,'activityDoubleClick','CanvasController');
 	   
 					_canvasModel.openBranchActivityContent(ca);
@@ -556,7 +556,7 @@
 		
 		if(_canvasModel.activeTool == CanvasModel.BRANCH_TOOL){
 			var p = new Point(_canvasModel.activeView._xmouse-(toolActWidth/2), _canvasModel.activeView._ymouse-(toolActHeight/2)); 
-			_canvasModel.createNewBranchActivity(p,parent);
+			_canvasModel.createNewBranchActivity(Activity.CHOOSEN_BRANCHING_ACTIVITY_TYPE,p,parent);
 			_canvasModel.getCanvas().stopBranchTool();
 		}
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -rd3d682445aa3dca16d7a1010db38c2473c1b8892 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision d3d682445aa3dca16d7a1010db38c2473c1b8892)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -253,7 +253,7 @@
 		Debugger.log("Locking all Complex Activities", Debugger.GEN, "lockAllComplexActivities", "CanvasModel");
 		var k:Array = _activitiesDisplayed.values();
 		for (var i=0; i<k.length; i++){
-			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.BRANCHING_ACTIVITY_TYPE){
+			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || k[i].activity.isBranchingActivity()){
 				k[i].locked = true;
 			}
 		}
@@ -264,7 +264,7 @@
 		Debugger.log("Unlocking all Complex Activities", Debugger.GEN, "unlockAllComplexActivities", "CanvasModel");
 		var k:Array = _activitiesDisplayed.values();
 		for (var i=0; i<k.length; i++){
-			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.BRANCHING_ACTIVITY_TYPE){
+			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || k[i].activity.isBranchingActivity()){
 				k[i].locked = (k[i].activity.readOnly) ? true : false;
 			}
 		}
@@ -333,7 +333,7 @@
 	 */
 	public function createNewGate(gateTypeID, pos:Point, parent){
 		Debugger.log('gateTypeID:'+gateTypeID,Debugger.GEN,'createNewGate','CanvasModel');
-		var gateAct = new GateActivity(_cv.ddm.newUIID(),gateTypeID);
+		var gateAct = new GateActivity(_cv.ddm.newUIID(), gateTypeID);
 		gateAct.learningDesignID = _cv.ddm.learningDesignID;
 		
 		gateAct.title = Dictionary.getValue('gate_btn');
@@ -363,10 +363,10 @@
 	 * @param   pos 
 	 * @return  
 	 */
-	public function createNewBranchActivity(pos:Point, parent){
+	public function createNewBranchActivity(branchTypeID, pos:Point, parent){
 		Debugger.log('Running...',Debugger.GEN,'createNewBranchActivity','CanvasModel');
 		
-		var branchingActivity = new BranchingActivity(_cv.ddm.newUIID());
+		var branchingActivity = new BranchingActivity(_cv.ddm.newUIID(), branchTypeID);
 		branchingActivity.title = Dictionary.getValue('branching_act_title');
 		branchingActivity.learningDesignID = _cv.ddm.learningDesignID;
 		branchingActivity.activityCategoryID = Activity.CATEGORY_SYSTEM;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -r7548a5a6349a58e304bfa7b35805978121ccbd87 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 7548a5a6349a58e304bfa7b35805978121ccbd87)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -293,7 +293,7 @@
 			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');
 		}
-		else if(a.activityTypeID==Activity.BRANCHING_ACTIVITY_TYPE){	
+		else if(a.isBranchingActivity()){	
 			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a,_canvasController:cvc,_canvasView:cvv});
 			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');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r5ffdfb896de13994030991c7634bb54a7c862404 -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 5ffdfb896de13994030991c7634bb54a7c862404)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
@@ -91,6 +91,10 @@
 	private var mins_stp:NumericStepper;
 	private var endHours_stp:NumericStepper;
 	private var endMins_stp:NumericStepper;
+	
+	//branches
+	private var branchType_lbl:Label;
+	private var branchType_cmb:ComboBox;
 
 	//grouping 
 	private var groupType_lbl:Label;
@@ -157,31 +161,32 @@
 		runOffline_chk.addEventListener("click",this);
 		defineLater_chk.addEventListener("click",this);
 		
-		numGroups_rdo.addEventListener("click",Delegate.create(this,onGroupingMethodChange));
-		numLearners_rdo.addEventListener("click",Delegate.create(this,onGroupingMethodChange));
-		groupType_cmb.addEventListener("change",Delegate.create(this,onGroupTypeChange));
-		gateType_cmb.addEventListener("change",Delegate.create(this,onGateTypeChange));
-		appliedGroupingActivity_cmb.addEventListener("change",Delegate.create(this,onAppliedGroupingChange));
-		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));
-		days_stp.addEventListener("change",Delegate.create(this,onScheduleOffsetChange));
-		hours_stp.addEventListener("change",Delegate.create(this,onScheduleOffsetChange));
-		mins_stp.addEventListener("change",Delegate.create(this,onScheduleOffsetChange));
-		days_stp.addEventListener("focusOut",Delegate.create(this,onScheduleOffsetChange));
-		hours_stp.addEventListener("focusOut",Delegate.create(this,onScheduleOffsetChange));
-		mins_stp.addEventListener("focusOut",Delegate.create(this,onScheduleOffsetChange));
-		endHours_stp.addEventListener("change",Delegate.create(this,onScheduleOffsetChange));
-		endMins_stp.addEventListener("change",Delegate.create(this,onScheduleOffsetChange));
-		endHours_stp.addEventListener("focusOut",Delegate.create(this,onScheduleOffsetChange));
-		endMins_stp.addEventListener("focusOut",Delegate.create(this,onScheduleOffsetChange));
-		numGroups_stp.addEventListener("change",Delegate.create(this,updateGroupingMethodData));
-		numLearners_stp.addEventListener("change",Delegate.create(this,updateGroupingMethodData));
-		numLearners_stp.addEventListener("focusOut",Delegate.create(this,updateGroupingMethodData));
-		numGroups_stp.addEventListener("focusOut",Delegate.create(this,updateGroupingMethodData));
-		numRandomGroups_stp.addEventListener("change",Delegate.create(this,updateGroupingMethodData));
-		numRandomGroups_stp.addEventListener("focusOut",Delegate.create(this,updateGroupingMethodData));
+		numGroups_rdo.addEventListener("click", Delegate.create(this, onGroupingMethodChange));
+		numLearners_rdo.addEventListener("click", Delegate.create(this, onGroupingMethodChange));
+		groupType_cmb.addEventListener("change", Delegate.create(this, onGroupTypeChange));
+		gateType_cmb.addEventListener("change", Delegate.create(this, onGateTypeChange));
+		branchType_cmb.addEventListener("change", Delegate.create(this, onBranchTypeChange));
+		appliedGroupingActivity_cmb.addEventListener("change", Delegate.create(this, onAppliedGroupingChange));
+		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));
+		days_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange));
+		hours_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange));
+		mins_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange));
+		days_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange));
+		hours_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange));
+		mins_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange));
+		endHours_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange));
+		endMins_stp.addEventListener("change", Delegate.create(this,onScheduleOffsetChange));
+		endHours_stp.addEventListener("focusOut", Delegate.create(this,onScheduleOffsetChange));
+		endMins_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange));
+		numGroups_stp.addEventListener("change", Delegate.create(this, updateGroupingMethodData));
+		numLearners_stp.addEventListener("change", Delegate.create(this, updateGroupingMethodData));
+		numLearners_stp.addEventListener("focusOut", Delegate.create(this, updateGroupingMethodData));
+		numGroups_stp.addEventListener("focusOut", Delegate.create(this, updateGroupingMethodData));
+		numRandomGroups_stp.addEventListener("change", Delegate.create(this, updateGroupingMethodData));
+		numRandomGroups_stp.addEventListener("focusOut", Delegate.create(this, updateGroupingMethodData));
 		
 		
 		this.onEnterFrame = setupLabels;
@@ -193,7 +198,10 @@
 	
 	public function setupLabels(){
 		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b>"
+		
 		gateType_lbl.text = Dictionary.getValue('trans_dlg_gatetypecmb');
+		branchType_lbl.text = Dictionary.getValue("trans_dlg_gatetypecmb");
+		
 		days_lbl.text = Dictionary.getValue('pi_days');
 		hours_lbl.text = Dictionary.getValue('pi_hours');
 		mins_lbl.text = Dictionary.getValue('pi_mins');
@@ -220,23 +228,24 @@
 		
 			//populate the synch type combo:
 		gateType_cmb.dataProvider = Activity.getGateActivityTypes();
+		branchType_cmb.dataProvider = Activity.getBranchingActivityTypes();
 		groupType_cmb.dataProvider = Grouping.getGroupingTypesDataProvider();
 		
 		//Call to apply style to all the labels and input fields
 		setStyles();
 		
 		//fire event to say we have loaded
-		
 		delete this.onEnterFrame; 
-		//hide all the controls at startup
 		
+		//hide all the controls at startup
 		delimitLine._visible = false;
 		hideAllSteppers(false);
 		showGroupingControls(false);
 		showGeneralControls(false);
 		showOptionalControls(false);
 		showToolActivityControls(false);
 		showGateControls(false);
+		showBranchingControls(false);
 		showAppliedGroupingControls(false);
 		showGeneralInfo(true);
 		
@@ -363,38 +372,30 @@
 		if(CanvasActivity(cm.selectedItem) != null){
 			cover_pnl.visible = false;
 			
-			// its a Canvas activity then
-			Debugger.log('Its a canvas activity',4,'updateItemProperties','PropertyInspector');
 			var ca = CanvasActivity(cm.selectedItem);
 			var a:Activity = ca.activity;	
+			
 			var cao = CanvasOptionalActivity(cm.selectedItem);
 			var cap = CanvasParallelActivity(cm.selectedItem);
+			
 			var caco:ComplexActivity = ComplexActivity(cao.activity);
 			var cacp:ComplexActivity = ComplexActivity(cap.activity);
 			
-			if(a.isGateActivity()){
-				//its a gate
-				delimitLine._visible = true;
+			if(a.isGateActivity()) {
 				showGroupingControls(false);
 				showToolActivityControls(false);
 				showGeneralInfo(false);
 				showOptionalControls(false);
 				showGateControls(true, !a.readOnly);
 				showAppliedGroupingControls(false);
-				//showGeneralProperties(a)
 				checkEnableGateControls();
 				showGateActivityProperties(GateActivity(a));
-				
 				showAppliedGroupingProperties(a);
-				//show the title
-				title_txt.text = StringUtils.cleanNull(a.title);
-				desc_txt.text = StringUtils.cleanNull(a.description);
+				
 				showGeneralControls(true, !a.readOnly);
 				
-				//PI_sp.refreshPane();
-			}else if(a.isGroupActivity()){
-				//its a grouping activity
-				delimitLine._visible = true;
+			} else if(a.isGroupActivity()) {
+			
 				showGroupingControls(true, !a.readOnly);
 				showGeneralControls(true, !a.readOnly);
 				showOptionalControls(false);
@@ -403,172 +404,170 @@
 				showToolActivityControls(false);
 				showGateControls(false);
 				showAppliedGroupingControls(false);
-				//showGeneralProperties(a)
 				populateGroupingProperties(GroupingActivity(a));
 				showAppliedGroupingProperties(a);
-				//show the title
-				title_txt.text = StringUtils.cleanNull(a.title);
-				desc_txt.text = StringUtils.cleanNull(a.description);
-				//PI_sp.refreshPane();
 			
-			} else if(a.isOptionalActivity()){
-				//its a grouping activity
-				delimitLine._visible = true;
+			} else if(a.isOptionalActivity()) {
 				
 				showGeneralControls(true, !a.readOnly);
 				showGroupingControls(false);
-				//showRelevantGroupOptions();
 				showToolActivityControls(false);
 				showGateControls(false);
 				showGeneralInfo(false);
 				showAppliedGroupingControls(false);
 				showOptionalControls(true, !a.readOnly);
-				//showGeneralProperties(cca)
 				populateGroupingProperties(GroupingActivity(caco));
 				showAppliedGroupingProperties(caco);
 				showOptionalActivityProperties(caco);
-				//show the title
-				title_txt.text = StringUtils.cleanNull(a.title);
-				desc_txt.text = StringUtils.cleanNull(a.description);
-				//PI_sp.refreshPane();
-			}else if(a.isParallelActivity()){
-				//its a grouping activity
-				delimitLine._visible = true;
-				//its an parallel activity
+				
+			} else if(a.isParallelActivity()) {
+				
 				showOptionalControls(false);
 				showGeneralControls(true, !a.readOnly);
 				showGeneralInfo(false);
 				showGroupingControls(false);
-				//showRelevantGroupOptions();
 				showToolActivityControls(false);
 				showGateControls(false);
 				showAppliedGroupingControls(true, !a.readOnly);
-				//showGeneralProperties(cca)
 				populateGroupingProperties(GroupingActivity(cacp));
 				showAppliedGroupingProperties(cacp);
 				showParallelActivityProperties(cacp);
-				//show the title
-				title_txt.text = StringUtils.cleanNull(a.title);
-				desc_txt.text = StringUtils.cleanNull(a.description);
-			}else{
-				//its a tool activity
-				delimitLine._visible = true;	
+				
+			} else {
 				showOptionalControls(false);
 				showGeneralControls(true, !a.readOnly);
 				showGroupingControls(false);
 				showGeneralInfo(false);
 				showAppliedGroupingControls(true, !a.readOnly);
 				showToolActivityControls(true, !a.readOnly);
 				showGateControls(false);
-				//showAppliedGroupingControls(true);
 				showToolActivityProperties(ToolActivity(a));
-				//showGeneralProperties(a)
 				showAppliedGroupingProperties(a);
-				//show the title
-				title_txt.text = StringUtils.cleanNull(a.title);
-				desc_txt.text = StringUtils.cleanNull(a.description);
-				//PI_sp.refreshPane();
 			}
-
 			
-		}else if(CanvasOptionalActivity(cm.selectedItem) != null){
+			delimitLine._visible = true;
+				
+			title_txt.text = StringUtils.cleanNull(a.title);
+			desc_txt.text = StringUtils.cleanNull(a.description);
+			
+		} else if(CanvasBranchingActivity(cm.selectedItem) != null) {
+			var cb = CanvasBranchingActivity(cm.selectedItem);
+			var ba:BranchingActivity = BranchingActivity(cb.activity);
+			
 			cover_pnl.visible = false;
+			delimitLine._visible = true;
+			
+			showBranchingControls(true, !ba.readOnly);
+			showGeneralControls(true, !ba.readOnly);
+				
+			showOptionalControls(false);
+			showGeneralInfo(false);
+			showToolActivityControls(false);
+			showGateControls(false);
+			showAppliedGroupingControls(false);
+			
+			showBranchingActivityProperties(ba);
+			showAppliedGroupingProperties(ba);
+				
+			title_txt.text = StringUtils.cleanNull(ba.title);
+			desc_txt.text = StringUtils.cleanNull(ba.description);
+			
+		} else if(CanvasOptionalActivity(cm.selectedItem) != null){
 			var co = CanvasOptionalActivity(cm.selectedItem);
 			var cca:ComplexActivity = ComplexActivity(co.activity);
-				//its an optional activity
-				delimitLine._visible = true;
-				
-				showGeneralControls(true, !co.activity.readOnly);
-				showGroupingControls(false);
-				//showRelevantGroupOptions();
-				showToolActivityControls(false);
-				showGateControls(false);
-				showGeneralInfo(false);
-				showAppliedGroupingControls(false);
-				showOptionalControls(true, !co.activity.readOnly);
-				//showGeneralProperties(cca)
-				populateGroupingProperties(GroupingActivity(cca));
-				showAppliedGroupingProperties(cca);
-				showOptionalActivityProperties(cca);
-				//show the title
-				title_txt.text = StringUtils.cleanNull(cca.title);
-				desc_txt.text = StringUtils.cleanNull(cca.description);
-				//PI_sp.refreshPane();
-		}else if(CanvasParallelActivity(cm.selectedItem) != null){
+			
 			cover_pnl.visible = false;
+			delimitLine._visible = true;
+				
+			showGeneralControls(true, !co.activity.readOnly);
+			showGroupingControls(false);
+			showToolActivityControls(false);
+			showGateControls(false);
+			showGeneralInfo(false);
+			showAppliedGroupingControls(false);
+			showOptionalControls(true, !co.activity.readOnly);
+			populateGroupingProperties(GroupingActivity(cca));
+			showAppliedGroupingProperties(cca);
+			showOptionalActivityProperties(cca);
+				
+			title_txt.text = StringUtils.cleanNull(cca.title);
+			desc_txt.text = StringUtils.cleanNull(cca.description);
+				
+		} else if(CanvasParallelActivity(cm.selectedItem) != null) {
 			var co = CanvasParallelActivity(cm.selectedItem);
 			var cca:ComplexActivity = ComplexActivity(co.activity);
-				delimitLine._visible = true;
-				//its an parallel activity
-				showOptionalControls(false);
-				showGeneralControls(true, !co.activity.readOnly);
-				showGeneralInfo(false);
-				showGroupingControls(false);
-				//showRelevantGroupOptions();
-				showToolActivityControls(false);
-				showGateControls(false);
-				showAppliedGroupingControls(true, !co.activity.readOnly);
-				//showGeneralProperties(cca)
-				populateGroupingProperties(GroupingActivity(cca));
-				showAppliedGroupingProperties(cca);
-				showParallelActivityProperties(cca);
-				//show the title
-				title_txt.text = StringUtils.cleanNull(cca.title);
-				desc_txt.text = StringUtils.cleanNull(cca.description);
-		}else if(CanvasTransition(cm.selectedItem) != null){
+			
 			cover_pnl.visible = false;
+			delimitLine._visible = true;
+			
+			showOptionalControls(false);
+			showGeneralControls(true, !co.activity.readOnly);
+			showGeneralInfo(false);
+			showGroupingControls(false);
+			
+			showToolActivityControls(false);
+			showGateControls(false);
+			showAppliedGroupingControls(true, !co.activity.readOnly);
+			
+			populateGroupingProperties(GroupingActivity(cca));
+			showAppliedGroupingProperties(cca);
+			showParallelActivityProperties(cca);
+			
+			title_txt.text = StringUtils.cleanNull(cca.title);
+			desc_txt.text = StringUtils.cleanNull(cca.description);
+			
+		} else if(CanvasTransition(cm.selectedItem) != null) {
 			var ct = CanvasTransition(cm.selectedItem);
 			var t:Transition = ct.transition;
-				Debugger.log('Its a canvas transition',4,'updateItemProperties','PropertyInspector');
-				delimitLine._visible = false;
-				showTransitionProperties(t);
-				//showGeneralProperties(t)
-				showGeneralInfo(false);
-				showGeneralControls(false);
-				showOptionalControls(false);
-				showGroupingControls(false);
-				showToolActivityControls(false);
-				showGateControls(false);
-				showAppliedGroupingControls(false);
-				//PI_sp.complete;
 			
-		}else{
 			cover_pnl.visible = false;
-				Debugger.log('Its a something we dont know',Debugger.CRITICAL,'updateItemProperties','PropertyInspector');
-				showGeneralInfo(true);
-				delimitLine._visible = false;
-				toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> "//Dictionary.getValue('pi_title_generalinfo');
-				showGroupingControls(false);
-				showGeneralControls(false);
-				showOptionalControls(false);
-				showRelevantGroupOptions();
-				showToolActivityControls(false);
-				showGateControls(false);
-				showAppliedGroupingControls(false);
-		
-				//PI_sp.complete
+			delimitLine._visible = false;
+			
+			showTransitionProperties(t);
+			showGeneralInfo(false);
+			showGeneralControls(false);
+			showOptionalControls(false);
+			showGroupingControls(false);
+			showToolActivityControls(false);
+			showGateControls(false);
+			showAppliedGroupingControls(false);
+			
+		} else {
+			cover_pnl.visible = false;
+			delimitLine._visible = false;
+			
+			toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> ";
+			
+			showGeneralInfo(true);
+			showGroupingControls(false);
+			showGeneralControls(false);
+			showOptionalControls(false);
+			showRelevantGroupOptions();
+			showToolActivityControls(false);
+			showGateControls(false);
+			showAppliedGroupingControls(false);
 		}
 	}
 	
 	private function showToolActivityControls(v:Boolean, e:Boolean){
 		
 		var a = _canvasModel.selectedItem.activity;
 		var parentAct = _canvasModel.getCanvas().ddm.getActivityByUIID(a.parentUIID)
-		if (a.parentUIID != null && parentAct.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE) {
+		
+		if(a.parentUIID != null && parentAct.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE) {
 			applied_grouping_lbl.visible = v
 			appliedGroupingActivity_cmb.visible = false;
 			
 			applied_grouping_lbl.enabled = e;
 			
-		}else {
+		} else {
 			applied_grouping_lbl.visible = false
 			appliedGroupingActivity_cmb.visible = v;
 			
 			appliedGroupingActivity_cmb.enabled = e;
 			
 		}
 		
-		
 		grouping_lbl.visible = v;
 		currentGrouping_lbl.visible = v;
 		runOffline_chk.visible = v;
@@ -625,6 +624,7 @@
 	}
 	
 	private function showGateControls(v:Boolean, e:Boolean){
+		
 		days_lbl.visible = v;
 		hours_lbl.visible = v;
 		mins_lbl.visible = v;
@@ -653,6 +653,16 @@
 		
 	}
 	
+	private function showBranchingControls(v:Boolean, e:Boolean){
+		branchType_lbl.visible = v;
+		branchType_cmb.visible = v;
+		
+		if(e != null) {
+			branchType_lbl.enabled = e;
+			branchType_cmb.enabled = e;
+		}
+	}
+	
 	/**
 	 * Shows or hides the app.lied grouping
 	 * AND title fields
@@ -713,34 +723,34 @@
 	}
 	
 	private function showGeneralProperties(ta:ToolActivity){
+		
 	}
 	
 	private function showOptionalActivityProperties(ca:ComplexActivity){
-		
 	
 		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_optional_title');
 		runOffline_chk.selected = ca.runOffline;
 		defineLater_chk.selected = ca.defineLater;
-		trace("min options when starting: "+ca.minOptions)
-		if (ca.minOptions == undefined){
+		
+		if(ca.minOptions == undefined) {
 			minAct_stp.value = 0
-		}else{
+		} else {
 			minAct_stp.value = ca.minOptions
 		}
 		
-		if (ca.maxOptions == undefined){
+		if(ca.maxOptions == undefined) {
 			maxAct_stp.value = 0
-		}else{
+		} else {
 			maxAct_stp.value = ca.maxOptions
 		}
+		
 		currentGrouping_lbl.text = "GroupingUIID:"+StringUtils.cleanNull(ca.runOffline.groupingUIID);
-			
-
 	}
 	
 	private function updateOptionalData(){
 		var oa = _canvasModel.selectedItem.activity;
 		var	o = ComplexActivity(oa);
+		
 		o.minOptions = minAct_stp.value;
 		o.maxOptions = maxAct_stp.value;
 		oa.init();
@@ -749,30 +759,38 @@
 	}
 	
 	private function showParallelActivityProperties(ca:ComplexActivity){
-		
-		
 		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_parallel_title');
 		runOffline_chk.selected = ca.runOffline;
 		defineLater_chk.selected = ca.defineLater;
 					
 		currentGrouping_lbl.text = "GroupingUIID:"+StringUtils.cleanNull(ca.runOffline.groupingUIID);
-			
-
 	}
 	
 	private function showGateActivityProperties(ga:GateActivity){
 		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_activity_type_gate');
+		
 		//loop through combo to find SI of our gate activity type
-		trace("gate Type is: "+ga.activityTypeID)
 		for (var i=0; i<gateType_cmb.dataProvider.length;i++){
 			if(_canvasModel.selectedItem.activity.activityTypeID == gateType_cmb.dataProvider[i].data){
 				
 				gateType_cmb.selectedIndex=i;
 			}
 		}
+		
 		//TODO: set the stepper values too!
+	
+	}
+	
+	private function showBranchingActivityProperties(ba:BranchingActivity){
+		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_activity_type_branching');
 		
-		
+		//loop through combo to find SI of our branching activity type
+		for (var i=0; i<branchType_cmb.dataProvider.length;i++){
+			if(_canvasModel.selectedItem.activity.activityTypeID == branchType_cmb.dataProvider[i].data){
+				
+				branchType_cmb.selectedIndex=i;
+			}
+		}
 	
 	}
 	
@@ -957,9 +975,6 @@
 		MovieClipUtils.doLater(Proxy.create(this,reDrawTroublesomeSteppers));
 	}
 	
-	
-	
-	
 	/**
 	 * Called when there is a change in the values of the group method steppers
 	 * Butdates the value inthe grouping class being edited.
@@ -985,13 +1000,15 @@
 		var gActsDP = new Array();
 		var ga = _canvasModel.selectedItem.activity;
 		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
+		
 		gActsDP.push({label:Dictionary.getValue('pi_no_grouping'),data:null});
+		
 		for(var i=0; i<gActs.length;i++){
 			if (ga.createGroupingUIID != gActs[i].createGroupingUIID){
-				trace("Grouping "+gActs[i].title+" has UIID: "+ gActs[i].createGroupingUIID );
 				gActsDP.push({label:gActs[i].title,data:gActs[i]});
 			}
 		}
+		
 		return gActsDP;
 	}
 	
@@ -1039,7 +1056,7 @@
 		grouping_lbl.setStyle('styleName',styleObj);
 		currentGrouping_lbl.setStyle('styleName',styleObj);
 		gateType_lbl.setStyle('styleName',styleObj);
-		gateType_lbl.setStyle('styleName',styleObj);
+		branchType_lbl.setStyle('styleName',styleObj);
 		startOffset_lbl.setStyle('styleName',styleObj);
 		endOffset_lbl.setStyle('styleName',styleObj);
 		days_lbl.setStyle('styleName', styleObj);
@@ -1066,6 +1083,7 @@
 		
 		styleObj = _tm.getStyleObject('picombo');
 		gateType_cmb.setStyle('styleName',styleObj);
+		branchType_cmb.setStyle('styleName', styleObj);
 		groupType_cmb.setStyle('styleName',styleObj);
 		appliedGroupingActivity_cmb.setStyle('styleName',styleObj);
 		
@@ -1106,6 +1124,19 @@
 	}
 	
 	/**
+	 *Handles change event fired from the branchType_cmb
+	 * @usage   
+	 * @param   evt 
+	 * @return  
+	 */
+	private function onBranchTypeChange(evt:Object){
+		_canvasModel.selectedItem.activity.activityTypeID = evt.target.value;
+		Debugger.log('Set branch type to: _canvasModel.selectedItem.activity.activityTypeID:'+_canvasModel.selectedItem.activity.activityTypeID,Debugger.GEN,'onBranchTypeChange','PropertyInspector');
+		
+		setModified();
+	}
+	
+	/**
 	 * Handles change event fired from the groupType_cmb
 	 * @usage   
 	 * @param   evt