@@ -36,12 +36,14 @@
 (declare (uses archivemod))
 (declare (uses mutils))
 (declare (uses odsmod))
 (declare (uses testsmod))
 (declare (uses diff-report))
+(declare (uses tdb))
 
-(use srfi-69 readline)
+(use srfi-69)
+(import csi)
 
 (module mtbody
 	*
 	
 (import scheme)
@@ -61,11 +63,11 @@
 	  md5
 	  message-digest
 	  pathname-expand
 	  posix
 	  posix-extras
-	  readline
+	  ;;	  readline
 	  regex
 	  regex-case
 	  sparse-vectors
 	  srfi-1
 	  srfi-18
@@ -116,11 +118,12 @@
 
 	  debugprint
   )))
 
 ;; imports common to chk5 and ck4
-(import srfi-13)
+(import srfi-13
+	csi)
 
 (import (prefix mtargs args:)
         archivemod
 	debugprint
 	dbmod
@@ -147,25 +150,30 @@
 	genexample
 	mutils
 	odsmod
 	testsmod
 	diff-report
+	tdb
         )
 
 (include "common_records.scm")
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
+
+;; (set! toplevel-command toplevel-command)
 
 ;; (include "common_records.scm")
 ;; (include "key_records.scm")
 ;; (include "db_records.scm")
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
 
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:))
-(use readline apropos json http-client directory-utils typed-records)
-(use http-client srfi-18 extras format tcp-server tcp)
+(import (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:))
+(import
+ ;; readline
+ apropos json http-client directory-utils typed-records)
+(import http-client srfi-18 extras format tcp-server tcp)
 
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
@@ -2206,11 +2214,11 @@
 	  target
 	  keys
 	  (or (args:get-arg "-runname")(args:get-arg ":runname") )
 	  (args:get-arg "-lock")
 	  (args:get-arg "-unlock")
-	  user))))
+	  (current-user-name)))))
 
   ;;======================================================================
   ;; Get paths to tests
   ;;======================================================================
   ;; Get test paths matching target, runname, and testpatt
@@ -2607,11 +2615,11 @@
 
 	(let ((dbstructs (db:setup)))
           (common:cleanup-db dbstructs))
 	(set! *didsomething* #t)))
 
-  (if (args:get-arg "-mark-incompletes")
+  #;(if (args:get-arg "-mark-incompletes")
       (begin
 	(if (not (launch:setup))
 	    (begin
 	      (debug:print 0 *default-log-port* "Failed to setup, exiting")
 	      (exit 1)))
@@ -2635,11 +2643,10 @@
   ;; Start a repl
   ;;======================================================================
 
   ;; fakeout readline
   (include "readline-fix.scm")
-
 
   (when (args:get-arg "-diff-rep")
     (when (and
            (not (args:get-arg "-diff-html"))
            (not (args:get-arg "-diff-email")))
@@ -2678,26 +2685,28 @@
 	      ;; export MT_RUNSCRIPT=yes
 	      ;; megatest << EOF
 	      ;; (print "Hello world")
 	      ;; (exit)
 	      ;; EOF
-
+    
 	      (repl))
 	     (else
 	      (begin
+		(define toplevel-command (lambda (a b)(print a " "b)))
 		(set! *db* dbstructs)
 		(import extras) ;; might not be needed
 		;; (import csi)
-		(import readline)
+		;; (import readline)
 		(import apropos)
 		(import dbfile)
+		
 		;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
 
 		(if *use-new-readline*
 		    (begin
-		      (install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])
-		      (current-input-port (make-readline-port "megatest> ")))
+		      #;(install-history-file (get-environment-variable "HOME") ".megatest_history") ;;  [homedir] [filename] [nlines])
+		      #;(current-input-port (make-readline-port "megatest> ")))
 		    #;(begin
 		      (gnu-history-install-file-manager
 		       (string-append
 			(or (get-environment-variable "HOME") ".") "/.megatest_history"))
 		      (current-input-port (make-gnu-readline-port "megatest> "))))