Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -36,12 +36,6 @@
 			// Learning library xml
 			public var learningLibrary:Dictionary;
 			
-			// State of cursor transition/help/dataflow etc...
-			public var cursorState:int = Constants.CURSOR_STATE_NORMAL;
-			
-			// ui state
-			public var uiState:int = Constants.UI_STATE_NORMAL;
-			
 			// lang code default en_AU
 			public var locale:String = "en_AU";
 			
@@ -75,25 +69,6 @@
 				
 				mainMap.init();
 			}
-		
-			
-			[Embed("assets/icons/transition.png")]
-            public var transitionCursor:Class;
-
-			public function changeCursorState(state:int):void{
-				cursorState = state;
-				CursorManager.removeCursor(CursorManager.currentCursorID);
-				switch (cursorState) {
-					case Constants.CURSOR_STATE_NORMAL:
-						break;
-					case Constants.CURSOR_STATE_TRANSITION:
-						CursorManager.setCursor(transitionCursor);
-						break;
-				}
-			
-			
-			}
-		
 		]]>
 	</mx:Script>
 
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/Bin.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/Bin.mxml	(.../Bin.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/Bin.mxml	(.../Bin.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -7,6 +7,7 @@
 
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.TransitionController;
 			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.events.TransitionEvent;
 			import org.lamsfoundation.lams.author.components.transition.TransitionComponent;
@@ -28,7 +29,7 @@
 			private var binOver:Class;
 			
 			private function dragEnter(event:DragEvent):void {
-				if (event.dragSource.hasFormat("img") || event.dragSource.hasFormat("dragActivity"))
+				if (event.dragSource.hasFormat("dragTransition") || event.dragSource.hasFormat("dragActivity"))
                 {
                     DragManager.acceptDragDrop(Canvas(event.currentTarget));
                     image.source = binOver;
@@ -44,7 +45,7 @@
 				if (event.dragInitiator is ActivityComponent) {
 					AuthorController.instance.deleteActivity(event.dragInitiator as ActivityComponent);
 				} else if (event.dragInitiator is TransitionComponent) {
-					AuthorController.instance.deleteTransition(event.dragInitiator as TransitionComponent);
+					TransitionController.instance.deleteTransition(event.dragInitiator as TransitionComponent);
 				}
 			}
 		]]>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -80,8 +80,8 @@
 			
 			// Deselect the current activity
 			protected function click(event:MouseEvent):void {
-				if (Application.application.selectedActivity != null && !(event.currentTarget is ActivityComponent)) {
-					Application.application.selectedActivity.deSelectActivity();
+				if (event.currentTarget is ActivityComponent) {
+					AuthorController.instance.deSelectActivityComponent();
 				}
 			}
              
Fisheye: Tag 3444f7cd21be73f0284515ef8f821ad9320b54a0 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary2.mxml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(.../LearningLibraryEntryComponent.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(.../LearningLibraryEntryComponent.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -3,11 +3,15 @@
 	width="100%" height="25" 
 	verticalAlign="middle" 
 	horizontalGap="0"
-	mouseMove="mouseMoveHandler(event)"
+	mouseDown="mouseDown(event)"
 	>
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.util.AuthorUtil;
+			import mx.core.Application;
+			import org.lamsfoundation.lams.author.model.activity.Activity;
+			import org.lamsfoundation.lams.author.model.activity.ActivityFactory;
 			import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
 			import org.lamsfoundation.lams.author.components.activity.*;
 			
@@ -23,7 +27,6 @@
 					
 			public function load(learningLibraryEntry:LearningLibraryEntry):void {
 				this.learningLibraryEntry = learningLibraryEntry;
-				
 				iconImage = new Image();
 				iconImage.source = learningLibraryEntry.icon;
 				iconImage.height = 25;
@@ -34,32 +37,20 @@
 				this.addChild(title);
 				
 			}
-			
-			
-			// The mouseMove event handler for the Image control
-	        // initiates the drag-and-drop operation.
-	        private function mouseMoveHandler(event:MouseEvent):void 
-	        {                
+	        
+	        // Handles the start of a drag from the learning library
+	        private function mouseDown(event:MouseEvent):void {
 	        	var dragInitiator:LearningLibraryEntryComponent = event.currentTarget as LearningLibraryEntryComponent;
 	        	var ds:DragSource = new DragSource();
 	        	
-	        	if (dragInitiator.learningLibraryEntry.isCombined) {
-	        		var combinedAactivityComponent:CombinedActivityComponent = new CombinedActivityComponent();
-	        		combinedAactivityComponent.learningLibraryEntry = dragInitiator.learningLibraryEntry
-	        		combinedAactivityComponent.load(0);
-					combinedAactivityComponent.x = UIComponent(event.currentTarget).mouseX;
-          			combinedAactivityComponent.y = UIComponent(event.currentTarget).mouseY; 
-          			ds.addData(combinedAactivityComponent, "dragActivity"); 
-	            	DragManager.doDrag(dragInitiator, ds, event, combinedAactivityComponent, 25, 15, 1.00, false);   
-	        	} else {
-	        		var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
-	        		toolActivityComponent.tool = dragInitiator.learningLibraryEntry.toolTemplates[0];
-	        		toolActivityComponent.load(0);
-					toolActivityComponent.x = UIComponent(event.currentTarget).mouseX;
-          			toolActivityComponent.y = UIComponent(event.currentTarget).mouseY;
-          			ds.addData(toolActivityComponent, "dragActivity"); 
-	            	DragManager.doDrag(dragInitiator, ds, event, toolActivityComponent, 25, 15, 1.00, false);   
-	        	}
+	        	var learningLibraryEntry:LearningLibraryEntry = dragInitiator.learningLibraryEntry
+	        	
+	        	var activity:Activity = ActivityFactory.getActivityInstance(learningLibraryEntry, 0);
+	        	var activityComponent:ActivityComponent = ActivityComponentFactory.getActivityComponentInstance(activity);
+	        	activityComponent.initialize();
+	        	
+	        	ds.addData(activityComponent, "dragActivity"); 
+	            DragManager.doDrag(dragInitiator, ds, event, activityComponent, 25, 15, 1.00, true);
 	        }
 		]]>
 	</mx:Script>
Fisheye: Tag 3444f7cd21be73f0284515ef8f821ad9320b54a0 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent2.mxml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -17,6 +17,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.util.AuthorUtil;
 			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.model.ToolOutputDefinition;
 			import mx.events.ListEvent;
@@ -32,18 +33,13 @@
 			import org.lamsfoundation.lams.author.components.activity.ToolActivityComponent;
 			import mx.core.Application;
 			import mx.managers.PopUpManager;
+		
 			
-			private static const STATE_GROUP_RANDOM:String = "randomGroupActivity";
-			private static const STATE_GROUP_MONITOR:String = "monitorGroupActivity";
-			private static const STATE_GROUP_LEARNER:String = "learnerGroupActivity";
-			
-			private static const STATE_TOOL_ACTIVITY:String = "toolActivity";
-			
 			public static const MIN_INPUT_WIDTH:int = 100;
 			public static const MAX_INPUT_WIDTH:int = 100;
 			
+			[Bindable] private var selectedActivityComponent:ActivityComponent;
 			
-			private var changeWatcherArray:ArrayCollection = new ArrayCollection();
 			
 			private var titleDisabledColors:Object;
 			
@@ -57,31 +53,18 @@
 			[Bindable]
 			[Embed("assets/icons/maximise.png")] 
 			private var maximiseIcon:Class;
-			
-			
-			public function openPropertyInspector(activity:ActivityComponent):void {
+						
+			public function openPropertyInspector():void {
 				visible = true;
 				PopUpManager.addPopUp(this, this, false);
 				
-				// Capture the binding so it can be removed when the property inpector is closed (activity de-selected)
-				changeWatcherArray.addItem(BindingUtils.bindProperty(titleInput, "text", activity.title, "text"));
-				changeWatcherArray.addItem(BindingUtils.bindProperty(activity.title, "text", titleInput, "text"));
-				
-				// Display particular ui components for the activity type
-				displayUIComponents(activity);
-				
 				applicationCenter.x = Application.application.width/2;
 				applicationCenter.y = Application.application.height/2;
 			}
 			
 			public function closePropertyInspector():void {
 				visible = false;
 				PopUpManager.removePopUp(this);
-				
-				// Free the bindings to the current selected activity if there are any
-				for each (var changeWatcher:ChangeWatcher in changeWatcherArray) {
-					changeWatcher.unwatch();
-				}
 			}
 			
 			// Enable the propertyInspector on rollOver
@@ -102,7 +85,7 @@
 				
 			}
 			
-			// Minimise/Maxomise the property inspector
+			// Minimise/Maximise the property inspector
 			private function toggleMininmiseMaximise():void {
 				if (vbox.visible) {
 					this.vbox.visible = false;
@@ -118,337 +101,40 @@
 					this.mybtn.setStyle("icon", minimiseIcon);
 				}
 			}
-			
-			private function displayUIComponents(activity:ActivityComponent):void {
-				this.currentState = "";
-				if (activity is ToolActivityComponent) {
-					this.currentState = STATE_TOOL_ACTIVITY;
-					var toolActivity:ToolActivityComponent = activity as ToolActivityComponent;
-					
-					loadGroupsDropDown(toolActivity);
-					loadToolOutputDefs(toolActivity);
-					
-					changeWatcherArray.addItem(BindingUtils.bindProperty(runOffline, "selected", toolActivity, "runOffline"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(toolActivity, "runOffline", runOffline, "selected"));
-					
-					changeWatcherArray.addItem(BindingUtils.bindProperty(defineLater, "selected", toolActivity, "defineLater"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(toolActivity, "defineLater", defineLater, "selected"));
-
-				
-				} else if (activity is RandomGroupActivityComponent) {
-					this.currentState = STATE_GROUP_RANDOM;
-					var randomGroupActivity:RandomGroupActivityComponent = activity as RandomGroupActivityComponent;
-					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroups, "selected", randomGroupActivity, "isGroupNumber"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroupActivity, "isGroupNumber", randomGroups, "selected"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroupsNum, "value", randomGroupActivity, "numGroups"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(activity, "numGroups", randomGroupsNum, "value"));
-					
-					changeWatcherArray.addItem(BindingUtils.bindProperty(randomLearners, "selected", randomGroupActivity, "isLearnersPerGroup"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroupActivity, "isLearnersPerGroup", randomLearners, "selected"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(randomLearnersNum, "value", randomGroupActivity, "numLearners"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroupActivity, "numLearners", randomLearnersNum, "value"));
-				}  else if (activity is MonitorGroupActivityComponent) {
-					this.currentState = STATE_GROUP_MONITOR;
-					var monitorGroupActivity:MonitorGroupActivityComponent = activity as MonitorGroupActivityComponent;
-					changeWatcherArray.addItem(BindingUtils.bindProperty(monitorGroupsNum, "value", monitorGroupActivity, "numLearners"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(monitorGroupActivity, "numLearners", monitorGroupsNum, "value"));
-				} else if (activity is LearnerGroupActivityComponent) {
-					this.currentState = STATE_GROUP_LEARNER;
-					var learnerGroupActivity:LearnerGroupActivityComponent = activity as LearnerGroupActivityComponent;
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroups, "selected", learnerGroupActivity, "isGroupNumber"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "isGroupNumber", learnerGroups, "selected"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupsNum, "value", learnerGroupActivity, "numGroups"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(activity, "numGroups", learnerGroupsNum, "value"));
-					
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerLearners, "selected", learnerGroupActivity, "isLearnersPerGroup"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "isLearnersPerGroup", learnerLearners, "selected"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerLearnersNum, "value", learnerGroupActivity, "numLearners"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "numLearners", learnerLearnersNum, "value")); 
-					
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerViewBefore, "selected", learnerGroupActivity, "isViewLearnersBeforeSelction"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "isViewLearnersBeforeSelction", learnerViewBefore, "selected"));
-					
-					changeWatcherArray.addItem(BindingUtils.bindProperty(equalGroupSizes, "selected", learnerGroupActivity, "isEqualGroupSizes"));
-					changeWatcherArray.addItem(BindingUtils.bindProperty(learnerGroupActivity, "isEqualGroupSizes", equalGroupSizes, "selected"));
-				} 
-				
-			}
-			
-			private function loadGroupsDropDown(activityComponent:ActivityComponent):void {
-				currentAvailableGroups.removeAll();
-				
-				// Set a dummy null grouping so it can be binded to the combo box in the preoperty inspector
-				var nullGrouping:Object = new Object();
-				nullGrouping.title = Application.application.dictionary.getLabel("none_act_lbl");
-				nullGrouping.activityUIID = 0;			
-				currentAvailableGroups.addItem(nullGrouping);
-				currentAvailableGroups.addAll(activityComponent.allPossibleGroupings);
-				
-				groupingCombo.selectedItem = nullGrouping;
-				for each (var item:Object in currentAvailableGroups) {
-					if (activityComponent.groupingUIID == item.activityUIID) {
-						groupingCombo.selectedItem = item;
-					}
-				}
-			}
-			
-			private function loadToolOutputDefs(toolActivityComponent:ToolActivityComponent):void {
-
-				
-				var nullOutput:ToolOutputDefinition = new ToolOutputDefinition();;
-				nullOutput.description = Application.application.dictionary.getLabel("none_act_lbl");
-				
-				toolOutputDefs.removeAll();
-				toolOutputDefs.addItem(nullOutput);
-				toolOutputDefs.addAll(Application.application.mainMap.getToolOutputDefinitions(toolActivityComponent));
-
-				gradebookOutputCombo.selectedItem = nullOutput;
-				for each (var item:ToolOutputDefinition in toolOutputDefs) {
-					if (item.isEqual(toolActivityComponent.gradebookOutput)) {
-						gradebookOutputCombo.selectedItem = item;
-						break;
-					} 
-				}
-				
-			}
-			
-			private function groupChange(event:ListEvent):void {
-				Application.application.selectedActivity.groupingUIID = event.currentTarget.selectedItem.activityUIID;
-			}
-			
-			private function outputsChange(event:ListEvent):void {
-				
-				if (Application.application.selectedActivity is ToolActivityComponent) {
-					var toolActivity:ToolActivityComponent = Application.application.selectedActivity as ToolActivityComponent;
-					toolActivity.gradebookOutput = event.currentTarget.selectedItem;
-				}
-				 
-			}
-			
-			private function groupNumChange(event:Event):void {
-				if (Application.application.selectedActivity is GroupActivityComponent) {
-					var groupActivity:GroupActivityComponent = Application.application.selectedActivity as GroupActivityComponent;
-					if (groupActivity.numGroups > groupActivity.groupNames.length) {
-						groupActivity.groupNames.addItem(Application.application.dictionary.getLabel('group_btn') + " " + groupActivity.numGroups)
-					}
-					
-					if (groupActivity.numGroups < groupActivity.groupNames.length) {
-						groupActivity.groupNames.removeItemAt(groupActivity.groupNames.length - 1);
-					}
-				}
-				
-			}
-			
-			private function openNameGroupsWindow():void {
-				nameGroupsWindow.openWindow();
-			}
-
 		]]>
 	</mx:Script>
-
+	
+	<mx:Binding destination="selectedActivityComponent" source="AuthorController.instance.selectedActivityComponent" />
+	<mx:Binding destination="selectedActivityComponent.title" source="txtTitle.text" />
+	
 	<mx:VBox id="vbox" height="100%" width="100%" 
 		horizontalAlign="center" verticalGap="2" paddingBottom="3" paddingLeft="2" paddingRight="2" top="5">
 		<mx:Grid id="grid" verticalGap="4">
