Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r70923fa577599b29f521d2daa8e348137e480bff -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 70923fa577599b29f521d2daa8e348137e480bff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -283,8 +283,9 @@
 			return new LFError("Adding grouping to hashtable failed","addGrouping",this,'groupingUIID:'+grp.groupingUIID);
 		}
 		*/
-		return true;
 		dispatchEvent({type:'ddmUpdate',target:this});
+		
+		return true;
 	}
 	
 	/**
@@ -838,6 +839,34 @@
 		return transObj;
 	}
 	
+	public function getBranchesForActivityUIID(UIID):Object{
+		var br:Array = _branches.values();
+		var branchObj = new Object();
+		var myBranches:Array = new Array();
+		var into = null;
+		var out = null;
+		
+		for(var i=0; i<br.length;i++){
+			if(br[i].toUIID == UIID || br[i].fromUIID == UIID){
+				myBranches.push(br[i]);
+			}
+			if(into != null && out != null){
+					break;
+			}else{
+				if(br[i].fromUIID == UIID){
+					out = br[i];
+				}
+				if(br[i].toUIID == UIID){
+					into = br[i];
+				}
+			}
+		}
+		branchObj.myBranches = myBranches;
+		branchObj.out = out;
+		branchObj.into = into;
+		return branchObj;
+	}
+	
 	//Getters and setters for the properties
 	public function get objectType():String{
 		return _objectType;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
===================================================================
diff -u -r70923fa577599b29f521d2daa8e348137e480bff -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision 70923fa577599b29f521d2daa8e348137e480bff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -28,7 +28,7 @@
 import org.lamsfoundation.lams.authoring.cv.*;
 import org.lamsfoundation.lams.authoring.br.*;
 
-class org.lamsfoundation.lams.authoring.br.BranchConnector extends CanvasTransition {
+class org.lamsfoundation.lams.authoring.br.BranchConnector extends CanvasConnection {
 	
 	private static var DIR_FROM_START:Number = 0;
 	private static var DIR_TO_END:Number = 1;
@@ -39,20 +39,89 @@
 	function BranchConnector(){
 		super();
 		
-		override_fromAct = (_direction == DIR_FROM_START) ? _canvasBranchView.startHub : null;
-		override_toAct = (_direction == DIR_TO_END) ? _canvasBranchView.endHub : null;
+		Debugger.log("_branch.fromUIID:"+_branch.fromUIID,4,'Constructor','BranchConnector');
+		Debugger.log("_branch.toUIID:"+_branch.toUIID,4,'Constructor','BranchConnector');
+		
+		MovieClipUtils.doLater(Proxy.create(this,init));
 	}
 	
+	public function init():Void{
+		_drawnLineStyle = 0xEA00FF;
+		draw();
+	}
+	
+	/**
+	 * Renders the branch to stage
+	 * @usage   
+	 * @return  
+	 */
+	private function draw():Void{
+
+		var cv:Canvas = Application.getInstance().getCanvas();
+		
+		if(cv.model.activeView.startHub.activity.activityUIID = _branch.fromUIID) direction = DIR_FROM_START;
+		else if(cv.model.activeView.endHub.activity.activityUIID = _branch.toUIID) direction = DIR_TO_END;
+		
+		var fromAct_mc = (direction == DIR_FROM_START) ? cv.model.activeView.startHub : cv.model.getActivityMCByUIID(_branch.fromUIID);	
+		var toAct_mc = (direction == DIR_TO_END) ? cv.model.activeView.endHub : cv.model.getActivityMCByUIID(_branch.toUIID);
+		
+		var fromOTC:Object = getFromOTC(fromAct_mc);
+		var toOTC:Object = getToOTC(toAct_mc);
+		
+		Debugger.log('fromAct_mc.getActivity().xCoord:' + fromAct_mc.getActivity().xCoord , 4, 'draw', 'BranchConnector');	
+		Debugger.log('offsetToCentre_x: ' + fromOTC.x, 4, 'draw', 'BranchConnector');	
+		
+		_startPoint = (direction == DIR_FROM_START) ? new Point(fromAct_mc._x + fromOTC.x,fromAct_mc._y + fromOTC.y)
+													: new Point(fromAct_mc.getActivity().xCoord + fromOTC.x,fromAct_mc.getActivity().yCoord + fromOTC.y);
+		_endPoint = (direction == DIR_TO_END) ? new Point(toAct_mc._x + toOTC.x, toAct_mc._y + toOTC.y)
+											  : new Point(toAct_mc.getActivity().xCoord + toOTC.x, toAct_mc.getActivity().yCoord + toOTC.y);
+		
+		createConnection(fromAct_mc, toAct_mc, _startPoint, _endPoint, fromOTC, toOTC);
+			
+	}
+	
 	public function get branch():Branch{
 		return _branch;
 	}
 	
 	public function set branch(b:Branch){
 		_branch = b;
-		_transition = _branch;
 	}
 	
 	public function get direction():Number {
 		return _direction;
+	}
+	
+	public function set direction(a:Number) {
+		_direction = a;
+	}
+	
+	private function onPress():Void{
+			// check double-click
+			var now:Number = new Date().getTime();
+			Debugger.log('now - _dcStartTime:'+(now - _dcStartTime)+' Config.DOUBLE_CLICK_DELAY:'+Config.DOUBLE_CLICK_DELAY,Debugger.GEN,'onPress','CanvasTransition');
+			if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){
+				_doubleClicking = true;
+				_canvasController.branchDoubleClick(this);
+			
+			}else{
+				Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','CanvasTransition');
+				_doubleClicking = false;
+				_canvasController.branchClick(this);
+			}
+			
+			_dcStartTime = now;
+	
+	}
+
+	private function onRelease():Void{
+		if(!_doubleClicking){
+			_canvasController.branchRelease(this);
+		}
+		
+	}
+	
+	private function onReleaseOutside():Void{
+		_canvasController.branchReleaseOutside(this);
 	}
 }  
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r70923fa577599b29f521d2daa8e348137e480bff -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 70923fa577599b29f521d2daa8e348137e480bff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -56,8 +56,8 @@
 	private var lastScreenHeight:Number = 300;
 
 	private var grid_mc:Object;
