diff --git a/CASA/gui/CASAManager.csproj b/CASA/gui/CASAManager.csproj
index ad8001fb..eedff964 100644
--- a/CASA/gui/CASAManager.csproj
+++ b/CASA/gui/CASAManager.csproj
@@ -235,6 +235,16 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "PersistentPolicyDialog.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "PolicyDialog.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "SingleApplication.cs"
                     SubType = "Code"
diff --git a/CASA/gui/CasaMain.cs b/CASA/gui/CasaMain.cs
index 746212ba..9e02775d 100644
--- a/CASA/gui/CasaMain.cs
+++ b/CASA/gui/CasaMain.cs
@@ -102,7 +102,9 @@ namespace Novell.CASA.GUI
 						checkbuttonGnomeKeyring, 
 						checkbuttonKdeWallet,
 						checkbuttonCloseMessage,
-						checkbuttonRunInTray;						
+						checkbuttonRunInTray,
+						checkbuttonSaveSecrets,
+						checkbuttonDecrypt;						
 						
 		[Glade.Widget] 
 		Gtk.Label		label88,
@@ -829,6 +831,7 @@ namespace Novell.CASA.GUI
 			}
 		}
 		
+
 		public void on_entryFirefoxMP_activate(object obj, EventArgs args)
 		{
 			on_buttonFirefoxMPok_clicked(obj, args);
@@ -1707,6 +1710,22 @@ namespace Novell.CASA.GUI
 			config.WriteConfig();
 		}
 
+		public void on_checkbuttonSaveSecrets_toggled(object obj, EventArgs args)
+		{
+			if (checkbuttonSaveSecrets.Active)
+			{
+				entryStorageDirectory.Sensitive = true;
+				buttonChooseDirectory.Sensitive = true;
+				checkbuttonDecrypt.Sensitive = true;
+			}
+			else
+			{
+				entryStorageDirectory.Sensitive = false;
+				buttonChooseDirectory.Sensitive = false;
+				checkbuttonDecrypt.Sensitive = false;
+			}
+		}
+
 		public void okbuttonPreferences_clicked(object abj, EventArgs args)
 		{    	
 			Logger.DbgLog("GUI:CasaMain.okbuttonPreferences_clicked() - BEGIN");
@@ -2133,7 +2152,7 @@ namespace Novell.CASA.GUI
 		{
 			//Choose directory for persistent storage
 			FileChooser fc = new FileChooser(FileChooser.ACTION_CHOOSE_DIR);
-			string sDirectory = fc.GetFile(entryStorageDirectory.Text, null);
+			string sDirectory = fc.GetFile(entryStorageDirectory.Text, null, "*.casa");
 
 			// show the user the directory choosen
 			if (sDirectory != null)
@@ -2190,6 +2209,18 @@ namespace Novell.CASA.GUI
 			return false;
 		}
 
+
+
+		public void on_policies_activate(object obj, EventArgs args)
+		{
+			//Console.WriteLine("policy Activate");
+			//PolicyDialog pd = new PolicyDialog();
+			//pd.ShowDialog();
+
+			PersistentPolicyDialog ppd = new PersistentPolicyDialog();
+			ppd.ShowDialog();
+		}
+
 		/// <summary>		
 		/// ********************************************************************
 		/// private void HandleQuit()
@@ -2249,7 +2280,7 @@ namespace Novell.CASA.GUI
 		{
 			DbgFileChooser dbf = new DbgFileChooser();
 			dbf.Run();
-		}		
+		}
 	}
 }
 
