Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/business/WizardManager.as
===================================================================
diff -u -rb791537342fb2b0446a7010efcc2db8ef94e826a -r58860805a9ca7a628058c2c280fc27cf3547d3ae
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/business/WizardManager.as	(.../WizardManager.as)	(revision b791537342fb2b0446a7010efcc2db8ef94e826a)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/business/WizardManager.as	(.../WizardManager.as)	(revision 58860805a9ca7a628058c2c280fc27cf3547d3ae)
@@ -7,10 +7,8 @@
 	import flash.utils.setInterval;
 	
 	import mx.collections.ArrayCollection;
-	import mx.rpc.Fault;
 	
 	import org.lamsfoundation.lams.common.dictionary.XMLDictionaryRegistry;
-	import org.lamsfoundation.lams.events.WizardErrorEvent;
 	import org.lamsfoundation.lams.vos.Lesson;
 	import org.lamsfoundation.lams.vos.WorkspaceItem;
 	
@@ -34,6 +32,7 @@
 		private var _usersLoaded:Boolean;
 		
 		private var _lessonID:uint;
+		private var _organisationID:uint;
 		private var _initializedLesson:Lesson;
 		
 		private var _lessonInstances:Array;
@@ -106,25 +105,34 @@
 		
 		/*-.........................................Methods..........................................*/
 		
