Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -66,26 +66,26 @@
 ;;   (debug:print 0 "INFO: client:setup remaining-tries=" remaining-tries)
 ;;   (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)))
+;;       (let ((host-info (hash-table-ref/default (common:get-remote remote) 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 (client:connect iface port))
 ;; 		   ;; (ping-res  (server:ping-server run-id iface port))
 ;; 		   (ping-res  (client:login-no-auto-setup start-res run-id)))
 ;; 	      (if ping-res   ;; sucessful login?
 ;; 		  (begin
-;; 		    (hash-table-set! *runremote* run-id start-res)
+;; 		    (hash-table-set! (common:get-remote remote) run-id start-res)
 ;; 		    start-res)  ;; return the server info
 ;; 		  (if (member remaining-tries '(3 4 6))
 ;; 		      (begin    ;; login failed
 ;; 			(debug:print 25 "INFO: client:setup start-res=" start-res ", run-id=" run-id ", server-dat=" host-info)
-;; 			(hash-table-delete! *runremote* run-id)
+;; 			(hash-table-delete! (common:get-remote remote) run-id)
 ;; 			(open-run-close tasks:server-force-clean-run-record
 ;; 			 		tasks:open-db
 ;; 			 		run-id 
 ;; 			 		(car  host-info)
 ;; 			 		(cadr host-info)
@@ -105,16 +105,16 @@
 ;; 			 (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 start-res run-id)))
 ;; 		    (if start-res
 ;; 			(begin
-;; 			  (hash-table-set! *runremote* run-id start-res)
+;; 			  (hash-table-set! (common:get-remote remote) run-id start-res)
 ;; 			  start-res)
 ;; 			(if (member remaining-tries '(2 5))
 ;; 			    (begin    ;; login failed
 ;; 			      (debug:print 25 "INFO: client:setup start-res=" start-res ", run-id=" run-id ", server-dat=" server-dat)
-;; 			      (hash-table-delete! *runremote* run-id)
+;; 			      (hash-table-delete! (common:get-remote remote) run-id)
 ;; 			      (open-run-close tasks:server-force-clean-run-record
 ;; 					      tasks:open-db
 ;; 					      run-id 
 ;; 					      (tasks:hostinfo-get-interface server-dat)
 ;; 					      (tasks:hostinfo-get-port      server-dat)
@@ -144,19 +144,19 @@
 
 ;; Do all the connection work, look up the transport type and set up the
 ;; connection if required.
 ;;
 ;; There are two scenarios. 
-;;   1. We are a test manager and we received *transport-type* and *runremote* via cmdline
+;;   1. We are a test manager and we received *transport-type* and (common:get-remote remote) via cmdline
 ;;   2. We are a run tests, list runs or other interactive process and we must figure out
-;;      *transport-type* and *runremote* from the monitor.db
+;;      *transport-type* and (common:get-remote remote) from the monitor.db
 ;;
 ;; client:setup
 ;;
-;; lookup_server, need to remove *runremote* stuff
+;; lookup_server, need to remove (common:get-remote remote) stuff
 ;;
-(define (client:setup-http run-id #!key (remaining-tries 10) (failed-connects 0))
+(define (client:setup-http run-id #!key (remaining-tries 10) (failed-connects 0)(remote #f))
   (debug:print-info 2 "client:setup remaining-tries=" remaining-tries)
   (let* ((tdbdat (tasks:open-db)))
     (if (<= remaining-tries 0)
 	(begin
 	  (debug:print 0 "ERROR: failed to start or connect to server for run-id " run-id)
@@ -177,18 +177,18 @@
  					       (car (vector-ref logininfo 1))
  					       #f))))))
 		(if (and start-res
 			 ping-res)
 		    (begin
-		      (hash-table-set! *runremote* run-id start-res)
+		      (common:set-remote! remote run-id start-res)
 		      (debug:print-info 2 "connected to " (http-transport:server-dat-make-url start-res))
 		      start-res)
 		    (begin    ;; login failed but have a server record, clean out the record and try again
 		      (debug:print-info 0 "client:setup, login failed, will attempt to start server ... start-res=" start-res ", run-id=" run-id ", server-dat=" server-dat)
 		      (case *transport-type* 
 			((http)(http-transport:close-connections run-id)))
-		      (hash-table-delete! *runremote* run-id)
+		      (common:del-remote! remote run-id)
 		      (tasks:kill-server-run-id run-id)
 		      (tasks:server-force-clean-run-record (db:delay-if-busy tdbdat)
 							   run-id 
 							   (tasks:hostinfo-get-interface server-dat)
 							   (tasks:hostinfo-get-port      server-dat)

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -68,10 +68,33 @@
 ;; SERVER
 (define *my-client-signature* #f)
 (define *transport-type*    'http)
 (define *transport-type*    'http)             ;; override with [server] transport http|rpc|nmsg
 (define *runremote*         (make-hash-table)) ;; if set up for server communication this will hold <host port>
+
+(define (common:get-remote remote run-id)
+  (let ((ht (or remote *runremote*)))
+    (if ht
+	(hash-table-ref/default ht run-id #f)
+	#f)))
+
+(define (common:set-remote! remote run-id value)
+  (let ((ht (or remote *runremote*)))
+    (if ht
+	(hash-table-set! ht run-id value))))
+
+(define (common:del-remote! remote run-id)
+  (let ((ht (or remote *runremote*)))
+    (if ht
+	(hash-table-delete! ht run-id))))
+
+(define (common:get-remote-all remote)
+  (let ((ht (or remote *runremote*)))
+    (if ht
+	(hash-table-keys ht)
+	'())))
+
 (define *max-cache-size*    0)
 (define *logged-in-clients* (make-hash-table))
 (define *client-non-blocking-mode* #f)
 (define *server-id*         #f)
 (define *server-info*       #f)

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -74,11 +74,11 @@
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
 ;; (if (args:get-arg "-host")
 ;;     (begin
-;;       (set! *runremote* (string-split (args:get-arg "-host" ":")))
+;;       (set! (common:get-remote remote) (string-split (args:get-arg "-host" ":")))
 ;;       (client:launch))
 ;;     (client:launch))
 
 ;; ease debugging by loading ~/.dashboardrc
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc")))
@@ -600,13 +600,12 @@
      (iup:attribute-set! tabtop "TABTITLE4" "runconfigs.config")
      tabtop)))
 
 (define *current-window-id* 0)
 
-(define (newdashboard dbstruct)
-  (let* ((data     (make-hash-table))
-	 (keys     (db:get-keys dbstruct))
+(define (newdashboard data)
+  (let* ((keys     (db:get-keys dbstruct))
 	 (runname  "%")
 	 (testpatt "%")
 	 (keypatts (map (lambda (k)(list k "%")) keys))
 	 (states   '())
 	 (statuses '())
@@ -627,9 +626,10 @@
 				    (changes   (dcommon:run-update keys data runname keypatts testpatt states statuses 'full my-window-id))
 				    (endtime   (current-milliseconds)))
 			       (set! nextmintime (+ endtime (* 2 (- endtime starttime))))
 			       (debug:print 11 "CHANGE(S): " (car changes) "..."))
 			     (debug:print-info 11 "Server overloaded"))))))
-
-(dboard:data-set-updaters! *data* (make-hash-table))
-(newdashboard *dbstruct-local*)    
-(iup:main-loop)
+;;; main
+;;;
+(let ((data (make-hash-table))) ;; data will have "areaname" => "area record" entries
+  (newdashboard data)
+  (iup:main-loop))

Index: dcommon.scm
==================================================================
--- dcommon.scm
+++ dcommon.scm
@@ -32,11 +32,13 @@
 
 ;;======================================================================
 ;; C O M M O N   D A T A   S T R U C T U R E
 ;;======================================================================
 ;; 
-;; A single data structure for all the data used in a dashboard.
+;; A single data structure for all the data used in a dashboard for
+;; a given area.
+;;
 ;; Share this structure between newdashboard and dashboard with the 
 ;; intent of converging on a single app.
 ;;
 ;; (define *data* (make-vector 25 #f))
 (define (dboard:data-get-runs          vec)    (vector-ref  vec 0))
@@ -63,10 +65,11 @@
 (define (dboard:data-get-target-string vec)
   (let ((targ (dboard:data-get-target vec)))
     (if (list? targ)(string-intersperse targ "/") "no-target-specified")))
 (define (dboard:data-get-run-name      vec)    (vector-ref vec 19))
 (define (dboard:data-get-runs-listbox  vec)    (vector-ref vec 20))
+(define (dboard:data-get-area-path     vec)    (vector-ref vec 21))
 
 (define (dboard:data-set-runs!          vec val)(vector-set! vec 0 val))
 (define (dboard:data-set-tests!         vec val)(vector-set! vec 1 val))
 (define (dboard:data-set-runs-matrix!   vec val)(vector-set! vec 2 val))
 (define (dboard:data-set-tests-tree!    vec val)(vector-set! vec 3 val))
@@ -87,10 +90,11 @@
 (define (dboard:data-set-command!       vec val)(vector-set! vec 16 val))
 (define (dboard:data-set-command-tb!    vec val)(vector-set! vec 17 val))
 (define (dboard:data-set-target!        vec val)(vector-set! vec 18 val))
 (define (dboard:data-set-run-name!      vec val)(vector-set! vec 19 val))
 (define (dboard:data-set-runs-listbox!  vec val)(vector-set! vec 20 val))
+(define (dboard:data-set-area-path!     vec val)(vector-set! vec 21 val))
 
 (dboard:data-set-run-keys! *data* (make-hash-table))
 
 ;; List of test ids being viewed in various panels
 (dboard:data-set-curr-test-ids! *data* (make-hash-table))
@@ -103,14 +107,63 @@
 
 ;;======================================================================
 ;; D O T F I L E
 ;;======================================================================
 
+;; write a sexp list to fname
+;;
 (define (dcommon:write-dotfile fname dat)
   (with-output-to-file fname
     (lambda ()
       (pp dat))))
+
+(define (dcommon:read-dotfile fname)
+  (if (file-exists? fname)
+      (with-input-from-file fname
+	(lambda ()
+	  (read)))
+      '()))       
+
+;; gets the name for the file ~/.megatest/<name>
+;; creates .megatest dir if not there
+;;
+(define (dcommon:get-dot-file-pathn name)
+  (let* ((dot-dir (conc (get-environment-variable "HOME") "/.megatest"))
+	 (dfile   (conc dot-dir "/" name)))
+    (if (not (file-exists? dot-dir))
+	(create-directory dot-dir))
+    dfile))
+
+;; dat is the top level data stucture that contains all the info being 
+;; displayed in all runs etc.
+;;
+(define (dcommon:dotfiles-save-areas data)
+  (let* ((areas-dat   (dcommon:data-get-areas data))
+	 (areas-dfile (dcommon:get-dot-file-pathn "areas")))
+    (dcommon:write-dotfile areas-dfile areas-dat)))
+
+;; returns alist of area => path
+;;
+(define (dcommon:data-get-areas data)
+  (let ((area-names (hash-table-keys data)))
+    (map (lambda (area-name)
+	   (cons area-name 
+		 (dboard:data-get-area-path (hash-table-ref data area-name))))
+	 area-names)))
+
+;; Fill the hash table data with area => area-record
+;;
+(define (dcommon:read-areas-init-data data)
+  (let* ((dfile       (dcommon:get-dot-file-pathn "areas"))
+	 (areas-dfile (dcommon:read-dotfile dfile)))
+    (for-each
+     (lambda (area)
+       (let ((rec (vector 25 #f)))
+	 (dboard:data-set-area-path! rec (cdr area))
+	 (dboard:data-set-updaters!  rec (make-hash-table))
+	 (hash-table-set! data (car area) rec)))
+     areas-dfile)))
 
 ;;======================================================================
 ;; TARGET AND PATTERN MANIPULATIONS
 ;;======================================================================
 
@@ -119,11 +172,10 @@
 (define (dboard:test-patt->lines test-patt)
   (string-substitute (regexp ",") "\n" test-patt))
 
 (define (dboard:lines->test-patt lines)
   (string-substitute (regexp "\n") "," lines #t))
-
 
 ;;======================================================================
 ;; P R O C E S S   R U N S
 ;;======================================================================
 
@@ -549,11 +601,11 @@
    ;;   )))
     servers-matrix
     ))
 
 ;; The main menu
-(define (dcommon:main-menu)
+(define (dcommon:main-menu data)
   (iup:menu ;; a menu is a special attribute to a dialog (think Gnome putting the menu at screen top)
    (iup:menu-item "Files" (iup:menu   ;; Note that you can use either #:action or action: for options
 			   (iup:menu-item "Open"  action: (lambda (obj)
 							    (let* ((area-name (iup:textbox #:expand "HORIZONTAL"))
 								   (fd        (iup:file-dialog #:dialogtype "DIR"))

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -164,11 +164,11 @@
 					  new-state
 					  new-status
 					  (args:get-arg "-m") #f)
 		  ;; need to update the top test record if PASS or FAIL and this is a subtest
 		  (if (not (equal? item-path ""))
-		      (cdb:roll-up-pass-fail-counts *runremote* run-id test-name item-path new-status))))
+		      (cdb:roll-up-pass-fail-counts (common:get-remote remote run-id) run-id test-name item-path new-status))))
 	    ;; for automated creation of the rollup html file this is a good place...
 	    (if (not (equal? item-path ""))
 		(tests:summarize-items #f run-id test-id test-name #f)) ;; don't force - just update if no
 	    )))
     (pop-directory)

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -221,11 +221,11 @@
   (mutex-lock! *http-mutex*)
   (set! *http-requests-in-progress* (+ 1 *http-requests-in-progress*)))
 
 ;; Send "cmd" with json payload "params" to serverdat and receive result
 ;;
-(define (http-transport:client-api-send-receive run-id serverdat cmd params #!key (numretries 3))
+(define (http-transport:client-api-send-receive run-id serverdat cmd params #!key (numretries 3)(remote #f))
   (let* ((fullurl    (if (vector? serverdat)
 			 (http-transport:server-dat-get-api-req serverdat)
 			 (begin
 			   (debug:print 0 "FATAL ERROR: http-transport:client-api-send-receive called with no server info")
 			   (exit 1))))
@@ -270,11 +270,11 @@
 					   exn
 					   (begin
 					     (set! success #f)
 					     (debug:print 0 "WARNING: failure in with-input-from-request to " fullurl ".")
 					     (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
-					     (hash-table-delete! *runremote* run-id)
+					     (common:del-remote! remote run-id)
 					     ;; Killing associated server to allow clean retry.")
 					     ;; (tasks:kill-server-run-id run-id)  ;; better to kill the server in the logic that called this routine?
 					     (mutex-unlock! *http-mutex*)
 					     ;;; (signal (make-composite-condition
 					     ;;;          (make-property-condition 'commfail 'message "failed to connect to server")))
@@ -314,14 +314,14 @@
 	     (signal (make-composite-condition
 		      (make-property-condition 
 		       'timeout
 		       'message "nmsg-transport:client-api-send-receive-raw timed out talking to server")))))))
 
-;; careful closing of connections stored in *runremote*
+;; careful closing of connections stored in (common:get-remote remote)
 ;;
 (define (http-transport:close-connections run-id)
-  (let* ((server-dat (hash-table-ref/default *runremote* run-id #f)))
+  (let* ((server-dat (common:get-remote remote run-id)))
     (if (vector? server-dat)
 	(let ((api-dat (http-transport:server-dat-get-api-uri server-dat)))
 	  (close-connection! api-dat)
 	  #t)
 	#f)))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1523,11 +1523,14 @@
 
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================
 
-(if *runremote* (close-all-connections!))
+;; if *runremote* is defined, close connections, otherwise - trust that it was
+;; taken care of.
+;;
+(if (common:get-remote #f #f)(close-all-connections!))
 
 (if (not *didsomething*)
     (debug:print 0 help))
 
 (set! *time-to-exit* #t)

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -74,11 +74,11 @@
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
 ;; (if (args:get-arg "-host")
 ;;     (begin
-;;       (set! *runremote* (string-split (args:get-arg "-host" ":")))
+;;       (set! (common:get-remote remote) (string-split (args:get-arg "-host" ":")))
 ;;       (client:launch))
 ;;     (client:launch))
 
 ;; ease debugging by loading ~/.dashboardrc
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc")))

Index: nmsg-transport.scm
==================================================================
--- nmsg-transport.scm
+++ nmsg-transport.scm
@@ -342,11 +342,11 @@
   (handle-exceptions
    exn
    (debug:print " ... exiting ...")
    (let ((th1 (make-thread (lambda ()
 			     (if (not *received-response*)
-				 (receive-message* *runremote*))) ;; flush out last call if applicable
+				 (receive-message* (common:get-remote remote #f)))) ;; flush out last call if applicable
 			   "eat response"))
 	 (th2 (make-thread (lambda ()
 			     (debug:print 0 "ERROR: Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
 			     (thread-sleep! 3) ;; give the flush three seconds to do it's stuff
 			     (debug:print 0 "       Done.")

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -70,38 +70,38 @@
 	     #f))))
 
 ;; if a server is either running or in the process of starting call client:setup
 ;; else return #f to let the calling proc know that there is no server available
 ;;
-(define (rmt:get-connection-info run-id)
-  (let ((cinfo (hash-table-ref/default *runremote* run-id #f)))
+(define (rmt:get-connection-info run-id #!key (remote #f))
+  (let ((cinfo (common:get-remote remote run-id)))
     (if cinfo
 	cinfo
 	;; NB// can cache the answer for server running for 10 seconds ...
 	;;  ;; (and (not (rmt:write-frequency-over-limit? cmd run-id))
 	(if (tasks:server-running-or-starting? (db:delay-if-busy (tasks:open-db)) run-id)
-	    (client:setup run-id)
+	    (client:setup run-id remote: remote)
 	    #f))))
 
 (define *send-receive-mutex* (make-mutex)) ;; should have separate mutex per run-id
-(define (rmt:send-receive cmd rid params #!key (attemptnum 1)) ;; start attemptnum at 1 so the modulo below works as expected
+(define (rmt:send-receive cmd rid params #!key (attemptnum 1)(remote #f)) ;; start attemptnum at 1 so the modulo below works as expected
   ;; clean out old connections
   (mutex-lock! *db-multi-sync-mutex*)
   (let ((expire-time (- (current-seconds) (server:get-timeout) 10))) ;; don't forget the 10 second margin
     (for-each 
      (lambda (run-id)
-       (let ((connection (hash-table-ref/default *runremote* run-id #f)))
+       (let ((connection (common:get-remote remote run-id)))
          (if (and (vector? connection)
         	  (< (http-transport:server-dat-get-last-access connection) expire-time))
              (begin
                (debug:print-info 0 "Discarding connection to server for run-id " run-id ", too long between accesses")
                ;; SHOULD CLOSE THE CONNECTION HERE
 	       (case *transport-type*
 		 ((nmsg)(nn-close (http-transport:server-dat-get-socket 
-				   (hash-table-ref *runremote* run-id)))))
-               (hash-table-delete! *runremote* run-id)))))
-     (hash-table-keys *runremote*)))
+				   (common:get-remote remote run-id)))))
+               (common:del-remote! remote run-id)))))
+     (common:get-remote-all remote)))
   (mutex-unlock! *db-multi-sync-mutex*)
   ;; (mutex-lock! *send-receive-mutex*)
   (let* ((run-id          (if rid rid 0))
 	 (connection-info (rmt:get-connection-info run-id)))
     ;; the nmsg method does the encoding under the hood (the http method should be changed to do this also)
@@ -127,11 +127,11 @@
 		  ((nmsg) res))) ;; (vector-ref res 1)))
 	      (begin ;; let ((new-connection-info (client:setup run-id)))
 		(debug:print 0 "WARNING: Communication failed, trying call to rmt:send-receive again.")
 		;; (case *transport-type*
 		;;   ((nmsg)(nn-close (http-transport:server-dat-get-socket connection-info))))
-		(hash-table-delete! *runremote* run-id) ;; don't keep using the same connection
+		(common:del-remote! remote run-id) ;; don't keep using the same connection
 		;; NOTE: killing server causes this process to block forever. No idea why. Dec 2. 
 		;; (if (eq? (modulo attemptnum 5) 0)
 		;;     (tasks:kill-server-run-id run-id tag: "api-send-receive-failed"))
 		;; (mutex-unlock! *send-receive-mutex*) ;; close the mutex here to allow other threads access to communications
 		(tasks:start-and-wait-for-server (tasks:open-db) run-id 15)
@@ -149,11 +149,11 @@
 	;; Note: The tasks db was checked for a server in starting mode in the rmt:get-connection-info call
 	;;
 	(if (and (< attemptnum 15)
 		 (member cmd api:write-queries))
 	    (let ((faststart (configf:lookup *configdat* "server" "faststart")))
-	      (hash-table-delete! *runremote* run-id)
+	      (common:del-remote! remote run-id)
 	      ;; (mutex-unlock! *send-receive-mutex*)
 	      (if (and faststart (equal? faststart "no"))
 		  (begin
 		    (tasks:start-and-wait-for-server (db:delay-if-busy (tasks:open-db)) run-id 10)
 		    (thread-sleep! (random 5)) ;; give some time to settle and minimize collison?

Index: rpc-transport.scm
==================================================================
--- rpc-transport.scm
+++ rpc-transport.scm
@@ -29,11 +29,11 @@
   (handle-exceptions
    exn
    (begin
      (debug:print 1 "Remote failed for " proc " " params)
      (apply (eval (string->symbol procstr)) params))
-   ;; (if *runremote*
+   ;; (if (common:get-remote remote)
    ;;    (apply (eval (string->symbol (conc "remote:" procstr))) params)
    (apply (eval (string->symbol procstr)) params)))
 
 ;; all routes though here end in exit ...
 ;;
@@ -160,22 +160,22 @@
 	 (begin
 	   (print "LOGIN_FAILED")
 	   (exit 1))))))
 
 (define (rpc-transport:client-setup run-id #!key (remtries 10))
-  (if *runremote*
+  (if (common:get-remote remote run-id)
       (begin
 	(debug:print 0 "ERROR: Attempt to connect to server but already connected")
 	#f)
-      (let* ((host-info (hash-table-ref/default *runremote* run-id #f))) ;; (open-run-close db:get-var #f "SERVER"))
+      (let* ((host-info (common:get-remote remote run-id))) ;; (open-run-close db:get-var #f "SERVER"))
 	(if host-info
 	    (let ((iface    (car host-info))
 		  (port     (cadr host-info))
 		  (ping-res ((rpc:procedure 'server:login host port) *toppath*)))
 	      (if ping-res
 		  (let ((server-dat (list iface port #f #f #f)))
-		    (hash-table-set! *runremote* run-id server-dat)
+		    (common:set-remote! remote run-id server-dat)
 		    server-dat)
 		  (begin
 		    (server:try-running run-id)
 		    (thread-sleep! 2)
 		    (rpc-transport:client-setup run-id (- remtries 1)))))
@@ -186,11 +186,11 @@
  			 (port      (tasks:hostinfo-get-port      server-db-info))
 			 (server-dat (list iface port #f #f #f))
  			 (ping-res  ((rpc:procedure 'server:login host port) *toppath*)))
  		    (if start-res
  			(begin
- 			  (hash-table-set! *runremote* run-id server-dat)
+ 			  (common:set-remote! remote run-id server-dat)
 			  server-dat)
 			(begin
 			  (server:try-running run-id)
 			  (thread-sleep! 2)
 			  (rpc-transport:client-setup run-id (- remtries 1)))))
@@ -211,16 +211,16 @@
 ;; 		 (debug:print 0 "   EXCEPTION: " ((condition-property-accessor 'exn 'message) exn))
 ;; 		 ;; (open-run-close 
 ;; 		 ;;  (lambda (db . param) 
 ;; 		 ;;    (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER'"))
 ;; 		 ;;  #f)
-;; 		 (set! *runremote* #f))
+;; 		 (set! (common:get-remote remote) #f))
 ;; 	       (if (and (not (args:get-arg "-server")) ;; no point in the server using the server using the server
 ;; 			((rpc:procedure 'server:login host portn) *toppath*))
 ;; 		   (begin
 ;; 		     (debug:print-info 2 "Logged in and connected to " host ":" port)
-;; 		     (set! *runremote* (vector host portn)))
+;; 		     (set! (common:get-remote remote) (vector host portn)))
 ;; 		   (begin
 ;; 		     (debug:print-info 2 "Failed to login or connect to " host ":" port)
-;; 		     (set! *runremote* #f)))))
+;; 		     (set! (common:get-remote remote) #f)))))
 ;; 	    (debug:print-info 2 "no server available")))))
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -35,11 +35,11 @@
 	 (itempath (db:test-get-item-path test)))
     (conc testname (if (equal? itempath "") "" (conc "(" itempath ")")))))
 
 ;; This is the *new* methodology. One record to inform them and in the chaos, organise them.
 ;;
-(define (runs:create-run-record)
+(define (runs:create-run-record #!key (remote #f))
   (let* ((mconfig      (if *configdat*
 		           *configdat*
 		           (if (launch:setup-for-run)
 		               *configdat*
 		               (begin
@@ -54,13 +54,10 @@
 	  (keys        (keys:config-get-fields mconfig))
 	  (keyvals     (keys:target->keyval keys target))
 	  (toppath     *toppath*)
 	  (envdat      keyvals) ;; initial values start with keyvals
 	  (runconfig   #f)
-	  (serverdat   (if (args:get-arg "-server")
-			   *runremote*
-			   #f)) ;; to be used later
 	  (transport   (or (args:get-arg "-transport") 'http))
 	  (run-id      #f))
     ;; Set all the environment vars we know so far, start with keys
     (for-each (lambda (keyval)
 		(setenv (car keyval)(cadr keyval)))
@@ -88,11 +85,11 @@
 		(for-each (lambda (varval)
 			    (set! envdat (append envdat (list varval)))
 			    (safe-setenv (car varval)(cadr varval)))
 			  (configf:get-section runconfig section)))
 	      (list "default" target))
-    (vector target runname testpatt keys keyvals envdat mconfig runconfig serverdat transport db toppath run-id)))
+    (vector target runname testpatt keys keyvals envdat mconfig runconfig (common:get-remote remote run-id) transport db toppath run-id)))
 
 (define (runs:set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f))
   (let* ((target    (or (common:args-get-target)
 			(get-environment-variable "MT_TARGET")))
 	 (keys    (if inkeys    inkeys    (rmt:get-keys)))

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -82,19 +82,19 @@
 					  (argv)))))))
 
 ;; When using zmq this would send the message back (two step process)
 ;; with spiffy or rpc this simply returns the return data to be returned
 ;; 
-(define (server:reply return-addr query-sig success/fail result)
+(define (server:reply return-addr query-sig success/fail result #!key (remote #f))
   (debug:print-info 11 "server:reply return-addr=" return-addr ", result=" result)
   ;; (send-message pubsock target send-more: #t)
   ;; (send-message pubsock 
   (case (server:get-transport)
     ((rpc)  (db:obj->string (vector success/fail query-sig result)))
     ((http) (db:obj->string (vector success/fail query-sig result)))
     ((zmq)
-     (let ((pub-socket (vector-ref *runremote* 1)))
+     (let ((pub-socket (vector-ref (common:get-remote remote #f) 1)))
        (send-message pub-socket return-addr send-more: #t)
        (send-message pub-socket (db:obj->string (vector success/fail query-sig result)))))
     ((fs)   result)
     (else 
      (debug:print 0 "ERROR: unrecognised transport type: " *transport-type*)
@@ -160,11 +160,11 @@
 (define (server:check-if-running run-id)
   (let ((tdbdat (tasks:open-db)))
     (let loop ((server (tasks:get-server (db:delay-if-busy tdbdat) run-id))
 	       (trycount 0))
     (if server
-	;; note: client:start will set *runremote*. this needs to be changed
+	;; note: client:start will set (common:get-remote remote). 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 (case *transport-type*

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -651,11 +651,11 @@
 	      (itemdat     (tests:testqueue-get-itemdat   test-record))
 	      (item-path   (tests:testqueue-get-item_path test-record))
 	      (waitons     (tests:testqueue-get-waitons   test-record))
 	      (keep-test   #t)
 	      (test-id     (rmt:get-test-id run-id test-name item-path))
-	      (tdat        (rmt:get-testinfo-state-status run-id test-id))) ;; (cdb:get-test-info-by-id *runremote* test-id)))
+	      (tdat        (rmt:get-testinfo-state-status run-id test-id))) ;; (cdb:get-test-info-by-id (common:get-remote remote) test-id)))
 	 (if tdat
 	     (begin
 	       ;; Look at the test state and status
 	       (if (or (and (member (db:test-get-status tdat) 
 				    '("PASS" "WARN" "WAIVED" "CHECK" "SKIP"))
@@ -668,11 +668,11 @@
 	       ;; from the runnable list
 	       (if keep-test
 		   (for-each (lambda (waiton)
 			       ;; for now we are waiting only on the parent test
 			       (let* ((parent-test-id (rmt:get-test-id run-id waiton ""))
-				      (wtdat          (rmt:get-testinfo-state-status run-id test-id))) ;; (cdb:get-test-info-by-id *runremote* test-id)))
+				      (wtdat          (rmt:get-testinfo-state-status run-id test-id))) ;; (cdb:get-test-info-by-id (common:get-remote remote) test-id)))
 				 (if (or (and (equal? (db:test-get-state wtdat) "COMPLETED")
 					      (member (db:test-get-status wtdat) '("FAIL")))
 					 (member (db:test-get-status wtdat)  '("KILLED"))
 					 (member (db:test-get-state wtdat)   '("INCOMPETE")))
 				 ;; (if (or (member (db:test-get-status wtdat)

Index: zmq-transport.scm
==================================================================
--- zmq-transport.scm
+++ zmq-transport.scm
@@ -104,11 +104,11 @@
     (set! pub-socket   (cadr  zmq-sdat2))
     (set! p2           (caddr zmq-sdat2))
 
     (set! *cache-on* #t)
 
-    (set! *runremote* (vector pull-socket pub-socket)) ;; overloading the use of *runremote* BUG!?
+    (set! *runremote* (vector pull-socket pub-socket)) ;; overloading the use of (common:get-remote remote) BUG!?
 
     ;; what to do when we quit
     ;;
 ;;     (on-exit (lambda ()
 ;; 	       (if (and *toppath* *server-info*)
@@ -477,11 +477,11 @@
 ;; 	(pullport (list-ref server-info 2))
 ;; 	(pubport  (list-ref server-info 3)))
 ;;     (zmq-transport:client-connect iface pullport pubport)
 ;;     (let loop ()
 ;;       (thread-sleep! 2)
-;;       (cdb:client-call *runremote* 'ping #t)
+;;       (cdb:client-call (common:get-remote remote) 'ping #t)
 ;;       (debug:print 4 "zmq-transport:self-ping - I'm alive on " iface ":" pullport "/" pubport "!")
 ;;       (mutex-lock! *heartbeat-mutex*)
 ;;       (set! *server-loop-heart-beat* (current-seconds))
 ;;       (mutex-unlock! *heartbeat-mutex*)
 ;;       (loop))))