diff --git a/TODO.txt b/TODO.txt
index 5fbb609bd0..9e7ac7a7c1 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -146,6 +146,10 @@ PCBNew
 
 Dick's Final TODO List:
 ======================
+*) Rewrite
+        PCB_BASE_FRAME::Save_Module_In_Library
+        PCB_EDIT_FRAME::ArchiveModulesOnBoard
+   to use FP_LIB_TABLE mechanisms.
 *) write options dialog for fp table dialog.
 *) Apply Fabrizio and Alexander's linux desktop patches after unifying them.
 *) Get licensing cleaned up.
diff --git a/pcbnew/module_editor_frame.h b/pcbnew/module_editor_frame.h
index 378dd2fe5a..d022c55a2a 100644
--- a/pcbnew/module_editor_frame.h
+++ b/pcbnew/module_editor_frame.h
@@ -432,8 +432,7 @@ protected:
      */
     void updateTitle();
 
-    // @todo these will eventually have to be made instance variables.
-    static wxString m_lib_nick_name;
+    wxString m_lib_nick_name;
 
     /// The library nickName is a short string, for now the same as the library path
     /// but without path and without extension.  After library table support it becomes
@@ -441,9 +440,10 @@ protected:
     wxString getLibNickName() const                     { return m_lib_nick_name; }
     void setLibNickName( const wxString& aLibNickName ) { m_lib_nick_name = aLibNickName; }
 
-    static wxString m_lib_path;
 
 #if !defined(USE_FP_LIB_TABLE)
+    wxString m_lib_path;
+
     void setLibPath( const wxString& aLibPath )         { m_lib_path = aLibPath; }
 
     /// The libPath is the full string used in the PLUGIN::Footprint*() calls.
diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index 41db7b5fa2..4608f37652 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -53,9 +53,6 @@
 
 static PCB_SCREEN* s_screenModule;      // the PCB_SCREEN used by the footprint editor
 
-wxString FOOTPRINT_EDIT_FRAME::m_lib_nick_name;
-wxString FOOTPRINT_EDIT_FRAME::m_lib_path;
-
 BOARD* FOOTPRINT_EDIT_FRAME::s_Pcb;
 
 BEGIN_EVENT_TABLE( FOOTPRINT_EDIT_FRAME, PCB_BASE_FRAME )