-	private var hSpace:Number = 100;
-	private var vSpace:Number = 100;
+	private var hSpace:Number = 30;
+	private var vSpace:Number = 30;
 
 	private var close_mc:MovieClip;
 	
@@ -215,8 +215,8 @@
 		Debugger.log('adding hubs for branch activity:' + _canvasBranchingActivity,Debugger.CRITICAL,'setupConenctorHubs','org.lamsfoundation.lams.CanvasBranchView');
 		
 		cHubStart_mc = activityLayer.createChildAtDepth("CanvasBranchingConnector",DepthManager.kTop,{_activity:_canvasBranchingActivity.activity,_canvasController:getController(),_canvasView:_canvasBranchView, _x: 0 , _y: 0});
-		cHubEnd_mc = activityLayer.createChildAtDepth("CanvasBranchingConnector",DepthManager.kTop,{_activity:_canvasBranchingActivity.activity,_canvasController:getController(),_canvasView:_canvasBranchView, _x: 0 , _y: 0});
-		
+		//cHubEnd_mc = activityLayer.createChildAtDepth("CanvasBranchingConnector",DepthManager.kTop,{_activity:_canvasBranchingActivity.activity,_canvasController:getController(),_canvasView:_canvasBranchView, _x: 0 , _y: 0});
+
 	}
 	
 	private function loadSequenceActivities() {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingConnector.as
===================================================================
diff -u -r7548a5a6349a58e304bfa7b35805978121ccbd87 -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingConnector.as	(.../CanvasBranchingConnector.as)	(revision 7548a5a6349a58e304bfa7b35805978121ccbd87)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingConnector.as	(.../CanvasBranchingConnector.as)	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -43,7 +43,7 @@
 class CanvasBranchingConnector extends CanvasActivity { 
 
 	function CanvasBranchingConnector(){
-		super();
+		super(true);
 		branchConnector = true;
 	}	
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r7548a5a6349a58e304bfa7b35805978121ccbd87 -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 7548a5a6349a58e304bfa7b35805978121ccbd87)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -795,8 +795,19 @@
 		canvasModel.selectedItem = null;
 	}
 	
+	/**
+	 * Removes an transition by using its branchUIID.  
+	 * Called by the bin
+	 * @usage   
+	 * @param   branchUIID 
+	 * @return  
+	 */
+	public function removeBranch(branchUIID:Number){	
+		_ddm.removeBranch(branchUIID);
+		canvasModel.setDirty();	
+		canvasModel.selectedItem = null;
+	}
 	
