Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -97,14 +97,29 @@
 ;;======================================================================
 ;; S T A T E S   A N D   S T A T U S E S
 ;;======================================================================
 
 (define *common:std-states*   
-  (list "COMPLETED" "NOT_STARTED" "RUNNING" "REMOTEHOSTSTART" "LAUNCHED" "KILLED" "KILLREQ" "STUCK"))
+  '((0 "COMPLETED")
+    (1 "NOT_STARTED")
+    (2 "RUNNING")
+    (3 "REMOTEHOSTSTART")
+    (4 "LAUNCHED")
+    (5 "KILLED")
+    (6 "KILLREQ")
+    (7 "STUCK")))
 
 (define *common:std-statuses*
-  (list  "PASS" "WARN" "FAIL" "CHECK" "n/a" "WAIVED" "SKIP" "DELETED" "STUCK/DEAD"))
+  '((0 "PASS")
+    (1 "WARN")
+    (2 "FAIL")
+    (3 "CHECK")
+    (4 "n/a")
+    (5 "WAIVED")
+    (6 "SKIP")
+    (7 "DELETED")
+    (8 "STUCK/DEAD")))
 
 ;; These are stopping conditions that prevent a test from being run
 (define *common:cant-run-states-sym* 
   '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE))
 

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -38,12 +38,12 @@
 ;; register a test run with the db
 ;;
 ;; Use: (db-get-value-by-header (db:get-header runinfo)(db:get-row runinfo))
 ;;  to extract info from the structure returned
 ;;
-(define (mt:get-runs-by-patt keys runnamepatt targpatt)
-  (let loop ((runsdat  (cdb:remote-run db:get-runs-by-patt #f keys runnamepatt targpatt 0 500))
+(define (mt:get-runs-by-patt dbstruct keys runnamepatt targpatt)
+  (let loop ((runsdat  (db:get-runs-by-patt dbstruct keys runnamepatt targpatt 0 500))
 	     (res      '())
 	     (offset   0)
 	     (limit    500))
     ;; (print "runsdat: " runsdat)
     (let* ((header    (vector-ref runsdat 0))
@@ -51,11 +51,11 @@
 	   (full-list (append res runslst))
 	   (have-more (eq? (length runslst) limit)))
       ;; (debug:print 0 "header: " header " runslst: " runslst " have-more: " have-more)
       (if have-more 
 	  (let ((new-offset (+ offset limit))
-		(next-batch (cdb:remote-run db:get-runs-by-patt #f keys runnamepatt targpatt offset limit)))
+		(next-batch (db:get-runs-by-patt dbstruct keys runnamepatt targpatt offset limit)))
 	    (debug:print-info 4 "More than " limit " runs, have " (length full-list) " runs so far.")
 	    (debug:print-info 0 "next-batch: " next-batch)
 	    (loop next-batch
 		  full-list
 		  new-offset
@@ -83,12 +83,12 @@
 	  full-list))))
 
 (define (mt:get-prereqs-not-met run-id waitons ref-item-path #!key (mode 'normal))
   (db:get-prereqs-not-met run-id waitons ref-item-path mode: mode))
 
-(define (mt:get-run-stats)
-  (cdb:remote-run db:get-run-stats #f))
+(define (mt:get-run-stats dbstruct run-id)
+  (db:get-run-stats dbstruct run-id))
 
 (define (mt:discard-blocked-tests run-id failed-test tests test-records)
   (if (null? tests)
       tests
       (begin
@@ -142,34 +142,34 @@
 
 ;;======================================================================
 ;;  S T A T E   A N D   S T A T U S   F O R   T E S T S 
 ;;======================================================================
 
-(define (mt:roll-up-pass-fail-counts run-id test-name item-path status)
+(define (mt:roll-up-pass-fail-counts dbstruct run-id test-name item-path status)
   (if (and (not (equal? item-path ""))
 	   (member status '("PASS" "WARN" "FAIL" "WAIVED" "RUNNING" "CHECK" "SKIP")))
       (begin
-	(cdb:update-pass-fail-counts *runremote* run-id test-name)
+	(db:update-pass-fail-counts dbstruct run-id test-name)
 	(if (equal? status "RUNNING")
-	    (cdb:top-test-set-running *runremote* run-id test-name)
-	    (cdb:top-test-set-per-pf-counts *runremote* run-id test-name))
+	    (db:top-test-set-running dbstruct run-id test-name)
+	    (db:top-test-set-per-pf-counts dbstruct run-id test-name))
 	#f)
       #f))
 
-;; speed up for common cases with a little logic
-(define (mt:test-set-state-status-by-id test-id newstate newstatus newcomment)
-  (cond
-   ((and newstate newstatus newcomment)
-    (cdb:client-call *runremote* 'state-status-msg #t *default-numtries* newstate newstatus newcomment test-id))
-   ((and newstate newstatus)
-    (cdb:client-call *runremote* 'state-status #t *default-numtries* newstate newstatus test-id))
-   (else
-    (if newstate   (cdb:client-call *runremote* 'set-test-state #t *default-numtries* newstate test-id))
-    (if newstatus  (cdb:client-call *runremote* 'set-test-status #t *default-numtries* newstatus test-id))
-    (if newcomment (cdb:client-call *runremote* 'set-test-comment #t *default-numtries* newcomment test-id))))
-   (mt:process-triggers test-id newstate newstatus)
-   #t)
+;; ;; speed up for common cases with a little logic
+;; (define (mt:test-set-state-status-by-id dbstruct run-id test-id newstate newstatus newcomment)
+;;   (cond
+;;    ((and newstate newstatus newcomment)
+;;     (sqlite3: 'state-status-msg #t *default-numtries* newstate newstatus newcomment test-id))
+;;    ((and newstate newstatus)
+;;     (cdb:client-call *runremote* 'state-status #t *default-numtries* newstate newstatus test-id))
+;;    (else
+;;     (if newstate   (cdb:client-call *runremote* 'set-test-state #t *default-numtries* newstate test-id))
+;;     (if newstatus  (cdb:client-call *runremote* 'set-test-status #t *default-numtries* newstatus test-id))
+;;     (if newcomment (cdb:client-call *runremote* 'set-test-comment #t *default-numtries* newcomment test-id))))
+;;    (mt:process-triggers test-id newstate newstatus)
+;;    #t)
 
 (define (mt:lazy-get-test-info-by-id test-id)
   (let* ((tdat (hash-table-ref/default *test-info* test-id #f)))
     (if (and tdat 
 	     (< (current-seconds)(+ (vector-ref tdat 0) 10)))

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -568,13 +568,13 @@
      (iup:attribute-set! tabtop "TABTITLE4" "runconfigs.config")
      tabtop)))
 
 (define *current-window-id* 0)
 
-(define (newdashboard)
+(define (newdashboard dbstruct)
   (let* ((data     (make-hash-table))
-	 (keys     (cdb:remote-run db:get-keys #f))
+	 (keys     (db:get-keys dbstruct))
 	 (runname  "%")
 	 (testpatt "%")
 	 (keypatts (map (lambda (k)(list k "%")) keys))
 	 (states   '())
 	 (statuses '())

Index: synchash.scm
==================================================================
--- synchash.scm
+++ synchash.scm
@@ -55,14 +55,14 @@
      orig-keys)
     (list changed deleted)
     ;; (list indat '()) ;; just for debugging
     ))
     
-;; (cdb:remote-run db:get-keys #f)  
-;; (cdb:remote-run db:get-num-runs #f "%")
-;; (cdb:remote-run db:get-runs #f runnamepatt numruns *start-run-offset* keypatts)
-;;
+;; (c?db:remote-run db:get-keys #f)  
+;; (c?db:remote-run db:get-num-runs #f "%")
+;; (c?db:remote-run db:get-runs #f runnamepatt numruns *start-run-offset* keypatts)
+;; 
 ;; keynum => the field to use as the unique key (usually 0 but can be other field)
 ;;
 (define (synchash:client-get proc synckey keynum synchash . params)
   (let* ((data   (apply cdb:remote-run synchash:server-get #f proc synckey keynum params))
 	 (newdat (car data))

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -26,10 +26,11 @@
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
+
 
 ;; Call this one to do all the work and get a standardized list of tests
 (define (tests:get-all)
   (let* ((test-search-path   (cons (conc *toppath* "/tests") ;; the default
 				   (tests:get-tests-search-path *configdat*))))
@@ -706,21 +707,19 @@
       (db:tests-update-uname-host dbstruct run-id test-id uname hostname)))
   
 ;; OPTIMIZE THESE!!! They are redundant!!
 
 (define (tests:set-full-meta-info dbstruct test-id run-id minutes work-area)
-  ;; DOES cdb:remote-run under the hood!
   (let* ((num-records 0) ;; (test:tdb-get-rundat-count tdb))
 	 (cpuload  (get-cpu-load))
 	 (diskfree (get-df (current-directory)))
 	 (uname    (get-uname "-srvpio"))
 	 (hostname (get-host-name)))
     ;; (tests:update-testdat-meta-info dbstruct run-id test-id work-area cpuload diskfree minutes)
     (tests:update-central-meta-info dbstruct run-id test-id cpuload diskfree minutes uname hostname)))
 	  
 (define (tests:set-partial-meta-info dbstruct test-id run-id minutes work-area)
-  ;; DOES cdb:remote-run under the hood!
   (let* ((cpuload  (get-cpu-load))
 	 (diskfree (get-df (current-directory))))
     (tests:update-testdat-meta-info db test-id work-area cpuload diskfree minutes)
     ;; Update central with uname and hostname = #f
     (tests:update-central-meta-info test-id cpuload diskfree minutes #f #f)))