@@ -36,12 +36,12 @@
 (define (rmt:get-connection-info areapath) ;; TODO: push areapath down.
   (let ((cinfo (remote-conndat *runremote*))
         (run-id 0))
     (if cinfo
 	cinfo
-	(if (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id)
-	    (client:setup run-id)
+	(if (server:check-if-running areapath)
+	    (client:setup areapath)
 	    #f))))
 
 (define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
 
 ;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname))
@@ -93,11 +93,11 @@
      ;; on homehost and this is a write, we already have a server, but server has died
      ((and (cdr (remote-hh-dat *runremote*))         ;; on homehost
            (not (member cmd api:read-only-queries))  ;; this is a write
            (remote-server-url *runremote*)           ;; have a server
            (not (server:check-if-running *toppath*)))  ;; server has died.
-      (set! *runremote* #f)
+      (set! *runremote* (make-remote))
       (mutex-unlock! *rmt-mutex*)
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  4.1")
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
 
      ;; on homehost and this is a write, we already have a server
@@ -123,11 +123,11 @@
 
      ((and (not (cdr (remote-hh-dat *runremote*)))        ;; not on a homehost 
            (not (remote-conndat *runremote*)))            ;; and no connection
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  6  hh-dat: " (remote-hh-dat *runremote*) " conndat: " (remote-conndat *runremote*))
       (mutex-unlock! *rmt-mutex*)
-      (tasks:start-and-wait-for-server (tasks:open-db) 0 15)
+      (server:start-and-wait *toppath*)
       (remote-conndat-set! *runremote* (rmt:get-connection-info *toppath*)) ;; calls client:setup which calls client:setup-http
       (rmt:send-receive cmd rid params attemptnum: attemptnum)) ;; TODO: add back-off timeout as
      ;; all set up if get this far, dispatch the query
      ((cdr (remote-hh-dat *runremote*)) ;; we are on homehost
       (mutex-unlock! *rmt-mutex*)
@@ -166,11 +166,11 @@
 	      (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
 	      (remote-conndat-set!    *runremote* #f)
 	      (remote-server-url-set! *runremote* #f)
               (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
 	      (mutex-unlock! *rmt-mutex*)
-	      (tasks:start-and-wait-for-server (tasks:open-db) 0 15)
+	      (server:start-and-wait *toppath*)
 	      (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))))))))
 
 ;; (define (rmt:update-db-stats run-id rawcmd params duration)
 ;;   (mutex-lock! *db-stats-mutex*)
 ;;   (handle-exceptions