@@ -134,11 +134,12 @@
     (http-transport:try-start-server run-id ipaddrstr start-port server-id)))
 
 ;; This is recursively run by http-transport:run until sucessful
 ;;
 (define (http-transport:try-start-server run-id ipaddrstr portnum server-id)
-  (let ((config-hostname (configf:lookup *configdat* "server" "hostname")))
+  (let ((config-hostname (configf:lookup *configdat* "server" "hostname"))
+	(tdbdat          (tasks:open-db)))
     (debug:print-info 0 "http-transport:try-start-server run-id=" run-id " ipaddrsstr=" ipaddrstr " portnum=" portnum " server-id=" server-id " config-hostname=" config-hostname)
     (handle-exceptions
      exn
      (begin
        (print-error-message exn)
@@ -155,18 +156,16 @@
 	     (http-transport:try-start-server run-id
 					      ipaddrstr
 					      (portlogger:open-run-close portlogger:find-port)
 					      server-id))
 	   (begin
-	     (tasks:wait-on-busy-monitor.db)
-	     (tasks:server-force-clean-run-record (tasks:get-db) run-id ipaddrstr portnum " http-transport:try-start-server")
+	     (tasks:server-force-clean-run-record (db:delay-if-busy tdbdat) run-id ipaddrstr portnum " http-transport:try-start-server")
 	     (print "ERROR: Tried and tried but could not start the server"))))
      ;; any error in following steps will result in a retry
      (set! *server-info* (list ipaddrstr portnum))
-     (tasks:wait-on-busy-monitor.db)
      (tasks:server-set-interface-port 
-		     (tasks:get-db)
+		     (db:delay-if-busy tdbdat)
 		     server-id 
 		     ipaddrstr portnum)
      (debug:print 0 "INFO: Trying to start server on " ipaddrstr ":" portnum)
      ;; This starts the spiffy server
      ;; NEED WAY TO SET IP TO #f TO BIND ALL
@@ -175,12 +174,11 @@
 	 (start-server port: portnum bind-address: (if (equal? config-hostname "-")
 						       ipaddrstr
 						       config-hostname))
 	 (start-server port: portnum))
      ;;  (portlogger:open-run-close portlogger:set-port portnum "released")
-     (tasks:wait-on-busy-monitor.db)
-     (tasks:server-force-clean-run-record (tasks:get-db) run-id ipaddrstr portnum " http-transport:try-start-server")
+     (tasks:server-force-clean-run-record (db:delay-if-busy tdbdat) run-id ipaddrstr portnum " http-transport:try-start-server")
      (debug:print 1 "INFO: server has been stopped"))))
 
 ;;======================================================================
 ;; S E R V E R   U T I L I T I E S 
 ;;======================================================================