diff --git a/CASA/gui/PersistentPolicyDialog.cs b/CASA/gui/PersistentPolicyDialog.cs
new file mode 100644
index 00000000..99e21c5e
--- /dev/null
+++ b/CASA/gui/PersistentPolicyDialog.cs
@@ -0,0 +1,309 @@
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+
+using Gtk;
+using Glade;
+
+
+using Novell.CASA;
+using Novell.CASA.CASAPolicy;
+
+namespace Novell.CASA.GUI 
+{
+	/// <summary>
+	/// Summary description for PolicyDialog.
+	/// </summary>
+	public class PersistentPolicyDialog
+	{
+
+		private TreeStore tsPersistentList = new TreeStore(typeof(string));
+		private TreeStore tsNonPersistentList = new TreeStore(typeof(string));
+		
+		private PersistencePol policy = null;
+		private bool bChanged = false;
+
+
+		#region Glade Widgets
+	
+		[Glade.Widget] 		
+		Gtk.TreeView	tvPersistentList,
+						tvNonPersistentList;
+
+		[Glade.Widget]
+		Gtk.Dialog		dialogPersistentPolicy;
+
+		[Glade.Widget]
+		Gtk.Button     applybuttonPersistent,
+						buttonMakeNonPersistent,
+						buttonMakePersistent;
+
+		#endregion
+
+		public PersistentPolicyDialog()
+		{
+			//
+			// TODO: Add constructor logic here
+			//
+		}
+
+		public void ShowDialog()
+		{
+			Glade.XML gxmlTemp = new Glade.XML(Common.GladeFile, "dialogPersistentPolicy", null);
+			gxmlTemp.Autoconnect(this);	
+
+			activateMoveButtons(false, false);
+			applybuttonPersistent.Sensitive = false;
+
+			// load store
+			SecretStore ss = SecretStore.getInstance();
+			StringCollection sc = ss.enumerateSecretIDs();
+			StringEnumerator senum = sc.GetEnumerator();
+
+			// load policy
+			policy = (PersistencePol)ICASAPol.GetPolicy(CASAPolType.PERSISTENCE_POL);
+			if (policy == null)
+			{
+				policy = new PersistencePol("Platform", "PersistentPath_NOT USED", 10);
+			}
+
+			while (senum.MoveNext())
+			{	
+				string sSecretID = senum.Current;
+				if (policy.GetSecretPolicy(sSecretID, "Persistent", true))
+				{
+					tsPersistentList.AppendValues(sSecretID); 
+				}
+				else
+				{
+					//tsNonPersistentList.AppendValues(sSecretID);
+				}
+			}
+					
+			// display non-persistent IDs
+			ArrayList al = policy.GetNonpersistentSecretIDs();
+			for (int i=0; i<al.Count; i++)
+			{
+				tsNonPersistentList.AppendValues((string)al[i]);
+			}
+						
+			
+			// set sortable
+			tsPersistentList.SetSortColumnId(0, Gtk.SortType.Ascending);
+			tsNonPersistentList.SetSortColumnId(0, Gtk.SortType.Ascending);
+
+			// add Columnts
+			tvPersistentList.AppendColumn("Persistent Secrets", new CellRendererText(), "text", 0);
+			tvPersistentList.Columns[0].Clickable = true;
+			tvPersistentList.Columns[0].Clicked +=new EventHandler(PersistentPolicyDialog_Clicked);
+			tvPersistentList.RowActivated +=new RowActivatedHandler(tvPersistentList_RowActivated);
+			tvPersistentList.ButtonReleaseEvent += new ButtonReleaseEventHandler(tvPersistentList_ButtonReleaseEvent);
+			
+
+			tvNonPersistentList.AppendColumn("Non-Persistent Secrets", new CellRendererText(), "text", 0);
+			tvNonPersistentList.Columns[0].Clickable = true;
+			tvNonPersistentList.Columns[0].Clicked +=new EventHandler(NonPersistentPolicyDialog_Clicked);
+			tvNonPersistentList.RowActivated +=new RowActivatedHandler(tvNonPeristentList_RowActivated);
+			tvNonPersistentList.ButtonReleaseEvent +=new ButtonReleaseEventHandler(tvNonPersistentList_ButtonReleaseEvent);
+
+
+			// hook up the model
+			tvPersistentList.Model = tsPersistentList;
+			tvNonPersistentList.Model = tsNonPersistentList;
+		}
+		
+		public void on_applybuttonPersistent_clicked(object obj, EventArgs args)
+		{
+			if (bChanged)
+			{
+				// enumerate ts, setting the policy for each secret
+				TreeIter iter;
+
+				if(tsPersistentList.GetIterFirst(out iter))
+				{
+					do
+					{									
+						string secretID = (string)tsPersistentList.GetValue(iter,0);					
+															
+						// set policy
+						if (policy != null)
+						{
+							policy.SetSecretPolicy(secretID, "Persistent", "True", "True");												
+						}					
+					}
+					while( tsPersistentList.IterNext(ref iter) );
+				}	
+
+				if(tsNonPersistentList.GetIterFirst(out iter))
+				{
+					do
+					{									
+						string secretID = (string)tsNonPersistentList.GetValue(iter,0);					
+															
+						// set policy
+						if (policy != null)
+						{
+							policy.SetSecretPolicy(secretID, "Persistent", "False", "True");												
+						}					
+					}
+					while( tsNonPersistentList.IterNext(ref iter) );
+				}
+	
+				// save policy now
+				ICASAPol.SetPolicy(policy);
+				bChanged = false;
+				applybuttonPersistent.Sensitive = false;
+				activateMoveButtons(false, false);
+			}
+		}
+
+		public void on_okbutton_clicked(object obj, EventArgs args)
+		{
+			if (bChanged)
+			{
+				on_applybuttonPersistent_clicked(obj, args);
+			}
+
+			closeDialog();
+		}
+
+		public void on_cancelbutton_clicked(object obj, EventArgs args)
+		{
+			closeDialog();
+		}
+
+		private void closeDialog()
+		{
+			if (dialogPersistentPolicy != null)
+			{
+				dialogPersistentPolicy.Destroy();
+			}
+		}
+		
+		private void tvPersistentList_RowActivated(object o, RowActivatedArgs args)
+		{
+			MakeNonPersistent();					
+		}
+
+		private void MakeNonPersistent()
+		{
+			TreeModel model;
+			TreeIter iter;
+			String selected;
+
+			if( tvPersistentList.Selection.GetSelected (out model, out iter) )
+			{
+				selected = (string) model.GetValue (iter, 0);
+				tsNonPersistentList.AppendValues(selected);
+				tsPersistentList.Remove(ref iter);
+				bChanged = true;
+				applybuttonPersistent.Sensitive = true;
+			}				
+		}
+
+		public void on_buttonMakeNonPersistent_clicked(object o, EventArgs args)
+		{
+			MakeNonPersistent();
+		}
+
+		public void on_buttonMakePersistent_clicked(object o, EventArgs args)
+		{
+			MakePersistent();
+		}
+
+		private void tvNonPeristentList_RowActivated(object o, RowActivatedArgs args)
+		{			
+			MakePersistent();	
+		}
+
+		private void MakePersistent()
+		{
+			TreeModel model;
+			TreeIter iter;
+			String selected;
+
+			if( tvNonPersistentList.Selection.GetSelected (out model, out iter) )
+			{
+				selected = (string) model.GetValue (iter, 0);
+				tsPersistentList.AppendValues(selected);
+				tsNonPersistentList.Remove(ref iter);
+				bChanged = true;
+				applybuttonPersistent.Sensitive = true;
+			}				
+		}
+
+
+
+		private void PersistentPolicyDialog_Clicked(object sender, EventArgs e)
+		{
+			int iColID = 0;
+			Gtk.SortType sortType = Gtk.SortType.Ascending;
+			
+			bool bReturn = tsPersistentList.GetSortColumnId(out iColID, out sortType);
+			if (bReturn)
+			{
+				if (sortType == Gtk.SortType.Ascending)
+				{
+					tsPersistentList.SetSortColumnId(0, Gtk.SortType.Descending);
+				}
+				else
+				{
+					tsPersistentList.SetSortColumnId(0, Gtk.SortType.Ascending);
+				}
+			}				
+		}
+
+		private void NonPersistentPolicyDialog_Clicked(object sender, EventArgs e)
+		{
+			int iColID = 0;
+			Gtk.SortType sortType = Gtk.SortType.Ascending;
+			
+			bool bReturn = tsNonPersistentList.GetSortColumnId(out iColID, out sortType);
+			if (bReturn)
+			{
+				if (sortType == Gtk.SortType.Ascending)
+				{
+					tsNonPersistentList.SetSortColumnId(0, Gtk.SortType.Descending);
+				}
+				else
+				{
+					tsNonPersistentList.SetSortColumnId(0, Gtk.SortType.Ascending);
+				}
+			}
+		}
+
+		private void tvPersistentList_ButtonReleaseEvent(object o, ButtonReleaseEventArgs args)
+		{
+			activateMoveButtons(true, false);	
+		}
+
+		private void tvNonPersistentList_ButtonReleaseEvent(object o, ButtonReleaseEventArgs args)
+		{
+			activateMoveButtons(false, true);
+		}
+		
+
+		private void activateMoveButtons(bool bMakeNonPersist, bool bMakePersist)
+		{
+			if (bMakeNonPersist)
+			{	
+				buttonMakeNonPersistent.Sensitive = true;
+			}
+			else
+			{
+				buttonMakeNonPersistent.Sensitive = false;
+			}
+
+			if (bMakePersist)
+			{
+				buttonMakePersistent.Sensitive = true;
+			}
+			else
+			{
+				buttonMakePersistent.Sensitive = false;
+			}
+		}
+
+
+	}
+}
diff --git a/CASA/gui/images/casa.glade b/CASA/gui/images/casa.glade
index a85e9c23..c0a12884 100644
--- a/CASA/gui/images/casa.glade
+++ b/CASA/gui/images/casa.glade
@@ -56,7 +56,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3986">
+			    <widget class="GtkImage" id="image4239">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-new</property>
 			      <property name="icon_size">1</property>
