@@ -30,69 +30,63 @@
      sparse-vectors srfi-18
      #;(prefix mtconfigf configf:)
      ) 
 (import (prefix sqlite3 sqlite3:))
 
-;; (declare (uses common))
-;; (declare (uses margs))
-;; (declare (uses keys))
-;; (declare (uses items))
-;; (declare (uses db))
-;; (declare (uses process))
-;; (declare (uses launch))
-;; (declare (uses runs))
-;; (declare (uses dashboard-tests))
-;; (declare (uses dashboard-guimonitor))
-;; (declare (uses tree))
-;; (declare (uses dcommon))
-;; (declare (uses dashboard-context-menu))
-;; (declare (uses vg))
-;; (declare (uses subrun))
-;; ;; (declare (uses dashboard-main))
-;; (declare (uses megatest-version))
-;; (declare (uses mt))
+(declare (uses mtargs))
+(import (prefix mtargs args:))
+
+(declare (uses ducttape-lib))
+(import ducttape-lib)
+
+(declare (uses mtconfigf))
+(import (prefix mtconfigf configf:))
+
+;; invoke the imports - ORDER IS IMPORTANT!
+(declare (uses mtargs.import))
+(declare (uses ducttape-lib.import))
+(declare (uses mtconfigf.import))
 
 (declare (uses megamod))
 (import megamod)
 
 (declare (uses commonmod))
 (import commonmod)
+
 (declare (uses rmtmod))
 (import rmtmod)
+
 (declare (uses runsmod))
 (import runsmod)
+
 (declare (uses dbmod))
 (import dbmod)
+
+(declare (uses testsmod))
+(import testsmod)
 
 (declare (uses dcommonmod))
 (import dcommonmod)
-(declare (uses mtargs))
-(import (prefix mtargs args:))
-(declare (uses ducttape-lib))
-(import ducttape-lib)
-(declare (uses mtconfigf))
-(import (prefix mtconfigf configf:))
 
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
 (include "vg_records.scm")
 
-;; invoke the imports
+;; invoke the imports - ORDER IS IMPORTANT!
 (declare (uses commonmod.import))
+(declare (uses testsmod.import))
 (declare (uses rmtmod.import))
 (declare (uses runsmod.import))
 (declare (uses megamod.import))
 (declare (uses dcommonmod.import))
-(declare (uses mtargs.import))
-(declare (uses ducttape-lib.import))
-(declare (uses mtconfigf.import))
 
-(configf:set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)
-(configf:add-eval-string "(import megamod commonmod (prefix mtargs args:))")
+;; (mtconfigf#set-debug-printers debug:print debug:print-info debug:print-error *default-log-port*)
+;; (configf:add-eval-string "(import megamod commonmod (prefix mtargs args:))")
+(mtconfigf#add-eval-string "(import megamod)(import commonmod)(prefix mtargs args:)")
 
 
 (define help (conc 
 	      "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "