@@ -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))