@@ -43,22 +43,24 @@
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
 (declare (uses commonmod))
+(declare (uses adjutant))
 ;; (declare (uses ftail))
 ;; (import ftail)
 
-(import stml2 mutils commonmod)
+(import stml2 mutils commonmod adjutant)
 
 ;; invoke the imports
 ;; (declare (uses mtargs.import))
 ;; (declare (uses mtconfigf.import))
 (declare (uses cookie.import))
 (declare (uses stml2.import))
 (declare (uses pkts.import))
 (declare (uses commonmod.import))
+(declare (uses adjutant.import))
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
@@ -215,10 +217,12 @@
   -update-meta            : update the tests metadata for all tests
   -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are
                                  overwritten by values set in config files.
   -server -|hostname      : start the server (reduces contention on megatest.db), use
                             - to automatically figure out hostname
+  -adjutant C,M           : start the server/adjutant with allocated cores C and Mem M (Gig), 
+                            use 0,0 to auto use full machine
   -transport http|rpc     : use http or rpc for transport (default is http) 
   -log logfile            : send stdout and stderr to logfile
   -list-servers           : list the servers 
   -kill-servers           : kill all servers
   -repl                   : start a repl (useful for extending megatest)
@@ -330,10 +334,11 @@
 			"-contour"
                         "-area-tag"  
                         "-area"  
 			"-run-tag"
 			"-server"
+			"-adjutant"
 			"-transport"
 			"-port"
 			"-extract-ods"
 			"-pathmod"
 			"-env2file"
@@ -510,10 +515,11 @@
 (let* ((no-watchdog-args
        '("-list-runs"
          "-testdata-csv"
          "-list-servers"
          "-server"
+	 "-adjutant"
          "-list-disks"
          "-list-targets"
          "-show-runconfig"
          ;;"-list-db-targets"
          "-show-runconfig"
@@ -903,10 +909,18 @@
 (if (args:get-arg "-server")
     (let ((tl        (launch:setup))
           (transport-type (string->symbol (or (args:get-arg "-transport") "http"))))
       (server:launch 0 transport-type)
       (set! *didsomething* #t)))
+
+;; The adjutant is a bit different, it does NOT run (launch:setup) as it is not necessarily tied to
+;; a specific Megatest area. Detail are being hashed out and this may change.
+;;
+(if (args:get-arg "-adjutant")
+    (begin
+      (adjutant-run)
+      (set! *didsomething* #t)))
 
 (if (or (args:get-arg "-list-servers")
         (args:get-arg "-kill-servers"))
     (let ((tl (launch:setup)))
       (if tl ;; all roads from here exit