@@ -59,21 +59,22 @@
     (string-intersperse 
      (map number->string
 	  (u8vector->list
 	   (if res res (hostname->ip hostname)))) ".")))
 
-(define (http-transport:run hostn run-id server-id)
+(define (http-transport:run hostn run-id server-id area-dat)
   (debug:print 2 "Attempting to start the server ...")
-  (let* ((db              #f) ;;        (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily
+  (let* ((configdat       (megatest:area-configdat area-dat))
+	 (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))) ".")
 					   (server:get-best-guess-address hostname)
 					   #f)))
 			    (if ipstr ipstr hostn))) ;; hostname))) 
 	 (start-port      (portlogger:open-run-close portlogger:find-port))
-	 (link-tree-path  (configf:lookup *configdat* "setup" "linktree")))
+	 (link-tree-path  (configf:lookup configdat "setup" "linktree")))
     ;; (set! db *inmemdb*)
     (debug:print-info 0 "portlogger recommended port: " start-port)
     (root-path     (if link-tree-path 
 		       link-tree-path
 		       (current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!
@@ -94,11 +95,11 @@
 				      (dat ($ 'dat))
 				      (res #f))
 				 (cond
 				  ((equal? (uri-path (request-uri (current-request)))
 					   '(/ "api"))
-				   (send-response body:    (api:process-request *inmemdb* $) ;; the $ is the request vars proc
+				   (send-response body:    (api:process-request *inmemdb* area-dat $) ;; the $ is the request vars proc
 						  headers: '((content-type text/plain)))
 				   (mutex-lock! *heartbeat-mutex*)
 				   (set! *last-db-access* (current-seconds))
 				   (mutex-unlock! *heartbeat-mutex*))
 				  ((equal? (uri-path (request-uri (current-request))) 
@@ -114,17 +115,17 @@
 				  ((equal? (uri-path (request-uri (current-request))) 
 					   '(/ "hey"))
 				   (send-response body: "hey there!\n"
 						  headers: '((content-type text/plain))))
 				  (else (continue))))))))
-    (http-transport:try-start-server run-id ipaddrstr start-port server-id)))
+    (http-transport:try-start-server run-id ipaddrstr start-port server-id area-dat)))
 
 ;; 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"))
-	(tdbdat          (tasks:open-db)))
+(define (http-transport:try-start-server run-id ipaddrstr portnum server-id area-dat)
+  (let ((config-hostname (configf:lookup (megatest:area-configdat area-dat) "server" "hostname"))
+	(tdbdat          (tasks:open-db area-dat)))
     (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)
@@ -139,11 +140,12 @@
 
 	     ;; get_next_port goes here
 	     (http-transport:try-start-server run-id
 					      ipaddrstr
 					      (portlogger:open-run-close portlogger:find-port)
-					      server-id))
+					      server-id
+					      area-dat))
 	   (begin
 	     (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))
@@ -470,11 +472,11 @@
 
       ;; (debug:print 11 "last-access=" last-access ", server-timeout=" server-timeout)
       ;;
       ;; no_traffic, no running tests, if server 0, no running servers
       ;;
-      ;; (let ((wait-on-running (configf:lookup *configdat* "server" "wait-on-running"))) ;; wait on running tasks (if not true then exit on time out)
+      ;; (let ((wait-on-running (configf:lookup configdat "server" "wait-on-running"))) ;; wait on running tasks (if not true then exit on time out)
       ;;
       (if (and *server-run*
 	       (> (+ last-access server-timeout)
 		  (current-seconds)))
 	  (begin
@@ -522,11 +524,11 @@
 
 ;; all routes though here end in exit ...
 ;;
 ;; start_server? 
 ;;
-(define (http-transport:launch run-id)
+(define (http-transport:launch run-id area-dat)
   (let* ((tdbdat (tasks:open-db)))
     (set! *run-id*   run-id)
     (if (args:get-arg "-daemonize")
 	(begin
 	  (daemon:ize)
@@ -556,11 +558,12 @@
 				     (http-transport:run 
 				      (if (args:get-arg "-server")
 					  (args:get-arg "-server")
 					  "-")
 				      run-id
-				      server-id)) "Server run"))
+				      server-id
+				      area-dat)) "Server run"))
 		 (th3 (make-thread (lambda ()
 				     (debug:print-info 0 "Server monitor thread started")
 				     (http-transport:keep-running server-id run-id))
 				   "Keep running")))
 	    (thread-start! th2)
@@ -602,15 +605,16 @@
 
 ;;======================================================================
 ;; web pages
 ;;======================================================================
 
-(define (http-transport:main-page)
-  (let ((linkpath (root-path)))
-    (conc "<head><h1>" (pathname-strip-directory *toppath*) "</h1></head>"
+(define (http-transport:main-page area-dat)
+  (let* ((toppath  (megatest:area-path area-dat))
+	 (linkpath (root-path)))
+    (conc "<head><h1>" (pathname-strip-directory toppath) "</h1></head>"
 	  "<body>"
-	  "Run area: " *toppath*
+	  "Run area: " toppath
 	  "<h2>Server Stats</h2>"
 	  (http-transport:stats-table) 
 	  "<hr>"
 	  (http-transport:runs linkpath)
 	  "<hr>"