-			<mx:GridRow height="16">
-				<mx:GridItem  >
+			<mx:GridRow height="16" visible="{selectedActivityComponent != null}" 
+				includeInLayout="{selectedActivityComponent != null}">
+				<mx:GridItem>
 					<mx:Label text="{Application.application.dictionary.getLabel('pi_lbl_title')}" height="22" />
 				</mx:GridItem>
 				<mx:GridItem>
-					<mx:TextInput id="titleInput" width="100" maxChars="256" height="22"  />
+					<mx:TextInput id="txtTitle" width="100" maxChars="256" height="22" 
+						text="{selectedActivityComponent.title}" />
 				</mx:GridItem>
 			</mx:GridRow>
-			<mx:GridRow id="groupingGridRow">
+			<!--<mx:GridRow id="groupingGridRow" visible="{AuthorUtil.activitySupportsGrouping(selectedActivityComponent.activityTypeID)}" 
+				includeInLayout="{AuthorUtil.activitySupportsGrouping(selectedActivityComponent.activityTypeID)}">
 				<mx:GridItem>
 					<mx:Label text="{Application.application.dictionary.getLabel('grouping_act_title')}" />
 				</mx:GridItem>
 				<mx:GridItem>
 					<mx:ComboBox id="groupingCombo" change="groupChange(event)" labelField="title" dataProvider="{currentAvailableGroups}" width="{MIN_INPUT_WIDTH}" dropdownWidth="250"  />
 				</mx:GridItem>
-			</mx:GridRow>
+			</mx:GridRow>-->
 		</mx:Grid>
 	</mx:VBox>
 	<mx:Canvas id="opacityLayer" height="100%" width="100%" backgroundColor="white" backgroundAlpha="0.6" />
 	
-	<states>
-		<!-- GROUP STATES -->
-		<mx:State name="{STATE_GROUP_RANDOM}">
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow height="22" styleName="firstInGroup">
-					<mx:GridItem  >
-						<mx:Label text="{Application.application.dictionary.getLabel('pi_num_groups')}" />
-					</mx:GridItem>
-					<mx:GridItem>
-						<mx:RadioButton id="randomGroups" mouseOver="{null}" />
-						<mx:NumericStepper id="randomGroupsNum" change="groupNumChange(event)" enabled="{randomGroups.selected}" minimum="2" height="22" width="40" fontSize="10" textAlign="center"/>
-					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow height="22">
-					<mx:GridItem  >
-						<mx:Label text="{Application.application.dictionary.getLabel('pi_num_learners')}" />
-					</mx:GridItem>
-					<mx:GridItem> 
-						<mx:RadioButton id="randomLearners"/>
-						<mx:NumericStepper id="randomLearnersNum" enabled="{randomLearners.selected}" minimum="1" height="22" width="40" fontSize="10" textAlign="center"/>
-					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-						
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">   
-                <mx:GridRow height="18"  visible="{randomGroups.selected}" includeInLayout="{randomGroups.selected}">
-                	<mx:GridItem colSpan="2" horizontalAlign="center"> 
-		                <mx:Button label="{Application.application.dictionary.getLabel('pi_group_naming_btn_lbl')}" 
-		                		height="18" click="openNameGroupsWindow()" />
-                	</mx:GridItem>
-                </mx:GridRow>
-            </mx:AddChild>
-			
-            <mx:SetProperty target="{this}" name="title" value="{Application.application.dictionary.getLabel('pi_random_group_activity')}"/>
-            <mx:SetProperty target="{groupingGridRow}" name="visible" value="{false}"/>     
-            <mx:SetProperty target="{groupingGridRow}" name="includeInLayout" value="{false}"/>
-
-		</mx:State>
-		<mx:State name="{STATE_GROUP_MONITOR}">
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow height="22" styleName="firstInGroup">
-					<mx:GridItem  >
-						<mx:Label text="{Application.application.dictionary.getLabel('pi_num_groups')}" />
-					</mx:GridItem>
-					<mx:GridItem>
-						<mx:NumericStepper id="monitorGroupsNum" change="groupNumChange(event)"  minimum="2" height="22" width="40" fontSize="10" textAlign="center"/>					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-			
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">   
-                <mx:GridRow height="18">
-                	<mx:GridItem colSpan="2" horizontalAlign="center"> 
-		                <mx:Button label="{Application.application.dictionary.getLabel('pi_group_naming_btn_lbl')}" 
-		                		height="18" click="openNameGroupsWindow()" />
-                	</mx:GridItem>
-                </mx:GridRow>
-            </mx:AddChild>
-        	
-        	<mx:SetProperty target="{this}" name="title" value="{Application.application.dictionary.getLabel('pi_monitor_group_activity')}"/> 
-           	<mx:SetProperty target="{groupingGridRow}" name="visible" value="{false}"/>
-            <mx:SetProperty target="{groupingGridRow}" name="includeInLayout" value="{false}"/>
-		</mx:State>
-		<mx:State name="{STATE_GROUP_LEARNER}">
-			
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow height="22" styleName="firstInGroup">
-					<mx:GridItem  >
-						<mx:Label text="{Application.application.dictionary.getLabel('pi_num_groups')}" />
-					</mx:GridItem>
-					<mx:GridItem>
-						<mx:RadioButton id="learnerGroups" mouseOver="{null}" />
-						<mx:NumericStepper id="learnerGroupsNum" change="groupNumChange(event)" enabled="{learnerGroups.selected}" minimum="2" height="22" width="40" fontSize="10" textAlign="center"/>
-					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-			
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow height="22">
-					<mx:GridItem  >
-						<mx:Label text="{Application.application.dictionary.getLabel('pi_num_learners')}" />
-					</mx:GridItem>
-					<mx:GridItem> 
-						<mx:RadioButton id="learnerLearners"/>
-						<mx:NumericStepper id="learnerLearnersNum" enabled="{learnerLearners.selected}" minimum="1" height="22" width="40" fontSize="10" textAlign="center"/>
-					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-			
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow height="16">
-					<mx:GridItem  >
-						<mx:Label text="{Application.application.dictionary.getLabel('view_students_before_selection')}" />
-					</mx:GridItem>
-					<mx:GridItem> 
-						<mx:CheckBox id="learnerViewBefore"/>					
-					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-			
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow height="16" enabled="{learnerGroups.selected}" visible="{learnerGroups.selected}" includeInLayout="{learnerGroups.selected}">
-					<mx:GridItem  >
-						<mx:Label text="{Application.application.dictionary.getLabel('pi_equal_group_sizes')}" />
-					</mx:GridItem>
-					<mx:GridItem> 
-						<mx:CheckBox id="equalGroupSizes" />				
-					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-			
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">   
-                <mx:GridRow height="18" visible="{learnerGroups.selected}"	includeInLayout="{learnerGroups.selected}">
-                	<mx:GridItem colSpan="2" horizontalAlign="center"> 
-		                <mx:Button label="{Application.application.dictionary.getLabel('pi_group_naming_btn_lbl')}" 
-		                		height="18" click="openNameGroupsWindow()" />
-                	</mx:GridItem>
-                </mx:GridRow>
-            </mx:AddChild>
-            
-            <mx:SetProperty target="{this}" name="title" value="{Application.application.dictionary.getLabel('pi_learner_group_activity')}"/>	
-            <mx:SetProperty target="{groupingGridRow}" name="visible" value="{false}"/>
-            <mx:SetProperty target="{groupingGridRow}" name="includeInLayout" value="{false}"/>
-			
-		</mx:State>
-		<!-- /GROUP STATES -->
-		
-		<mx:State name="{STATE_TOOL_ACTIVITY}">
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				
-			</mx:AddChild>
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow styleName="firstInGroup">
-					<mx:GridItem  >
-						<mx:Label text="{Application.application.dictionary.getLabel('gradebook_output_type')}" />
-					</mx:GridItem>
-					<mx:GridItem>
-						<mx:ComboBox id="gradebookOutputCombo" dataProvider="{toolOutputDefs}" labelField="description" change="outputsChange(event)" width="{MIN_INPUT_WIDTH}" dropdownWidth="250"/>
-					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow height="22" >
-					<mx:GridItem >
-						<mx:Label text="{Application.application.dictionary.getLabel('pi_runoffline')}" />
-					</mx:GridItem>
-					<mx:GridItem>
-						<mx:CheckBox id="runOffline" />
-					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
-				<mx:GridRow height="22" >
-					<mx:GridItem >
-						<mx:Label text="{Application.application.dictionary.getLabel('pi_define_monitor_cb_lbl')}" />
-					</mx:GridItem>
-					<mx:GridItem>
-						<mx:CheckBox id="defineLater" />
-					</mx:GridItem>
-				</mx:GridRow>
-			</mx:AddChild>
-			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">   
-                <mx:GridRow height="18">
-                	<mx:GridItem colSpan="2" horizontalAlign="center"> 
-		                <mx:Button label="{Application.application.dictionary.getLabel('map_comptence_btn')}" 
-		                		height="18" />
-                	</mx:GridItem>
-                </mx:GridRow>
-            </mx:AddChild>
-            
-            <mx:SetProperty target="{this}" name="title" value="{Application.application.selectedActivity.title.text}"/>
-		</mx:State>
-	</states>
-	
-	
-	<group:NameGroupsWindow id="nameGroupsWindow"  includeInLayout="false" />
-	
 	<mx:ArrayCollection id="currentAvailableGroups" />
 	<mx:ArrayCollection id="toolOutputDefs" />
+	
 
 </ButtonPanel>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -3,6 +3,7 @@
 	mouseDown="mouseDown(event)"
 	mouseOver="mouseOver(event)" 
 	mouseOut="mouseOut(event)"
+	mouseMove="mouseMove(event)"
 	click="click(event)" 
 	>
 
@@ -13,10 +14,12 @@
 
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.model.activity.Activity;
 			import mx.controls.Image;
 			import org.lamsfoundation.lams.author.util.AuthorUtil;
 			import org.lamsfoundation.lams.author.controller.AuthorController;
-			import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
+			import org.lamsfoundation.lams.author.controller.TransitionController;
+			import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent; 
 			import mx.collections.ArrayCollection;
 			import mx.core.UIComponent;
 			import mx.controls.Alert;
@@ -28,97 +31,70 @@
 			import mx.controls.Label;
 			import org.lamsfoundation.lams.author.components.transition.TransitionComponent;
 			
-			// Activity UIID
-			[Bindable]
-			public var activityUIID:int;
+			[Bindable] protected var _activity:Activity;
 			
-			// Activity title label
-			public var title:Label;
-			
-			// Center position of the activity component
-			public var centerX:int;
-			public var centerY:int;
-			
 			// Point of mouse during drag
 			public var mouseOffSetX:int;
 			public var mouseOffSetY:int;
+		
+			// Center position of the activity component
+			[Bindable] public var centerX:int;
+			[Bindable] public var centerY:int;
 			
-			// Transtitions
-			public var transitionIn:TransitionComponent
-			public var transitionOut:TransitionComponent;
+			// Transition components, need a reference so we can move the transitions with the component
+			public var transitionToComponent:TransitionComponent
+			public var transitionFromComponent:TransitionComponent;
 			
 			// Grouping UUID 0 means no grouping
-			[Bindable]
-			public var groupingUIID:int = 0;
+			//[Bindable] public var groupingUIID:int = 0;
 			
 			// Activity states
 			public var isDragable:Boolean = true;
 			public var canStartTransitions:Boolean = true;  	// True if this activty can start transitions
 			public var canAcceptTransitions:Boolean = true;		// True if this activty can accept transitions
-			public var state:int = Constants.ACTIVITY_STATE_NORMAL;
-			
-			// Function used to load a new activity 
-			public function load(UIID:int):void { 
-				this.activityUIID = UIID;
-		    }
+			[Bindable] public var state:int = Constants.ACTIVITY_STATE_NORMAL;
 		    
