@@ -23,10 +23,11 @@
 (include "stml2/stml2.scm")
 (include "pkts/pkts.scm")
 (include "csv-xml/csv-xml.scm")
 (include "ducttape/ducttape-lib.scm")
 (include "hostinfo/hostinfo.scm")
+(include "adjutant.scm")
 
 ;; (include "call-with-environment-variables/call-with-environment-variables.scm")
 
 (module megatest-main
 	*
@@ -59,10 +60,11 @@
 		(prefix base64 base64:)
 		address-info
 		csv-abnf
 		directory-utils
 		fmt
+		json
 		matchable
 		md5
 		message-digest
 		queues
 		regex
@@ -74,11 +76,12 @@
 		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
@@ -87,10 +90,11 @@
 		;; local modules
 		mutils
 		csv-xml
 		ducttape-lib
 		hostinfo
+		adjutant
 		)
 	
 ;; (include "common.scm")
 (include "megatest-version.scm")
 
@@ -174,13 +178,13 @@
 ;; (require-library mutils)
 
 ;; copied from egg call-with-environment-variables
 ;;
 (define (call-with-environment-variables variables thunk)
-  #;@("Sets up environment variable via dynamic-wind which are taken down after thunk."
-    (variables "An alist of the form {{'((\"var\" . \"value\") ...)}}")
-    (thunk "The thunk to execute with a modified environment"))
+  ;; @("Sets up environment variable via dynamic-wind which are taken down after thunk."
+  ;;   (variables "An alist of the form {{'((\"var\" . \"value\") ...)}}")
+  ;;   (thunk "The thunk to execute with a modified environment"))
   (let ((pre-existing-variables
          (map (lambda (var-value)
                 (let ((var (car var-value)))
                   (cons var (get-environment-variable var))))
               variables)))
@@ -693,11 +697,11 @@
 		       logpath-in)))
      (if (not (directory-exists? log-dir))
          (system (conc "mkdir -p " log-dir)))
      (open-output-file logpath))
    (exn ()
-        (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath)
+        (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath-in)
         (define *didsomething* #t)  
         (exit 1))))
 
 ;; this segment will run launch:setup only if -log is not set. This is fairly safe as servers are not
 ;; manually started and thus should never be started in a non-megatest area. Thus no need to handle situation
@@ -2039,19 +2043,19 @@
 
 ;;======================================================================
 ;; Rollup into a run
 ;;======================================================================
 
-(if (args:get-arg "-rollup")
-    (general-run-call 
-     "-rollup" 
-     "rollup tests" 
-     (lambda (target runname keys keyvals)
-       (runs:rollup-run keys
-			keyvals
-			(or (args:get-arg "-runname")(args:get-arg ":runname") )
-			user))))
+;; (if (args:get-arg "-rollup")
+;;     (general-run-call 
+;;      "-rollup" 
+;;      "rollup tests" 
+;;      (lambda (target runname keys keyvals)
+;;        (runs:rollup-run keys
+;; 			keyvals
+;; 			(or (args:get-arg "-runname")(args:get-arg ":runname") )
+;; 			user))))
 
 ;;======================================================================
 ;; Lock or unlock a run
 ;;======================================================================
 
@@ -2451,11 +2455,11 @@
     (begin
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting")
 	    (exit 1)))
-      (open-run-close db:find-and-mark-incomplete #f)
+      (rmt:find-and-mark-incomplete #f)
       (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Update the tests meta data from the testconfig files
 ;;======================================================================