-	
 	/**
 	 * Called by Comms after a design has been loaded, usually set as the call back of something like openDesignByID.
 	 * Will accept a learningDesign DTO and then render it all out.
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -r70923fa577599b29f521d2daa8e348137e480bff -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 70923fa577599b29f521d2daa8e348137e480bff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -107,7 +107,7 @@
 	private var bgNegative:String = "original";
 	private var authorMenu:ContextMenu;
 	
-	function CanvasActivity(){
+	function CanvasActivity(_connector){
 		_tm = ThemeManager.getInstance();
 		_ccm = CustomContextMenu.getInstance();
 		
@@ -116,7 +116,7 @@
 		
 		//let it wait one frame to set up the components.
 		//this has to be set b4 the do later :)
-		if(_activity.isGateActivity() || _branchConnector){
+		if(_activity.isGateActivity() || _connector){
 			_visibleHeight = CanvasActivity.GATE_ACTIVITY_HEIGHT;
 			_visibleWidth = CanvasActivity.GATE_ACTIVITY_WIDTH;
 		}else if(_activity.isGroupActivity()){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasConnection.as
===================================================================
diff -u
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasConnection.as	(revision 0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasConnection.as	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -0,0 +1,211 @@
+/***************************************************************************
+ * 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.util.*;
+import org.lamsfoundation.lams.common.ui.*;
+import org.lamsfoundation.lams.common.*;
+import org.lamsfoundation.lams.authoring.*;
+import org.lamsfoundation.lams.authoring.cv.*;
+import org.lamsfoundation.lams.authoring.br.*;
+
+class org.lamsfoundation.lams.authoring.cv.CanvasConnection extends MovieClip{  
+	
+	private var _canvasController:CanvasController;
+	private var _canvasView:CanvasView;
+	private var _canvasBranchView:CanvasBranchView;
+	
+	private var _drawnLineStyle:Number;
+	
+	private var arrow_mc:MovieClip;
+	private var stopArrow_mc:MovieClip;
+	private var stopSign_mc:MovieClip;
+	
+	private var _startPoint:Point;
+	private var _midPoint:Point;
+	private var _endPoint:Point;
+	private var _fromAct_edgePoint:Point;
+	private var _toAct_edgePoint:Point;
+	private var xPos:Number;
+	
+	private var _dcStartTime:Number = 0;
+	private var _doubleClicking:Boolean;
+	
+	function CanvasConnection(){
+		arrow_mc._visible = false;
+		stopArrow_mc._visible = false;
+		stopSign_mc._visible = false;
+	}
+	
+	public function get midPoint():Point{
+		return _midPoint;
+	}
+	
+	public function get toAct_edgePoint():Point{
+		return _toAct_edgePoint;
+	}
+	
+	public function get fromAct_edgePoint():Point{
+		return _fromAct_edgePoint;
+	}
+	
+	public function get xPosition():Number{
+		return xPos;
+	}
+	
+	public function createConnection(fromAct_mc, toAct_mc, _startPoint:Point, _endPoint:Point, fromOTC:Object, toOTC:Object) {
+		Debugger.log('fromAct_mc:'+fromAct_mc,4,'draw','CanvasConnection');
+		Debugger.log('toAct_mc:'+toAct_mc,4,'draw','CanvasConnection');
+		
+		this.lineStyle(2, _drawnLineStyle);
+		this.moveTo(_startPoint.x, _startPoint.y);
+		this.lineTo(_endPoint.x, _endPoint.y);
+		
+		Debugger.log('drawn line from:'+_startPoint.x+','+_startPoint.y+'to:'+_endPoint.x+','+_endPoint.y,4,'draw','CanvasTransition');
+		
+		// calc activity root angles
+		var fromAct_Angle:Number = Math.atan2(fromOTC.y, fromOTC.x);
+		var toAct_Angle:Number = Math.atan2(toOTC.y,toOTC.x);
+		
+		var fromAct_Deg:Number = convertToDegrees(fromAct_Angle);
+		var toAct_Deg:Number = convertToDegrees(toAct_Angle);
+		
+		Debugger.log("fromAct root angle: " + fromAct_Deg, Debugger.CRITICAL, "draw", "CanvasConnection");
+		Debugger.log("toAct root angle: " + toAct_Deg, Debugger.CRITICAL, "draw", "CanvasConnection");
+		
+		// gradient
+		var angle:Number = Math.atan2((_endPoint.y - _startPoint.y),(_endPoint.x - _startPoint.x));
+		var degs:Number = convertToDegrees(angle);
+		
+		Debugger.log("angle: " + angle, Debugger.CRITICAL, "draw", "CanvasConnection");
+		Debugger.log("degs: " + degs, Debugger.CRITICAL, "draw", "CanvasConnection");
+		
+		// get edgepoint for connected activities 
+		_fromAct_edgePoint = calcEdgePoint(degs, fromOTC.x, fromOTC.y, fromAct_Deg,  _startPoint);
+		_toAct_edgePoint = (degs >= 0) ? calcEdgePoint(degs - 180, toOTC.x, toOTC.y, toAct_Deg, _endPoint)
+										: calcEdgePoint(degs + 180, toOTC.x, toOTC.y, toAct_Deg, _endPoint);
+		// calc midpoint
+		if(_fromAct_edgePoint != null & _toAct_edgePoint != null) {
+			arrow_mc._x = (_fromAct_edgePoint.x + _toAct_edgePoint.x)/2;
+			arrow_mc._y = (_fromAct_edgePoint.y + _toAct_edgePoint.y)/2;
+		} else {
+			arrow_mc._x = (_startPoint.x + _endPoint.x)/2;
+			arrow_mc._y = (_startPoint.y + _endPoint.y)/2;
+		}
+		
+		Debugger.log("startPoint: (" + _startPoint.x + ", " + _startPoint.y + ")", Debugger.CRITICAL, "draw", "CanvasConnection");
+		Debugger.log("fromAct edge point: (" + _fromAct_edgePoint.x + ", " + _fromAct_edgePoint.y + ")", Debugger.CRITICAL, "draw", "CanvasConnection");
+		Debugger.log("toAct edge point: (" + _toAct_edgePoint.x + ", " + _toAct_edgePoint.y + ")", Debugger.CRITICAL, "draw", "CanvasConnection");
+		Debugger.log("endPoint: (" + _endPoint.x + ", " + _endPoint.y + ")", Debugger.CRITICAL, "draw", "CanvasConnection");
+		
+		Debugger.log("mid point: (" + _midPoint.x + ", " + _midPoint.y + ")", Debugger.CRITICAL, "draw", "CanvasConnection");
+		
+		arrow_mc._rotation = degs;
+		arrow_mc._visible = true;
+		
+		_midPoint = new Point(arrow_mc._x,arrow_mc._y);
+		
+		xPos = this._x;
+				
+	}
+	
+	private static function convertToDegrees(angle:Number):Number {
+		return Math.round(angle*180/Math.PI);
+	}
+	
+	private static function convertToRadians(degrees:Number):Number {
+		return degrees/180*Math.PI;
+	}
+	
+	private function getQuadrant(d:Number) {
+		if(d >= 0 && d < 90) {
+			return "q3";
+		} else if(d < 0 && d >= - 90) {
+			return "q2";
+		} else if(d < -90 && d >= -180) {
+			return  "q1";
+		} else {
+			return "q4";
+		}
+	}
+	
+	private function calcEdgePoint(_d:Number, x_offset:Number, y_offset:Number, _act_d:Number, point:Point):Point {
+		var _edgePoint:Point = new Point();
+		var d:Number = _d;
+		var quad:String = getQuadrant(d);
+	
+		switch(quad) {
+			case "q1":
+				d = 180 + d;
+				
+				_edgePoint.y = (d >= _act_d) ? point.y - y_offset : point.y - (x_offset * calcTangent(d, false));
+				_edgePoint.x = (d >= _act_d) ? point.x - (y_offset * calcTangent(d, true)) : point.x - x_offset;;
+				
+				break;
+			case "q2":
+				d = Math.abs(d);
+				
+				_edgePoint.y = (d >= _act_d) ? point.y - y_offset : point.y - (x_offset * calcTangent(d, false));
+				_edgePoint.x = (d >= _act_d) ? point.x + (y_offset * calcTangent(d, true)) : point.x + x_offset;;
+				
+				break;
+			case "q3":
+			
+				_edgePoint.y = (d >= _act_d) ? point.y + y_offset : point.y + (x_offset * calcTangent(d, false));
+				_edgePoint.x = (d >= _act_d) ? point.x + (y_offset * calcTangent(d, true)) : point.x + x_offset;
+			
+					
+				break;
+			case "q4":
+				d = 180 - d;
+			
+				_edgePoint.y = (d >= _act_d) ? point.y + y_offset : point.y + (x_offset * calcTangent(d, false));
+				_edgePoint.x = (d >= _act_d) ? point.x - (y_offset * calcTangent(d, true)) : point.x - x_offset;;
+				
+				break;
+			default:
+				// ERR: No Quadrant found
+				break;
+		}
+		
+		return _edgePoint;
+	}
+	
+	private function calcTangent(_d:Number, _use_adj_angle:Boolean) {
+		var d:Number = (_use_adj_angle) ? 90 - _d: _d;
+		return Math.tan(convertToRadians(d));
+	}
+	
+	public function getToOTC(toAct_mc):Object {
+		var _toOTC = new Object();
+		_toOTC.x = toAct_mc.getVisibleWidth()/2;
+		_toOTC.y = toAct_mc.getVisibleHeight()/2;
+		return _toOTC;
+	}
+	
+	public function getFromOTC(fromAct_mc):Object {
+		var _fromOTC = new Object();
+		_fromOTC.x = fromAct_mc.getVisibleWidth()/2;
+		_fromOTC.y = fromAct_mc.getVisibleHeight()/2;
+		return _fromOTC;
+	}
+}
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r7548a5a6349a58e304bfa7b35805978121ccbd87 -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 7548a5a6349a58e304bfa7b35805978121ccbd87)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -192,7 +192,6 @@
 			
 			//run in a loop to support branches, maybe more then 2 transitions.
 			for (var i=0; i<myTransitions.length;i++){
-				Debugger.log('removing transition for redraw:'+myTransitions[i].transitionUIID,Debugger.GEN,'activityRelease','CanvasController');
 				var t = _canvasModel.transitionsDisplayed.remove(myTransitions[i].transitionUIID);
 				t.removeMovieClip();
 			}
@@ -206,6 +205,17 @@
 				t.removeMovieClip();
 			}
 			
+			// refresh any branches connected to activities
+			//TODO: refresh the branches as you drag...
+			var myBranches = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID);
+			myBranches = myBranches.myBranches;
+			
+			for (var i=0; i<myBranches.length;i++){
+				Debugger.log('removing branch for redraw:'+myBranches[i].branchUIID,Debugger.GEN,'activityRelease','CanvasController');
+				var b = _canvasModel.branchesDisplayed.remove(myBranches[i].branchUIID);
+				b.removeMovieClip();
+			}
+			
 			clearAllSelections(optionalOnCanvas, parallelOnCanvas)		
 			_canvasModel.setDirty();
 			_canvasModel.selectedItem = ca;
@@ -365,20 +375,42 @@
 		ct.startDrag(false);
 	   
 	}
-   
+	
+	public function branchClick(bc:BranchConnector):Void{
+	    Debugger.log('branchClick Transition:'+bc.branch.branchUIID,Debugger.GEN,'branchClick','CanvasController');
+	    _canvasModel.getCanvas().stopActiveTool();
+		
+		_canvasModel.selectedItem = bc;
+		_canvasModel.isDragging = true;
+		bc.startDrag(false);
+	   
+	}
+	
     public function transitionDoubleClick(ct:CanvasTransition):Void{
 		Debugger.log('transitionDoubleClick CanvasTransition:'+ct.transition.transitionUIID,Debugger.GEN,'transitionDoubleClick','CanvasController');
 	   
 		_canvasModel.getCanvas().stopActiveTool();
 	   
 		//TODO: fix this, its null
 		_canvasView =  CanvasView(getView());
-		Debugger.log('_canvasView:'+_canvasView,Debugger.GEN,'transitionDoubleClick','CanvasController');
 	   
 		if(!isTransitionTargetReadOnly(ct, Dictionary.getValue("cv_element_readOnly_action_mod"))) _canvasModel.activeView.createTransitionPropertiesDialog("centre",Delegate.create(this, transitionPropertiesOK));
 		
 	    _canvasModel.selectedItem = ct;
     }
+    
+    public function branchDoubleClick(bc:BranchConnector):Void{
+		Debugger.log('branchDoubleClick CanvasConnection:' + bc.branch.branchUIID,Debugger.GEN,'branchDoubleClick','CanvasController');
+	   
+		_canvasModel.getCanvas().stopActiveTool();
+	   
+		//TODO: fix this, its null
+		_canvasView =  CanvasView(getView());
+	   
+		//	if(!isTransitionTargetReadOnly(bc, Dictionary.getValue("cv_element_readOnly_action_mod"))) _canvasModel.activeView.createTransitionPropertiesDialog("centre",Delegate.create(this, transitionPropertiesOK));
+		
+	    _canvasModel.selectedItem = bc;
+    }
    
     public function transitionRelease(ct:CanvasTransition):Void{
 		Debugger.log("transitionRelease Transition:" + ct.transition.uiID, Debugger.GEN, "transitionRelease", "CanvasController");
@@ -397,7 +429,25 @@
 		}
 	
     }
+    
+    public function branchRelease(bc:BranchConnector):Void{
+		Debugger.log("branchRelease Transition:" + bc.branch.branchUIID, Debugger.GEN, "branchRelease", "CanvasController");
+		if(_canvasModel.isDragging){
+			bc.stopDrag();
+			
+			//if (bc.hitTest(_canvasModel.getCanvas().bin) && !isTransitionTargetReadOnly(bc, Dictionary.getValue("cv_element_readOnly_action_del"))){
+			//	_canvasModel.getCanvas().removeBranch(bc.branch.branchUIID); 
+			//} else {
+				if (bc._x != bc.xPosition){
+					var t = _canvasModel.branchesDisplayed.remove(bc.branch.branchUIID);
+					t.removeMovieClip();
+					_canvasModel.setDirty();
+				}
+		//	}
+		}
 	
+    }
+	
 	private function transitionSnapBack(ct:Object){
 		ct.reDraw();
 	}
@@ -406,6 +456,10 @@
 		transitionRelease(ct);
 	}
    
+   	public function branchReleaseOutside(bc:BranchConnector):Void{
+		branchRelease(bc);
+	}
+   
 	private function setBusy():Void{
 		if(_isBusy){
 			//Debugger.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!',1,'checkBusy','org.lamsfoundation.lams.common.util.Hashtable');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r70923fa577599b29f521d2daa8e348137e480bff -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 70923fa577599b29f521d2daa8e348137e480bff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -601,11 +601,11 @@
 				/*********************************************
 				* TODO: REQUIRE NORMAL BRANCH CLIENT_SIDE VALIDATION
 				*********************************************/
