Index: lams_flex/LamsAuthor/src/assets/languages/en_AU.xml
===================================================================
diff -u -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14 -raca1d4a6b6656c176d1a953cdbe9d8e733fb0d1a
--- lams_flex/LamsAuthor/src/assets/languages/en_AU.xml	(.../en_AU.xml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
+++ lams_flex/LamsAuthor/src/assets/languages/en_AU.xml	(.../en_AU.xml)	(revision aca1d4a6b6656c176d1a953cdbe9d8e733fb0d1a)
@@ -194,6 +194,17 @@
 	    <entry key="pi_equal_group_sizes">
 	      <name>Equal group sizes</name>
 	    </entry>
-		
+	    <entry key="gradebook_output_type">
+	      <name>Gradebook Output</name>
+	    </entry>
+	    <entry key="pi_runoffline">
+	      <name>Offline Activity</name>
+	    </entry>
+	    <entry key="pi_define_monitor_cb_lbl">
+	      <name>Define in Monitor</name>
+	    </entry>
+	    <entry key="map_comptence_btn">
+	      <name>Map to competencies</name>
+	    </entry>
 	</language>
 </xml>
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml
===================================================================
diff -u -rb59f524fb51096a8d3e8341a2dbb14b6b061bab7 -raca1d4a6b6656c176d1a953cdbe9d8e733fb0d1a
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision b59f524fb51096a8d3e8341a2dbb14b6b061bab7)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision aca1d4a6b6656c176d1a953cdbe9d8e733fb0d1a)
@@ -26,13 +26,16 @@
 			import mx.binding.utils.ChangeWatcher;
 			import mx.binding.utils.BindingUtils;
 			import org.lamsfoundation.lams.author.components.activity.ActivityComponent;
+			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";
+			
 			private var changeWatcherArray:ArrayCollection = new ArrayCollection();
 			
 			private var titleDisabledColors:Object;
@@ -106,7 +109,13 @@
 			
 			private function displayUIComponents(activity:ActivityComponent):void {
 				this.currentState = "";
-				if (activity is RandomGroupActivityComponent) {
+				if (activity is ToolActivityComponent) {
+					this.currentState = STATE_TOOL_ACTIVITY;
+					var toolActivity:ToolActivityComponent = activity as ToolActivityComponent;
+					var groupings:ArrayCollection = toolActivity.allPossibleGroupings;
+					changeWatcherArray.addItem(BindingUtils.bindProperty(groupingCombo, "dataProvider", toolActivity, "allPossibleGroupings"));
+				
+				} else if (activity is RandomGroupActivityComponent) {
 					this.currentState = STATE_GROUP_RANDOM;
 					var randomGroupActivity:RandomGroupActivityComponent = activity as RandomGroupActivityComponent;
 					changeWatcherArray.addItem(BindingUtils.bindProperty(randomGroups, "selected", randomGroupActivity, "isGroupNumber"));
@@ -164,6 +173,14 @@
 				nameGroupsWindow.openWindow();
 			}
 			
+			private function getGroupingComboLabel(obj_data:Object):String {
+				if (obj_data is GroupActivityComponent) {
+					return (obj_data as GroupActivityComponent).title.text;
+				} else {
+					return "none";
+				}
+			}
+			
 		]]>
 	</mx:Script>
 
@@ -183,6 +200,7 @@
 	<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">
@@ -305,6 +323,58 @@
             	name="title" value="{Application.application.dictionary.getLabel('pi_learner_group_activity')}"/>
 			
 		</mx:State>
+		<!-- /GROUP STATES -->
+		
+		<mx:State name="{STATE_TOOL_ACTIVITY}">
+			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
+				<mx:GridRow styleName="firstInGroup">
+					<mx:GridItem  >
+						<mx:Label text="{Application.application.dictionary.getLabel('grouping_act_title')}" />
+					</mx:GridItem>
+					<mx:GridItem>
+						<mx:ComboBox id="groupingCombo" labelFunction="getGroupingComboLabel"  />
+					</mx:GridItem>
+				</mx:GridRow>
+			</mx:AddChild>
+			<mx:AddChild relativeTo="{grid}" position="lastChild"  creationPolicy="all">
+				<mx:GridRow>
+					<mx:GridItem  >
+						<mx:Label text="{Application.application.dictionary.getLabel('gradebook_output_type')}" />
+					</mx:GridItem>
+					<mx:GridItem>
+						<mx:ComboBox id="gradebookOutput" />
+					</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="offlineActivity" />
+					</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="defineInMonitor" />
+					</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:State>
 	</states>
 	
 	
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -raca1d4a6b6656c176d1a953cdbe9d8e733fb0d1a
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ToolActivityComponent.mxml	(.../ToolActivityComponent.mxml)	(revision aca1d4a6b6656c176d1a953cdbe9d8e733fb0d1a)
@@ -7,6 +7,8 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
+			import mx.collections.ArrayCollection;
 			import mx.core.Application;
 			import org.lamsfoundation.lams.author.model.learninglibrary.Tool;
 			import mx.containers.HBox;
@@ -21,6 +23,10 @@
 			public var iconImage:Image;
 			public var tool:Tool;
 			
+			public var toolOutputDefinitions:ArrayCollection = new ArrayCollection();
+			
+			public var grouping:GroupActivityComponent;
+			
 			override public function load():void {
 				
 				var vbox:VBox = new VBox();
@@ -63,7 +69,39 @@
 			}
 			
 			
+			public function getToolOutputDefinitions():ArrayCollection {
+				return this.toolOutputDefinitions;
+			}
 			
+			public function get allPossibleGroupings():ArrayCollection {
+				
+				var ret:ArrayCollection = new ArrayCollection();
+				ret.addItem(new Object());
+				if (this.transitionIn != null){
+					ret = getGroupingsRecurse(this.transitionIn.fromActivity, new ArrayCollection());
+				}
+				return ret;
+				
+			}
+			
+			public function getGroupingsRecurse(activity:ActivityComponent, groupCollection:ArrayCollection):ArrayCollection {
+				
+				// If the current activity is a grouping activity, add it to the array
+				if (activity is GroupActivityComponent) {
+					groupCollection.addItem(activity);
+				}
+				
+				// Once we get back to the first activity, return
+				if (activity.transitionIn == null) {
+					return groupCollection;
+				}
+				
+				groupCollection.addAll(getGroupingsRecurse(activity.transitionIn.fromActivity, groupCollection));
+				
+				return groupCollection;
+			}
+			
+			
 		]]>
 	</mx:Script>