Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
diff -u -rbd2bc54a1b78829ff02a8355a86be5a7a44978ec -r09139a18612e0af686ddc05190832a1e05d67398
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision bd2bc54a1b78829ff02a8355a86be5a7a44978ec)
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml	(.../LamsAuthor.mxml)	(revision 09139a18612e0af686ddc05190832a1e05d67398)
@@ -10,6 +10,9 @@
 
 	<mx:Script>
 		<![CDATA[
+			import mx.core.Container;
+			import mx.controls.Button;
+			import mx.core.UIComponent;
 			import mx.managers.CursorManager;
 			import mx.events.MenuEvent;
 			import org.lamsfoundation.lams.author.util.Constants;
@@ -55,21 +58,33 @@
 			
 			[Embed("assets/icons/transition.png")]
             public var transitionCursor:Class;
+            
+            [Embed("assets/icons/zoom_in.png")]
+            public var zoomInCursor:Class;
+            
+            [Embed("assets/icons/zoom_out.png")]
+            public var zoomOutCursor:Class;
 
 			public function changeCursorState(state:int):void{
 				cursorState = state;
-				
+				CursorManager.removeCursor(CursorManager.currentCursorID);
 				switch (cursorState) {
 					case Constants.CURSOR_STATE_NORMAL:
-						CursorManager.removeCursor(CursorManager.currentCursorID);
 						break;
 					case Constants.CURSOR_STATE_TRANSITION:
 						CursorManager.setCursor(transitionCursor);
 						break;
+					case Constants.CURSOR_STATE_ZOOM_IN:
+						CursorManager.setCursor(zoomInCursor);
+						break;
+					case Constants.CURSOR_STATE_ZOOM_OUT:
+						CursorManager.setCursor(zoomOutCursor);
+						break;
 				}
 			
 			
 			}
+		
 		]]>
 	</mx:Script>
 
@@ -86,7 +101,7 @@
 	
 		
 	<components:CanvasArea height="100%" width="100%" id="canvasArea" top="30"
-		backgroundColor="#FFFFF8" >
+		 >
 	</components:CanvasArea>
 	
 	<components:ToolBar id="toolBar" width="100%" height="30"></components:ToolBar>
