@@ -45,10 +45,13 @@
 (declare (uses mutils))
 (import mutils)
 
 (declare (uses adjutant))
 (import adjutant)
+
+(declare (uses mttop))
+(import mttop)
 
 ;; (declare (uses ftail))
 ;; (import ftail)
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
@@ -109,10 +112,11 @@
  
 Usage: megatest [options]
   -h                      : this help
   -manual                 : show the Megatest user manual
   -version                : print megatest version (currently " megatest-version ")
+  help                    : help for the new Megatest interface
 
 Launching and managing runs
   -run                    : run all tests or as specified by -testpatt
   -remove-runs            : remove the data for a run, requires -runname and -testpatt
                             Optionally use :state and :status, use -keep-records to remove only
@@ -275,10 +279,14 @@
 Version " megatest-version ", built from " megatest-fossil-hash ))
 
 ;;  -gui                    : start a gui interface
 ;;  -config fname           : override the runconfigs file with fname
 
+
+(mttop-run (command-line-arguments)
+	   '("help"))
+
 ;; process args
 (define remargs (args:get-args 
 		 (argv)
 		 (list  "-runtests"  ;; run a specific test
 			"-config"    ;; override the config file name
@@ -927,11 +935,14 @@
       (let loop ((wait-count 0))
 	(if (< wait-count 10) ;; 6 x 10 seconds = one minute
 	    (let* ((dat (rmt:no-sync-take-job host-type)))
 	      (match dat
 		((id ht vars exekey cmdline state event-time last-update)
-		 (system cmdline)
+		 (call-with-environment-variables
+		  vars
+		  (lambda ()
+		    (system cmdline)))
 		 (loop 0))
 		(else
 		 (thread-sleep! 10)
 		 (loop (+ wait-count 1)))))
 	    (print "I'm bored. Exiting.")))