@@ -19,10 +19,11 @@
 (declare (uses margs))
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses server))
 (declare (uses tests))
+(declare (uses genexample))
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
@@ -99,10 +100,13 @@
   -extract-ods fname.ods  : extract an open document spreadsheet from the database
   -pathmod path           : insert path, i.e. path/runame/itempath/logfile.html
                             will clear the field if no rundir/testname/itempath/logfile
                             if it contains forward slashes the path will be converted
                             to windows style
+Getting started
+  -gen-megatest-area      : create a skeleton megatest area. You will be prompted for paths
+  -gen-megatest-test      : create a skeleton megatest test. You will be prompted for info
 
 Examples
 
 # Get test path, the '.' is required, could use '*' or a specific path/file
 megatest -test-path . -target ubuntu/n%/no% :runname w49% -testpatt test_mt%
@@ -151,10 +155,11 @@
 			"-pathmod"
 			"-env2file"
 			"-setvars"
 			"-set-state-status"
 			"-debug" ;; for *verbosity* > 2
+			"-gen-megatest-test"
 			"-override-timeout"
 			) 
 		 (list  "-h"
 		        "-force"
 		        "-xterm"
@@ -177,10 +182,11 @@
 			"-remove-runs"
 			"-usequeue"
 			"-rebuild-db"
 			"-rollup"
 			"-update-meta"
+			"-gen-megatest-area"
 
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
 		       )
 		 args:arg-hash
@@ -753,10 +759,20 @@
 (if (args:get-arg "-gui")
     (begin
       (debug:print 0 "Look at the dashboard for now")
       ;; (megatest-gui)
       (set! *didsomething* #t)))
+
+(if (args:get-arg "-gen-megatest-area")
+    (begin
+      (genexample:mk-megatest.config)
+      (set! *didsomething* #t)))
+
+(if (args:get-arg "-gen-megatest-test")
+    (let ((testname (args:get-arg "-gen-megatest-test")))
+      (genexample:mk-megatest-test testname)
+      (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Update the database schema on request
 ;;======================================================================