Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -60,16 +60,17 @@
   (if (<= remaining-tries 0)
       (begin
 	(debug:print 0 "ERROR: failed to start or connect to server for run-id " run-id)
 	(exit 1))
       (let ((host-info (hash-table-ref/default *runremote* run-id #f)))
+	(debug:print-info 0 "client:setup host-info=" host-info ", remaining-tries=" remaining-tries)
 	(if host-info
 	    (let* ((iface     (car  host-info))
 		   (port      (cadr host-info))
 		   (start-res (http-transport:client-connect iface port))
 		   ;; (ping-res  (server:ping-server run-id iface port))
-		   (ping-res  (rmt:login-no-auto-client-setup server-dat run-id)))
+		   (ping-res  (rmt:login-no-auto-client-setup start-res run-id)))
 	      (if ping-res   ;; sucessful login?
 		  (begin
 		    (hash-table-set! *runremote* run-id start-res)
 		    start-res)  ;; return the server info
 		  (if (member remaining-tries '(3 4 6))
@@ -88,10 +89,11 @@
 			(debug:print 25 "INFO: client:setup failed to connect, start-res=" start-res ", run-id=" run-id ", host-info=" host-info)
 			(thread-sleep! 5)
 			(client:setup run-id remaining-tries: (- remaining-tries 1))))))
 	    ;; YUK: rename server-dat here
 	    (let* ((server-dat (open-run-close tasks:get-server tasks:open-db run-id)))
+	      (debug:print-info 0 "client:setup server-dat=" server-dat ", remaining-tries=" remaining-tries)
 	      (if server-dat
 		  (let* ((iface     (tasks:hostinfo-get-interface server-dat))
 			 (port      (tasks:hostinfo-get-port      server-dat))
 			 (start-res (http-transport:client-connect iface port))
 			 ;; (ping-res  (server:ping-server run-id iface port))

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -156,12 +156,12 @@
 		   server-id 
 		   ipaddrstr portnum)
    (debug:print 1 "INFO: Trying to start server on " ipaddrstr ":" portnum)
    ;; This starts the spiffy server
    ;; NEED WAY TO SET IP TO #f TO BIND ALL
-   (start-server ;; bind-address: ipaddrstr
-		 port: portnum)
+   ;; (start-server bind-address: ipaddrstr port: portnum)
+   (start-server port: portnum)
    (open-run-close tasks:server-force-clean-run-record tasks:open-db 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 

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -111,21 +111,20 @@
       (rmt:start-server run-id)))
 
 (define (server:check-if-running run-id)
   (let loop ((server (open-run-close tasks:get-server tasks:open-db run-id))
 	     (trycount 0))
-    (thread-sleep! 2)
     (if server
 	;; note: client:start will set *runremote*. this needs to be changed
 	;;       also, client:start will login to the server, also need to change that.
 	;;
 	;; client:start returns #t if login was successful.
 	;;
-	(let ((res (client:start run-id server)))
+	(let ((res (server:ping-server run-id (vector-ref server 1)(vector-ref server 0))))
 	  ;; if the server didn't respond we must remove the record
 	  (if res
-	      res
+	      #t
 	      (begin
 		(open-run-close tasks:server-force-clean-running-records-for-run-id tasks:open-db run-id 
 				" server:check-if-running")
 		res)))
 	#f)))