@@ -78,7 +78,7 @@
 				  <signal name="activate" handler="OnNewSecretActivated" last_modification_time="Tue, 27 Sep 2005 06:02:26 GMT"/>
 
 				  <child internal-child="image">
-				    <widget class="GtkImage" id="image3987">
+				    <widget class="GtkImage" id="image4240">
 				      <property name="visible">True</property>
 				      <property name="stock">gtk-new</property>
 				      <property name="icon_size">1</property>
@@ -99,7 +99,7 @@
 				  <signal name="activate" handler="OnNewKeyActivated" last_modification_time="Tue, 27 Sep 2005 06:02:36 GMT"/>
 
 				  <child internal-child="image">
-				    <widget class="GtkImage" id="image3988">
+				    <widget class="GtkImage" id="image4241">
 				      <property name="visible">True</property>
 				      <property name="stock">gtk-new</property>
 				      <property name="icon_size">1</property>
@@ -125,7 +125,7 @@
 			  <accelerator key="F5" modifiers="0" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3989">
+			    <widget class="GtkImage" id="image4242">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-refresh</property>
 			      <property name="icon_size">1</property>
@@ -152,7 +152,7 @@
 			  <signal name="activate" handler="OnLockMiCASASecrets" last_modification_time="Mon, 10 Oct 2005 19:51:54 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3990">
