@@ -41,14 +41,18 @@
 (declare (uses rmtmod))
 (declare (uses subrunmod))
 (declare (uses tree))
 (declare (uses vgmod))
 (declare (uses testsmod))
+(declare (uses tasksmod))
 
 ;; (declare (uses dashboard-guimonitor))
 ;; (declare (uses dashboard-main))
 
+(module dashboard
+	*
+	
 (import (prefix iup iup:))
 (import canvas-draw)
 (import canvas-draw-iup)
 
 (import ducttape-lib
@@ -63,10 +67,11 @@
 	regex regex-case srfi-69
 	typed-records
 	sparse-vectors
 	format
 	srfi-4
+	srfi-14
 	)
 
 ;; (include "common_records.scm")
 ;; (include "db_records.scm")
 ;; (include "run_records.scm")
@@ -92,11 +97,13 @@
 	vgmod
 	dcommon
 	tree
 	dashboard-context-menu
 	dashboard-tests
-	testsmod)
+	testsmod
+	tasksmod
+	)
 
 (define help (conc 
 	      "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright (C) Matt Welland 2012-2017
@@ -409,11 +416,12 @@
   (keys       (rmt:get-keys))         ;; to be removed when targets handling is refactored
   (runs       (make-sparse-vector))   ;; id => runrec
   (runsbynum  (make-vector 100 #f))   ;; vector num => runrec 
   (targ-runid (make-hash-table))      ;; area/target/runname => run-id  ;; not sure this will be needed
   (tests      (make-hash-table))      ;; test[/itempath] => list of test rec
-
+  (path-run-ids (make-hash-table))    ;; path => run-id (this is a guess based on code reference)
+  
   ;; run sql filters 
   (targ-sql-filt        "%")
   (runname-sql-filt     "%")
   (run-state-sql-filt   "%")
   (run-status-sql-filt  "%")
@@ -485,11 +493,11 @@
   status   ;; test status
   )
 
 ;; default is to NOT set the cell if the column and row names are not pre-existing
 ;;
-(define (dboard:runsdat-set-test-cell dat target runname testname itempath test-id state status #!key (force-set #f))
+#;(define (dboard:runsdat-set-test-cell dat target runname testname itempath test-id state status #!key (force-set #f))
   (let* ((col-num  (dcommon:runsdat-get-col-num dat target runname force-set))
 	 (row-num  (dcommon:runsdat-get-row-num dat testname itempath force-set)))
     (if (and row-num col-num)
 	(let ((tdat (dboard:testdat 
 		     id: test-id
@@ -1693,11 +1701,11 @@
       (hash-table-ref/default (dboard:tabdat-path-run-ids tabdat) path #f)
       #f))
 
 (define (new-tree-path->run-id rdat path)
   (if (not (null? path))
-      (hash-table-ref/default (dboard:rdat-path-run-ids tabdat) path #f)
+      (hash-table-ref/default (dboard:rdat-path-run-ids rdat) path #f)
       #f))
 
 ;; (define (dboard:get-tests-dat tabdat run-id last-update)
 ;;   (let* ((access-mode     (dboard:tabdat-access-mode tabdat))
 ;;          (tdat (if run-id (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run
@@ -3174,11 +3182,11 @@
 			(begin
 			  (debug:print 0 *default-log-port* "ERROR: I only know sqlite3 databases for now: " dbstr)
 			  #f)))))
     (if (and dbpth (file-readable? dbpth))
 	(let ((db (sqlite3:open-database dbpth))) ;; (open-database dbpth)))
-	  (sqlite3:set-busy-handler! db (make-busy-timeout 10000))
+	  (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 10000))
 	  db)
 	#f)))
 
 ;; sqlite3:path tablename timefieldname varfieldname field1 field2 ...
 ;;
@@ -3689,10 +3697,13 @@
 				(dboard:common-run-curr-updaters commondat 0) ;; force update of summary tab 
 				) "update buttons once"))
 	    (th2 (make-thread iup:main-loop "Main loop")))
 	(thread-start! th2)
 	(thread-join! th2)))))
+)
+
+(import dashboard)
 
 ;; ease debugging by loading ~/.dashboardrc
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc")))
   (if (common:file-exists? debugcontrolf)
       (load debugcontrolf)))