Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -31,11 +31,11 @@
 
 # module source files
 MSRCFILES = dbmod.scm servermod.scm apimod.scm commonmod.scm rmtmod.scm \
             ods.scm configfmod.scm transport.scm portlogger.scm tasks.scm \
             pgdb.scm margsmod.scm debugprint.scm client.scm items.scm \
-            tdb.scm
+            tdb.scm 
 
 MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o))
 MOIMPFILES = $(MSRCFILES:%.scm=%.import.o)
 
 # ftail.scm rmtmod.scm commonmod.scm removed
@@ -61,10 +61,13 @@
 # mofiles/%.o  %.import.scm : %.scm megatest-fossil-hash.scm
 #	@[ -e mofiles ] || mkdir -p mofiles
 #	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o $*.o
 #	cp $*.o mofiles/$*.o
 
+# mofiles/commonmod.o commonmod.import.scm : commonmod.scm mofiles/stml2.o
+# 	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o mofiles/$*.o
+# 	@touch $*.import.scm
 
 # ensure import.scm is touched after the .o is made
 #
 mofiles/%.o %.import.scm : %.scm
 	csc $(CSCOPTS) -I mofiles -I $* -J -c $< -o mofiles/$*.o
@@ -175,11 +178,11 @@
 
 vg.o dashboard.o : vg_records.scm megatest-version.scm
 
 dcommon.o : run_records.scm
 
-mofiles/stml2.o  : mofiles/cookie.o
+# mofiles/stml2.o  : mofiles/cookie.o
 
 # for the modularized stuff
 # mofiles/rmtmod.o : mofiles/commonmod.o
 
 megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -20,19 +20,24 @@
 
 (declare (unit commonmod))
 (declare (uses margsmod))
 (declare (uses debugprint))
 (declare (uses configfmod))
+;; (declare (uses stml2))
+
+;; (include "stml2/cookie.scm")
+;; (include "stml2/stml2.scm")
 
 (module commonmod
 	*
 	
 ;;(import scheme chicken data-structures extras files ports)
 (import scheme chicken)
 (import margsmod)
 (import debugprint)
 (import configfmod)
+(import stml2)
 
 (use data-structures extras files ports)
 (use 
   (prefix base64 base64:)
   (prefix sqlite3 sqlite3:) 
@@ -52,15 +57,16 @@
   srfi-1
   srfi-4
   srfi-13
   srfi-69
   stack
-  stml2
   typed-records 
   z3
  )
-	
+
+;; (require-library stml)
+
 (include "common_records.scm")
 
 ;;======================================================================
 ;; (require-library margs)
 ;; (include "margs.scm")

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -76,10 +76,19 @@
 (import dbmod)
 ;; (declare (uses dbmod.import))
 
 (declare (uses servermod))
 (import servermod)
+
+;; (declare (uses stml2))
+;; (import stml2)
+;; (declare (uses stml2.import))
+
+;; (require-library stml)
+
+(include "stml2/stml2.scm")
+(import stml2)
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses configf))
 (declare (uses process))

Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -846,11 +846,11 @@
                        0 *default-log-port* "db:sync-tables called with todb not a read-only database " bad-dbdat))
                     readonly-slave-dbs)
                    readonly-slave-dbs))) -6)
     (else
      (let ((stmts       (make-hash-table)) ;; table-field => stmt
-	   (all-stmts   '())              ;; ( ( stmt1 value1 ) ( stml2 value2 ))
+	   (all-stmts   '())              ;; ( ( stmt1 value1 ) ( stmt2 value2 ))
 	   (numrecs     (make-hash-table))
 	   (start-time  (current-milliseconds))
 	   (tot-count   0))
        (for-each ;; table
 	(lambda (tabledat)

Index: diff-report.scm
==================================================================
--- diff-report.scm
+++ diff-report.scm
@@ -20,12 +20,18 @@
 (declare (uses common))
 (declare (uses rmt))
          
 (declare (uses commonmod))
 (declare (uses debugprint))
+;; (declare (uses stml2))
+
+(include "stml2/cookie.scm")
+(include "stml2/stml2.scm")
+	 
 (import commonmod)
 (import debugprint)
+(import stml2)
 
 (include "common_records.scm")
 (use matchable)
 (use fmt)
 (use ducttape-lib)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -92,10 +92,18 @@
 
 (declare (uses servermod))
 (import servermod)
 (declare (uses servermod.import))
 
+;; ;; (declare (uses stml2))
+;; (include "stml2/cookie.scm")
+;; (include "stml2/stml2.scm")
+;; 
+;; (import stml2)
+;; (declare (uses stml2.import))
+
+;; (require-library stml)
 
 ;; (include "common.scm")
 (include "megatest-version.scm")
 
 (declare (uses common))

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -27,29 +27,33 @@
      (prefix dbi dbi:)
      (prefix sqlite3 sqlite3:)
      nanomsg)
 
 (declare (uses common))
-(declare (uses margsmod))
-(import margsmod)
-
 (declare (uses configf))
-;; (declare (uses rmt))
 
+(declare (uses margsmod))
+(declare (uses debugprint))
+(declare (uses configfmod))
 (declare (uses commonmod))
-(declare (uses debugprint))
-(import commonmod)
+;; (declare (uses stml2))
+
+(include "stml2/cookie.scm")
+(include "stml2/stml2.scm")
+	 
+(import margsmod)
 (import debugprint)
-
-(declare (uses configfmod))
 (import configfmod)
+(import commonmod)
+(import stml2)
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 
-(require-library stml)
+;; (require-library stml)
+(import stml2)
 
 ;; stuff for the mapper and checker functions
 ;;
 (define *target-mappers*  (make-hash-table)) 
 (define *runname-mappers* (make-hash-table)) 

Index: stml2.scm
==================================================================
--- stml2.scm
+++ stml2.scm
@@ -17,7 +17,7 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit stml2))
-
+(include "stml2/cookie.scm")
 (include "stml2/stml2.scm")

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -28,30 +28,33 @@
 (declare (uses tdb))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
 (declare (uses server))
+
+(declare (uses debugprint))
 (declare (uses margsmod))
+(declare (uses configfmod))
+(declare (uses commonmod))
+(declare (uses dbmod))
+(declare (uses servermod))
+;; (declare (uses stml2))
+
+(include "stml2/stml2.scm")
+
 (import margsmod)
+(import debugprint)
+(import configfmod)
+(import commonmod)
+(import dbmod)
+(import servermod)
+(import stml2)
+
+;; (require-library stml)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
 (import (prefix sqlite3 sqlite3:))
-(require-library stml)
-
-(declare (uses commonmod))
-(declare (uses debugprint))
-(import commonmod)
-(import debugprint)
-
-(declare (uses dbmod))
-(import dbmod)
-
-(declare (uses configfmod))
-(import configfmod)
-
-(declare (uses servermod))
-(import servermod)
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")