Index: lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as
===================================================================
diff -u -r287f10e65058b7ad8688c2b767bdc64c372b701a -rd6b2de6d50c508a7c2724532926a792df607b4d9
--- lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	(.../Dictionary.as)	(revision 287f10e65058b7ad8688c2b767bdc64c372b701a)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	(.../Dictionary.as)	(revision d6b2de6d50c508a7c2724532926a792df607b4d9)
@@ -73,12 +73,12 @@
     * @returns a string holding the text requested
     */
     public static function getValue(key:String):String{
-        //Debugger.log('returning item-' +id + '-' + items.get(id).value,Debugger.GEN,'getItemById','org.lamsfoundation.lams.dict.Dictionary');
+        Debugger.log('requesting :' + key + ' > ' + getInstance().items.get(key).value,Debugger.GEN,'getValue','org.lamsfoundation.lams.dict.Dictionary');
         var v:String = _instance.items.get(key).value;
 		if(v!=null){
 			return v;
 		}else{
-			Debugger.log('Entry not found in '+_currentLanguage+' dictionary, key='+key,Debugger.CRITICAL,'createFromData','Dictionary');
+			Debugger.log('Entry not found in '+getInstance()._currentLanguage+' dictionary, key='+key,Debugger.CRITICAL,'createFromData','Dictionary');
 		}
 		
 		
@@ -112,14 +112,14 @@
 
         //First empty hash 
         items.clear();
-        
+        _global.breakpoint();
         //Go through data object and copy values to items hash
-        for(var i=0;i<dataObj.dictionaryItems.length;i++){
+        for(var i=0;i<dataObj.length;i++){
             //Create hashKey object and then prune hashkey from dataObject before adding dictionary item to hashtable 
-            var hashKey = dataObj.dictionaryItems[i].key;
-            delete dataObj.dictionaryItems[i].key;
+            var hashKey = dataObj[i].key;
+            delete dataObj[i].key;
             //Create the dictionary item from the data object
-            var dictItem:DictionaryItem = DictionaryItem.createFromData(dataObj.dictionaryItems[i]);
+            var dictItem:DictionaryItem = DictionaryItem.createFromData(dataObj[i])
             items.put(hashKey,dictItem);
         }
         //Dispatch load event 
@@ -149,7 +149,7 @@
     */
     public function onDictionaryLoadedFromServer(dictionaryDataObj:Object){
 		Debugger.log('onDictionaryLoadedFromServer',Debugger.CRITICAL,'onDictionaryLoadedFromServer','Dictionary');		
-        //Create the dictionary from the data obj
+	   //Create the dictionary from the data obj
         createFromData(dictionaryDataObj);
 		
         //Now that dict has been loaded by server, cache it 
@@ -162,7 +162,8 @@
     public function openFromServer() {
 		Debugger.log('URL : '+ 'http://dolly.uklams.net/lams/lams_authoring/' + _currentLanguage + '_dictionary.xml',Debugger.CRITICAL,'openFromServer','Dictionary');
 		var callBack = Proxy.create(this,onDictionaryLoadedFromServer);
-        comms.loadXML('http://dolly.uklams.net/lams/lams_authoring/' + _currentLanguage + '_dictionary.xml',callBack,true,true);
+        //comms.loadXML('http://dolly.uklams.net/lams/lams_authoring/' + _currentLanguage + '_dictionary.xml',callBack,true,true);
+        comms.getRequest('http://dolly.uklams.net/lams/lams_authoring/' + _currentLanguage + '_dictionary.xml',callBack,true);
     }
     
     /**
@@ -173,7 +174,8 @@
         Debugger.log('SHOULD NOT BE CALLED _ NO LONGER USED!!',Debugger.CRITICAL,'createDictionaryFromCode','Dictionary');
 		//_global.breakpoint();
         //Clear the dictionary + set language
-        items.clear();
+        /*
+		items.clear();
         _currentLanguage = lang;
         switch (lang) {
             case 'en' : 
@@ -233,6 +235,7 @@
         }
         //Dispatch load event 
         dispatchEvent({type:'load',target:this});
+		*/
    }
     
     /**
Index: lams_common/src/flash/org/lamsfoundation/lams/common/dict/DictionaryItem.as
===================================================================
diff -u -r287f10e65058b7ad8688c2b767bdc64c372b701a -rd6b2de6d50c508a7c2724532926a792df607b4d9
--- lams_common/src/flash/org/lamsfoundation/lams/common/dict/DictionaryItem.as	(.../DictionaryItem.as)	(revision 287f10e65058b7ad8688c2b767bdc64c372b701a)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/dict/DictionaryItem.as	(.../DictionaryItem.as)	(revision d6b2de6d50c508a7c2724532926a792df607b4d9)
@@ -32,16 +32,20 @@
     * Create Dictionary item from dataObject
     */
     public static function createFromData(dataobj:Object):DictionaryItem{
-        var dictionaryItem:DictionaryItem =  new DictionaryItem(dataobj.key,dataobj.description,dataobj.value)
+        var dictionaryItem:DictionaryItem =  new DictionaryItem(dataobj.key,dataobj.value,dataobj.description);
         return dictionaryItem;
     }
     
-    function get name():String{
-        return _name;
+    function get key():String{
+        return _key;
     }
     
     function get value():String{
         return _value;
     }
+	
+	function get description():String{
+        return _description;
+    }
 
 }
\ No newline at end of file
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
diff -u -re10a5d443d7b79cb23358f7c11e0f89d61d5cf60 -rd6b2de6d50c508a7c2724532926a792df607b4d9
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision e10a5d443d7b79cb23358f7c11e0f89d61d5cf60)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision d6b2de6d50c508a7c2724532926a792df607b4d9)
@@ -79,8 +79,8 @@
         myLabel_lbl.text = 'text label';
         
         //Set the text for buttons
-        ok_btn.label = Dictionary.getValue(1);
-        cancel_btn.label = Dictionary.getValue(2);
+        ok_btn.label = Dictionary.getValue('ws_dlg_ok_button');
+        cancel_btn.label = Dictionary.getValue('ws_dlg_cancel_button');
         
         //get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager
         fm = _container.getFocusManager();
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as
===================================================================
diff -u -r6785b91b97fa9629f62e1b2d5851f4a7104e8763 -rd6b2de6d50c508a7c2724532926a792df607b4d9
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as	(.../WorkspaceView.as)	(revision 6785b91b97fa9629f62e1b2d5851f4a7104e8763)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as	(.../WorkspaceView.as)	(revision d6b2de6d50c508a7c2724532926a792df607b4d9)
@@ -46,9 +46,9 @@
         var dialog:MovieClip;
         //Check to see whether this should be a centered or positioned dialog
         if(typeof(pos)=='string'){
-            dialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue(0),closeButton:true,scrollContentPath:'workspaceDialog'});
+            dialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue('ws_dlg_title'),closeButton:true,scrollContentPath:'workspaceDialog'});
         } else {
-            dialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue(0),closeButton:true,scrollContentPath:'workspaceDialog',_x:pos.x,_y:pos.y});
+            dialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue('ws_dlg_title'),closeButton:true,scrollContentPath:'workspaceDialog',_x:pos.x,_y:pos.y});
         }
         //Assign dialog load handler
         dialog.addEventListener('contentLoaded',Delegate.create(this,dialogLoaded));