Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -7,11 +7,11 @@
            db.scm keys.scm margs.scm megatest-version.scm \
            process.scm runs.scm tasks.scm tests.scm genexample.scm \
 	   http-transport.scm filedb.scm \
            client.scm gutils.scm synchash.scm daemon.scm mt.scm dcommon.scm \
 	   tree.scm ezsteps.scm lock-queue.scm sdb.scm \
-	   rmt.scm api.scm tdb.scm
+	   rmt.scm api.scm tdb.scm rpc-transport.scm
 
 GUISRCF  = dashboard-tests.scm dashboard-guimonitor.scm 
 
 OFILES   = $(SRCFILES:%.scm=%.o)
 GOFILES  = $(GUISRCF:%.scm=%.o)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -25,12 +25,10 @@
 (declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
 (declare (uses daemon))
 (declare (uses db))
-;; (declare (uses sdb))
-;; (declare (uses filedb))
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
 

Index: rpc-transport.scm
==================================================================
--- rpc-transport.scm
+++ rpc-transport.scm
@@ -12,11 +12,11 @@
 (import (prefix rpc rpc:))
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 (import (prefix sqlite3 sqlite3:))
 
-(declare (unit server))
+(declare (unit rpc-transport))
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
@@ -190,11 +190,11 @@
     ;; (debug:print 0 "Server started on port " (rpc:default-server-port) "...")
     ;; (thread-start! th2)
     ;; (thread-join!  th2)
     ;; return th2 for the calling process to do a join with 
     th1
-    )))) ;; rpc:server)))
+    )) ;; rpc:server)))
 
 (define (rpc-transport:keep-running db host:port)
   ;; if none running or if > 20 seconds since 
   ;; server last used then start shutdown
     (let loop ((count 0))

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -53,41 +53,17 @@
       ((http) (http-transport:launch run-id))
       ((rpc)  (rpc-transport:launch run-id))
       (else   (debug:print 0 "ERROR: No known transport set, transport=" transport ", using rpc")
 	      (rpc-transport:launch run-id)))))
 
-(define (server:run hostn)
-  (debug:print 2 "Attempting to start the server ...")
-  (if (not *toppath*)
-      (if (not (setup-for-run))
-	  (begin
-	    (debug:print 0 "ERROR: cannot find megatest.config, cannot start server, exiting")
-	    (exit))))
-  (let* (;; (iface           (if (string=? "-" hostn)
-	 ;;        	      #f ;; (get-host-name) 
-	 ;;        	      hostn))
-	 (db              #f) ;;        (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily
-	 (hostname        (get-host-name))
-	 (ipaddrstr       (let ((ipstr (if (string=? "-" hostn)
-					   (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
-					   #f)))
-			    (if ipstr ipstr hostn))) ;; hostname)))
-	 (start-port    (if (args:get-arg "-port")
-			    (string->number (args:get-arg "-port"))
-			    (+ 5000 (random 1001))))
-	 (link-tree-path (config-lookup *configdat* "setup" "linktree")))
-    (set! *cache-on* #t)
-    (root-path     (if link-tree-path 
-		       link-tree-path
-		       (current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!
-
 ;;======================================================================
 ;; S E R V E R   U T I L I T I E S 
 ;;======================================================================
 
 ;; Get the transport
 (define (server:get-transport)
+  (if *
   (string->symbol
    (or (args:get-arg "-transport")
        (configf:lookup *configdat* "server" "transport")
        "rpc")))
 
@@ -105,11 +81,11 @@
 ;; 
 (define (server:reply return-addr query-sig success/fail result)
   (debug:print-info 11 "server:reply return-addr=" return-addr ", result=" result)
   ;; (send-message pubsock target send-more: #t)
   ;; (send-message pubsock 
-  (case *transport-type*
+  (case (server:get-transport)
     ((fs) result)
     ((http)(db:obj->string (vector success/fail query-sig result)))
     ((zmq)
      (let ((pub-socket (vector-ref *runremote* 1)))
        (send-message pub-socket return-addr send-more: #t)