@@ -259,11 +257,10 @@
 	    (close-all-connections!))
 	   (debug:print 0 "WARNING: Failed to communicate with server, trying again, numretries left: " numretries)
 	   (http-transport:client-api-send-receive run-id serverdat cmd params numretries: (- numretries 1)))
 	 (begin
 	   (mutex-unlock! *http-mutex*)
-	   (tasks:wait-on-busy-monitor.db)
 	   (tasks:kill-server-run-id run-id)
 	   #f))
      (begin
        (debug:print-info 11 "fullurl=" fullurl ", cmd=" cmd ", params=" params ", run-id=" run-id "\n")
        ;; set up the http-client here
@@ -279,11 +276,11 @@
 			      ;; (condition-case (with-input-from-request "http://localhost"; #f read-lines)
 			      ;;					       ((exn http client-error) e (print e)))
 			      (set! res (handle-exceptions
 					 exn
 					 (begin
-					   (debug:print 0 "WARNING: failure in with-input-from-request. Killing associated server to allow clean retry.")
+					   (debug:print 0 "WARNING: failure in with-input-from-request to " fullrul ". Killing associated server to allow clean retry.")
 					   (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
 					   (hash-table-delete! *runremote* run-id)
 					   (tasks:kill-server-run-id run-id)
 					   #f)
 					 (with-input-from-request ;; was dat
@@ -354,11 +351,12 @@
 ;;
 (define (http-transport:keep-running server-id run-id)
   ;; if none running or if > 20 seconds since 
   ;; server last used then start shutdown
   ;; This thread waits for the server to come alive
-  (let* ((server-info (let loop ((start-time (current-seconds))
+  (let* ((tdbdat      (tasks:open-db))
+	 (server-info (let loop ((start-time (current-seconds))
 				 (changed    #t)
 				 (last-sdat  "not this"))
                         (let ((sdat #f))
 			  (thread-sleep! 0.01)
 			  (debug:print-info 0 "Waiting for server alive signature")
@@ -371,23 +369,20 @@
 			      sdat
                               (begin
 				(debug:print-info 0 "Still waiting, last-sdat=" last-sdat)
                                 (sleep 4)
 				(if (> (- (current-seconds) start-time) 120) ;; been waiting for two minutes
-				    (let ((tdb  (tasks:open-db)))
+				    (begin
 				      (debug:print 0 "ERROR: transport appears to have died, exiting server " server-id " for run " run-id)
-				      (tasks:wait-on-busy-monitor.db)
-				      (tasks:server-delete-record tdb server-id "failed to start, never received server alive signature")
-				      (sqlite3:finalize! tdb)
+				      (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id "failed to start, never received server alive signature")
 				      (exit))
 				    (loop start-time
 					  (equal? sdat last-sdat)
 					  sdat)))))))
          (iface       (car server-info))
          (port        (cadr server-info))
          (last-access 0)
-	 (tdb         (tasks:open-db))
 	 (server-timeout (let ((tmo (configf:lookup  *configdat* "server" "timeout")))
 			   (if (and (string? tmo)
 				    (string->number tmo))
 			       (* 60 60 (string->number tmo))
 			       ;; (* 3 24 60 60) ;; default to three days
@@ -398,11 +393,11 @@
 	       (server-state 'available))
       ;; Use this opportunity to sync the inmemdb to db
       (let ((start-time (current-milliseconds))
 	    (sync-time  #f)
 	    (rem-time   #f))
-
+	;; inmemdb is a dbstruct
 	(if *inmemdb* (db:sync-touched *inmemdb* *run-id* force-sync: #t))
 	(set! sync-time  (- (current-milliseconds) start-time))
 	(set! rem-time (quotient (- 4000 sync-time) 1000))
 	(debug:print 2 "SYNC: time= " sync-time ", rem-time=" rem-time)
 
@@ -409,15 +404,14 @@
       ;;
       ;; set_running after our first pass through and start the db
       ;;
       (if (eq? server-state 'available)
 	  (begin
-	    (tasks:wait-on-busy-monitor.db)
-	    (tasks:server-set-state! tdb server-id "dbprep")
+	    (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "dbprep")
 	    (thread-sleep! 5) ;; give some margin for queries to complete before switching from file based access to server based access
 	    (set! *inmemdb*  (db:setup run-id))
-	    (tasks:server-set-state! tdb server-id "running")))
+	    (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "running")))
 
       (if (and (<= rem-time 4)
 	       (> rem-time 0))
 	  (thread-sleep! rem-time)
 	  (thread-sleep! 4))) ;; fallback for if the math is changed ...
@@ -469,16 +463,15 @@
 	    (loop 0 server-state))
 	  (begin
 	    (debug:print-info 0 "Starting to shutdown the server.")
 	    ;; need to delete only *my* server entry (future use)
 	    (set! *time-to-exit* #t)
-	    (tasks:wait-on-busy-monitor.db) ;; wait here in addition to just before the shutting-down
 	    (if *inmemdb* (db:sync-touched *inmemdb* *run-id* force-sync: #t))
 	    ;;
 	    ;; start_shutdown
 	    ;;
-	    (tasks:server-set-state! tdb server-id "shutting-down")
+	    (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "shutting-down")
 	    (portlogger:open-run-close portlogger:set-port port "released")
 	    (thread-sleep! 5)
 	    (debug:print-info 0 "Max cached queries was    " *max-cache-size*)
 	    (debug:print-info 0 "Number of cached writes   " *number-of-writes*)
 	    (debug:print-info 0 "Average cached write time "
@@ -493,72 +486,69 @@
 				  "n/a (no queries)"
 				  (/ *total-non-write-delay* 
 				     *number-non-write-queries*))
 			      " ms")
 	    (debug:print-info 0 "Server shutdown complete. Exiting")
-	    (tasks:wait-on-busy-monitor.db)
-	    (tasks:server-delete-record tdb server-id " http-transport:keep-running")
+	    (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id " http-transport:keep-running")
 	    (exit))))))
 
 ;; all routes though here end in exit ...
 ;;
 ;; start_server? 
 ;;
 (define (http-transport:launch run-id)
-  (set! *run-id*   run-id)
-  (if (args:get-arg "-daemonize")
-      (begin
-	(daemon:ize)
-	(if *alt-log-file* ;; we should re-connect to this port, I think daemon:ize disrupts it
-	    (begin
-	      (current-error-port *alt-log-file*)
-	      (current-output-port *alt-log-file*)))))
-  (if (server:check-if-running run-id)
-      (begin
-	(debug:print 0 "INFO: Server for run-id " run-id " already running")
-	(exit 0)))
-  (tasks:wait-on-busy-monitor.db)
-  (let loop ((server-id (tasks:server-lock-slot (tasks:get-db) run-id))
-	     (remtries  4))
-    (if (not server-id)
-	(if (> remtries 0)
-	    (begin
-	      (thread-sleep! 2)
-	      (tasks:wait-on-busy-monitor.db)
-	      (loop (tasks:server-lock-slot (tasks:get-db) run-id)
-		    (- remtries 1)))
-	    (begin
-	      ;; since we didn't get the server lock we are going to clean up and bail out
-	      (debug:print-info 2 "INFO: server pid=" (current-process-id) ", hostname=" (get-host-name) " not starting due to other candidates ahead in start queue")
-	      (tasks:wait-on-busy-monitor.db)
-	      (tasks:server-delete-records-for-this-pid (tasks:get-db) " http-transport:launch")
-	      ))
-	(let* ((th2 (make-thread (lambda ()
-				   (debug:print-info 0 "Server run thread started")
-				   (http-transport:run 
-				    (if (args:get-arg "-server")
-					(args:get-arg "-server")
-					"-")
-				    run-id
-				    server-id)) "Server run"))
-	       (th3 (make-thread (lambda ()
-				   (debug:print-info 0 "Server monitor thread started")
-				   (http-transport:keep-running server-id run-id))
-				 "Keep running")))
-	  ;; Database connection
-
-
-	  ;; don't start the db here
-
-	  ;; (set! *inmemdb*  (db:setup run-id))
-
-
-	  (thread-start! th2)
-	  (thread-start! th3)
-	  (set! *didsomething* #t)
-	  (thread-join! th2)
-	  (exit)))))
+  (let* ((tdbdat (tasks:open-db)))
+    (set! *run-id*   run-id)
+    (if (args:get-arg "-daemonize")
+	(begin
+	  (daemon:ize)
+	  (if *alt-log-file* ;; we should re-connect to this port, I think daemon:ize disrupts it
+	      (begin
+		(current-error-port *alt-log-file*)
+		(current-output-port *alt-log-file*)))))
+    (if (server:check-if-running run-id)
+	(begin
+	  (debug:print 0 "INFO: Server for run-id " run-id " already running")
+	  (exit 0)))
+    (let loop ((server-id (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id))
+	       (remtries  4))
+      (if (not server-id)
+	  (if (> remtries 0)
+	      (begin
+		(thread-sleep! 2)
+		(loop (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id)
+		      (- remtries 1)))
+	      (begin
+		;; since we didn't get the server lock we are going to clean up and bail out
+		(debug:print-info 2 "INFO: server pid=" (current-process-id) ", hostname=" (get-host-name) " not starting due to other candidates ahead in start queue")
+		(tasks:server-delete-records-for-this-pid (db:delay-if-busy tdbdat) " http-transport:launch")
+		))
+	  (let* ((th2 (make-thread (lambda ()
+				     (debug:print-info 0 "Server run thread started")
+				     (http-transport:run 
+				      (if (args:get-arg "-server")
+					  (args:get-arg "-server")
+					  "-")
+				      run-id
+				      server-id)) "Server run"))
+		 (th3 (make-thread (lambda ()
+				     (debug:print-info 0 "Server monitor thread started")
+				     (http-transport:keep-running server-id run-id))
+				   "Keep running")))
+	    ;; Database connection
+
+
+	    ;; don't start the db here
+
+	    ;; (set! *inmemdb*  (db:setup run-id))
+
+
+	    (thread-start! th2)
+	    (thread-start! th3)
+	    (set! *didsomething* #t)
+	    (thread-join! th2)
+	    (exit))))))
 
 (define (http-transport:server-signal-handler signum)
   (signal-mask! signum)
   (handle-exceptions
    exn