Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -9,11 +9,11 @@
    db.scm keys.scm margs.scm megatest-version.scm \
    process.scm runs.scm tasks.scm tests.scm genexample.scm \
    http-transport.scm filedb.scm tdb.scm \
    client.scm daemon.scm mt.scm \
    ezsteps.scm lock-queue.scm sdb.scm \
-   rmt.scm api.scm \
+   rmt.scm api.scm subrun.scm \
    portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm
 
 # module source files
 MSRCFILES = ftail.scm
 

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -13,11 +13,12 @@
      format dot-locking csv-xml z3 ;; sql-de-lite
      hostinfo md5 message-digest typed-records directory-utils stack
      matchable regex posix (srfi 18) extras ;; tcp 
      (prefix nanomsg nmsg:)
      (prefix sqlite3 sqlite3:)
-     pkts)
+     pkts
+     )
 
 (declare (unit common))
 
 (include "common_records.scm")
 
@@ -1793,11 +1794,11 @@
                    ("test-patt" . "-testpatt")
                    ("msg"       . "-m")
                    ("new"       . "-set-state-status"))))
     (if (eq? flavor 'switch)
         (map (lambda (x)
-               (cons (string->symbol (conc "-" (car x)) (cdr x))))
+               (cons (string->symbol (conc "-" (car x))) (cdr x)))
              default)
         default)))
 
 ;; set some env vars from an alist, return an alist with original values
 ;; (("VAR" "value") ...)

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -1,5 +1,36 @@
+
+;; Copyright 2006-2016, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
+
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
+     posix-extras directory-utils pathname-expand typed-records format)
+(declare (unit subrun))
+(declare (uses runs))
+(declare (uses db))
+(declare (uses common))
+(declare (uses items))
+(declare (uses runconfig))
+(declare (uses tests))
+(declare (uses server))
+(declare (uses mt))
+(declare (uses archive))
+;; (declare (uses filedb))
+
+(include "common_records.scm")
+(include "key_records.scm")
+(include "db_records.scm")
+(include "run_records.scm")
+(include "test_records.scm")
 
 
 (define (subrun:initialize-toprun-test test-run-dir testconfig)
   (let ((ra (configf:lookup testconfig "subrun" "run-area")))
     (when (not ra)      ;; when runarea is not set we default to *toppath*. However