-		public function initWorkspace():WorkspaceItem {
+		public function initWorkspace(organisationID:uint):WorkspaceItem {
 			var item:WorkspaceItem = new WorkspaceItem();
 			item.populate({name: "root", description: "root node", resourceID: -1, resourceType:WorkspaceItem.RT_FOLDER});
 			
+			_organisationID = organisationID;
 			_workspaceRoot = item;
 			
 			dispatchEvent(new Event("workspaceRootChanged"));
 			
 			return workspaceRoot;
 		}
 		
-		public function setFolderContents(contents:Object, folder:WorkspaceItem):void {
+		public function setFolderContents(contents:Object, folder:WorkspaceItem):Array {
+			var foldersToOpen:Array = new Array();
+			
 			for each(var content:Object in contents.contents as ArrayCollection) {
    				var newItem:WorkspaceItem = new WorkspaceItem();
    				newItem.populate(content);	
-   				newItem.parentWorkspaceFolderID = folder.workspaceFolderID;
    				
-   				folder.children.addItem(newItem);
+   				newItem.parentWorkspaceFolderID = folder.workspaceFolderID;
+  				
+  				if(newItem.resourceID == _organisationID)
+  					foldersToOpen.push(newItem); 
+  				
+  				folder.children.addItem(newItem);
    			}
+   			
+   			return foldersToOpen;
 		}
 		
 		public function setUsersLoaded(value:Boolean):void {
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as
===================================================================
diff -u -rb791537342fb2b0446a7010efcc2db8ef94e826a -r58860805a9ca7a628058c2c280fc27cf3547d3ae
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as	(.../WizardEvent.as)	(revision b791537342fb2b0446a7010efcc2db8ef94e826a)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as	(.../WizardEvent.as)	(revision 58860805a9ca7a628058c2c280fc27cf3547d3ae)
@@ -38,6 +38,7 @@
 		
 		public var folderID:int = -1;
 		public var folder:WorkspaceItem;
+		public var folders:Array;
 		
 		public var organisationID:uint = Application.application.parameters.organisationID;
 		
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml
===================================================================
diff -u -rb791537342fb2b0446a7010efcc2db8ef94e826a -r58860805a9ca7a628058c2c280fc27cf3547d3ae
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision b791537342fb2b0446a7010efcc2db8ef94e826a)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 58860805a9ca7a628058c2c280fc27cf3547d3ae)
@@ -54,7 +54,7 @@
 	</EventHandlers>
 
 	<EventHandlers type="{WizardEvent.INIT_WORKSPACE}">
-		<MethodInvoker generator="{WizardManager}" method="initWorkspace" />
+		<MethodInvoker generator="{WizardManager}" method="initWorkspace" arguments="{event.organisationID}" />
 		<EventAnnouncer generator="{WizardEvent}" type="{WizardEvent.GET_FOLDER_CONTENTS}">
 			<Properties folder="{lastReturn}" folderID="{lastReturn.resourceID}" /> 
 		</EventAnnouncer>
@@ -69,7 +69,7 @@
 					method="parseObject" arguments="{resultObject}" />
 				<MethodInvoker generator="{WizardManager}" method="setFolderContents" arguments="{[lastReturn, event.folder]}" />
 				<EventAnnouncer generator="{WizardEvent}" type="{WizardEvent.OPEN_FOLDER}">
-					<Properties folder="{event.folder}" />
+					<Properties folder="{event.folder}" folders="{lastReturn}" />
 				</EventAnnouncer>
 			</resultHandlers>
 		</HTTPServiceInvoker>
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml
===================================================================
diff -u -r56b3234f9554fa6ae5a6f07319e88dd3e87fe288 -r58860805a9ca7a628058c2c280fc27cf3547d3ae
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml	(.../Lesson.mxml)	(revision 56b3234f9554fa6ae5a6f07319e88dd3e87fe288)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml	(.../Lesson.mxml)	(revision 58860805a9ca7a628058c2c280fc27cf3547d3ae)
@@ -4,28 +4,27 @@
 	xmlns:mate="http://mate.asfusion.com/"
 	xmlns:model="org.lamsfoundation.lams.model.*" 
 	xmlns:validate="org.lamsfoundation.lams.validators.*" 
-	preinitialize="createInitWorkspace()" >
+	>
 
 	<mx:Script>
 		<![CDATA[
-			import mx.validators.Validator;
-			import mx.managers.ToolTipManager;
+			import mx.collections.ArrayCollection;
+			import mx.controls.Alert;
 			import mx.core.Application;
+			import mx.events.ListEvent;
+			import mx.events.TreeEvent;
 			import mx.events.ValidationResultEvent;
-			import mx.controls.Alert;
-			import mx.collections.ArrayCollection;
+			import mx.managers.ToolTipManager;
+			import mx.validators.Validator;
 			
-			import mx.events.TreeEvent;
-			import mx.events.ListEvent;
-			
-			import org.lamsfoundation.lams.events.WizardEvent;
-			import org.lamsfoundation.lams.events.NavigationEvent;
-			
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionary;
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionaryRegistry;
 			import org.lamsfoundation.lams.common.util.WDDXParser;
 			import org.lamsfoundation.lams.common.util.WDDXUtil;
 			
+			import org.lamsfoundation.lams.events.WizardEvent;
+			import org.lamsfoundation.lams.events.NavigationEvent;
+			
 			import org.lamsfoundation.lams.vos.Lesson;
 			import org.lamsfoundation.lams.vos.WorkspaceCollection;
 			import org.lamsfoundation.lams.vos.WorkspaceItem;
@@ -58,19 +57,33 @@
    			
    			public function set workspace(value:WorkspaceItem):void {
    				_workspace = value;
-   				
    				workspaceTree.expandItem(_workspace, true);
-   				workspaceTree.showRoot = false;
    			}
    			
    			private function createInitWorkspace():void {
    				organisationID = Application.application.parameters.organisationID;
    				
    				var wizardEvent:WizardEvent = new WizardEvent(WizardEvent.INIT_WORKSPACE);
+   				wizardEvent.organisationID = 4;
+   				
    				this.dispatchEvent(wizardEvent);
    				
    			}
    			
+			private function openFolders(event:WizardEvent):void {
+				workspaceTree.expandItem(event.folder, true);
+				
+				for each(var folder:WorkspaceItem in event.folders) {
+					
+			   		var wizardEvent:WizardEvent = new WizardEvent(WizardEvent.GET_FOLDER_CONTENTS);
+			   		wizardEvent.folderID = folder.resourceID;
+			   		wizardEvent.folder = folder as WorkspaceItem;
+			   			
+			   		this.dispatchEvent(wizardEvent);
+				}
+					
+			}
+   			
    			public function selectDesign(event:Event):void {
    				if(selectedNode == Tree(event.target).selectedItem as WorkspaceItem)
    					return;
@@ -84,12 +97,13 @@
    			
    			public function getFolderContents(event:TreeEvent):void {
    				if(event.item.resourceType == WorkspaceItem.RT_FOLDER && event.item.children.length <= 0) {
+			   		workspaceTree.expandItem(event.item, false);
+			   		
 			   		var wizardEvent:WizardEvent = new WizardEvent(WizardEvent.GET_FOLDER_CONTENTS);
 			   		wizardEvent.folderID = event.item.resourceID;
 			   		wizardEvent.folder = event.item as WorkspaceItem;
 			   			
 			   		this.dispatchEvent(wizardEvent);
-			   		workspaceTree.expandItem(event.item, false);
 			   	}
    			}
    			
@@ -215,13 +229,14 @@
 				}
 					
 			}
+			
 		]]>
 	</mx:Script>
 	
 	
 	<!-- Event Listeners -->
 	<mate:Listener type="{NavigationEvent.TAB_SELECT}" receive="hasFocus(event.selectedIndex==Wizard.LESSON_INDEX)" />
