Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as
===================================================================
diff -u -r7b855245133f01885c4b7f1d85beb3e91675bb40 -rc7b8f5053c4cf9d8c68d1048a4cddb61bb049cf5
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as	(.../ToolkitController.as)	(revision 7b855245133f01885c4b7f1d85beb3e91675bb40)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitController.as	(.../ToolkitController.as)	(revision c7b8f5053c4cf9d8c68d1048a4cddb61bb049cf5)
@@ -60,10 +60,29 @@
 		//lets do a test to see if we got the canvas
 		var cv:Canvas = Application.getInstance().getCanvas();
 		var canvasView:MovieClip = cv.getCanvasView().getViewMc();
-	
+		
+		var optionalOnCanvas:Array  = cv.getCanvasModel().findOptionalActivities();
 		//SEE IF ITS HIT the canvas
 		var isCanvasDrop:Boolean = canvasView.hitTest(dragIcon_mc);
 		Debugger.log('isCanvasDrop:'+isCanvasDrop,4,'dropIcon','TemplateActivity');
+		/*for (var i=0; i<optionalOnCanvas.length; i++){
+			trace ("testing Optional on Canvas "+i)
+			//var optionalContainer:MovieClip = 
+			if (dragIcon_mc.hitTest(optionalOnCanvas[i])){
+				
+				if (optionalOnCanvas[i].locked == true){
+					//var msg:String = "Test"   //Dictionary.getValue('act_lock_chk');
+					//LFMessage.showMessageAlert(msg);
+					trace("Container is locked")
+				}else{
+					trace("hit with optional")
+					var ta:TemplateActivity;
+					ta = _toolkitModel.getSelectedTemplateActivity();
+					cv.getCanvasModel().addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ta)
+				}						
+			}
+			
+		}*/
 		if(isCanvasDrop){
 
 			//remove the drag icon
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as
===================================================================
diff -u -r7b855245133f01885c4b7f1d85beb3e91675bb40 -rc7b8f5053c4cf9d8c68d1048a4cddb61bb049cf5
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as	(.../ToolkitView.as)	(revision 7b855245133f01885c4b7f1d85beb3e91675bb40)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as	(.../ToolkitView.as)	(revision c7b8f5053c4cf9d8c68d1048a4cddb61bb049cf5)
@@ -46,7 +46,7 @@
 	private var toolkitLibraries_sp:MovieClip;
 	private var libraryActivityDesc_txa:TextArea;
 	private var title_lbl:Label;
-	
+	private var toolTip:MovieClip;
 	private var _className = "ToolkitView";
 	private var _depth:Number;
 	
@@ -147,12 +147,9 @@
         //dispatch load event
         dispatchEvent({type:'load',target:this});
 		//Debugger.log('_toolkit_mc.desc_panel:'+this.desc_panel,4,'createToolkit','ToolkitView');
-		layoutToolkit();
+		//layoutToolkit();
 	}
         
-	public function layoutToolkit():Void{
-		
-	}
 	
 	/**
 	* Updates state of the tookit, called by the model
@@ -205,8 +202,7 @@
         if(spWidth > 0 && spHeight>0) {
             toolkitLibraries_sp.setSize(spWidth,spHeight);
         }
-        //toolkitLibraries_sp.setSize(s.w-_scrollPanelWidthDiff,s.h-(libraryActivityDesc_txa._y+libraryActivityDesc_txa.height));
-        //Debugger.log('SetSize, x,y:'+s.w + ',' + s.h,Debugger.GEN,'setSize','ToolkitView');
+        
     }
     
     /**
@@ -266,6 +262,19 @@
 		//toolkitLibraries_sp.refreshPane();
 		
 		
+	}
+	
+	public function showToolTip(toolName:String):Void{
+		//trace("ToolName is: "+toolName)
+		//toolTip = this.createEmptyMovieClip ("toolTip", DepthManager.kTop)
+		//toolTip.attachMovie("wizard-wand", "toolTip_mc", this.getNextHighestDepth(), {_x:_xmouse+5 ,_y:_ymouse-10});
+		Application.tooltip.attachMovie("toolTip_mc", "toolTip_mc", Application.root.getNextHighestDepth(), {_x:_xmouse+5 ,_y:_ymouse-30, toolTipName:"Hello worl how are you doing?"});
+		//Application.tooltip.toolTip_mc.toolTipName = "Hello world how are you?"
+		//toolTip.toolTip_cmp.text = "test"
+	}
+	
+	public function hideToolTip():Void{
+		toolTip.removeMovieClip();
 	}
 
 	/**