-				Debugger.log('No validation errors, creating branch.......',Debugger.GEN,'addActivityToTransition','CanvasModel');
-			
+				
 				//lets make the connection
 				var b:Branch = createBranchConnector(_transitionActivities);
-				
+				Debugger.log('No validation errors, creating branch.......' + b,Debugger.GEN,'addActivityToTransition','CanvasModel');
+			
 				//add it to the DDM
 				var success:Object = _cv.ddm.addBranch(b);
 				
@@ -908,20 +908,23 @@
 		//now check the transitions:
 		var ddmBranch_keys:Array = _cv.ddm.branches.keys();
 		var cmBranch_keys:Array = _branchesDisplayed.keys();
-		var trLongest = Math.max(ddmBranch_keys.length, cmBranch_keys.length);
+		var brLongest = Math.max(ddmBranch_keys.length, cmBranch_keys.length);
 		
-		if(ddmTransition_keys.length == trLongest){
-			trIndexArray = ddmBranch_keys;
+		//chose which array we are going to loop over
+		var brIndexArray:Array;
+		
+		if(ddmBranch_keys.length == brLongest){
+			brIndexArray = ddmBranch_keys;
 		}else{
-			trIndexArray = cmBranch_keys;
+			brIndexArray = cmBranch_keys;
 		}
 		
 		//loop through and do comparison
-		for(var i=0;i<trIndexArray.length;i++){
+		for(var i=0;i<brIndexArray.length;i++){
 			
-			var branchKeyToCheck:Number = trIndexArray[i];
+			var branchKeyToCheck:Number = brIndexArray[i];
 
-			var ddmBranch:Branch = _cv.ddm.transitions.get(branchKeyToCheck);
+			var ddmBranch:Branch = _cv.ddm.branches.get(branchKeyToCheck);
 			var cmBranch:Branch = _branchesDisplayed.get(branchKeyToCheck).branch;
 			var r_branch:Object = compareBranches(ddmBranch, cmBranch);
 			
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as
===================================================================
diff -u -r70923fa577599b29f521d2daa8e348137e480bff -r5b8b877a9e81a776b5af2cb4177c60e304e06dc6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as	(.../CanvasTransition.as)	(revision 70923fa577599b29f521d2daa8e348137e480bff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as	(.../CanvasTransition.as)	(revision 5b8b877a9e81a776b5af2cb4177c60e304e06dc6)
@@ -28,41 +28,18 @@
 import org.lamsfoundation.lams.authoring.cv.*;
 import org.lamsfoundation.lams.authoring.br.*;
 
-class org.lamsfoundation.lams.authoring.cv.CanvasTransition extends MovieClip{  
-	
-	private var _canvasController:CanvasController;
-	private var _canvasView:CanvasView;
-	private var _canvasBranchView:CanvasBranchView;
+class org.lamsfoundation.lams.authoring.cv.CanvasTransition extends CanvasConnection {  
+	
 	private var _transition:Transition;
 	
-	private var _drawnLineStyle:Number;
-	
-	private var arrow_mc:MovieClip;
-	private var stopArrow_mc:MovieClip;
-	private var stopSign_mc:MovieClip;
-	
-	
-	private var _startPoint:Point;
-	private var _midPoint:Point;
-	private var _endPoint:Point;
-	private var _fromAct_edgePoint:Point;
-	private var _toAct_edgePoint:Point;
-	private var xPos:Number;
-	
-	private var fromAct_override_mc:MovieClip;
-	private var toAct_override_mc:MovieClip;
-	
 	private var _dcStartTime:Number = 0;
 	private var _doubleClicking:Boolean;
 	
 	function CanvasTransition(){
+		super();
 		
 		Debugger.log("_transition.fromUIID:"+_transition.fromUIID,4,'Constructor','CanvasTransition');
 		Debugger.log("_transition.toUIID:"+_transition.toUIID,4,'Constructor','CanvasTransition');
-		
-		arrow_mc._visible = false;
-		stopArrow_mc._visible = false;
-		stopSign_mc._visible = false;
 		
 		MovieClipUtils.doLater(Proxy.create(this,init));
 	}
@@ -79,27 +56,7 @@
 	public function set transition(t:Transition){
 		_transition = t;
 	}
-	
-	public function get midPoint():Point{
-		return _midPoint;
-	}
 	
-	public function get toAct_edgePoint():Point{
-		return _toAct_edgePoint;
-	}
-	
-	public function get fromAct_edgePoint():Point{
-		return _fromAct_edgePoint;
-	}
-	
-	public function set override_fromAct(a:MovieClip) {
-		fromAct_override_mc = a;
-	}
-	
-	public function set override_toAct(a:MovieClip) {
-		toAct_override_mc = a;
-	}
-	
 	/**
 	 * Renders the transition to stage
 	 * @usage   
@@ -113,153 +70,24 @@
 		var toAct_mc;
 		
 		if(_transition.mod_fromUIID != null) fromAct_mc = cv.model.getActivityMCByUIID(_transition.mod_fromUIID);
-		else if(fromAct_override_mc != null) fromAct_mc = fromAct_override_mc;
 		else fromAct_mc = cv.model.getActivityMCByUIID(_transition.fromUIID);
-		
+			
 		if(_transition.mod_toUIID != null) toAct_mc = cv.model.getActivityMCByUIID(_transition.mod_toUIID);
-		else if(toAct_override_mc != null) toAct_mc = toAct_override_mc;
 		else toAct_mc = cv.model.getActivityMCByUIID(_transition.toUIID);
 		
-		var isGateTransition = toAct_mc.activity.isGateActivity();
+		var fromOTC:Object = getFromOTC(fromAct_mc);
+		var toOTC:Object = getToOTC(toAct_mc);
 		
-		var offsetToCentre_x = fromAct_mc.getVisibleWidth() / 2;
-		var offsetToCentre_y = fromAct_mc.getVisibleHeight() / 2;
-		Debugger.log('fromAct_mc.getActivity().xCoord:'+fromAct_mc.getActivity().xCoord,4,'draw','CanvasTransition');	
-		Debugger.log('offsetToCentre_x:'+offsetToCentre_x,4,'draw','CanvasTransition');	
-
+		Debugger.log('fromAct_mc.getActivity().xCoord:' + fromAct_mc.getActivity().xCoord , 4, 'draw', 'CanvasTransition');	
+		Debugger.log('offsetToCentre_x: ' + fromOTC.x, 4, 'draw', 'CanvasTransition');	
 		
-		_startPoint = new Point(fromAct_mc.getActivity().xCoord+offsetToCentre_x,fromAct_mc.getActivity().yCoord+offsetToCentre_y);
+		_startPoint = new Point(fromAct_mc.getActivity().xCoord + fromOTC.x, fromAct_mc.getActivity().yCoord + fromOTC.y);
+		_endPoint = new Point(toAct_mc.getActivity().xCoord + toOTC.x, toAct_mc.getActivity().yCoord + toOTC.y);
 		
-		var toOTC_x:Number = toAct_mc.getVisibleWidth() /2;
-		var toOTC_y:Number = toAct_mc.getVisibleHeight() /2;
-		
-		_endPoint = new Point(toAct_mc.getActivity().xCoord+toOTC_x,toAct_mc.getActivity().yCoord+toOTC_y);
-		
-		Debugger.log('fromAct_mc:'+fromAct_mc,4,'draw','CanvasTransition');
-		Debugger.log('toAct_mc:'+toAct_mc,4,'draw','CanvasTransition');
-		
-		this.lineStyle(2, _drawnLineStyle);
-		this.moveTo(_startPoint.x, _startPoint.y);
-		this.lineTo(_endPoint.x, _endPoint.y);
-		Debugger.log('drawn line from:'+_startPoint.x+','+_startPoint.y+'to:'+_endPoint.x+','+_endPoint.y,4,'draw','CanvasTransition');
-		
-		// calc activity root angles
-		var fromAct_Angle:Number = Math.atan2(offsetToCentre_y, offsetToCentre_x);
-		var toAct_Angle:Number = Math.atan2(toOTC_y,toOTC_x);
-		
-		var fromAct_Deg:Number = convertToDegrees(fromAct_Angle);
-		var toAct_Deg:Number = convertToDegrees(toAct_Angle);
-		
-		Debugger.log("fromAct root angle: " + fromAct_Deg, Debugger.CRITICAL, "draw", "CanvasTransition");
-		Debugger.log("toAct root angle: " + toAct_Deg, Debugger.CRITICAL, "draw", "CanvasTransition");
-		
-		// gradient
-		var angle:Number = Math.atan2((_endPoint.y- _startPoint.y),(_endPoint.x- _startPoint.x));
-		var degs:Number = convertToDegrees(angle);
-		
-		Debugger.log("angle: " + angle, Debugger.CRITICAL, "draw", "CanvasTransition");
-		Debugger.log("degs: " + degs, Debugger.CRITICAL, "draw", "CanvasTransition");
-		
-		// get edgepoint for connected activities 
-		_fromAct_edgePoint = calcEdgePoint(degs, offsetToCentre_x, offsetToCentre_y, fromAct_Deg,  _startPoint);
-		_toAct_edgePoint = (degs >= 0) ? calcEdgePoint(degs - 180, toOTC_x, toOTC_y, toAct_Deg, _endPoint)
-										: calcEdgePoint(degs + 180, toOTC_x, toOTC_y, toAct_Deg, _endPoint);
-		// calc midpoint
-		if(_fromAct_edgePoint != null & _toAct_edgePoint != null) {
-			arrow_mc._x = (_fromAct_edgePoint.x + _toAct_edgePoint.x)/2;
-			arrow_mc._y = (_fromAct_edgePoint.y + _toAct_edgePoint.y)/2;
-		} else {
-			arrow_mc._x = (_startPoint.x + _endPoint.x)/2;
-			arrow_mc._y = (_startPoint.y + _endPoint.y)/2;
-		}
-		
-		Debugger.log("startPoint: (" + _startPoint.x + ", " + _startPoint.y + ")", Debugger.CRITICAL, "draw", "CanvasTransition");
-		Debugger.log("fromAct edge point: (" + _fromAct_edgePoint.x + ", " + _fromAct_edgePoint.y + ")", Debugger.CRITICAL, "draw", "CanvasTransition");
-		Debugger.log("toAct edge point: (" + _toAct_edgePoint.x + ", " + _toAct_edgePoint.y + ")", Debugger.CRITICAL, "draw", "CanvasTransition");
-		Debugger.log("endPoint: (" + _endPoint.x + ", " + _endPoint.y + ")", Debugger.CRITICAL, "draw", "CanvasTransition");
-		
-		Debugger.log("mid point: (" + _midPoint.x + ", " + _midPoint.y + ")", Debugger.CRITICAL, "draw", "CanvasTransition");
-		
-		arrow_mc._rotation = degs;
-		arrow_mc._visible = true;
-		
-		_midPoint = new Point(arrow_mc._x,arrow_mc._y);
-		
-		xPos = this._x;
+		createConnection(fromAct_mc, toAct_mc, _startPoint, _endPoint, fromOTC, toOTC);
 			
 	}
-
-	public function get xPosition():Number{
-		return xPos;
-	}
-	
-	private static function convertToDegrees(angle:Number):Number {
-		return Math.round(angle*180/Math.PI);
-	}
-	
-	private static function convertToRadians(degrees:Number):Number {
-		return degrees/180*Math.PI;
-	}
-	
-	private function getQuadrant(d:Number) {
-		if(d >= 0 && d < 90) {
-			return "q3";
-		} else if(d < 0 && d >= - 90) {
-			return "q2";
-		} else if(d < -90 && d >= -180) {
-			return  "q1";
-		} else {
-			return "q4";
-		}
-	}
-	
-	private function calcEdgePoint(_d:Number, x_offset:Number, y_offset:Number, _act_d:Number, point:Point):Point {
-		var _edgePoint:Point = new Point();
-		var d:Number = _d;
-		var quad:String = getQuadrant(d);
-	
-		switch(quad) {
-			case "q1":
-				d = 180 + d;
-				
-				_edgePoint.y = (d >= _act_d) ? point.y - y_offset : point.y - (x_offset * calcTangent(d, false));
-				_edgePoint.x = (d >= _act_d) ? point.x - (y_offset * calcTangent(d, true)) : point.x - x_offset;;
-				
-				break;
-			case "q2":
-				d = Math.abs(d);
-				
-				_edgePoint.y = (d >= _act_d) ? point.y - y_offset : point.y - (x_offset * calcTangent(d, false));
-				_edgePoint.x = (d >= _act_d) ? point.x + (y_offset * calcTangent(d, true)) : point.x + x_offset;;
-				
-				break;
-			case "q3":
-			
-				_edgePoint.y = (d >= _act_d) ? point.y + y_offset : point.y + (x_offset * calcTangent(d, false));
-				_edgePoint.x = (d >= _act_d) ? point.x + (y_offset * calcTangent(d, true)) : point.x + x_offset;
-			
-					
-				break;
-			case "q4":
-				d = 180 - d;
-			
-				_edgePoint.y = (d >= _act_d) ? point.y + y_offset : point.y + (x_offset * calcTangent(d, false));
-				_edgePoint.x = (d >= _act_d) ? point.x - (y_offset * calcTangent(d, true)) : point.x - x_offset;;
-				
-				break;
-			default:
-				// ERR: No Quadrant found
-				break;
-		}
-		
-		return _edgePoint;
-	}
-	
-	private function calcTangent(_d:Number, _use_adj_angle:Boolean) {
-		var d:Number = (_use_adj_angle) ? 90 - _d: _d;
-		return Math.tan(convertToRadians(d));
-	}
-	
+
 	private function onPress():Void{
 			// check double-click
 			var now:Number = new Date().getTime();