@@ -384,36 +384,13 @@
 		      ((http)
 		       (set! *transport-type 'http)
 		       (server:ensure-running)
 		       (client:launch))
 		      (else ;; (fs)
+		       (debug:print 0 "ERROR: Should NOT be getting here! fs transport is no longer supported")
 		       (set! *transport-type* 'fs)
-		       (set! *megatest-db* (open-db))))))))))
-;; 		    (cond
-;; 		     ;; command line overrides other mechanisms
-;; 		     (transport-from-cmdln
-;; 		      (if (equal? transport-from-cmdln "fs")
-;; 			  (set! *transport-type* 'fs)
-;; 			  (begin
-;; 			    (server:ensure-running)
-;; 			    (client:launch))))
-;; 		     ;; cmdinfo is second priority
-;; 		     (transport-from-cmdinfo
-;; 		      (if (equal? transport-from-cmdinfo "fs")
-;; 			  (set! *transport-type* 'fs)
-;; 			  (begin
-;; 			    (server:ensure-running)
-;; 			    (client:launch))))
-;; 		     ;; config file is next highest priority for determinining transport
-;; 		     (transport-from-config
-;; 		      (if (equal? transport-from-config "fs")
-;; 			  (set! *transport-type* 'fs)
-;; 			  (begin
-;; 			    (server:ensure-running)
-;; 			    (client:launch))))
-;; 		     (else
-;; 		      (set! *transport-type* 'fs)))))))))
+		       (set! *megatest-db* (make-dbr:dbstruct path: *toppath* local: #t))))))))))
 
 (if (or (args:get-arg "-list-servers")
 	(args:get-arg "-stop-server"))
     (let ((tl (setup-for-run)))
       (if tl 
@@ -435,11 +412,11 @@
 		      (pubport    (vector-ref server 5))
 		      (start-time (vector-ref server 6))
 		      (priority   (vector-ref server 7))
 		      (state      (vector-ref server 8))
 		      (mt-ver     (vector-ref server 9))
-		      (last-update (vector-ref server 10)) ;;   (open-run-close tasks:server-alive? tasks:open-db #f hostname: hostname port: port))
+		      (last-update (vector-ref server 10)) 
 		      (transport  (vector-ref server 11))
 		      (killed     #f)
 		      (status     (< last-update 20)))
 		 ;;   (zmq-sockets (if status (server:client-connect hostname port) #f)))
 		 ;; no need to login as status of #t indicates we are connecting to correct 
@@ -584,11 +561,11 @@
 ;; NOTE: list-runs and list-db-targets operate on local db!!!
 ;;
 (if (or (args:get-arg "-list-runs")
 	(args:get-arg "-list-db-targets"))
     (if (setup-for-run)
-	(let* ((db       (open-db))
+	(let* ((db       (make-dbr:dbstruct path: *toppath* local: #t))
 	       (runpatt  (args:get-arg "-list-runs"))
 	       (testpatt (if (args:get-arg "-testpatt") 
 			     (args:get-arg "-testpatt") 
 			     "%"))
 	       (runsdat  (db:get-runs db runpatt #f #f '()))
@@ -809,11 +786,11 @@
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (db-host   (assoc/default 'db-host   cmdinfo))
 	       (run-id    (assoc/default 'run-id    cmdinfo))
 	       (itemdat   (assoc/default 'itemdat   cmdinfo))
-	       (db        (open-db))
+	       ;; (db        (make-dbr:dbstruct path: *))
 	       (state     (args:get-arg ":state"))
 	       (status    (args:get-arg ":status"))
 	       (target    (args:get-arg "-target")))
 	  (change-directory testpath)
 	  ;; (set! *runremote* runremote)
@@ -826,22 +803,23 @@
 	      (begin
 		(debug:print 0 "Failed to setup, giving up on -archive, exiting")
 		(exit 1)))
 	  (let* ((keys     (db:get-keys db))
 		 ;; DO NOT run remote
-		 (paths    (db:test-get-paths-matching db keys target)))
+		 (paths    (rmt:test-get-paths-matching keys target)))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
 			(print path))
 		      paths))
-	  (if (sqlite3:database? db)(sqlite3:finalize! db)))
+	  ;; (if (sqlite3:database? db)(sqlite3:finalize! db))
+	  )
 	;; else do a general-run-call
 	(general-run-call 
 	 "-test-paths"
 	 "Get paths to tests"
 	 (lambda (target runname keys keyvals)
-	   (let* ((db       (open-db))
+	   (let* ((db       (make-dbr:dbstruct path: *toppath* local: #t))
 		  ;; DO NOT run remote
 		  (paths    (db:test-get-paths-matching db keys target)))
 	     (for-each (lambda (path)
 			 (print path))
 		       paths)
@@ -854,11 +832,11 @@
 (if (args:get-arg "-extract-ods")
     (general-run-call
      "-extract-ods"
      "Make ods spreadsheet"
      (lambda (target runname keys keyvals)
-       (let ((db         (open-db))
+       (let ((db         (make-dbr:dbstruct path: *toppath* local: #t))
 	     (outputfile (args:get-arg "-extract-ods"))
 	     (runspatt   (args:get-arg ":runname"))
 	     (pathmod    (args:get-arg "-pathmod")))
 	     ;; (keyvalalist (keys->alist keys "%")))
 	 (debug:print 2 "Extract ods, outputfile: " outputfile " runspatt: " runspatt " keyvals: " keyvals)
@@ -1150,17 +1128,18 @@
 ;;======================================================================
 
 (if (or (args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (setup-for-run))
-	   (db      (if toppath (open-db) #f)))
+	   (db      (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)))
       (if db
 	  (begin
 	    (set! *db* db)
 	    (set! *client-non-blocking-mode* #t)
 	    (import readline)
 	    (import apropos)
+	    ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
 	    (gnu-history-install-file-manager
 	     (string-append
 	      (or (get-environment-variable "HOME") ".") "/.megatest_history"))
 	    (current-input-port (make-gnu-readline-port "megatest> "))
 	    (if (args:get-arg "-repl")
@@ -1169,11 +1148,11 @@
 	  (exit))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-convert-to-norm")
     (let* ((toppath (setup-for-run))
-	   (db      (if toppath (open-db) #f)))
+	   (db      (if toppath (make-dbr:dbstruct path: toppath local: #t))))
       (for-each 
        (lambda (field)
 	 (let ((dat '()))
 	   (debug:print-info 0 "Getting data for field " field)
 	   (sqlite3:for-each-row