Index: lams_flex/LamsAuthor/src/assets/icons/cursor.png
===================================================================
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml
===================================================================
diff -u -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633 -r09139a18612e0af686ddc05190832a1e05d67398
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml	(.../CanvasArea.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml	(.../CanvasArea.mxml)	(revision 09139a18612e0af686ddc05190832a1e05d67398)
@@ -2,10 +2,12 @@
 <mx:HBox 
 	xmlns:mx="http://www.adobe.com/2006/mxml" 
 	xmlns:components="org.lamsfoundation.lams.author.components.*"
-	horizontalGap="0">
+	horizontalGap="0"
+	>
 	
 	<mx:Script>
 		<![CDATA[
+			import mx.containers.Canvas;
 			import mx.core.Application;
 			import mx.controls.Label;
 			import mx.controls.Image;
@@ -23,36 +25,7 @@
             [Bindable]
 			public var learningDesign:ArrayCollection;
 			
-			private function doZoom(component:UIComponent,val:Number):void
-			{
-				component.scaleX = val;
-				component.scaleY = val;
-				
-				if (component is Button) {
-					var button:Button = component as Button;
-					button
-				}
-				
-				
-				if(component is Container)
-				{
-					var children:Array = Container(component).getChildren();
-					for(var i:int = 0; i < children.length; i++)
-					{
-						doZoom(children[i], val);
-					}
-				}
-			} 
-			public function applyZoom():void
-			{
-				if(canvasBox == null)
-				{
-					return;
-				}
-				//doZoom(canvasBox,zoomSlider.value);
-			}
-			
-			private function toggleLearningLibrary():void{
+			/* private function toggleLearningLibrary():void{
 				compLearningLibrary.includeInLayout = !compLearningLibrary.includeInLayout;
 				compLearningLibrary.visible = !compLearningLibrary.visible;
 				
@@ -61,9 +34,10 @@
 				} else {
 					hideButton.label = ">";
 				}
-		    }
-		  		             
-            // The dragEnter event handler for the Canvas container
+		    } */
+		  	
+		  	/*	             
+           	// The dragEnter event handler for the Canvas container
             // enables dropping.
             private function dragEnterHandler(event:DragEvent):void {
                 if (event.dragSource.hasFormat("img"))
@@ -105,16 +79,16 @@
                 }  
                 
                                   
-            }
+            }*/ 
             
             /* private function maximizeLearningLibrary():void {
 	        	var effResize:Resize = new Resize();
 	        	effResize.stop();
 	            effResize.heightFrom = 0;
-	            effResize.heightTo = 120;
+	            effResize.heightTo = 12yy0;
 	            effResize.duration = 100;
 	            effResize.play([compLearningLibrary2]);
-	        } */
+	        }  */
 		]]>
 	</mx:Script>
 	
@@ -123,22 +97,21 @@
 	<components:LearningLibrary id="compLearningLibrary"
 			height="{Application.application.height - 30}" width="190" verticalScrollPolicy="on"
 		/>	
-	<mx:HBox id="canvasblock" height="100%" width="25" verticalAlign="middle" >
+	<!--<mx:HBox id="canvasblock" height="100%" width="25" verticalAlign="middle" >
 		<mx:Button id="hideButton" label="&lt;" click="toggleLearningLibrary()" 
 			width="25" paddingLeft="0" textAlign="right" />
-	</mx:HBox>
+	</mx:HBox>-->
 	
-	<mx:Canvas height="100%" width="100%" verticalScrollPolicy="off" horizontalScrollPolicy="off" >
-				<!-- The Canvas is the drag target --> 
-			    <components:CanvasBox id="canvasBox" 
-			        width="100%" height="100%"   
+	<mx:Canvas id="dragCanvas"
+               height="100%" width="100%" >
+               
+               <components:CanvasBox id="canvasBox" backgroundColor="#FFFFF8"  
+			        
 			     >
 			     </components:CanvasBox>
-			    
-				<!--<mx:Button horizontalCenter="0" bottom="0" click="maximizeLearningLibrary()" label="^"></mx:Button>
-			    <components:LearningLibrary2 id="compLearningLibrary2"
-						height="120"  horizontalCenter="0" bottom="0"
-						width="900"
-				/>-->
-	</mx:Canvas>
+               
+    </mx:Canvas>
+               
+	
+	
 </mx:HBox>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633 -r09139a18612e0af686ddc05190832a1e05d67398
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 09139a18612e0af686ddc05190832a1e05d67398)
@@ -4,10 +4,15 @@
     dragEnter="dragEnterHandler(event);" 
     dragDrop="dragDropHandler(event);"
     xmlns:mate="http://mate.asfusion.com/"
+    click="doZoom(event)"
+    borderStyle="solid"
+    width="4000" height="3000"   
+    x="0" y="0"
 	>
 	
 	<mx:Script>
 		<![CDATA[
+			import mx.containers.Canvas;
 			import org.lamsfoundation.lams.author.util.Constants;
 			import mx.core.Application;
 			import mx.controls.Alert;
@@ -17,8 +22,14 @@
 			import mx.controls.Image;
 			import mx.managers.DragManager;
 			import mx.events.DragEvent;
+			import mx.effects.Zoom;
 			
+			public var currentZoom:Number = 1;
 			
+			public const MAX_ZOOM:Number = 1;
+			public const MIN_ZOOM:Number = 0.2;
+			public const ZOOM_LEVEL:Number = 0.2;
+			
 		  		             
             // The dragEnter event handler for the Canvas container
             // enables dropping.
@@ -70,6 +81,54 @@
             
             
             
+            
+            
+            
+            /* private function doZoom(component:UIComponent,val:Number):void
+			{
+				component.scaleX = val;
+				component.scaleY = val;
+				
+				if(component is Container)
+				{
+					var children:Array = Container(component).getChildren();
+					for(var i:int = 0; i < children.length; i++)
+					{
+						doZoom(children[i], val);
+					}
+				}
+			} */ 
+			
+			
+			private function doZoom(event:MouseEvent):void
+			{
+				var zoom:Zoom = new Zoom();
+				
+				//zoom.originX = event.localX;
+				//zoom.originY = event.localY;
+				zoom.originX = 0;
+				zoom.originY = 0;
+				zoom.zoomHeightFrom = currentZoom;
+				zoom.zoomWidthFrom = currentZoom;
+				
+				if (Application.application.cursorState == Constants.CURSOR_STATE_ZOOM_IN && currentZoom < MAX_ZOOM) {
+					zoom.zoomHeightTo = currentZoom + ZOOM_LEVEL;
+					zoom.zoomWidthTo = currentZoom + ZOOM_LEVEL;
+					currentZoom += 0.2;
+					currentZoom = Math.round(currentZoom * 10)/10;
+					zoom.play([this], false);
+				} else if (Application.application.cursorState == Constants.CURSOR_STATE_ZOOM_OUT && currentZoom > MIN_ZOOM) {
+					zoom.zoomHeightTo = currentZoom - ZOOM_LEVEL;
+					zoom.zoomWidthTo = currentZoom - ZOOM_LEVEL;
+					currentZoom -= 0.2;
+					currentZoom = Math.round(currentZoom * 10)/10;
+					
+					zoom.play([this], false);
+				}
+				
+				
+			}
+            
              
 		]]>
 	</mx:Script>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml
