@@ -24,105 +24,122 @@
 ;; (include "autoload/autoload.scm")
 ;; (include "dbi/dbi.scm")
 ;; (include "stml2/cookie.scm")
 ;; (include "stml2/stml2.scm")
 ;; (include "pkts/pkts.scm")
-(include "csv-xml/csv-xml.scm")
+;; (include "csv-xml/csv-xml.scm")
 ;; (include "ducttape/ducttape-lib.scm")
-(include "hostinfo/hostinfo.scm")
+;; (include "hostinfo/hostinfo.scm")
 (include "adjutant.scm")
 
-(declare (uses mutils))
 (declare (uses autoload))
 (declare (uses pkts))
-(declare (uses ducttape-lib))
 (declare (uses stml2))
 (declare (uses cookie))
+(declare (uses csv-xml))
+(declare (uses hostinfo))
+
+(declare (uses mutils))
+(declare (uses ducttape-lib))
 (declare (uses mtargs))
 (declare (uses commonmod))
 (declare (uses apimod))
 (declare (uses dbmod))
 (declare (uses rmtmod))
-
+(declare (uses servermod))
+(declare (uses mtver))
 
 ;; (include "call-with-environment-variables/call-with-environment-variables.scm")
 
 (module megatest-main
 	*
 
-	(import scheme
-		chicken.base
-		chicken.bitwise
-		chicken.condition
-		chicken.file
-		chicken.file.posix
-		chicken.format
-		chicken.io
-		chicken.irregex
-		chicken.pathname
-		chicken.port
-		chicken.pretty-print
-		chicken.process
-		chicken.process-context
-		chicken.process-context.posix
-		chicken.process.signal
-		chicken.random
-		chicken.repl
-		chicken.sort
-		chicken.string
-		chicken.tcp
-		chicken.time
-		chicken.time.posix
-		
-		(prefix sqlite3 sqlite3:)
-		(prefix base64 base64:)
-		address-info
-		csv-abnf
-		directory-utils
-		fmt
-		json
-		matchable
-		md5
-		message-digest
-		queues
-		regex
-		regex-case
-		sql-de-lite
-		stack
-		typed-records
-		s11n
-		sparse-vectors
-		sxml-serializer
-		sxml-modifications
-		system-information
-		z3
-		spiffy
-		uri-common
-		intarweb
-		http-client
-		spiffy-request-vars
-		intarweb
-		spiffy-directory-listing
-		
-		srfi-1
-		srfi-4
-		srfi-18
-		srfi-13
-		srfi-98
-		srfi-69
-
-		;; local modules
-		mutils
-		csv-xml
-		ducttape-lib
-		hostinfo
-		adjutant
-		)
-	
-;; (include "common.scm")
-(include "megatest-version.scm")
-
+  (import scheme
+	  chicken.base
+	  chicken.bitwise
+	  chicken.condition
+	  chicken.file
+	  chicken.file.posix
+	  chicken.format
+	  chicken.io
+	  chicken.irregex
+	  chicken.pathname
+	  chicken.port
+	  chicken.pretty-print
+	  chicken.process
+	  chicken.process-context
+	  chicken.process-context.posix
+	  chicken.process.signal
+	  chicken.random
+	  chicken.repl
+	  chicken.sort
+	  chicken.string
+	  chicken.tcp
+	  chicken.time
+	  chicken.time.posix
+	  
+	  (prefix sqlite3 sqlite3:)
+	  (prefix base64 base64:)
+	  address-info
+	  csv-abnf
+	  directory-utils
+	  fmt
+	  json
+	  matchable
+	  md5
+	  message-digest
+	  queues
+	  regex
+	  regex-case
+	  sql-de-lite
+	  stack
+	  typed-records
+	  s11n
+	  sparse-vectors
+	  sxml-serializer
+	  sxml-modifications
+	  system-information
+	  z3
+	  spiffy
+	  uri-common
+	  intarweb
+	  http-client
+	  spiffy-request-vars
+	  intarweb
+	  spiffy-directory-listing
+	  
+	  srfi-1
+	  srfi-4
+	  srfi-18
+	  srfi-13
+	  srfi-98
+	  srfi-69
+
+	  ;; local modules
+	  adjutant
+	  csv-xml
+	  ducttape-lib
+	  hostinfo
+	  mtver
+	  mutils
+	  autoload
+	  cookie
+	  csv-xml
+	  ducttape-lib
+	  mtargs
+	  pkts
+	  stml2
+	  (prefix dbi dbi:)
+
+	  apimod
+	  commonmod
+	  dbmod
+	  rmtmod
+	  servermod
+	  
+	  )
+	
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 (define setenv set-environment-variable!)
 (define unsetenv unset-environment-variable!)
 
@@ -145,25 +162,24 @@
 ;; (declare (uses tasks)) ;; only used for debugging.
 ;; (declare (uses env))
 ;; (declare (uses diff-report))
 ;; (declare (uses ftail))
 ;; (import ftail)
+
+(define (blahblah)(thread-sleep! 1.234))
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
+
+(include "common.scm")
 (include "megatest-fossil-hash.scm")
 
-(import (prefix dbi dbi:))
-(import stml2)
-(import pkts)
-
-(include "common.scm")
 (include "configf.scm")
 (include "margs.scm")
 (include "process.scm")
 (include "keys.scm")
 (include "portlogger.scm")