+			    <widget class="GtkImage" id="image4243">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-dialog-authentication</property>
 			      <property name="icon_size">1</property>
@@ -173,7 +173,7 @@
 			  <signal name="activate" handler="OnUnLockMiCASASecrets" last_modification_time="Tue, 11 Oct 2005 20:12:35 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3991">
+			    <widget class="GtkImage" id="image4244">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-open</property>
 			      <property name="icon_size">1</property>
@@ -194,7 +194,7 @@
 			  <signal name="activate" handler="OnDestroyMiCASASecrets" last_modification_time="Tue, 11 Oct 2005 20:12:35 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3992">
+			    <widget class="GtkImage" id="image4245">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-delete</property>
 			      <property name="icon_size">1</property>
@@ -221,7 +221,7 @@
 			  <signal name="activate" handler="on_exportSecrets_activate" last_modification_time="Mon, 07 Aug 2006 19:38:42 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3993">
+			    <widget class="GtkImage" id="image4246">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-floppy</property>
 			      <property name="icon_size">1</property>
@@ -242,7 +242,7 @@
 			  <signal name="activate" handler="on_importSecrets_activate" last_modification_time="Mon, 07 Aug 2006 19:38:42 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3994">
+			    <widget class="GtkImage" id="image4247">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-open</property>
 			      <property name="icon_size">1</property>
@@ -270,7 +270,7 @@
 			  <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3995">
+			    <widget class="GtkImage" id="image4248">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-quit</property>
 			      <property name="icon_size">1</property>
@@ -306,7 +306,7 @@
 			  <accelerator key="F2" modifiers="0" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3996">
+			    <widget class="GtkImage" id="image4249">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-zoom-fit</property>
 			      <property name="icon_size">1</property>
@@ -327,7 +327,7 @@
 			  <signal name="activate" handler="LinkKeyValue" last_modification_time="Fri, 19 Aug 2005 06:23:15 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3997">
+			    <widget class="GtkImage" id="image4250">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-jump-to</property>
 			      <property name="icon_size">1</property>
@@ -348,7 +348,7 @@
 			  <signal name="activate" handler="CopyKeyValue" last_modification_time="Fri, 19 Aug 2005 06:23:15 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3998">
+			    <widget class="GtkImage" id="image4251">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-copy</property>
 			      <property name="icon_size">1</property>
@@ -376,7 +376,7 @@
 			  <accelerator key="Delete" modifiers="0" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image3999">
+			    <widget class="GtkImage" id="image4252">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-delete</property>
 			      <property name="icon_size">1</property>
@@ -410,7 +410,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image4000">
+			    <widget class="GtkImage" id="image4253">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-execute</property>
 			      <property name="icon_size">1</property>
@@ -432,7 +432,7 @@
 				  <signal name="activate" handler="on_konquerer_activate" last_modification_time="Thu, 02 Mar 2006 07:08:06 GMT"/>
 
 				  <child internal-child="image">
-				    <widget class="GtkImage" id="image4001">
+				    <widget class="GtkImage" id="image4254">
 				      <property name="visible">True</property>
 				      <property name="stock">gtk-execute</property>
 				      <property name="icon_size">1</property>
@@ -453,7 +453,7 @@
 				  <signal name="activate" handler="on_kopete_activate" last_modification_time="Thu, 02 Mar 2006 07:08:44 GMT"/>
 
 				  <child internal-child="image">
-				    <widget class="GtkImage" id="image4002">
+				    <widget class="GtkImage" id="image4255">
 				      <property name="visible">True</property>
 				      <property name="stock">gtk-execute</property>
 				      <property name="icon_size">1</property>
@@ -474,7 +474,7 @@
 				  <signal name="activate" handler="on_networkmanager_activate" last_modification_time="Thu, 02 Mar 2006 07:07:54 GMT"/>
 
 				  <child internal-child="image">