===================================================================
diff -u -rbd2bc54a1b78829ff02a8355a86be5a7a44978ec -r09139a18612e0af686ddc05190832a1e05d67398
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml	(.../ToolBar.mxml)	(revision bd2bc54a1b78829ff02a8355a86be5a7a44978ec)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml	(.../ToolBar.mxml)	(revision 09139a18612e0af686ddc05190832a1e05d67398)
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Canvas xmlns:mx="http://www.adobe.com/2006/mxml"
 	styleName="toolBar"
-	xmlns:components="org.lamsfoundation.lams.author.components.*">
+	xmlns:components="org.lamsfoundation.lams.author.components.*"
+	horizontalScrollPolicy="off"
+	>
 	
 	<mx:Style source="assets/css/toolBar.css" />
 	
@@ -34,7 +36,7 @@
 		]]>
 	</mx:Script>
 	
-	<mx:HBox horizontalGap="5" verticalAlign="middle"  >
+	<mx:HBox horizontalGap="5" verticalAlign="middle" horizontalScrollPolicy="off" >
 
 		<mx:MenuBar id="myMenuBar" labelField="@label" iconField="@icon" height="30" >
 	        <mx:XMLList>
@@ -62,8 +64,9 @@
 	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/save.png')" toolTip="Save"></mx:Button>
 	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/copy.png')" toolTip="Copy Activity"></mx:Button>
 	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/paste.png')" toolTip="Paste Activity"></mx:Button>
-	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/zoom_in.png')" toolTip="Zoom Out"></mx:Button>
-	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/zoom_out.png')" toolTip="Zoom In"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/zoom_in.png')" toolTip="Zoom In" click="Application.application.changeCursorState(Constants.CURSOR_STATE_ZOOM_IN)"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/zoom_out.png')" toolTip="Zoom Out" click="Application.application.changeCursorState(Constants.CURSOR_STATE_ZOOM_OUT)"></mx:Button>
+	    <mx:Button height="25" width="27" icon="@Embed(source='assets/icons/cursor.png')" toolTip="Normal Cursor" click="Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL)"></mx:Button>
 	    <mx:Spacer width="5"></mx:Spacer>
 	    <mx:Button height="25" icon="@Embed(source='assets/icons/transition.png')" label="Transition" click="Application.application.changeCursorState(Constants.CURSOR_STATE_TRANSITION)"></mx:Button>
 	    <mx:Button id="optionalButton" height="25" icon="@Embed(source='assets/icons/optional.png')" label="Optional" click="toggleDropDownMenu(optionalMenu)"></mx:Button>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -r09139a18612e0af686ddc05190832a1e05d67398
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision 09139a18612e0af686ddc05190832a1e05d67398)
@@ -17,8 +17,9 @@
 	    public static const CURSOR_STATE_TRANSITION:int = 2;
 	    public static const CURSOR_STATE_DATAFLOW:int = 3;
 	    public static const CURSOR_STATE_HELP:int = 4;
+	    public static const CURSOR_STATE_ZOOM_IN:int = 5;
+	    public static const CURSOR_STATE_ZOOM_OUT:int = 6;
 	    
-	    
 	    public static const UI_STATE_NORMAL:int = 1;
 	    public static const UI_STATE_DRAWING:int = 2;