-		    public function disableTitle():void {
-		    	toolTip = title.text;
-				title.visible = false;
-				title.height = 0;
-		    }
-		    
 		    // When you click on an activity, it becomes selected
 		    // And the properties box appears
 		    protected function click(event:MouseEvent):void {
-		    	selectActivity();
+		    	AuthorController.instance.selectActivityComponent(this);
 				event.stopPropagation();
 		    }
 		    
 		    public function selectActivity():void {
-		    	
-		    	// check the activity is loaded.
-		    	if (title != null) {
+				// check the activity is loaded.
+		    	if (_activity.title != null) {
 		    		this.setStyle('borderStyle', 'solid');
 					this.setStyle('borderColor', '#66CCFF');
 					this.state = Constants.ACTIVITY_STATE_SELECTED;
-					
-					if (Application.application.selectedActivity != null) {
-						Application.application.selectedActivity.deSelectActivity();
-					}
-					Application.application.selectedActivity = this;
-					Application.application.canvasArea.propertyInspector.openPropertyInspector(this);
 		    	}
 		    }
 		    
 		    public function deSelectActivity():void {
 		    	this.setStyle('borderStyle', 'none');
 		    	this.state = Constants.ACTIVITY_STATE_NORMAL;
 		    	
-		    	if (Application.application.selectedActivity == this) {
-		    		Application.application.selectedActivity = null;
-		    		Application.application.canvasArea.propertyInspector.closePropertyInspector();
-		    	}
 		    }
 		    
+		 	/**
+		 	 * The mouseMove event starts a drag
+		 	 */ 
+		    protected function mouseMove(event:MouseEvent):void {
+		    	startDragging(event);
+		    }
 
 			/**
-			 * The mouse down event handler
-			 * Initiates drag of activity as well as starting a transition 
-			 * depending on the cursor state
+			 * The mouse down event handler starts a transition 
 			 */
 		    protected function mouseDown(event:MouseEvent):void {
 		    	setCenter();
 		    	
-		    	switch (Application.application.cursorState) {
+		    	switch (AuthorController.instance.cursorState) {
 		    		case Constants.CURSOR_STATE_TRANSITION:
 			    		if (this.canStartTransitions) {
-			    			startTransition(event);
+			    			TransitionController.instance.startTransition(event, this);
 			    		}
 		    			break;
-		    		case Constants.CURSOR_STATE_NORMAL:
-		        		startDragging(event);
-				        break;	
 		    	}
 		    }
 		    
@@ -129,13 +105,10 @@
 		    public function startDragging(event:MouseEvent):void {
 				var activityComponent:ActivityComponent = event.currentTarget as ActivityComponent;
 					        
-		        if (activityComponent.isDragable) {
+		        if (activityComponent.isDragable && AuthorController.instance.cursorState != Constants.CURSOR_STATE_TRANSITION) {
 		        	var ds:DragSource = new DragSource();
-		        	//ds.addData(activityComponent, "img"); 
-		        	ds.addData( activityComponent.parent, 'dragParent' );
 					ds.addData( activityComponent, 'dragActivity' );
-					
-	                 
+					 
 		        	// Set the offset for dropping the activity to the local mouse position
 		        	activityComponent.mouseOffSetX = event.localX;
 		        	activityComponent.mouseOffSetY = event.localY; 
@@ -145,106 +118,17 @@
 			}
 		    
 		    public function setCenter():void {
-		    	centerX = x + height/2;
-				centerY = y + height/2 -10;
+	    		centerX = x + width/2;
+				centerY = y + height/2;
 		    }
 		    
-	        protected function startTransition(event:MouseEvent):void {
-			 
-				// Check if there is a pre-existing transition
-				var possibleBranch:Boolean = transitionOut != null;
-				var possibleFirstActivityInBranch:ActivityComponent = null;
-				if (possibleBranch) {
-					possibleFirstActivityInBranch = transitionOut.toActivity;
-				}
-				
-				if (transitionOut != null) {
-					//Alert.show(Application.application.dictionary.getLabelAndInsert("cv_invalid_trans_target_from_activity", [this.title.text]));
-					
-					// Return cursor state to normal
-	    			//Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);			
-	    			//return;	
-				} 
-				
-				state = Constants.ACTIVITY_STATE_DRAWING;
 
-				Application.application.uiState = Constants.UI_STATE_DRAWING;
-				transitionOut = new TransitionComponent();
-				transitionOut.fromActivity = this;
-				transitionOut.startX = centerX;
-				transitionOut.startY = centerY;
-				transitionOut.endX = centerX;
-				transitionOut.endY = centerY;
-				transitionOut.invalidateProperties();
-				transitionOut.possibleBranch = possibleBranch;
-				transitionOut.possibleFirstActivityInBranch = possibleFirstActivityInBranch;
-				
-				
-				// deselect the currently selected activity
-				if (Application.application.selectedActivity != null) {
-					Application.application.selectedActivity.deSelectActivity();
-				}
-				
-				parent.addChild(transitionOut);
-				
-				systemManager.addEventListener(MouseEvent.MOUSE_MOVE, systemManagerMouseMoveHandler, true);
-				systemManager.addEventListener(MouseEvent.MOUSE_UP, systemManagerMouseUpHandler, true);
-				systemManager.stage.addEventListener(Event.MOUSE_LEAVE, stageMouseLeaveHandler);
-			
-			}
-			
-			protected function stopTransition():void
-			{
-			    Application.application.uiState = Constants.UI_STATE_NORMAL;
-			    systemManager.removeEventListener(MouseEvent.MOUSE_MOVE, systemManagerMouseMoveHandler, true);			
-			    systemManager.removeEventListener(MouseEvent.MOUSE_UP, systemManagerMouseUpHandler, true);
-			    systemManager.stage.removeEventListener(Event.MOUSE_LEAVE, stageMouseLeaveHandler);
-			}
-			
-			private function systemManagerMouseMoveHandler(event:MouseEvent):void
-		    {
-		    	var pt:Point = new Point(event.stageX,event.stageY);
-		    	pt = parent.globalToLocal(pt);
-		    	
-		    	transitionOut.endX = pt.x;
-		    	transitionOut.endY = pt.y;
-		    	
-		    	transitionOut.invalidateDisplayList();
-		    }
-		    
-		   
-		    /**
-		    * This event fires at the end of a transition.
-		    * 
-		    * Needs to be handled by the controller as it changes the learningDesing state
-		    * 
-		    */ 
-		    private function systemManagerMouseUpHandler(event:MouseEvent):void
-		    {
-		    	stopTransition();
-		    	
-		    	var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.TRANSITION_COMPLETE);
-	    		transitionEvent.sourceActivityComponent = this;
-	    		transitionEvent.transition = transitionOut;
-	    		Application.application.dispatchEvent(transitionEvent);
-	    		
-	    		AuthorController.instance.drawTransition(this, transitionOut);
-		    	
-		    }
-		    
-		    private function stageMouseLeaveHandler(event:MouseEvent):void
-		    {
-		    	stopTransition();
-		    }
-		    
 		    private function mouseOver(event:MouseEvent):void {
-				
-				if (Application.application.uiState == Constants.UI_STATE_DRAWING && this.state != Constants.ACTIVITY_STATE_DRAWING && canAcceptTransitions) {
+				if (AuthorController.instance.uiState == Constants.UI_STATE_DRAWING && this.state != Constants.ACTIVITY_STATE_DRAWING && canAcceptTransitions) {
 					this.setStyle('borderStyle', 'solid');
 					this.setStyle('borderColor', '#66CCFF');
 					this.state = Constants.ACTIVITY_STATE_MOUSE_OVER;
 				}
-				
 			}
 			
 			private function mouseOut(event:MouseEvent):void {
@@ -260,16 +144,16 @@
 			
 			public function updateTransitionPositions():void {
 				this.setCenter();
-				if (transitionOut != null)
+				if (this.transitionFromComponent != null)
 		   		{
-		   			transitionOut.startX = centerX;
-		   			transitionOut.startY = centerY;
-		   			transitionOut.invalidateDisplayList();
+		   			this.transitionFromComponent.startX = centerX;
+		   			this.transitionFromComponent.startY = centerY;
+		   			this.transitionFromComponent.invalidateDisplayList();
 		   		} 
-		   		if (transitionIn != null) {
-		   			transitionIn.endX = centerX;
-		   			transitionIn.endY = centerY;
-		   			transitionIn.invalidateDisplayList();
+		   		if (this.transitionToComponent != null) {
+		   			this.transitionToComponent.endX = centerX;
+		   			this.transitionToComponent.endY = centerY;
+		   			this.transitionToComponent.invalidateDisplayList();
 		   		}
 			}
 			
@@ -279,31 +163,57 @@
 			 * @return collection of all possible groupings for this activity
 			 */
 			public function get allPossibleGroupings():ArrayCollection {	
-				var ret:ArrayCollection = new ArrayCollection();
+				/* var ret:ArrayCollection = new ArrayCollection();
 				if (this.transitionIn != null){
-					var activity:ActivityComponent = this.transitionIn.fromActivity;
+					var activityCmp:ActivityComponent = this.transitionIn.fromActivity;
 					
 					while (true) {
-						if (activity is GroupActivityComponent) {
+						if (activityCmp is GroupActivityComponent) {
 							var entry:Object = new Object();
-							entry.activityUIID = activity.activityUIID;
-							entry.title = activity.title.text;
+							entry.activity.activityUIID = activityCmp.activity.activityUIID;
+							entry.activity.title = activityCmp.activity.title;
 							ret.addItem(entry);
 						}
 						
-						if (activity.transitionIn != null) {
-							activity = activity.transitionIn.fromActivity;
+						if (activityCmp.transitionIn != null) {
+							activityCmp = activityCmp.transitionIn.fromActivity;
 						} else {
 							break;
 						}
 					}  
 				}
 				
-				return ret;
+				return ret; */
+				
+				return null;
 			}
+			
+			[Bindable]
+			public function get title():String {
+				return _activity.title;
+			}
+			
+			public function set title(title:String):void {
+				_activity.title = title;
+			}
+			
+			public function get activityTypeID():int {
+				return _activity.activityTypeID;
+			}
+			
+			/**
+			 * Returns the root activity object
+			 * This is required as AS3 has not concept of abstract methods.
+			 * So we need to be able to fetch this activity instance
+			 * Without knowing what activity type it is.
+			 */ 
+			public function get rootActivity():Activity {
+				return _activity;
+			}
 
 		]]>
 	</mx:Script>
 	
-	
+	<mx:Binding source="_activity.xCoord" destination="this.x" />
+	<mx:Binding source="_activity.yCoord" destination="this.y" />
 </mx:VBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponentFactory.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponentFactory.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponentFactory.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,65 @@
+package org.lamsfoundation.lams.author.components.activity
+{
+	import mx.core.IUIComponent;
+	
+	import org.lamsfoundation.lams.author.components.LearningLibraryEntryComponent;
+	import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
+	import org.lamsfoundation.lams.author.components.toolbar.SystemToolComponent;
+	import org.lamsfoundation.lams.author.controller.AuthorController;
+	import org.lamsfoundation.lams.author.model.activity.Activity;
+	import org.lamsfoundation.lams.author.model.activity.ActivityFactory;
+	import org.lamsfoundation.lams.author.model.activity.CombinedActivity;
+	import org.lamsfoundation.lams.author.model.activity.GroupActivity;
+	import org.lamsfoundation.lams.author.model.activity.OptionalActivity;
+	import org.lamsfoundation.lams.author.model.activity.ToolActivity;
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class ActivityComponentFactory
+	{
+		public function ActivityComponentFactory(){}
+		
+		public static function getActivityComponentInstance(activity:Activity):ActivityComponent {
+			switch (activity.activityTypeID) {
+				case Constants.ACTIVITY_TYPE_TOOL:
+					var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
+					toolActivityComponent.activity = activity as ToolActivity;
+					return toolActivityComponent;
+					break;
+				case Constants.ACTIVITY_TYPE_COMBINED:
+					var combinedActivityComponent:CombinedActivityComponent = new CombinedActivityComponent();
+					combinedActivityComponent.activity = activity as CombinedActivity;
+					combinedActivityComponent.initialize();
+					return combinedActivityComponent;
+					break;
+				case Constants.ACTIVITY_TYPE_GROUPING:
+					var groupActivityComponent:GroupActivityComponent = new GroupActivityComponent();
+					groupActivityComponent.activity = activity as GroupActivity;
+					groupActivityComponent.initialize();
+					return groupActivityComponent;
+				case Constants.ACTIVITY_TYPE_OPTIONAL_ACTIVITY:
+					var optionalActivityComponent:OptionalActivityComponent = new OptionalActivityComponent();
+					optionalActivityComponent.activity = activity as OptionalActivity;
+					return optionalActivityComponent;
+				default:
+					return null;
+			}
+		}
+		
+		public static function getActivityComponentInstanceFromDrag(dragInitiator:IUIComponent, UIID:int):ActivityComponent {
+			if (dragInitiator is LearningLibraryEntryComponent) {
+				var learningLibraryComponent:LearningLibraryEntryComponent = dragInitiator as LearningLibraryEntryComponent;
+				var activity:Activity = ActivityFactory.getActivityInstance(learningLibraryComponent.learningLibraryEntry, UIID);
+		        var activityComponent:ActivityComponent = getActivityComponentInstance(activity);
+				return activityComponent;
+			} else if (dragInitiator is SystemToolComponent){
+				var systemToolComponent:SystemToolComponent = dragInitiator as SystemToolComponent;
+				var systemActivity:Activity = ActivityFactory.getSystemActivityInstance(systemToolComponent, UIID);
+				var systemActivityComponent:ActivityComponent = getActivityComponentInstance(systemActivity);
+				return systemActivityComponent;
+			} else {
+				return null;
+			}
+		}
+
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -8,6 +8,8 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.util.Constants;
+			import org.lamsfoundation.lams.author.model.activity.CombinedActivity;
 			import mx.containers.VBox;
 			import mx.core.Application;
 			import mx.controls.Label;
@@ -16,67 +18,30 @@
 			
 			public var toolActivityComponent1:ToolActivityComponent;
 			public var toolActivityComponent2:ToolActivityComponent;
-			public var learningLibraryEntry:LearningLibraryEntry;
-			public var toolContentID:int;
 			
-			public function loadCombined(UIIDCombined:int, UIIDActivity1:int, UIIDActivity2:int):void {
-				
-				super.load(UIIDCombined);
-				
-				var vbox:VBox = new VBox();
-				vbox.setConstraintValue("verticalAlign", "middle");
-				vbox.setConstraintValue("verticalGap", 0);
-				vbox.setConstraintValue("horizontalAlign", "center");
-				vbox.setStyle('borderStyle', 'solid');
-				vbox.setStyle('dropShadowEnabled', true);
-				vbox.setStyle('shadowDirection', "right");
-				vbox.setStyle('cornerRadius', '10');
-				vbox.setStyle('backgroundColor', '#C2D5FE');
-				vbox.setStyle('paddingTop', 6);
-				vbox.setStyle('paddingBottom', 4);
-				vbox.horizontalScrollPolicy = "off";
-				vbox.height = 120;
-				vbox.minWidth = 100;
-				
-				var tool1:Tool = learningLibraryEntry.toolTemplates[1];
-				var tool2:Tool = learningLibraryEntry.toolTemplates[2];
-				
-				if (tool1 != null) {
-					toolActivityComponent1 = new ToolActivityComponent();
-					toolActivityComponent1.tool = learningLibraryEntry.toolTemplates[1];
-					toolActivityComponent1.load(UIIDActivity1);
-					toolActivityComponent1.isDragable = false;
-					toolActivityComponent1.canStartTransitions = false;
-					toolActivityComponent1.canAcceptTransitions = false;
-					toolActivityComponent1.disableTitle()
-					vbox.addChild(toolActivityComponent1);
-				}
-				
-				if (tool1 != null) {
-					toolActivityComponent2 = new ToolActivityComponent();
-					toolActivityComponent2.tool = learningLibraryEntry.toolTemplates[2];
-					toolActivityComponent2.load(UIIDActivity2);
-					toolActivityComponent2.isDragable = false;
-					toolActivityComponent2.canStartTransitions = false;
-					toolActivityComponent2.canAcceptTransitions = false;
-					toolActivityComponent2.disableTitle()
-					vbox.addChild(toolActivityComponent2);
-				}
-				
-				this.addChild(vbox);
-				
-				// Set the title
-				title = new Label();
-   				title.text = learningLibraryEntry.title;
-				this.addChild(title);
+			[Bindable] private var bgColour:uint;
+			
+			[Bindable] private var bgColour1:uint;
+			[Bindable] private var bgColour2:uint;
+
+			[Bindable]
+			public function get activity():CombinedActivity {
+				return this._activity as CombinedActivity;
 			}
 			
+			public function set activity(activity:CombinedActivity):void {
+				this._activity = activity;
+			}
 		]]>
 	</mx:Script>
 	
-	
-	
-	
-	
-	
+	<mx:VBox id="vbox" verticalAlign="middle" horizontalAlign="center" borderStyle="solid"
+		dropShadowEnabled="true" shadowDirection="right" cornerRadius="10" minWidth="70" minHeight="50"
+		backgroundColor="#C2D5FE" paddingTop="3" paddingBottom="3" paddingLeft="5" paddingRight="5"
+		verticalGap="0"
+		>
+		<ToolActivityComponent activity="{activity.toolActivity1}" isTitleShown="false" />
+		<ToolActivityComponent activity="{activity.toolActivity2}" isTitleShown="false" />
+		<mx:Label id="lblTitle" text="{activity.title}"/>
+	</mx:VBox>
 </ActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(.../OptionalActivityComponent.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(.../OptionalActivityComponent.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -7,19 +7,14 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.model.activity.OptionalActivity;
 			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.util.Constants;
 			import mx.core.Application;
 			import mx.managers.DragManager;
 			import mx.events.DragEvent;
 			import mx.collections.ArrayCollection;
 			
-			public var activities:ArrayCollection = new ArrayCollection();
-			
-			public var minActivities:int;
-			public var maxActivities:int;
-			public var description:String;
-			
 			// The dragEnter event handler for the Canvas container
             // enables dropping.
             private function dragEnterHandler(event:DragEvent):void {
@@ -39,24 +34,25 @@
                 	activityComponent = event.dragInitiator as ActivityComponent;
                 	activityComponent.canStartTransitions = false;
                 	activityComponent.canAcceptTransitions = false;
-                	activityComponent.disableTitle();
+                	//activityComponent.disableTitle();
                 	optionalArea.addChild(activityComponent);
-                	activities.addItem(activityComponent);
+                	//activities.addItem(activityComponent);
               		activityComponent.updateTransitionPositions();
                 } 
                 
                 // Return cursor state to normal
-				Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);                    
+				AuthorController.instance.changeCursorState(Constants.CURSOR_STATE_NORMAL);                    
             }
             
-           	override public function load(UIID:int):void {
-            	super.load(UIID);
-            	title = new Label();
-            	title.text = Application.application.dictionary.getLabel("grouping_act_title");
-            	this.disableTitle();
-				this.addChild(title);
-            }
+            [Bindable]
+			public function get activity():OptionalActivity {
+				return this._activity as OptionalActivity;
+			}
 			
+			public function set activity(activity:OptionalActivity):void {
+				this._activity = activity;
+			}
+			
 		]]>
 	</mx:Script>
 	
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -20,65 +20,32 @@
 			import mx.controls.Label;
 			import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
 			import org.lamsfoundation.lams.author.util.Constants;
+			import org.lamsfoundation.lams.author.model.activity.ToolActivity;
 			
-			
-			public var iconImage:Image;
-			public var tool:Tool;
-			
 			public var toolContentID:int = 0;
 			
-			[Bindable]
-			public var gradebookOutput:ToolOutputDefinition;
+			[Bindable] public var isTitleShown:Boolean = true;
 			
-			[Bindable]
-			public var runOffline:Boolean;
+			[Bindable] public var bgColour:uint;
 			
 			[Bindable]
-			public var defineLater:Boolean;
-			
-			override public function load(UIID:int):void {
-				
-				super.load(UIID);
-				
-				var vbox:VBox = new VBox();
-				vbox.setConstraintValue("verticalAlign", "middle");
-				vbox.setConstraintValue("horizontalAlign", "center");
-				vbox.setStyle('borderStyle', 'solid');
-				vbox.setStyle('dropShadowEnabled', true);
-				vbox.setStyle('shadowDirection', "right");
-				vbox.setStyle('cornerRadius', 10);
-				vbox.height = 40;
-				vbox.width = 50;
-				
-   				switch (tool.activityCategoryID) {
-	   				case Constants.TOOL_CATEGORY_ASSESSMENT:
-	   					vbox.setStyle("backgroundColor", "#E9E2F5");
-	   					break;
-	   				case Constants.TOOL_CATEGORY_INFORMATIVE:
-	   					vbox.setStyle("backgroundColor", "#FFEEC8");
-	   					break;
-	   				case Constants.TOOL_CATEGORY_REFLECTIVE:
-	   					vbox.setStyle("backgroundColor", "#DDFCB1");
-	   					break;
-	   				case Constants.TOOL_CATEGORY_COLLABORATIVE:
-	   					vbox.setStyle("backgroundColor", "#FFFDBE");
-	   					break;
-   				}
-
-   				iconImage = new Image();
-   				iconImage.height = 30;
-   				iconImage.width = 30;
-   				iconImage.source = tool.libraryActivityUIImage;
-   				vbox.addChild(iconImage);
-   				this.addChild(vbox);
-   				
-   				// Set the activity title
-   				title = new Label();
-   				title.text = tool.toolName;
-				this.addChild(title);
+			public function get activity():ToolActivity {
+				return this._activity as ToolActivity;
 			}
 			
-			
+			public function set activity(activity:ToolActivity):void {
+				this._activity = activity;
+			}
 		]]>
 	</mx:Script>
+	<mx:VBox id="vbox" verticalAlign="middle" horizontalAlign="center" borderStyle="solid"
+		dropShadowEnabled="true" shadowDirection="right" cornerRadius="10" minWidth="60" minHeight="50"
+		backgroundColor="{activity.tool.bgColour}" paddingTop="3" paddingBottom="3" paddingLeft="5" paddingRight="5"
+		verticalGap="0" toolTip="{(isTitleShown)? undefined : activity.title}"
+		>
+		<mx:Image id="iconImage" width="30" height="30" source="{activity.tool.libraryActivityUIImage}" />
+		<mx:Label id="lblTitle" text="{activity.title}" visible="{isTitleShown}" includeInLayout="{isTitleShown}"/>
+	</mx:VBox>
+	
+	
 </ActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml	(.../GroupActivityComponent.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml	(.../GroupActivityComponent.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -2,41 +2,34 @@
 <ActivityComponent xmlns="org.lamsfoundation.lams.author.components.activity.*" xmlns:mx="http://www.adobe.com/2006/mxml"
 	horizontalScrollPolicy="off" horizontalAlign="center"
 	paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5"
+	toolTip="{activity.toolTip}"
 	>
 	<mx:Script>
 		<![CDATA[
-			import org.lamsfoundation.lams.author.controller.AuthorController;
-			import mx.collections.ArrayCollection;
-			import mx.controls.Label;
-			import mx.core.Application;
+			import org.lamsfoundation.lams.author.model.activity.GroupActivity;
 			
-			public var numGroups:Number = 2;
-			
-			public var isNull:Boolean = false;
-			
 			[Bindable]
-			public var groupNames:ArrayCollection = new ArrayCollection();
+			public function get activity():GroupActivity {
+				return this._activity as GroupActivity;
+			}
 			
-			override public function load(UIID:int):void {
-            	super.load(UIID);
-            	this.title = new Label();
-            	title.text = Application.application.dictionary.getLabel("grouping_act_title");
-				this.addChild(title);
-				
-				groupNames.addItem(Application.application.dictionary.getLabel('group_btn') + " 1");
-				groupNames.addItem(Application.application.dictionary.getLabel('group_btn') + " 2");
-            }
+			public function set activity(activity:GroupActivity):void {
+				this._activity = activity;
+			}
 		]]>
 	</mx:Script>
 	
 	<mx:VBox verticalAlign="middle" horizontalAlign="center"
+		paddingTop="5" paddingBottom="0" paddingLeft="5" paddingRight="5" 
+		verticalGap="5"
 		borderStyle="solid"
 		dropShadowEnabled="true"
 		shadowDirection="right"
-		cornerRadius="5"
+		cornerRadius="10"
 		backgroundColor="#C2D5FE"
-		height="40" width="50">
+		minHeight="50" minWidth="60">
 		<mx:Image source="@Embed(source='assets/icons/group.png')" />
+		<mx:Label id="lblTitle" text="{activity.title}" />
 	</mx:VBox>
 	
 </ActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml	(.../SystemToolComponent.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/SystemToolComponent.mxml	(.../SystemToolComponent.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -4,8 +4,12 @@
 	<mx:Script>
 		<![CDATA[
 			
-			public var type:int;
+			// Identifiest the type of system activity
+			public var activityTypeID:int;
 			
+			// This is just fro grouping, 
+			public var groupingType:int;
+			
 		]]>
 	</mx:Script>
 </mx:Button>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -10,6 +10,9 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.model.activity.ActivityFactory;
+			import org.lamsfoundation.lams.author.model.activity.Activity;
+			import org.lamsfoundation.lams.author.components.activity.ActivityComponentFactory;
 			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.components.activity.group.LearnerGroupActivityComponent;
 			import org.lamsfoundation.lams.author.components.activity.group.MonitorGroupActivityComponent;
@@ -65,11 +68,14 @@
 	        	
 	        	var ds:DragSource = new DragSource();
 	        	
-	        	var activityComponent:ActivityComponent;
 	        	
+	        	var activity:Activity = ActivityFactory.getSystemActivityInstance(dragInitiator, 0);
+	        	var activityComponent:ActivityComponent = ActivityComponentFactory.getActivityComponentInstance(activity);
+	        	
+	        	
 	        	closeAllMenus();
 	        	
-	        	switch (dragInitiator.type) {
+	        	/* switch (dragInitiator.activityTypeID) {
 	        		case Constants.SYSTEM_ACTIVITY_TYPE_OPTIONAL: 
 		        		activityComponent = new OptionalActivityComponent();
 	          			break;
@@ -82,7 +88,7 @@
 	          		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_LEARNER:
 		        		activityComponent = new LearnerGroupActivityComponent();	
 	          			break;
-	        	}
+	        	} */
 	        	
 	        	ds.addData(activityComponent, "dragActivity");  
 	          	DragManager.doDrag(dragInitiator, ds, event, activityComponent, 25, 15, 1.00, false);
@@ -147,15 +153,15 @@
 	    	toolTip="{Application.application.dictionary.getLabel('zoom_out_btn_tooltip')}"/>
 	    		
 	    <mx:Button height="25" width="27" 
-	    	click="Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL)"
+	    	click="AuthorController.instance.changeCursorState(Constants.CURSOR_STATE_NORMAL)"
 	    	icon="@Embed(source='assets/icons/cursor.png')" 
 	    	toolTip="{Application.application.dictionary.getLabel('normal_cursor_btn_tooltip')}" />
 	    
 	    <mx:Spacer width="5"></mx:Spacer>
 	    
 	    <mx:Button height="25" icon="@Embed(source='assets/icons/transition.png')" 
 	    	label="{Application.application.dictionary.getLabel('trans_btn')}" toolTip="{Application.application.dictionary.getLabel('trans_btn_tooltip')}" 
-	    	click="Application.application.changeCursorState(Constants.CURSOR_STATE_TRANSITION)" />
+	    	click="AuthorController.instance.changeCursorState(Constants.CURSOR_STATE_TRANSITION)" />
 	    	
 	    <mx:Button id="optionalButton" height="25" 
 	    	click="toggleDropDownMenu(optionalMenu)"
@@ -184,7 +190,7 @@
     
     
     <toolbar:ToolBarDropDown id="optionalMenu">
-    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_OPTIONAL}" height="25" 
+    	<toolbar:SystemToolComponent activityTypeID="{Constants.ACTIVITY_TYPE_OPTIONAL_ACTIVITY}" height="25" 
     		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/optional.png')" 
     		label="{Application.application.dictionary.getLabel('optional_act_btn')}" 
@@ -209,7 +215,7 @@
     		icon="@Embed(source='assets/icons/gate.png')" 
     		label="{Application.application.dictionary.getLabel('gate_btn')}" 
     		toolTip="{Application.application.dictionary.getLabel('gate_btn_tooltip')}"/>
-    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_BRANCH}" height="25" 
+    	<toolbar:SystemToolComponent activityTypeID="{Constants.ACTIVITY_TYPE_BRANCHING_CHOSEN}" height="25" 
     		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/gate.png')" 
     		label="{Application.application.dictionary.getLabel('gate_btn')}" 
@@ -224,19 +230,19 @@
     <mx:Binding destination="flowMenu.y" source="flowButton.y + flowButton.height" />
     
     <toolbar:ToolBarDropDown id="groupMenu">
-    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM}" height="25" 
+    	<toolbar:SystemToolComponent activityTypeID="{Constants.ACTIVITY_TYPE_GROUPING}" groupingType="{Constants.GROUPING_TYPE_RANDOM}" height="25" 
     		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/group.png')" 
     		label="{Application.application.dictionary.getLabel('random_group_btn')}" 
     		toolTip="{Application.application.dictionary.getLabel('random_group_btn_tooltip')}"/>
 
-    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_GROUP_MONITOR}" height="25" 
+    	<toolbar:SystemToolComponent activityTypeID="{Constants.ACTIVITY_TYPE_GROUPING}" groupingType="{Constants.GROUPING_TYPE_TEACHER_CHOSEN}" height="25" 
     		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/group.png')" 
     		label="{Application.application.dictionary.getLabel('monitor_group_btn')}" 
     		toolTip="{Application.application.dictionary.getLabel('monitor_group_btn_tooltip')}"/>
     		
-    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_GROUP_LEARNER}" height="25" 
+    	<toolbar:SystemToolComponent activityTypeID="{Constants.ACTIVITY_TYPE_GROUPING}" groupingType="{Constants.GROUPING_TYPE_STUDENT_CHOICE}" height="25" 
     		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/group.png')" 
     		label="{Application.application.dictionary.getLabel('learner_group_btn')}" 
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(.../TransitionComponent.as)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(.../TransitionComponent.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -5,24 +5,29 @@
 	import flash.events.MouseEvent;
 	import flash.geom.Point;
 	
-	import mx.core.Application;
 	import mx.core.DragSource;
+	import mx.core.UIComponent;
 	import mx.managers.DragManager;
 	
-	import org.lamsfoundation.lams.author.components.activity.ActivityComponent;
+	import org.lamsfoundation.lams.author.controller.AuthorController;
+	import org.lamsfoundation.lams.author.model.transition.Transition;
 	import org.lamsfoundation.lams.author.util.Constants;
 	
-	public class TransitionComponent extends DrawingTool
+	public class TransitionComponent extends UIComponent
 	{
-		public var toActivity:ActivityComponent;
-		public var fromActivity:ActivityComponent;
+		public var transition:Transition;
+		public var startX:Number;
+		public var startY:Number;
 		
+		public var endX:Number;
+		public var endY:Number;
+		
 		// This flag is set if when the transition is created, the source activty alread has an out transition
 		public var possibleBranch:Boolean = false;
 		
 		// A variable used in the controller for possible branch transitions
 		// Used to generate branch points where needed.
-		public var possibleFirstActivityInBranch:ActivityComponent = null;
+		//public var possibleFirstActivityInBranch:ActivityComponent = null;
 		
 		
 
@@ -66,12 +71,21 @@
 	    // initiates the drag-and-drop operation.
 	    private function mouseMove(event:MouseEvent):void 
 	    {                
-	        if (Application.application.cursorState == Constants.CURSOR_STATE_NORMAL) {
+	        if (AuthorController.instance.cursorState == Constants.CURSOR_STATE_NORMAL) {
 	        	var ds:DragSource = new DragSource();
-	        	ds.addData(this, "img");    
-	        	DragManager.doDrag(this, ds, event, this);
+	        	ds.addData(this, "dragTransition");    
+	        	DragManager.doDrag(this, ds, event, this.getImageForDrag());
 	        }
 	    }
-
+	    
+	    public function getImageForDrag():TransitionComponent{
+	    	var ret:TransitionComponent = new TransitionComponent();
+	    	ret.endX = this.endX;
+	    	ret.endY = this.endY;
+	    	ret.startX = this.startX;
+	    	ret.startY = this.startY;
+	    	ret.invalidateDisplayList();
+	    	return ret;
+	    }
 	}
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -4,23 +4,18 @@
 	import flash.utils.Dictionary;
 	
 	import mx.collections.ArrayCollection;
-	import mx.controls.Alert;
 	import mx.core.Application;
 	import mx.core.UIComponent;
-	import mx.events.CloseEvent;
 	import mx.events.DragEvent;
+	import mx.managers.CursorManager;
 	
 	import org.lamsfoundation.lams.author.components.CanvasBox;
 	import org.lamsfoundation.lams.author.components.LearningLibraryEntryComponent;
 	import org.lamsfoundation.lams.author.components.activity.*;
-	import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
-	import org.lamsfoundation.lams.author.components.activity.group.LearnerGroupActivityComponent;
-	import org.lamsfoundation.lams.author.components.activity.group.MonitorGroupActivityComponent;
-	import org.lamsfoundation.lams.author.components.activity.group.RandomGroupActivityComponent;
 	import org.lamsfoundation.lams.author.components.toolbar.SystemToolComponent;
 	import org.lamsfoundation.lams.author.components.transition.TransitionComponent;
+	import org.lamsfoundation.lams.author.model.activity.GroupActivity;
 	import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
-	import org.lamsfoundation.lams.author.util.AuthorUtil;
 	import org.lamsfoundation.lams.author.util.Constants;
 	import org.lamsfoundation.lams.common.dictionary.XMLDictionaryRegistry;
 	
@@ -31,14 +26,27 @@
 		
 		private static var _instance:AuthorController;
 		
-		
-	 	public var transitionArray:ArrayCollection = new ArrayCollection();
-	 	
+		private var nextUIID:int = 1;
+		private var nextToolContentID:int = 1;
+			 	
 	 	public var activities:Dictionary = new Dictionary();
-		
+	 	
+	 	[Bindable] public var selectedActivityComponent:ActivityComponent;
+	 	
+	 	
+	 	// Reference to all activity components via UIID (key)
+	 	public var activityComponents:Dictionary = new Dictionary();
+	 	
+
+	 	
+	 	// STATES
+		public var cursorState:int = Constants.CURSOR_STATE_NORMAL; // State of cursor transition/help/dataflow etc...
+		public var uiState:int = Constants.UI_STATE_NORMAL; 		// ui state
+
+
 		public function AuthorController(){
 			if (_instance != null) {
-				throw new Error("This is a singleton, do not instantiate, instead use AuthorController.instance");
+				throw new Error("This is a singleton, do not instanciate, instead use AuthorController.instance");
 			}
 		}
 		
@@ -82,6 +90,18 @@
 			Application.application.dictionary = new XMLDictionaryRegistry(xml, dictionaryFallback);
 		}
 		
+		public function generateUIID():int {
+			var ret:int = this.nextUIID;
+			nextUIID++;
+			return ret;
+		}
+		
+		public function generateToolContentID():int {
+			var ret:int = this.nextToolContentID;
+			nextToolContentID++;
+			return ret;
+		}
+		
 		/**
 		 * The drop activity function is fired when the user drops an activity directly into the canvas
 		 * ie not inside a complex activity like optional. The event is fired by the CanvasBox
@@ -100,354 +120,140 @@
 			if (event.dragInitiator is ActivityComponent) {
             	var activityComponent:ActivityComponent;
             	activityComponent = event.dragInitiator as ActivityComponent;
-            	activityComponent.x = currentMousePoint.x - activityComponent.mouseOffSetX;
-          		activityComponent.y = currentMousePoint.y - activityComponent.mouseOffSetY;
-          		activityComponent.setCenter();
-          		activityComponent.updateTransitionPositions();
-          		activityComponent.selectActivity();
-            } else {
+          		activityComponent.rootActivity.xCoord = currentMousePoint.x - activityComponent.mouseOffSetX;
+	           	activityComponent.rootActivity.yCoord = currentMousePoint.y - activityComponent.mouseOffSetY;
+	           	activityComponent.setCenter();
+				activityComponent.updateTransitionPositions();
+          		selectActivityComponent(activityComponent);
+            } else if (event.dragInitiator is LearningLibraryEntryComponent || event.dragInitiator is SystemToolComponent) {
             	// Adding a new activity to the canvas
             	
             	// Get the next UIID
-				var nextActivityUIID:int = getNewUIID();
-            	
-            	if (event.dragInitiator is LearningLibraryEntryComponent) {
-	            	var learningLibraryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent;
-	            	
-	            	// Get the current toolContentID then increment the global counter
-					var toolContentID:int = Application.application.nextToolContentID;
-					Application.application.nextToolContentID++;
-	            	
-	            	if (learningLibraryComponent.learningLibraryEntry.isCombined) {
-	            		
-	            		var act1UIID:int = getNewUIID();
-	            		var act2UIID:int = getNewUIID();
-	            		var combinedActivityComponent:CombinedActivityComponent = new CombinedActivityComponent();
-	                	combinedActivityComponent.toolContentID = toolContentID;
-	                	combinedActivityComponent.learningLibraryEntry = learningLibraryComponent.learningLibraryEntry;
-	                	combinedActivityComponent.loadCombined(nextActivityUIID, act1UIID, act2UIID)
-						combinedActivityComponent.x = currentMousePoint.x;
-	              		combinedActivityComponent.y = currentMousePoint.y
-	                	canvasBox.addChild(combinedActivityComponent);
-	                	combinedActivityComponent.setCenter();
-	                	combinedActivityComponent.selectActivity();
-	                	activities[nextActivityUIID] = combinedActivityComponent;
-	            	} else {
-	            		var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
-	                	toolActivityComponent.toolContentID = toolContentID;
-	                	toolActivityComponent.tool = learningLibraryComponent.learningLibraryEntry.toolTemplates[0];
-	                	toolActivityComponent.load(nextActivityUIID)
-						toolActivityComponent.x = currentMousePoint.x  - toolActivityComponent.mouseOffSetX;
-	              		toolActivityComponent.y = currentMousePoint.y  - toolActivityComponent.mouseOffSetY;
-	                	canvasBox.addChild(toolActivityComponent);
-	                	toolActivityComponent.setCenter();
-	                	toolActivityComponent.selectActivity();
-	                	activities[nextActivityUIID] = toolActivityComponent;
-	            	}
-	            } else if (event.dragInitiator is SystemToolComponent) {
-	            	var systemToolComponent:SystemToolComponent = event.dragInitiator as SystemToolComponent;
-	            	
-	            	switch (systemToolComponent.type) {
-	            		case Constants.SYSTEM_ACTIVITY_TYPE_OPTIONAL:
-	            			var optionalActivityComponent:OptionalActivityComponent = new OptionalActivityComponent();       			
-		                	optionalActivityComponent.x = currentMousePoint.x;
-			              	optionalActivityComponent.y = currentMousePoint.y;
-			              	canvasBox.addChild(optionalActivityComponent);
-		                	optionalActivityComponent.setCenter();
-		                	optionalActivityComponent.load(nextActivityUIID);
-		                	optionalActivityComponent.selectActivity();
-		                	activities[nextActivityUIID] = optionalActivityComponent;
-	            			break;
-	            		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM:
-	            			var randomGroup:RandomGroupActivityComponent = new RandomGroupActivityComponent();
-		                	randomGroup.x = currentMousePoint.x;
-			              	randomGroup.y = currentMousePoint.y;
-			              	canvasBox.addChild(randomGroup);
-		                	randomGroup.setCenter();
-		                	randomGroup.load(nextActivityUIID);
-		                	randomGroup.selectActivity();
-		                	activities[nextActivityUIID] = randomGroup;
-	            			break;
-	            		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_MONITOR:
-	            			var monitorGroup:MonitorGroupActivityComponent = new MonitorGroupActivityComponent();
-		                	monitorGroup.x = currentMousePoint.x;
-			              	monitorGroup.y = currentMousePoint.y;
-			              	canvasBox.addChild(monitorGroup);
-		                	monitorGroup.setCenter();
-		                	monitorGroup.load(nextActivityUIID);
-		                	monitorGroup.selectActivity();
-		                	activities[nextActivityUIID] = monitorGroup;
-	            			break;
-	            		case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_LEARNER:
-	            			var learnerGroup:GroupActivityComponent = new LearnerGroupActivityComponent();
-		                	learnerGroup.x = currentMousePoint.x;
-			              	learnerGroup.y = currentMousePoint.y;
-			              	canvasBox.addChild(learnerGroup);
-		                	learnerGroup.setCenter();
-		                	learnerGroup.load(nextActivityUIID);
-		                	learnerGroup.selectActivity();
-		                	activities[nextActivityUIID] = learnerGroup;
-	            			break;
-	            		case Constants.SYSTEM_ACTIVITY_TYPE_BRANCH:
-	            			var branchPoint:BranchPoint = new BranchPoint;
-	            			branchPoint.x = currentMousePoint.x;
-			              	branchPoint.y = currentMousePoint.y;
-			              	canvasBox.addChild(branchPoint);
-		                	branchPoint.setCenter();
-		                	branchPoint.load(nextActivityUIID);
-		                	branchPoint.selectActivity();
-		                	activities[nextActivityUIID] = branchPoint;
-	            			break;
-	            	}
-	            }	
+				var nextActivityUIID:int = generateUIID();
+				
+				var newActivityComponent:ActivityComponent = ActivityComponentFactory.getActivityComponentInstanceFromDrag(event.dragInitiator, nextActivityUIID);
+	           	newActivityComponent.rootActivity.xCoord = currentMousePoint.x;
+	           	newActivityComponent.rootActivity.yCoord = currentMousePoint.y
+	            canvasBox.addChild(newActivityComponent);
+	            selectActivityComponent(newActivityComponent);
+	            activities[nextActivityUIID] = newActivityComponent.rootActivity;	
+	            activityComponents[nextActivityUIID] = newActivityComponent;
             }
             
                 
             // Return cursor state to normal
-			Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);  
+			AuthorController.instance.changeCursorState(Constants.CURSOR_STATE_NORMAL);  
 		}
 		
 		
 		/**
-		 * Handles transitions.
+		 * This function is invoked when an activity is dragged into the bin
+		 * it deletes the activity and any related transitions
 		 * 
-		 * This is fired when a transition is finished.. 
-		 * ie after the user's mouse button goes up when drawing an activity.
+		 * TODO: Check the state of the LD and set it to invalid if neccessary
 		 * 
-		 * First - find the activity (if any) that the transition landed on.
-		 * Second - Validate the transition against the learning design
-		 * Third - If valid, update the two activities involded and the learning design.
+		 * @param activityComponent the acitvity object
 		 * 
-		 * @param event The transition event fired by the source activity
-		 */ 
-		public function drawTransition(sourceActivityComponent:ActivityComponent, transition:TransitionComponent):void {
-			
-			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
-			var validTransition:Boolean = false;
-			for (var i:int = 0; i < canvasBox.numChildren; i++) {
-		    		
-	    		if (canvasBox.getChildAt(i) is ActivityComponent) {
-	    			
-	    			var destActivityComponent:ActivityComponent = canvasBox.getChildAt(i) as ActivityComponent;
-	    			if (destActivityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER && destActivityComponent.canAcceptTransitions) {
-	    				
-	    				
-	    				var validationString:String = validateTransition(transition, sourceActivityComponent, destActivityComponent);
-	    				
-	    				switch (validationString) {
-	    					case "valid": 
-		    					validTransition = true;	
-		    					
-		    					// Apply the transition
-		    					transitionArray.addItem(transition);
-		    					sourceActivityComponent.state = Constants.ACTIVITY_STATE_NORMAL;
-		    					destActivityComponent.transitionIn = transition;	
-		    					transition.toActivity = destActivityComponent;
-		    					sourceActivityComponent.transitionOut = transition;
-		    					destActivityComponent.updateTransitionPositions();
-								sourceActivityComponent.updateTransitionPositions();
-								break;
-							case "branchAttempt":
-								validTransition = true;	
-								Alert.show("Looks like your trying to create a branch. Do you want to generate a branch point?","",
-									Alert.OK|Alert.CANCEL,Application.application.canvasArea,
-									function clickListener(event:CloseEvent):void {
-										if (event.detail == Alert.OK) {
-											automaticallyGenerateBranch(transition, sourceActivityComponent, destActivityComponent);
-										} else {
-											Alert.show("no");
-										}
-									}
-									
-									,null,Alert.OK);
-								break;
-							default:
-								Alert.show(validationString);
-								break;
-	    				}
-
-	    				// Return cursor state to normal
-	    				Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);			
-	    				break;
-	    			}
-	    		}
-	    	}
-	    	
-	    	if (!validTransition) {
-	    		transition.graphics.clear();
-	    		canvasBox.removeChild(transition);
-	    		sourceActivityComponent.transitionOut = null;
-	    	}
-		}
-		
-		/**
-		 * 
-		 * Validates a transition against the learning design
-		 *  
-		 * @param event The TransitionEvent fired by the source acitivity
-		 * @param destActivity The activity at the end of the transition
-		 * @return "valid" if valid, otherwise the translated error message.
-		 * 
 		 */
-		public function validateTransition(transition:TransitionComponent, sourceActivity:ActivityComponent, destActivity:ActivityComponent):String {
-			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+		public function deleteActivity(activityComponent:ActivityComponent):void {
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;			
+			activityComponent.deSelectActivity();
 			
-			// Check if there is more than one transition coming our of the source activity
-			if (transition.possibleBranch) {
-				return "branchAttempt";
+			// Remove transition in, if needed
+			if (activityComponent.transitionToComponent != null) {
+				TransitionController.instance.deleteTransition(activityComponent.transitionToComponent);		
 			}
 			
-			// Check if the destination activity already has a transition
-			if (destActivity.transitionIn != null) {
-				return Application.application.dictionary.getLabelAndInsert("cv_invalid_trans_target_to_activity", [destActivity.title.text]);
+			// Remove transition out if needed
+			if (activityComponent.transitionFromComponent != null) {
+				TransitionController.instance.deleteTransition(activityComponent.transitionFromComponent);
 			}
 			
-			// Check if there is a circuit
-			if (isLoopingLearningDesign(sourceActivity, destActivity)){
-				return Application.application.dictionary.getLabel("cv_invalid_trans_circular_sequence");
-			}
+			// Remove from reference array
+			this.activityComponents[activityComponent.rootActivity.activityUIID] = null;
 			
-			return "valid";
+			// Remove activity
+			canvasBox.removeChild(activityComponent);
+			activityComponent = null;
 		}
 		
+				
 		
-		/**
-		 * A recursive function that checks whether the learning design has a circuit in it 
-		 * as a result of adding a transition between the two activities
-		 *  
-		 * @param fromActivity the source of the transition
-		 * @param toActivity the destination of the transition
-		 * @return true if loop exists, false otherwise
-		 * 
-		 */
-		private function isLoopingLearningDesign(fromActivity:ActivityComponent, toActivity:ActivityComponent):Boolean{
-			
-			//var toTransitions = _cv.ddm.getTransitionsForActivityUIID(toAct)
-			if (toActivity.transitionOut != null){
-				var nextActivity:ActivityComponent = toActivity.transitionOut.toActivity;
-				if (nextActivity == fromActivity){
-					return true;
-				}else {
-					return isLoopingLearningDesign(fromActivity, nextActivity)
-				}
-			}else {
-				return false;
+		public function selectActivityComponent(activityComponent:ActivityComponent):void {
+			deSelectActivityComponent();
+			this.selectedActivityComponent = activityComponent;
+			activityComponent.selectActivity(); 
+			Application.application.canvasArea.propertyInspector.openPropertyInspector();
+		}
+		
+		public function deSelectActivityComponent():void {
+			if (this.selectedActivityComponent!= null) {
+				this.selectedActivityComponent.deSelectActivity();
+				this.selectedActivityComponent = null;
+				Application.application.canvasArea.propertyInspector.closePropertyInspector();
 			}
 		}
 		
-		private function automaticallyGenerateBranch(transition:TransitionComponent, sourceActivity:ActivityComponent, destActivity:ActivityComponent):void {
-			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+		public function getAllPossibleGroupings(activityComponent:ActivityComponent):ArrayCollection {
+			var currentAvailableGroups:ArrayCollection = new ArrayCollection();	
 			
-			var destActivity2:ActivityComponent = sourceActivity.transitionOut.possibleFirstActivityInBranch;
 			
-			// Remove old transitions
-        	deleteTransition(transition.possibleFirstActivityInBranch.transitionIn);
-        	deleteTransition(transition);
+			// Make a null grouping for this activity
+			var nullGrouping:GroupActivity = new GroupActivity(0, 1);
+			nullGrouping.title = Application.application.dictionary.getLabel("none_act_lbl");
+			currentAvailableGroups.addItem(nullGrouping);			
+			currentAvailableGroups.addAll(activityComponent.allPossibleGroupings);
 			
-			var sourcePoint:Point = new Point(sourceActivity.centerX, sourceActivity.centerY);
+			return currentAvailableGroups;
 			
-			// Find midpoint between two dest activities
-			var midPoint:Point = AuthorUtil.getMidpoint(new Point(destActivity.x, destActivity.y),new Point(destActivity2.x, destActivity2.y));
+			// TODO: Need to traverse the learning design array to find any previous activities
+			// that are grouping activities
 			
-			// Find point 30 pixels away from the source activity in the direction of the midpoint
-			// This is the point of the branch point
-			var resultPoint:Point = Point.interpolate(sourcePoint, midPoint, 0.5);
 			
-			var nextActivityUIID:int = getNewUIID();
+			/* 
+			var activity:Activity = activityComponent.rootActivity;
 			
-			// Add the branch point to the canvas
-			var branchPoint:BranchPoint = new BranchPoint();
-        	canvasBox.addChild(branchPoint);
-        	branchPoint.x = resultPoint.x;
-          	branchPoint.y = resultPoint.y;
-          	
-        	branchPoint.load(nextActivityUIID);
-        	branchPoint.selectActivity();
-        	activities[nextActivityUIID] = branchPoint;	
-        	
-        	// Create the transition to the branch activity
-        	var transition:TransitionComponent = new TransitionComponent();
-        	canvasBox.addChild(transition);
-        	transition.startX = sourceActivity.centerX;
-        	transition.startY = sourceActivity.centerY;
-        	transition.endX = branchPoint.centerX;
-        	transition.endY = branchPoint.centerY;
-        	transition.toActivity = branchPoint;
-        	transition.fromActivity = sourceActivity;
-        	
-        	// link with activities
-        	sourceActivity.transitionOut = transition;
-        	branchPoint.transitionIn = transition;
-        	branchPoint.updateTransitionPositions();
-        	sourceActivity.updateTransitionPositions();
-        	
-		}
-		
-		/**
-		 * This function is invoked when an activity is dragged into the bin
-		 * it deletes the activity and any related transitions
-		 * 
-		 * TODO: Check the state of the LD and set it to invalid if neccessary
-		 * 
-		 * @param activityComponent the acitvity object
-		 * 
-		 */
-		public function deleteActivity(activityComponent:ActivityComponent):void {
-			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;			
-			activityComponent.deSelectActivity();
+			if (activity.transitionIn != null){
+				var activityCmp:ActivityComponent = this.transitionIn.fromActivity;
+				
+				while (true) {
+					if (activityCmp is GroupActivityComponent) {
+						var entry:Object = new Object();
+						entry.activity.activityUIID = activityCmp.activity.activityUIID;
+						entry.activity.title = activityCmp.activity.title;
+						ret.addItem(entry);
+					}
+					
+					if (activityCmp.transitionIn != null) {
+						activityCmp = activityCmp.transitionIn.fromActivity;
+					} else {
+						break;
+					}
+				}  
+			} */
 			
-			// Remove transition in, if needed
-			if (activityComponent.transitionIn != null) {
-				canvasBox.removeChild(activityComponent.transitionIn);
-				transitionArray.removeItemAt(transitionArray.getItemIndex(activityComponent.transitionIn));
-				activityComponent.transitionIn.fromActivity.transitionOut = null;
-				activityComponent.transitionIn = null;				
-			}
 			
-			// Remove transition out if needed
-			if (activityComponent.transitionOut != null) {
-				canvasBox.removeChild(activityComponent.transitionOut);
-				transitionArray.removeItemAt(transitionArray.getItemIndex(activityComponent.transitionOut));
-				activityComponent.transitionOut.toActivity.transitionIn = null;
-				activityComponent.transitionOut = null;				
-			}
-			
-			// Remove activity
-			canvasBox.removeChild(activityComponent);
-			activityComponent = null;
+			/* groupingCombo.selectedItem = nullGrouping;
+			for each (var item:Object in currentAvailableGroups) {
+				if (activityComponent.groupingUIID == item.activityUIID) {
+					groupingCombo.selectedItem = item;
+				}
+			} */
 		}
 		
-		/**
-		 * This function is invoked when a transition is dropped into the bin
-		 * it deletes the transition
-		 * 
-		 * TODO: Check the state of the LD and set it to invalid if neccessary
-		 * 
-		 * @param transition
-		 */
-		public function deleteTransition(transition:TransitionComponent):void {
-			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
-			
-			if (transition != null) {
-				if (transitionArray.getItemIndex(transition) != -1) {
-					transitionArray.removeItemAt(transitionArray.getItemIndex(transition));
-				}
-				if (transition.fromActivity != null) {
-					transition.fromActivity.transitionOut = null;
-				} 
-				if (transition.toActivity != null) {
-					transition.toActivity.transitionIn = null;
-				}
-				
-				canvasBox.removeChild(transition);
-				transition = null;
+		[Embed("assets/icons/transition.png")]
+        public var transitionCursor:Class;
+
+		public function changeCursorState(state:int):void{
+			cursorState = state;
+			CursorManager.removeCursor(CursorManager.currentCursorID);
+			switch (cursorState) {
+				case Constants.CURSOR_STATE_NORMAL:
+					break;
+				case Constants.CURSOR_STATE_TRANSITION:
+					CursorManager.setCursor(transitionCursor);
+					break;
 			}
 		}
-		
-		private function getNewUIID():int{
-			var UIID:int = Application.application.nextUIID;
-			Application.application.nextUIID++;
-			return UIID;
-		}
 	}
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorControllerInitiator.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorControllerInitiator.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorControllerInitiator.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,30 @@
+package org.lamsfoundation.lams.author.controller
+{
+	import mx.collections.ArrayCollection;
+	
+	
+	/**
+	 * @author lfoxton
+	 * 
+	 * Helper class for author controller so that mate
+	 * can initiate values without calling the constructor
+	 * for AuthorController (which ruins its singleton status)
+	 * 
+	 */
+	public class AuthorControllerInitiator
+	{
+		public function AuthorControllerInitiator(){}
+		
+		public function setLearningLibrary(learningLibraryIn:ArrayCollection):void {
+			AuthorController.instance.setLearningLibrary(learningLibraryIn);
+		}
+		
+		public function setDictionaryFallback(xml:XML):void {
+			AuthorController.instance.setDictionaryFallback(xml);
+		}
+		
+		public function setDictionary(xml:XML):void {
+			AuthorController.instance.setDictionary(xml);
+		}
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/TransitionController.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/TransitionController.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/TransitionController.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,332 @@
+package org.lamsfoundation.lams.author.controller
+{
+	import flash.events.Event;
+	import flash.events.MouseEvent;
+	import flash.geom.Point;
+	import flash.utils.Dictionary;
+	
+	import mx.controls.Alert;
+	import mx.core.Application;
+	import mx.events.CloseEvent;
+	
+	import org.lamsfoundation.lams.author.components.CanvasBox;
+	import org.lamsfoundation.lams.author.components.activity.ActivityComponent;
+	import org.lamsfoundation.lams.author.components.transition.TransitionComponent;
+	import org.lamsfoundation.lams.author.model.activity.Activity;
+	import org.lamsfoundation.lams.author.model.transition.Transition;
+	import org.lamsfoundation.lams.author.model.transition.TransitionFactory;
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class TransitionController
+	{
+		private static var _instance:TransitionController;
+		
+		private var currentTransitionComponent:TransitionComponent;
+		private var currentFromActivityActivityComponent:ActivityComponent;
+		
+		// Reference to all transition components via uiid
+		[Bindable] public var transitionComponents:Dictionary = new Dictionary();
+		
+		public function TransitionController() {
+			if (_instance != null) {
+				throw new Error("This is a singleton, do not instanciate, instead use TransitionController.instance");
+			}
+		}
+		
+		public static function get instance():TransitionController {
+			if (_instance == null) {
+				_instance = new TransitionController();
+			}
+			return _instance;
+		}
+			
+		public function startTransition(event:MouseEvent, activityComponent:ActivityComponent):void {
+			// Set the activityComponent state to drawing
+			activityComponent.state = Constants.ACTIVITY_STATE_DRAWING;
+			
+			// Set the global state to drawing
+			AuthorController.instance.uiState = Constants.UI_STATE_DRAWING;
+			
+			var possibleBranch:Boolean = activityComponent.rootActivity.transitionFrom != null;
+			var possibleFirstActivityInBranch:Activity = null;
+			if (possibleBranch) {
+				possibleFirstActivityInBranch = activityComponent.rootActivity.transitionFrom.toActivity;
+			}
+			
+			this.currentFromActivityActivityComponent = activityComponent;
+
+			// Create a transition component
+			currentTransitionComponent = new TransitionComponent();
+			currentTransitionComponent.startX = activityComponent.centerX;
+			currentTransitionComponent.startY = activityComponent.centerY;
+			currentTransitionComponent.endX = activityComponent.centerX;
+			currentTransitionComponent.endY = activityComponent.centerY;
+			currentTransitionComponent.invalidateProperties()
+			
+			// Deselect the currently selected activity
+			AuthorController.instance.deSelectActivityComponent();
+			
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+			canvasBox.addChild(currentTransitionComponent);
+			
+			Application.application.systemManager.addEventListener(MouseEvent.MOUSE_MOVE, systemManagerMouseMoveHandler, true);
+			Application.application.systemManager.addEventListener(MouseEvent.MOUSE_UP, systemManagerMouseUpHandler, true);
+			Application.application.systemManager.stage.addEventListener(Event.MOUSE_LEAVE, stageMouseLeaveHandler);
+		}
+		
+		protected function stopTransition():void
+		{
+		    AuthorController.instance.uiState = Constants.UI_STATE_NORMAL;
+		    Application.application.systemManager.removeEventListener(MouseEvent.MOUSE_MOVE, systemManagerMouseMoveHandler, true);			
+		    Application.application.systemManager.removeEventListener(MouseEvent.MOUSE_UP, systemManagerMouseUpHandler, true);
+		    Application.application.systemManager.stage.removeEventListener(Event.MOUSE_LEAVE, stageMouseLeaveHandler);
+		}
+		
+		private function systemManagerMouseMoveHandler(event:MouseEvent):void
+	    {
+	    	var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+	    	
+	    	var pt:Point = new Point(event.stageX,event.stageY);
+	    	pt = canvasBox.globalToLocal(pt);
+	    	
+	    	this.currentTransitionComponent.endX = pt.x;
+	    	this.currentTransitionComponent.endY = pt.y;
+	    	
+	    	currentTransitionComponent.invalidateDisplayList();
+	    }
+	    
+	    /**
+	    * This event fires at the end of a transition.
+	    * 
+	    * Needs to be handled by the controller as it changes the learningDesing state
+	    * 
+	    */ 
+	    private function systemManagerMouseUpHandler(event:MouseEvent):void
+	    {
+    		stopTransition();
+    		finishTransition(this.currentFromActivityActivityComponent, this.currentTransitionComponent);
+	    }
+	    
+	    private function stageMouseLeaveHandler(event:MouseEvent):void
+	    {
+	    	stopTransition();
+		}
+
+	
+		/**
+		 * Handles transitions.
+		 * 
+		 * This is fired when a transition is finished.. 
+		 * ie after the user's mouse button goes up when drawing an activity.
+		 * 
+		 * First - find the activity (if any) that the transition landed on.
+		 * Second - Validate the transition against the learning design
+		 * Third - If valid, update the two activities involded and the learning design.
+		 * 
+		 * @param event The transition event fired by the source activity
+		 */ 
+		public function finishTransition(sourceActivityComponent:ActivityComponent, transitionComponent:TransitionComponent):void {
+			
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+			var validTransition:Boolean = false;
+			for (var i:int = 0; i < canvasBox.numChildren; i++) {
+		    		
+	    		if (canvasBox.getChildAt(i) is ActivityComponent) {
+	    			
+	    			var destActivityComponent:ActivityComponent = canvasBox.getChildAt(i) as ActivityComponent;
+	    			if (destActivityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER && destActivityComponent.canAcceptTransitions) {
+
+	    				var validationString:String = validateTransition(transitionComponent.transition, sourceActivityComponent.rootActivity, destActivityComponent.rootActivity);
+	    				
+	    				switch (validationString) {
+	    					case "valid": 
+		    					validTransition = true;	
+		    					
+		    					var nextUIID:int = AuthorController.instance.generateUIID();
+		    					
+		    					var transition:Transition = TransitionFactory.createTransition(this.currentFromActivityActivityComponent.rootActivity, 
+		    						destActivityComponent.rootActivity, Constants.TRANSITION_TYPE_NORMAL, nextUIID);
+		    					
+		    					this.currentTransitionComponent.transition = transition;
+		    					
+		    					
+		    					currentFromActivityActivityComponent.state = Constants.ACTIVITY_STATE_NORMAL;
+		    					currentFromActivityActivityComponent.transitionFromComponent = currentTransitionComponent;
+		    					destActivityComponent.transitionToComponent = currentTransitionComponent;
+		    					
+
+		    					destActivityComponent.updateTransitionPositions();
+								sourceActivityComponent.updateTransitionPositions();
+								break;
+							case "branchAttempt":
+								validTransition = true;	
+								Alert.show("Looks like your trying to create a branch. Do you want to generate a branch point?","",
+									Alert.OK|Alert.CANCEL,Application.application.canvasArea,
+									function clickListener(event:CloseEvent):void {
+										if (event.detail == Alert.OK) {
+											//automaticallyGenerateBranch(transition, sourceActivityComponent, destActivityComponent);
+										} else {
+											Alert.show("no");
+										}
+									}
+									
+									,null,Alert.OK);
+								break;
+							default:
+								Alert.show(validationString);
+								break;
+	    				}
+
+	    				// Return cursor state to normal
+	    				AuthorController.instance.changeCursorState(Constants.CURSOR_STATE_NORMAL);			
+	    				break;
+	    			}
+	    		}
+	    	}
+	    	
+	    	if (!validTransition) {
+	    		this.currentTransitionComponent.graphics.clear();
+	    		canvasBox.removeChild(currentTransitionComponent);
+	    		this.currentFromActivityActivityComponent.transitionFromComponent = null;
+	    	}
+		}
+		
+		/**
+		 * 
+		 * Validates a transition against the learning design
+		 *  
+		 * @param event The TransitionEvent fired by the source acitivity
+		 * @param destActivity The activity at the end of the transition
+		 * @return "valid" if valid, otherwise the translated error message.
+		 * 
+		 */
+		public function validateTransition(transition:Transition, sourceActivity:Activity, destActivity:Activity):String {
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+			
+			// Check if there is more than one transition coming our of the source activity
+			//if (transition.possibleBranch) {
+			//	return "branchAttempt";
+			//}
+			
+			// Check if the destination activity already has a transition
+			if (destActivity.transitionTo != null) {
+				return Application.application.dictionary.getLabelAndInsert("cv_invalid_trans_target_to_activity", [destActivity.title]);
+			}
+			
+			// Check if there is a circuit
+			if (isLoopingLearningDesign(sourceActivity, destActivity)){
+				return Application.application.dictionary.getLabel("cv_invalid_trans_circular_sequence");
+			}
+			
+			return "valid";
+		}
+		
+		/**
+		 * A recursive function that checks whether the learning design has a circuit in it 
+		 * as a result of adding a transition between the two activities
+		 *  
+		 * @param fromActivity the source of the transition
+		 * @param toActivity the destination of the transition
+		 * @return true if loop exists, false otherwise
+		 * 
+		 */
+		private function isLoopingLearningDesign(fromActivity:Activity, toActivity:Activity):Boolean{
+			
+			//var toTransitions = _cv.ddm.getTransitionsForActivityUIID(toAct)
+			if (toActivity.transitionFrom != null){
+				var nextActivity:Activity = toActivity.transitionFrom.toActivity;
+				if (nextActivity == fromActivity){
+					return true;
+				}else {
+					return isLoopingLearningDesign(fromActivity, nextActivity)
+				}
+			} else {
+				return false;
+			}
+
+		}
+		
+		private function automaticallyGenerateBranch(transition:TransitionComponent, sourceActivity:ActivityComponent, destActivity:ActivityComponent):void {
+			/* var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+			
+			var destActivity2:ActivityComponent = sourceActivity.transitionOut.possibleFirstActivityInBranch;
+			
+			// Remove old transitions
+        	deleteTransition(transition.possibleFirstActivityInBranch.transitionIn);
+        	deleteTransition(transition);
+			
+			var sourcePoint:Point = new Point(sourceActivity.centerX, sourceActivity.centerY);
+			
+			// Find midpoint between two dest activities
+			var midPoint:Point = AuthorUtil.getMidpoint(new Point(destActivity.x, destActivity.y),new Point(destActivity2.x, destActivity2.y));
+			
+			// Find point 30 pixels away from the source activity in the direction of the midpoint
+			// This is the point of the branch point
+			var resultPoint:Point = Point.interpolate(sourcePoint, midPoint, 0.5);
+			
+			var nextActivityUIID:int = getNewUIID();
+			
+			// Add the branch point to the canvas
+			var branchPoint:BranchPoint = new BranchPoint();
+        	canvasBox.addChild(branchPoint);
+        	branchPoint.x = resultPoint.x;
+          	branchPoint.y = resultPoint.y;
+          	
+        	branchPoint.load(nextActivityUIID);
+        	branchPoint.selectActivity();
+        	activities[nextActivityUIID] = branchPoint;	
+        	
+        	// Create the transition to the branch activity
+        	var transition:TransitionComponent = new TransitionComponent();
+        	canvasBox.addChild(transition);
+        	transition.startX = sourceActivity.centerX;
+        	transition.startY = sourceActivity.centerY;
+        	transition.endX = branchPoint.centerX;
+        	transition.endY = branchPoint.centerY;
+        	transition.toActivity = branchPoint;
+        	transition.fromActivity = sourceActivity;
+        	
+        	// link with activities
+        	sourceActivity.transitionOut = transition;
+        	branchPoint.transitionIn = transition;
+        	branchPoint.updateTransitionPositions();
+        	sourceActivity.updateTransitionPositions(); */
+        	
+		}
+		
+		 /**
+		 * This function is invoked when a transition is dropped into the bin
+		 * it deletes the transition
+		 * 
+		 * TODO: Check the state of the LD and set it to invalid if neccessary
+		 * 
+		 * @param transition
+		 */
+		public function deleteTransition(transitionComponent:TransitionComponent):void {
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+			
+			 if (transitionComponent != null) {
+				
+				this.transitionComponents[transitionComponent.transition.transitionUUID] = null;
+				
+				if (transitionComponent.transition.fromActivity != null) {
+					// Need to remove transition from model and from view
+					var fromActivityComponent:ActivityComponent = AuthorController.instance.activityComponents[transitionComponent.transition.fromActivity.activityUIID] as ActivityComponent;
+					fromActivityComponent.transitionFromComponent = null;	
+					transitionComponent.transition.fromActivity.transitionFrom = null;
+					
+				} 
+				if (transitionComponent.transition.toActivity != null) {
+					var toActivityComponent:ActivityComponent = AuthorController.instance.activityComponents[transitionComponent.transition.toActivity.activityUIID] as ActivityComponent;
+					toActivityComponent.transitionToComponent = null;	
+					transitionComponent.transition.toActivity.transitionTo = null;
+				}
+				
+				canvasBox.removeChild(transitionComponent);
+				transitionComponent = null;
+			}
+		}
+			    
+
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -3,6 +3,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.AuthorControllerInitiator;
 			import org.lamsfoundation.lams.author.util.TestingConstants;
 			import org.lamsfoundation.lams.author.model.ToolOutputDefinition;
 			import mx.controls.Alert;
@@ -57,12 +58,12 @@
 			}
 			
 			private var wddxParser:WDDXParser = new WDDXParser();
-			public function getToolOutputDefinitions(toolActivity:ToolActivityComponent):ArrayCollection {
+			public function getToolOutputDefinitions(toolActivityComponent:ToolActivityComponent):ArrayCollection {
 				var toolContentID:int;
-				if (toolActivity.toolContentID == 0) {
-					toolContentID = toolActivity.tool.defaultToolContentID;
+				if (toolActivityComponent.toolContentID == 0) {
+					toolContentID = toolActivityComponent.activity.tool.defaultToolContentID;
 				} else {
-					toolContentID = toolActivity.toolContentID;
+					toolContentID = toolActivityComponent.activity.toolContentID;
 				}
 				
 				var xmlString:String;
@@ -106,28 +107,28 @@
 	<!-- FlexEvent.APPLICATION_COMPLETE ___________________________________________________________ -->
 	<!-- Loads learning library and dictionary files -->
 	<EventHandlers type="{FlexEvent.INITIALIZE}" debug="true" >
-		<ObjectBuilder id="authorController" generator="{AuthorController}"/>
+		<ObjectBuilder id="authorController" generator="{AuthorControllerInitiator}"/>
 		
 		<!-- load leearning library -->
 		<HTTPServiceInvoker instance="{learningLibraryService}">
 			<Request method="getAllLearningLibraryDetails"/>
 			<resultHandlers>
 				<MethodInvoker generator="{WDDXParser}" method="parseObject" arguments="{resultObject}" />
-				<MethodInvoker generator="{AuthorController}" method="setLearningLibrary" arguments="{[lastReturn]}" />
+				<MethodInvoker generator="{AuthorControllerInitiator}" method="setLearningLibrary" arguments="{[lastReturn]}" />
 			</resultHandlers>
 		</HTTPServiceInvoker>
 		
 		<!-- load dictionary fallback -->
 		<HTTPServiceInvoker instance="{dictionaryFallbackService}">
 			<resultHandlers>
-				<MethodInvoker generator="{AuthorController}" method="setDictionaryFallback" arguments="{resultObject}" />
+				<MethodInvoker generator="{AuthorControllerInitiator}" method="setDictionaryFallback" arguments="{resultObject}" />
 			</resultHandlers>
 		</HTTPServiceInvoker>
 		
 		<!-- load dictionary -->
 		<HTTPServiceInvoker instance="{dictionaryService}">
 			<resultHandlers>
-				<MethodInvoker generator="{AuthorController}" method="setDictionary" arguments="{resultObject}" />
+				<MethodInvoker generator="{AuthorControllerInitiator}" method="setDictionary" arguments="{resultObject}" />
 			</resultHandlers>
 		</HTTPServiceInvoker>
 		
Fisheye: Tag 3444f7cd21be73f0284515ef8f821ad9320b54a0 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/Activity.as'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/Activity.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/Activity.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/Activity.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,64 @@
+package org.lamsfoundation.lams.author.model.activity
+{
+	import org.lamsfoundation.lams.author.model.transition.Transition;
+	
+	public class Activity
+	{
+		// Activity categories
+		public static var CATEGORYSYSTEM:Number = 1;
+		public static var CATEGORYCOLLABORATION:Number = 2;
+		public static var CATEGORYASSESSMENT:Number = 3;
+		public static var CATEGORYCONTENT:Number = 4;
+		public static var CATEGORYSPLIT:Number = 5;
+
+		// Grouping support types
+		public static var GROUPINGSUPPORTNONE:Number = 1;
+		public static var GROUPINGSUPPORTOPTIONAL:Number = 2;
+		public static var GROUPINGSUPPORTREQUIRED:Number = 3;
+		
+		// Activity Properties
+		public var activityID:Number;
+		[Bindable] public var activityUIID:int;
+		public var activityCategoryID:Number;
+		public var activityTypeID:Number;
+		public var learningLibraryID:Number;
+		public var learningDesignID:Number;
+		public var parentActivityID:Number;		
+		public var parentUIID:int;
+		public var orderID:Number;
+		public var groupingID:Number;			
+		[Bindable] public var groupingUIID:Number;
+		[Bindable] public var title:String;
+		public var description:String;
+		public var helpText:String;
+		[Bindable]public var xCoord:Number;	
+		[Bindable]public var yCoord:Number;
+		public var libraryActivityUIImage:String;	// Possibly not needed because of Tool object
+		public var createDateTime:Date;
+		public var groupingSupportType:Number;	// Possibly not needed because of Tool object	
+		
+		// Activity state
+		public var runOffline:Boolean;
+		public var applyGrouping:Boolean;
+		public var stopAfterActivity:Boolean;
+		public var readOnly:Boolean;
+		public var defineLater:Boolean;
+		public var isActivitySelected:String		// Not found in wddx xml
+			
+		// Not found in wddx xml
+		public var objectType:String;
+		public var libraryActivityID:Number;
+		public var activityToolContentID:Number;
+		public var viewID:Boolean;
+		//public var branchView:CanvasBranchView;
+		public var i18nActivityTypeString:String;
+		
+		//Transitions
+		public var transitionTo:Transition;
+		public var transitionFrom:Transition;
+	     
+	    function Activity(activityUIID:int){
+	    	this.activityUIID = activityUIID;
+		}
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/ActivityFactory.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/ActivityFactory.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/ActivityFactory.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,105 @@
+package org.lamsfoundation.lams.author.model.activity
+{
+	import org.lamsfoundation.lams.author.components.toolbar.SystemToolComponent;
+	import org.lamsfoundation.lams.author.controller.AuthorController;
+	import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class ActivityFactory
+	{
+		public function ActivityFactory(){}
+		
+		/**
+		 * Gets an activity instance given a learningLibraryEntry 
+		 * @param learningLibraryEntry the learningLibraryEntry
+		 * @param UIID the user interface id for the new activity
+		 * @return the activity
+		 * 
+		 */
+		public static function getActivityInstance(learningLibraryEntry:LearningLibraryEntry, UIID:int):Activity {
+			
+			switch (learningLibraryEntry.activityTypeID) {
+				case Constants.ACTIVITY_TYPE_TOOL:
+					return getToolActivityInstance(learningLibraryEntry, UIID);
+					break;
+				case Constants.ACTIVITY_TYPE_COMBINED:
+					return getCombinedActivityInstance(learningLibraryEntry, UIID);	
+					break;
+				default:
+					return null;
+				
+			}
+		}
+		
+		/**
+		 * Gets a system activity instance given a systemToolComponent
+		 * this is for groupings,optionals,branching,gates etc 
+		 * @param learningLibraryEntry the learningLibraryEntry
+		 * @param UIID the user interface id for the new activity
+		 * @return the activity
+		 * 
+		 */
+		public static function getSystemActivityInstance(systemToolComponent:SystemToolComponent, UIID:int):Activity {
+			
+			switch (systemToolComponent.activityTypeID) {
+				case Constants.ACTIVITY_TYPE_GROUPING:
+					return getGroupActivityInstance(systemToolComponent, UIID);
+					break;
+				case Constants.ACTIVITY_TYPE_OPTIONAL_ACTIVITY: 
+					return getOptionalActivityInstance(systemToolComponent, UIID);
+					break;
+				default:
+					return null;
+				
+			}
+		}
+		
+		private static function getToolActivityInstance(learningLibraryEntry:LearningLibraryEntry, UIID:int):ToolActivity {
+			var toolActivity:ToolActivity = new ToolActivity(UIID);
+    		toolActivity.tool = learningLibraryEntry.toolTemplates[0];
+    		toolActivity.title = toolActivity.tool.toolName;
+    		return toolActivity;
+		}
+		
+		private static function getCombinedActivityInstance(learningLibraryEntry:LearningLibraryEntry, UIID:int):CombinedActivity {
+			var tool1UIID:int = UIID;
+    		var tool2UIID:int = UIID;
+    		if (UIID != 0) {
+    			// this is a canvas instance, need new uuids
+    			tool1UIID = AuthorController.instance.generateUIID();
+    			tool2UIID = AuthorController.instance.generateUIID();
+    		}
+    		
+    		var combinedActivity:CombinedActivity = new CombinedActivity(UIID);
+    		combinedActivity.tool = learningLibraryEntry.toolTemplates[0];
+    		combinedActivity.title = combinedActivity.tool.toolName;
+    		
+    		// Create toolactivity 1
+    		var toolActivity1:ToolActivity = new ToolActivity(tool1UIID);
+			toolActivity1.tool = learningLibraryEntry.toolTemplates[1];
+    		toolActivity1.title = toolActivity1.tool.toolName;
+    		combinedActivity.toolActivity1 = toolActivity1;
+    		
+    		// Create toolactivity 2
+    		var toolActivity2:ToolActivity = new ToolActivity(tool1UIID);
+			toolActivity2.tool = learningLibraryEntry.toolTemplates[2];
+    		toolActivity2.title = toolActivity2.tool.toolName;
+    		combinedActivity.toolActivity2 = toolActivity2;
+    		
+    		return combinedActivity;
+		}
+		
+		private static function getGroupActivityInstance(systemToolComponent:SystemToolComponent, UIID:int):GroupActivity {
+			var groupActivity:GroupActivity = new GroupActivity(UIID, systemToolComponent.groupingType);
+			return groupActivity;
+		}
+		
+		private static function getOptionalActivityInstance(systemToolComponent:SystemToolComponent, UIID:int):OptionalActivity {
+			var optionalActivity:OptionalActivity = new OptionalActivity(UIID);
+			return optionalActivity;
+		}
+		
+		
+
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/CombinedActivity.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/CombinedActivity.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/CombinedActivity.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,22 @@
+package org.lamsfoundation.lams.author.model.activity
+{
+	import org.lamsfoundation.lams.author.model.learninglibrary.Tool;
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class CombinedActivity extends Activity
+	{
+		[Bindable] public var tool:Tool;
+		
+		[Bindable] public var toolActivity1:ToolActivity;
+		[Bindable] public var toolActivity2:ToolActivity;
+		
+	
+		
+		public function CombinedActivity(activityUIID:Number)
+		{
+			super(activityUIID);
+			this.activityTypeID = Constants.ACTIVITY_TYPE_COMBINED;
+		}
+		
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/GroupActivity.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/GroupActivity.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/GroupActivity.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,39 @@
+package org.lamsfoundation.lams.author.model.activity
+{
+	import mx.collections.ArrayCollection;
+	import mx.core.Application;
+	
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class GroupActivity extends Activity
+	{
+		public var groupingType:int;
+		[Bindable]public var numGroups:Number = 2;
+		[Bindable]public var groupNames:ArrayCollection = new ArrayCollection();
+		[Bindable]public var toolTip:String;
+		
+		public function GroupActivity(UIID:int, groupingType:int)
+		{
+			super(activityUIID);
+			this.activityTypeID = Constants.ACTIVITY_TYPE_GROUPING;
+			this.groupingType = groupingType;
+			
+			this.title = Application.application.dictionary.getLabel("grouping_act_title");
+			this.groupNames.addItem(Application.application.dictionary.getLabel('group_btn') + " 1");
+			this.groupNames.addItem(Application.application.dictionary.getLabel('group_btn') + " 2");
+			
+			switch (groupingType) {
+				case Constants.GROUPING_TYPE_RANDOM:
+					this.toolTip = Application.application.dictionary.getLabel('pi_random_group_activity');
+					break;
+				case Constants.GROUPING_TYPE_TEACHER_CHOSEN:
+					this.toolTip = Application.application.dictionary.getLabel('pi_monitor_group_activity');
+					break;
+				case Constants.GROUPING_TYPE_STUDENT_CHOICE:
+					this.toolTip = Application.application.dictionary.getLabel('pi_learner_group_activity');
+					break;
+				
+			} 
+		}
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/OptionalActivity.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/OptionalActivity.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/OptionalActivity.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,23 @@
+package org.lamsfoundation.lams.author.model.activity
+{
+	import mx.collections.ArrayCollection;
+	import mx.core.Application;
+	
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class OptionalActivity extends Activity
+	{
+		[Bindable] public var maxOptions:int = 0;
+		[Bindable] public var minOptions:int = 0;
+		[Bindable] public var instructions:String;
+		
+		[Bindable] public var activities:ArrayCollection = new ArrayCollection();
+		
+		public function OptionalActivity(activityUIID:Number)
+		{
+			super(activityUIID);
+			this.activityTypeID = Constants.ACTIVITY_TYPE_OPTIONAL_ACTIVITY;
+			this.title = Application.application.dictionary.getLabel('opt_activity_title');
+		}
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/ToolActivity.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/ToolActivity.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/ToolActivity.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,28 @@
+
+package org.lamsfoundation.lams.author.model.activity
+{
+	import mx.collections.ArrayCollection;
+	
+	import org.lamsfoundation.lams.author.model.learninglibrary.Tool;
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class ToolActivity extends Activity {
+		public var toolID:Number;
+		public var toolContentID:Number;		//generated by the LAMS server, has to do a round trip to populate them	
+		public var gradebookToolOutputDefinitionName:String;
+		
+		public var activityEvaluations:ArrayCollection;
+		public var competenceMappings:ArrayCollection; 	// competences to which this activity is mapped
+		
+		public var useDefaultToolOutput:Boolean;
+		
+		[Bindable] public var tool:Tool;
+
+		function ToolActivity(activityUIID:Number){
+			super(activityUIID);
+			this.activityTypeID = Constants.ACTIVITY_TYPE_TOOL;
+		}
+		
+	}
+}
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/learninglibrary/LearningLibraryEntry.as
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/learninglibrary/LearningLibraryEntry.as	(.../LearningLibraryEntry.as)	(revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/learninglibrary/LearningLibraryEntry.as	(.../LearningLibraryEntry.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -1,59 +1,61 @@
-package org.lamsfoundation.lams.author.model.learninglibrary
-{
-	import mx.collections.ArrayCollection;
-	import mx.core.Application;
-	
-	public class LearningLibraryEntry
-	{
-		public var learningLibraryID:int;
-		public var title:String;
-		public var validFlag:Boolean;
-		public var toolTemplates:ArrayCollection;
-		public var category:int;
-		public var icon:String;
-		
-		// For combined tools
-		public var isCombined:Boolean;
-		public var subIcon1:String;
-		public var subIcon2:String;
-		public var subTitle1:String;
-		public var subTitle2:String;
-		
-		public function LearningLibraryEntry(dto:Object)
-		{
-			this.learningLibraryID = parseInt(dto.learningLibraryID);
-			this.title = dto.title;
-			this.validFlag = Boolean(dto.validFlag);
-			toolTemplates = new ArrayCollection();
-			
-			for each(var toolDTO:Object in dto.templateActivities) {
-				var tool:Tool = new Tool(toolDTO, learningLibraryID);
-				this.category = tool.activityCategoryID;
-				toolTemplates.addItem(tool);
-			}
-			
-			if (toolTemplates.getItemAt(0) != null){
-				this.title = toolTemplates.getItemAt(0).toolName;
-				this.icon = toolTemplates.getItemAt(0).libraryActivityUIImage;
-			} 
-			
-			if (toolTemplates.length == 3) {
-				this.subIcon1 = toolTemplates.getItemAt(1).libraryActivityUIImage;
-				this.subIcon2 = toolTemplates.getItemAt(2).libraryActivityUIImage;
-				
-				this.subTitle1 = toolTemplates.getItemAt(1).toolName;
-				this.subTitle2 = toolTemplates.getItemAt(2).toolName;
-				
-				if (Application.application.TESTING && Application.application.TESTING_LOCAL) {
-					subIcon1 = "assets/test/toolimages" + subIcon1.substring(subIcon1.lastIndexOf("/"));
-					subIcon2 = "assets/test/toolimages" + subIcon2.substring(subIcon2.lastIndexOf("/"));
-				} else {
-					subIcon1 = Application.application.lamsURL + subIcon1;
-					subIcon2 = Application.application.lamsURL + subIcon2;
-				}
-				this.isCombined = true;
-			}
-		}
-		
-	}
+package org.lamsfoundation.lams.author.model.learninglibrary
+{
+	import mx.collections.ArrayCollection;
+	import mx.core.Application;
+	
+	public class LearningLibraryEntry
+	{
+		public var learningLibraryID:int;
+		public var title:String;
+		public var validFlag:Boolean;
+		public var toolTemplates:ArrayCollection;
+		public var category:int;
+		public var icon:String;
+		public var activityTypeID:int;
+		
+		// For combined tools
+		public var isCombined:Boolean;
+		public var subIcon1:String;
+		public var subIcon2:String;
+		public var subTitle1:String;
+		public var subTitle2:String;
+		
+		public function LearningLibraryEntry(dto:Object)
+		{
+			this.learningLibraryID = parseInt(dto.learningLibraryID);
+			this.title = dto.title;
+			this.validFlag = Boolean(dto.validFlag);
+			toolTemplates = new ArrayCollection();
+			
+			for each(var toolDTO:Object in dto.templateActivities) {
+				var tool:Tool = new Tool(toolDTO, learningLibraryID);
+				this.category = tool.activityCategoryID;
+				toolTemplates.addItem(tool);
+			}
+			
+			if (toolTemplates.getItemAt(0) != null){
+				this.title = toolTemplates.getItemAt(0).toolName;
+				this.icon = toolTemplates.getItemAt(0).libraryActivityUIImage;
+				this.activityTypeID = parseInt(toolTemplates.getItemAt(0).activityTypeID);
+			} 
+			
+			if (toolTemplates.length == 3) {
+				this.subIcon1 = toolTemplates.getItemAt(1).libraryActivityUIImage;
+				this.subIcon2 = toolTemplates.getItemAt(2).libraryActivityUIImage;
+				
+				this.subTitle1 = toolTemplates.getItemAt(1).toolName;
+				this.subTitle2 = toolTemplates.getItemAt(2).toolName;
+				
+				if (Application.application.TESTING && Application.application.TESTING_LOCAL) {
+					subIcon1 = "assets/test/toolimages" + subIcon1.substring(subIcon1.lastIndexOf("/"));
+					subIcon2 = "assets/test/toolimages" + subIcon2.substring(subIcon2.lastIndexOf("/"));
+				} else {
+					subIcon1 = Application.application.lamsURL + subIcon1;
+					subIcon2 = Application.application.lamsURL + subIcon2;
+				}
+				this.isCombined = true;
+			}
+		}
+		
+	}
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/learninglibrary/Tool.as
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/learninglibrary/Tool.as	(.../Tool.as)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/learninglibrary/Tool.as	(.../Tool.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -3,7 +3,9 @@
 	import mx.collections.ArrayCollection;
 	import mx.core.Application;
 	
+	import org.lamsfoundation.lams.author.util.Constants;
 	
+	
 	/**
 	 * This class contains the information for each tool so it doesnt need to be stored
 	 * inside the ToolActivity class for each activity. 
@@ -19,7 +21,7 @@
 		public var toolName:String;
 		public var toolDisplayName:String;
 		public var toolSignature:String;
-		public var activityCategoryID:int;
+		[Bindable] public var activityCategoryID:int;
 		public var description:String;
 		public var authoringURL:String;
 		public var monitoringURL:String;
@@ -32,8 +34,10 @@
 		public var supportsOutputs:Boolean;
 		public var valid:Boolean;
 		public var groupingSupportType:int;
-		public var libraryActivityUIImage:String;
+		[Bindable] public var libraryActivityUIImage:String;
 		public var toolOutputDefinitions:ArrayCollection;
+		[Bindable] public var bgColour:uint;
+		public var activityTypeID:int;
 		
 		// For tool adapter tools
 		public var mappedServers:ArrayCollection;		// List of allowable servers to show this tool for
@@ -63,6 +67,7 @@
 			this.valid = Boolean(dto.valid);
 			this.groupingSupportType = parseInt(dto.groupingSupportType);
 			this.libraryActivityUIImage = dto.libraryActivityUIImage;
+			this.activityTypeID = dto.activityTypeID;
 			
 			toolOutputDefinitions = new ArrayCollection();
 			
@@ -76,6 +81,9 @@
 			} else {
 				libraryActivityUIImage = Application.application.lamsURL + libraryActivityUIImage;
 			}
+			
+			// Work out the bg colour based on the activityCategoryID
+			this.bgColour = Constants.TOOL_CATEGORY_COLOURS[activityCategoryID];
 		}
 	}
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/transition/Transition.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/transition/Transition.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/transition/Transition.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,23 @@
+package org.lamsfoundation.lams.author.model.transition
+{
+	import org.lamsfoundation.lams.author.model.activity.Activity;
+	
+	public class Transition
+	{
+		public var transitionUUID:int;
+		public var toActivity:Activity;
+		public var fromActivity:Activity;
+		
+		[Bindable] public var endX:int;
+		[Bindable] public var endY:int;
+		
+		public function Transition(fromActivity:Activity, toActivity:Activity, transitionUUID:int) {
+			this.transitionUUID = transitionUUID;
+			this.fromActivity = fromActivity;
+			this.toActivity = toActivity;
+			
+			this.toActivity.transitionTo = this;
+			this.fromActivity.transitionFrom = this;
+		}
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/transition/TransitionFactory.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/transition/TransitionFactory.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/transition/TransitionFactory.as	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -0,0 +1,20 @@
+package org.lamsfoundation.lams.author.model.transition
+{
+	import org.lamsfoundation.lams.author.model.activity.Activity;
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class TransitionFactory
+	{
+		public function TransitionFactory(){}
+		
+		public static function createTransition(fromActivity:Activity, toActivity:Activity, type:int, UIID:int):Transition {
+			switch (type) {
+				case Constants.TRANSITION_TYPE_NORMAL:
+					return new Transition(fromActivity, toActivity, UIID);
+					break;
+				default:
+					return null;
+			}
+		}
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/AuthorUtil.as
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/AuthorUtil.as	(.../AuthorUtil.as)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/AuthorUtil.as	(.../AuthorUtil.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -1,7 +1,7 @@
 package org.lamsfoundation.lams.author.util
 {
-	import flash.display.BitmapData;
 	import flash.display.Bitmap;
+	import flash.display.BitmapData;
 	import flash.display.DisplayObject;
 	import flash.geom.Matrix;
 	import flash.geom.Point;
@@ -42,6 +42,16 @@
 	        image.source = new Bitmap(getBitmapData(target));
 			return image;
 	   	}
+	   	
+	   	public static function activitySupportsGrouping(activityTypeID:int):Boolean {
+	   		return activityTypeID != Constants.ACTIVITY_TYPE_GATE_CONDITION &&
+	   			activityTypeID != Constants.ACTIVITY_TYPE_GATE_PERMISSION &&
+	   			activityTypeID != Constants.ACTIVITY_TYPE_GATE_SCHEDULE &&
+	   			activityTypeID != Constants.ACTIVITY_TYPE_GATE_SYNCH &&
+	   			activityTypeID != Constants.ACTIVITY_TYPE_GATE_SYSTEM &&
+	   			activityTypeID != Constants.ACTIVITY_TYPE_GROUPING &&
+	   			activityTypeID != Constants.ACTIVITY_TYPE_REFERENCE;
+	   	}
 
 	}
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r3444f7cd21be73f0284515ef8f821ad9320b54a0
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
@@ -23,15 +23,39 @@
 	    public static const ACTIVITY_STATE_MOUSE_OVER:int = 3;
 	    public static const ACTIVITY_STATE_SELECTED:int = 4;
 	    
-	    public static const SYSTEM_ACTIVITY_TYPE_OPTIONAL:int = 1;
-	    public static const SYSTEM_ACTIVITY_TYPE_OPTIONAL_SEQUENCE:int = 2;
-	    public static const SYSTEM_ACTIVITY_TYPE_SUPPORT:int = 3;
-	    public static const SYSTEM_ACTIVITY_TYPE_GATE:int = 4;
-	    public static const SYSTEM_ACTIVITY_TYPE_BRANCH:int = 5;
-	    public static const SYSTEM_ACTIVITY_TYPE_CONVERGE:int = 6;
-	    public static const SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM:int = 7;
-	    public static const SYSTEM_ACTIVITY_TYPE_GROUP_MONITOR:int = 8;
-	    public static const SYSTEM_ACTIVITY_TYPE_GROUP_LEARNER:int = 9;
-	     
+	    public static const TOOL_CATEGORY_COLOURS:Object =  {
+	    	2:0xFFFDBE, 
+	    	3:0xE9E2F5,
+	    	6:0xDDFCB1,
+	    	4:0xFFEEC8
+	    };
+	    
+	    // Activity types
+		public static const ACTIVITY_TYPE_TOOL:int = 1;
+		public static const ACTIVITY_TYPE_GROUPING:int = 2;
+		public static const ACTIVITY_TYPE_GATE_SYNCH:int = 3;
+		public static const ACTIVITY_TYPE_GATE_SCHEDULE:int = 4;
+		public static const ACTIVITY_TYPE_GATE_PERMISSION:int = 5;
+		public static const ACTIVITY_TYPE_COMBINED:int = 6;
+		public static const ACTIVITY_TYPE_OPTIONAL_ACTIVITY:int = 7;
+		public static const ACTIVITY_TYPE_SEQUENCE:int = 8;
+		public static const ACTIVITY_TYPE_GATE_SYSTEM:int = 9;
+		public static const ACTIVITY_TYPE_BRANCHING_CHOSEN:int = 10;
+		public static const ACTIVITY_TYPE_BRANCHING_GROUP:int = 11;
+		public static const ACTIVITY_TYPE_BRANCHING_TOOL:int = 12;
+		public static const ACTIVITY_TYPE_OPTIONAL_SEQUENCE:int = 13;
+		public static const ACTIVITY_TYPE_GATE_CONDITION:int = 14;
+		public static const ACTIVITY_TYPE_REFERENCE:int = 15;
+		
+		// Grouping type
+		public static const GROUPING_TYPE_RANDOM:int = 1;
+		public static const GROUPING_TYPE_TEACHER_CHOSEN:int = 2;
+		public static const GROUPING_TYPE_STUDENT_CHOICE:int = 3;
+		
+		// Transition type
+		public static const TRANSITION_TYPE_NORMAL:int = 1;
+		public static const TRANSITION_TYPE_BRANCH:int = 2;
+		public static const TRANSITION_TYPE_DATA_FLOW:int = 3;
+
 	}
 }
\ No newline at end of file