-				    <widget class="GtkImage" id="image4003">
+				    <widget class="GtkImage" id="image4256">
 				      <property name="visible">True</property>
 				      <property name="stock">gtk-execute</property>
 				      <property name="icon_size">1</property>
@@ -495,7 +495,7 @@
 				  <signal name="activate" handler="on_gaim_activate" last_modification_time="Thu, 02 Mar 2006 07:07:29 GMT"/>
 
 				  <child internal-child="image">
-				    <widget class="GtkImage" id="image4004">
+				    <widget class="GtkImage" id="image4257">
 				      <property name="visible">True</property>
 				      <property name="stock">gtk-execute</property>
 				      <property name="icon_size">1</property>
@@ -520,7 +520,7 @@
 			  <signal name="activate" handler="ResetMasterPassword" last_modification_time="Wed, 02 Nov 2005 15:28:00 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image4005">
+			    <widget class="GtkImage" id="image4258">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-revert-to-saved</property>
 			      <property name="icon_size">1</property>
@@ -547,7 +547,7 @@
 			  <signal name="activate" handler="Preferences" last_modification_time="Fri, 19 Aug 2005 06:40:17 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image4006">
+			    <widget class="GtkImage" id="image4259">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-preferences</property>
 			      <property name="icon_size">1</property>
@@ -559,6 +559,34 @@
 			  </child>
 			</widget>
 		      </child>
+
+		      <child>
+			<widget class="GtkSeparatorMenuItem" id="separator9">
+			  <property name="visible">True</property>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkImageMenuItem" id="policies">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">P_olicies</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_policies_activate" last_modification_time="Fri, 08 Sep 2006 20:06:15 GMT"/>
+			  <accelerator key="F3" modifiers="0" signal="activate"/>
+
+			  <child internal-child="image">
+			    <widget class="GtkImage" id="image4260">
+			      <property name="visible">True</property>
+			      <property name="stock">gtk-properties</property>
+			      <property name="icon_size">1</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>
@@ -581,7 +609,7 @@
 			  <signal name="activate" handler="on_create_sample_secrets1_activate" last_modification_time="Fri, 30 Sep 2005 12:58:41 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image4007">
+			    <widget class="GtkImage" id="image4261">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-add</property>
 			      <property name="icon_size">1</property>
@@ -602,7 +630,7 @@
 			  <signal name="activate" handler="on_remove_test_secrets1_activate" last_modification_time="Fri, 30 Sep 2005 12:59:05 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image4008">
+			    <widget class="GtkImage" id="image4262">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-remove</property>
 			      <property name="icon_size">1</property>
@@ -668,7 +696,7 @@
 			  <accelerator key="F1" modifiers="0" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image4009">
+			    <widget class="GtkImage" id="image4263">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-help</property>
 			      <property name="icon_size">1</property>
@@ -695,7 +723,7 @@
 			  <signal name="activate" handler="About" last_modification_time="Thu, 01 Sep 2005 15:30:28 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image4010">
+			    <widget class="GtkImage" id="image4264">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-dialog-info</property>
 			      <property name="icon_size">1</property>
@@ -795,7 +823,6 @@
 	  <property name="tab_pos">GTK_POS_TOP</property>
 	  <property name="scrollable">True</property>
 	  <property name="enable_popup">False</property>
-	  <signal name="switch_page" handler="on_notebookStores_switch_page" last_modification_time="Tue, 11 Oct 2005 10:32:35 GMT"/>
 
 	  <child>
 	    <widget class="GtkVBox" id="vboxMiCasa">
@@ -1053,6 +1080,7 @@
 
 	  <child>
 	    <widget class="GtkHBox" id="hbox3">
+	      <property name="can_focus">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">0</property>
 
@@ -4440,6 +4468,440 @@ prompted for the Master Password at startup.</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">0</property>
 