-	<mate:Listener type="{WizardEvent.OPEN_FOLDER}"  receive="workspaceTree.expandItem(event.folder, true)" />
+	<mate:Listener type="{WizardEvent.OPEN_FOLDER}"  receive="openFolders(event)" />
 	<mate:Listener type="{WizardEvent.START}" receive="startLesson(event)" />
 	
 	<!-- Model ______________________________________________________________________ -->
@@ -252,7 +267,7 @@
 		
 	<mx:VBox width="100%" height="100%" paddingLeft="10" paddingRight="10" paddingTop="10" paddingBottom="10">
 		<mx:Label width="100%" textAlign="left" fontWeight="bold" text="{dictionary.getLabel('lesson.tab.heading.label')}" />
-		<mx:Tree id="workspaceTree" width="100%" dataDescriptor="{new WorkspaceCollection()}" dataProvider="{_workspace}" itemOpen="getFolderContents(event)" change="selectDesign(event)" labelField="name" height="100%"/>
+		<mx:Tree id="workspaceTree" width="100%" preinitialize="createInitWorkspace()" dataDescriptor="{new WorkspaceCollection()}" dataProvider="{_workspace}" itemOpen="getFolderContents(event)" change="selectDesign(event)" labelField="name" height="100%" showRoot="false" />
 		<mx:HBox horizontalAlign="left" right="5" width="100%">
 			<mx:FormItem label="{dictionary.getLabelAndInsert('wizardTitle.x.lbl', [''])}" width="100%">
 				<mx:TextInput id="resourceName_txi" text="{selectedNode.name}" width="50%" />
Index: lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml
===================================================================
diff -u -r36d58516270e64c1a292ca45b1f7ded31d6600f7 -r58860805a9ca7a628058c2c280fc27cf3547d3ae
--- lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml	(.../Wizard.mxml)	(revision 36d58516270e64c1a292ca45b1f7ded31d6600f7)
+++ lams_flash/src/central/flex/CloudWizard/src/org/lamsfoundation/lams/views/Wizard.mxml	(.../Wizard.mxml)	(revision 58860805a9ca7a628058c2c280fc27cf3547d3ae)
@@ -5,8 +5,6 @@
 	
 	<mx:Script>
 		<![CDATA[
-			import mx.rpc.Fault;
-			import mx.binding.utils.BindingUtils;
 			import mx.controls.Alert;
 			import mx.core.Application;
 			import mx.events.IndexChangedEvent;
@@ -15,6 +13,7 @@
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionaryRegistry;
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionaryEvent;
 			import org.lamsfoundation.lams.common.managers.LamsAjaxOverlayManager;
+			
 			import org.lamsfoundation.lams.events.*;
 		
 			public static const LESSON_INDEX:uint = 0;
Index: lams_monitoring/web/CloudWizard.swf
===================================================================
diff -u -r3b820664dd3af70b0de9ed188782a49c4ccc920f -r58860805a9ca7a628058c2c280fc27cf3547d3ae
Binary files differ