Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -108,10 +108,11 @@
   (home                   (getenv "HOME"))
   (user                   (getenv "USER"))
   (watchdog               #f)
   (time-to-exit           #f)
   (task-db                #f)
+  (target                 #f)
   ;; (server-loop-heart-beat (current-seconds))
   )
 
 (define (make-and-init-bigdata)
   (set! *bdat*
@@ -197,11 +198,11 @@
 
 ;; RPC transport
 (define *rpc:listener*      #f)
 
 ;; KEY info
-(define *target*            (make-hash-table)) ;; cache the target here; target is keyval1/keyval2/.../keyvalN
+;; (define *target*            (make-hash-table)) ;; cache the target here; target is keyval1/keyval2/.../keyvalN
 (define *keys*              (make-hash-table)) ;; cache the keys here
 (define *keyvals*           (make-hash-table))
 (define *toptest-paths*     (make-hash-table)) ;; cache toptest path settings here
 (define *test-paths*        (make-hash-table)) ;; cache test-id to test run paths here
 (define *test-ids*          (make-hash-table)) ;; cache run-id, testname, and item-path => test-id
@@ -504,11 +505,11 @@
 ;; cache of verbosity given string
 ;;
 (define *verbosity-cache*    (make-hash-table))
 
 (define (common:clear-caches)
-  (set! *target*             (make-hash-table))
+  (bdat-target-set! *bdat*   (make-hash-table))
   (set! *keys*               (make-hash-table))
   (set! *keyvals*            (make-hash-table))
   (set! *toptest-paths*      (make-hash-table))
   (set! *test-paths*         (make-hash-table))
   (set! *test-ids*           (make-hash-table))

Index: mtmod.scm
==================================================================
--- mtmod.scm
+++ mtmod.scm
@@ -141,11 +141,11 @@
 	 ;; NOTE: Should be setting env vars based on (target|default)
 	 (confdat   (runconfig:read fname thekey environ-patt))
 	 (whatfound (make-hash-table))
 	 (finaldat  (make-hash-table))
 	 (sections (list "default" thekey)))
-    (if (not *target*)(set! *target* thekey)) ;; may save a db access or two but repeats db:get-target code
+    (if (not (bdat-target *bdat*))(bdat-target-set! *bdat* thekey)) ;; may save a db access or two but repeats db:get-target code
     (debug:print 4 *default-log-port* "Using key=\"" thekey "\"")
 
     (if change-env
 	(for-each ;; NB// This can be simplified with new content of keyvals having all that is needed.
 	 (lambda (keyval)