+	  <child>
+	    <widget class="GtkFrame" id="frame32">
+	      <property name="border_width">6</property>
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment47">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkVBox" id="vbox159">
+		      <property name="border_width">4</property>
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox97">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="checkbuttonSaveSecrets">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Encrpyt and save miCASA secrets to disk (Persistent)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">True</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <signal name="toggled" handler="on_checkbuttonSaveSecrets_toggled" last_modification_time="Fri, 15 Sep 2006 18:00:13 GMT"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox98">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label282">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">      </property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkVBox" id="vbox167">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkCheckButton" id="checkbuttonDecrypt">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Decypt and open miCASA using my workstation password</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">True</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox92">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox93">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label281">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">      </property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEntry" id="entryStorageDirectory">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="padding">3</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="buttonChooseDirectory">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">False</property>
+				  <signal name="clicked" handler="on_buttonChooseDirectory_clicked" last_modification_time="Mon, 28 Aug 2006 20:08:37 GMT"/>
+
+				  <child>
+				    <widget class="GtkImage" id="image3960">
+				      <property name="visible">True</property>
+				      <property name="stock">gtk-find</property>
+				      <property name="icon_size">4</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label273">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt; miCASA Store options &lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame29">
+	      <property name="border_width">6</property>
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment44">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkVBox" id="vbox146">
+		      <property name="border_width">4</property>
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkCheckButton" id="checkbuttonRunInTray">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Show CASA Manager icon in notify area</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">True</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="clicked" handler="on_checkbuttonRunInTray_clicked" last_modification_time="Thu, 13 Jul 2006 19:51:18 GMT"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox86">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label262">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">      </property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkVBox" id="vbox147">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkRadioButton" id="radiobutton1">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Display CASA Manager when icon is clicked</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				  <signal name="toggled" handler="on_radiobutton1_clicked" last_modification_time="Thu, 13 Jul 2006 21:36:16 GMT"/>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkRadioButton" id="radiobutton2">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Lock/Unlock secrets when icon is clicked</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				  <property name="group">radiobutton1</property>
+				  <signal name="toggled" handler="on_radiobutton1_clicked" last_modification_time="Thu, 13 Jul 2006 21:36:25 GMT"/>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label261">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt; CASA Manager Options &lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
 	  <child>
 	    <widget class="GtkFrame" id="frame3">
 	      <property name="border_width">6</property>
@@ -4576,312 +5038,6 @@ prompted for the Master Password at startup.</property>
 	    </packing>
 	  </child>
 
-	  <child>
-	    <widget class="GtkFrame" id="frame29">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment44">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">1</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">12</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox146">
-		      <property name="border_width">4</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="checkbuttonRunInTray">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Show CASA Manager in notify area</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			  <signal name="clicked" handler="on_checkbuttonRunInTray_clicked" last_modification_time="Thu, 13 Jul 2006 19:51:18 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox86">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label262">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">      </property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox147">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="radiobutton1">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Display CASA Manager when icon is clicked</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="on_radiobutton1_clicked" last_modification_time="Thu, 13 Jul 2006 21:36:16 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="radiobutton2">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Lock/Unlock secrets when icon is clicked</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">radiobutton1</property>
-				  <signal name="toggled" handler="on_radiobutton1_clicked" last_modification_time="Thu, 13 Jul 2006 21:36:25 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label261">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt; Options &lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame32">
-	      <property name="border_width">6</property>
-	      <property name="visible">True</property>
-	      <property name="label_xalign">0</property>
-	      <property name="label_yalign">0.5</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment47">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">1</property>
-		  <property name="yscale">1</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">12</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox159">
-		      <property name="border_width">4</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox92">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox93">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkEntry" id="entryStorageDirectory">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="padding">3</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="buttonChooseDirectory">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">False</property>
-				  <signal name="clicked" handler="on_buttonChooseDirectory_clicked" last_modification_time="Mon, 28 Aug 2006 20:08:37 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image3960">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-find</property>
-				      <property name="icon_size">4</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label273">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt; miCASA Storage Location &lt;/b&gt;</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
 	  <child>
 	    <widget class="GtkFrame" id="frame16">
 	      <property name="border_width">6</property>
@@ -13650,4 +13806,399 @@ to encrypt this file</property>
   </child>
 </widget>
 
+<widget class="GtkDialog" id="dialogSecretPolicy">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Edit Secret Policy</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+  <property name="modal">True</property>
+  <property name="default_width">200</property>
+  <property name="default_height">530</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox13">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area13">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="helpbuttonPolicy">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-11</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="applybuttonPolicy">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-apply</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-10</property>
+	      <signal name="clicked" handler="on_applybuttonPolicy_clicked" last_modification_time="Fri, 08 Sep 2006 20:39:37 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="cancelbuttonPolicy">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	      <signal name="clicked" handler="on_cancelbuttonPolicy_clicked" last_modification_time="Fri, 08 Sep 2006 20:55:59 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="okbuttonPolicy">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	      <signal name="clicked" handler="on_okbuttonPolicy_clicked" last_modification_time="Fri, 08 Sep 2006 20:57:28 GMT"/>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkScrolledWindow" id="scrolledwindow68">
+	  <property name="width_request">64</property>
+	  <property name="height_request">64</property>
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	  <property name="shadow_type">GTK_SHADOW_IN</property>
+	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	  <child>
+	    <widget class="GtkTreeView" id="tvSecretPolicy">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="headers_visible">True</property>
+	      <property name="rules_hint">False</property>
+	      <property name="reorderable">False</property>
+	      <property name="enable_search">True</property>
+	      <property name="fixed_height_mode">False</property>
+	      <property name="hover_selection">False</property>
+	      <property name="hover_expand">False</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkDialog" id="dialogPersistentPolicy">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Select non-persistent Secrets</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+  <property name="modal">True</property>
+  <property name="default_width">250</property>
+  <property name="default_height">500</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox14">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area14">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="helpbutton5">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-help</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-11</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="applybuttonPersistent">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-apply</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-10</property>
+	      <signal name="clicked" handler="on_applybuttonPersistent_clicked" last_modification_time="Mon, 11 Sep 2006 17:59:43 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="cancelbutton">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	      <signal name="clicked" handler="on_cancelbutton_clicked" last_modification_time="Mon, 11 Sep 2006 18:04:33 GMT"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="okbutton">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	      <signal name="clicked" handler="on_okbutton_clicked" last_modification_time="Mon, 11 Sep 2006 18:08:29 GMT"/>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHBox" id="hbox96">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkScrolledWindow" id="scrolledwindow69">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	      <child>
+		<widget class="GtkTreeView" id="tvPersistentList">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="headers_visible">True</property>
+		  <property name="rules_hint">False</property>
+		  <property name="reorderable">False</property>
+		  <property name="enable_search">True</property>
+		  <property name="fixed_height_mode">False</property>
+		  <property name="hover_selection">False</property>
+		  <property name="hover_expand">False</property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox166">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkLabel" id="label280">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">
+
+
+
+
+
+</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkButton" id="buttonMakeNonPersistent">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <signal name="clicked" handler="on_buttonMakeNonPersistent_clicked" last_modification_time="Mon, 11 Sep 2006 17:56:23 GMT"/>
+
+		  <child>
+		    <widget class="GtkImage" id="image4088">
+		      <property name="visible">True</property>
+		      <property name="stock">gtk-go-forward</property>
+		      <property name="icon_size">4</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">7</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkButton" id="buttonMakePersistent">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <signal name="clicked" handler="on_buttonMakePersistent_clicked" last_modification_time="Mon, 11 Sep 2006 17:57:10 GMT"/>
+
+		  <child>
+		    <widget class="GtkImage" id="image4087">
+		      <property name="visible">True</property>
+		      <property name="stock">gtk-go-back</property>
+		      <property name="icon_size">4</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">19</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkScrolledWindow" id="scrolledwindow70">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	      <child>
+		<widget class="GtkTreeView" id="tvNonPersistentList">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="headers_visible">True</property>
+		  <property name="rules_hint">False</property>
+		  <property name="reorderable">False</property>
+		  <property name="enable_search">True</property>
+		  <property name="fixed_height_mode">False</property>
+		  <property name="hover_selection">False</property>
+		  <property name="hover_expand">False</property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>
diff --git a/CASA/policy/PersistencePol.cs b/CASA/policy/PersistencePol.cs
index eeb8f053..6b15334a 100644
--- a/CASA/policy/PersistencePol.cs
+++ b/CASA/policy/PersistencePol.cs
@@ -22,6 +22,8 @@
 
 using System;
 using System.Collections;
+using System.Collections.Specialized;
+
 using System.Xml;
 using System.Xml.Serialization;
 
@@ -54,13 +56,91 @@ public class PersistencePol : CASAPol
         }
     }
 
-    public PersistencePol(string osName,string path, int time)
+	public PersistencePol(string osName,string path, int time)
+	{
+		policyType = CASAPolType.PERSISTENCE_POL;
+		os = osName;
+		filePath = path;
+		pollInterval = time;
+	}
+
+
+    public PersistencePol(string osName,string path, int time, Hashtable htPolicies)
     {
         policyType = CASAPolType.PERSISTENCE_POL;
         os = osName;
         filePath = path;
         pollInterval = time;
+		htSecretPolicys = htPolicies;
     }
+	
+	private Hashtable htSecretPolicys; // = new Hashtable();
+	public void SetSecretPolicy(string sSecretID, string sPolicyAttribID, string sPolicyAttribValue, string sDefaultValue)
+	{
+
+		if (htSecretPolicys == null)
+		{
+			htSecretPolicys = new Hashtable();
+		}
+
+		// find policys for given secretID
+		NameValueCollection nvc = (NameValueCollection)htSecretPolicys[sSecretID];
+		if (nvc == null)
+		{
+			nvc = new NameValueCollection();
+			htSecretPolicys.Add(sSecretID, nvc);		
+		}				
+
+		if (sPolicyAttribValue.Equals(sDefaultValue))
+		{			
+			nvc.Remove(sPolicyAttribID);
+		}
+		else
+		{
+			nvc.Set(sPolicyAttribID, sPolicyAttribValue);			
+		}
+	}
+
+	public bool GetSecretPolicy(string sSecretID, string sPolicyAttribID, bool bDefaultValue)
+	{
+		string sReturn = GetSecretPolicy(sSecretID, sPolicyAttribID, bDefaultValue.ToString());
+		return bool.Parse(sReturn);
+	}
+
+	public string GetSecretPolicy(string sSecretID, string sPolicyAttribID, string sDefaultValue)
+	{
+		if (htSecretPolicys != null)
+		{
+			NameValueCollection nvc = (NameValueCollection)htSecretPolicys[sSecretID];
+			if (nvc != null)
+			{
+				try
+				{
+					return nvc.GetValues(sPolicyAttribID)[0];
+				}
+				catch 
+				{
+				}
+			}
+		}
+
+		return sDefaultValue;
+	}
+
+	public ArrayList GetNonpersistentSecretIDs()
+	{
+		ArrayList al = new ArrayList();
+		
+		//enumerate all secrets loaded
+		IDictionaryEnumerator idEnum = htSecretPolicys.GetEnumerator();
+		while (idEnum.MoveNext())
+		{
+			string sSecretID = (string)idEnum.Key;
+			al.Add(sSecretID);
+		}		
+		
+		return al;
+	}
 
     public override void DumpPol()
     {
@@ -95,10 +175,40 @@ public class PersistencePol : CASAPol
             elem.InnerText = pollInterval.ToString();
         
             persistPolElem.AppendChild(elem);
+
+			// write out policy for secrets
+			// write out NameValueCollection			
+			XmlElement configElem = doc.CreateElement("SecretPolicies");
+			persistPolElem.AppendChild(configElem);
+
+			IDictionaryEnumerator ienum = htSecretPolicys.GetEnumerator();
+			while (ienum.MoveNext())
+			{
+				// get the collection for current SecretID
+				string sCurrentID = ienum.Key.ToString();
+				NameValueCollection nvc = (NameValueCollection)htSecretPolicys[sCurrentID];
+
+				// if no attributes exist, skip it
+				if (nvc.Count == 0) continue;
+
+				// create a policy element
+				XmlElement policyElement = doc.CreateElement("Secret");
+				policyElement.SetAttribute("id", sCurrentID);
+
+				// add all attributes
+				for (int i=0; i<nvc.Count; i++)
+				{
+					policyElement.SetAttribute(nvc.GetKey(i), nvc.GetValues(i)[0]);					
+				}
+
+				configElem.AppendChild(policyElement);
+			}
+			
+
         }
         catch(Exception e)
         {
-            //Console.WriteLine(e.ToString());
+            Console.WriteLine(e.ToString());
         }
     }
 }
diff --git a/CASA/policy/PolicyImpl.cs b/CASA/policy/PolicyImpl.cs
index 92da4d99..6308e6b6 100644
--- a/CASA/policy/PolicyImpl.cs
+++ b/CASA/policy/PolicyImpl.cs
@@ -22,6 +22,8 @@
 
 using System;
 using System.Collections;
+using System.Collections.Specialized;
+
 using System.Xml;
 using System.Xml.Serialization;
 using System.IO;
@@ -179,7 +181,49 @@ public class ICASAPol
                 XmlNode pollIntervalNode = persistenceNode.SelectSingleNode(xpath);
                 int pollInterval = Convert.ToInt32(pollIntervalNode.InnerText);
 
-                PersistencePol persistencePol = new PersistencePol(os,storeFileLocation, pollInterval);
+				// load SecretPolices
+				xpath = "//SecretPolicies";
+				XmlNode policyNode = persistenceNode.SelectSingleNode(xpath);
+				Hashtable htSecretPolicies = new Hashtable();
+				if (policyNode != null)
+				{						
+					XmlNodeList secretNodes = policyNode.ChildNodes;
+
+					IEnumerator ienum = secretNodes.GetEnumerator();
+					while (ienum.MoveNext())
+					{						
+						XmlNode node = (XmlNode)ienum.Current;
+						
+						// get the id
+						XmlAttributeCollection coll = node.Attributes;
+						XmlNode idNode = coll.GetNamedItem("id");
+						
+
+						// get the rest of the attributes
+						IEnumerator enumAttribs = coll.GetEnumerator();
+						NameValueCollection nvc = new NameValueCollection();						
+						while (enumAttribs.MoveNext())
+						{	
+							XmlAttribute attrib = (XmlAttribute)enumAttribs.Current;
+							if (!attrib.Name.Equals("id"))
+							{
+								nvc.Add(attrib.Name, attrib.Value);
+							}							
+						}	
+						
+						// add this one 
+						try
+						{
+							htSecretPolicies.Add(idNode.Value, nvc);
+						}
+						catch (Exception e)
+						{
+							//Console.WriteLine(e.ToString());
+						}
+					}
+				}
+
+                PersistencePol persistencePol = new PersistencePol(os,storeFileLocation, pollInterval, htSecretPolicies);
                 return persistencePol;
             }
         }