Merge branch 'switch' into Domme.

1 files changed, 2407 insertions, 564 deletions

diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 51f14eb..2691749 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -3,18 +3,86 @@
  * Copyright 2020 David Seikel <sledjchisl@sledjhamr.org>
  * Not in SUSv4.  An entirely new invention, thus no web site either.
 
-USE_SLEDJCHISL(NEWTOY(sledjchisl, "m(mode):", TOYFLAG_USR|TOYFLAG_BIN))
+USE_SLEDJCHISL(NEWTOY(sledjchisl, "?vqma", TOYFLAG_USR|TOYFLAG_BIN))
 
 config SLEDJCHISL
   bool "sledjchisl"
   default y
   help
-    usage: sledjchisl [-m|--mode mode]
+    usage: sledjchisl [-vqma] [mode [name]]
 
     opensim-SC management system.
+
+    -v verbose mode.
+
+    Mode selects what sledjchisl will do -
+      start
+      start -q
+      start Welcome
+      start Welcome.ini
+      start Welcome.shini
+      start "Welcome sim"
+        Will start a sim or everything.
+        -q when starting everything wont show the tmux console.
+      backup
+      backup -m
+      backup -m "Joan Smith"
+      backup Welcome
+      backup Welcome.ini
+      backup Welcome.shini
+      backup "Welcome sim"
+        Will backup sim or everything.
+        -m for a members inventory.
+      gitar m "Joan Smith"
+      gitar Welcome
+      gitar Welcome.ini
+      gitar Welcome.shini
+      gitar o "Welcome sim"
+      restart
+      restart Welcome
+      restart Welcome.ini
+      restart Welcome.shini
+      restart "Welcome sim"
+        Will stop then start a sim, or everything.
+      status
+      status Welcome
+      status Welcome.ini
+      status Welcome.shini
+      status "Welcome sim"
+        Will show status of a sim, or everything.
+      stop
+      stop -a
+      stop Welcome
+      stop Welcome.ini
+      stop Welcome.shini
+      stop "Welcome sim"
+        Will stop a sim, or everything.
+        -a when stopping everything will close down all tmux windows and panes.
 */
 
 
+// TODO - remember to rebuild all of toybox if any of the above changes.
+// Toybox's strend overrides another strend that causes MariaDB library to crash.  Renaming it to tb_strend helps.
+// I deal with that by using a sed invokation when building toybox.
+#define FOR_sledjchisl
+#include "toys.h"
+
+GLOBALS(
+)
+
+/*
+  configs/sim01 -
+    backup-sim
+    start-sim
+    stop-sim
+
+Currently they are all links to ../../current/scripts/start-sim,
+they should be links to ../../current/bin/sledjchisl,
+which itself is a link to ../src/build/toybox/generated/unstripped/toybox or ../src/build/toybox/toybox
+They are obsolete now, should remove them.
+
+*/
+
 // TODO - figure out how to automate testing of this.
 //          Being all interactive and involving external web servers / viewers makes it hard.
 
@@ -45,6 +113,15 @@ extern char **environ;
 #include <lauxlib.h>
 #include <luajit.h>
 
+//  lua.h has LUA_T* NONE, NIL, BOOLEAN, LIGHTUSERDATA, NUMBER, STRING, TABLE, FUNCTION, USERDATA, THREAD as defines, -1 - 8.
+//  These are the missing ones.  Then later we will have prim, mesh, script, sound, terrain, ...
+#define LUA_TGROUP      42
+#define LUA_TINTEGER    43
+#define LUA_TEMAIL      44
+#define LUA_TPASSWORD   45
+#define LUA_TFILE       46
+#define LUA_TIMAGE      47
+
 #include "lib/fcgi_SC.h"
 #include "lib/handlekeys.h"
 
@@ -54,33 +131,45 @@ extern char **environ;
 // https://mariadb.com/kb/en/about-mariadb-connector-c/                         Official docs.
 // http://dev.mysql.com/doc/refman/5.5/en/c-api-function-overview.html          MySQL docs.
 // http://zetcode.com/db/mysqlc/                                                MySQL tutorial.
-#include <my_global.h>
+//#include <my_global.h>
 #include <mysql.h>
 
 #include <qlibc.h>
 #include <extensions/qconfig.h>
 
 // TODO - I should probably replace openSSL with something else.  Only using it for the hash functions, and apparently it's got a bit of a bad rep.
+//              only sha 512 I think.  Which qLibc doesn't have.  It has MD5 128 bit, Mummur3 32 and 128 bit, and FNV1 32 and 64 bit.
 //          qLibc optionally uses openSSL for it's HTTP client stuff.
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
 #include "openssl/hmac.h"
 #include <uuid/uuid.h>
 
-// Toybox's strend overrides another strend that causes MariaDB library to crash.  Renaming it to tb_strend helps.
-// I deal with that by using a sed invokation when building toybox.
-#include "toys.h"
-
-
-GLOBALS(
-  char *mode;
-)
-
-#define TT this.sledjchisl
-
-#define FLAG_m  2
-
-
+typedef enum
+{
+    START       = 0,
+    BACKUP      = 1,
+    GITAR       = 2,
+    RESTART     = 3,
+    STATUS      = 4,
+    STOP        = 9
+} modes;
+
+modes currentMode = START;
+
+char *modeStrings[] =
+{
+  "start",
+  "backup",
+  "gitAR",
+  "restart",
+  "status",
+  "Huh?",
+  "WTF?",
+  "mumblefuck",
+  "dontDoThis"
+  "stop"
+};
 
 // Duplicate some small amount of code from qLibc, coz /, + and, = are not good choices, and the standard says we can pick those.
 /**
@@ -282,10 +371,10 @@ typedef enum
 // Silly "man getrandom" is bullshitting.
 // Note - this is Linux specific, it's calling a Linux kernel function.
 // Remove this when we have a real getrandom(), and replace it with -
-// #include <sys/random.h>
+//#include <sys/random.h>
 #include <sys/syscall.h>
 #include <linux/random.h>
-int getrandom(void *b, size_t l, unsigned int f)
+ssize_t getrandom(void *b, size_t l, unsigned int f)
 {
   return (int) syscall(SYS_getrandom, b, l, f);
 }
@@ -427,10 +516,14 @@ char *scBackup = "";
 char *scCache = "";
 char *scData = "";
 char *scLog = "";
+char *scTemp = "";
 char *Tconsole = "SledjChisl";
 char *Tsocket = "opensim-tmux.socket";
 char *Ttab = "SC";
 char *Tcmd = "tmux -S";
+char *backupIARsim = "Sandbox";
+char *rSync = "";
+int  rSyncPort = 0;
 char *webRoot = "/var/www/html";
 char *URL = "fcgi-bin/sledjchisl.fcgi";
 char *ToS = "Be good.";
@@ -439,9 +532,11 @@ int  seshRenew    = 10 * 60;
 int  idleTimeOut  = 30 * 60;
 int  seshTimeOut  = 24 * 60 * 60;
 int newbieTimeOut = 30;
-float loadAverageInc = 0.5;
+float loadAverageInc = 0.7;
 int  simTimeOut = 45;
-boolean DEBUG = TRUE;
+int bulkSims = 0;
+boolean DEBUG = FALSE;
+boolean VERBOSE = FALSE;
 qhashtbl_t *mimeTypes;
 qlist_t *dbRequests;
 
@@ -462,8 +557,9 @@ char *logTypes[] =
   "93",         "WARNING",      // yellow
   "36",         "TIMEOUT",      // cyan
   "97;40",      "INFO",         // white
+  "92;40",      "VERBOSE",      // green
   "90",         "DEBUG",        // grey
-// VERBOSE?  UNKNOWN?  FATAL?  SILENT?  All from Android aparently.
+// UNKNOWN?  FATAL?  SILENT?  All from Android apparently.
   "35",         "debug",        // magenta
   "34",         "timeout",      // blue
 };
@@ -477,6 +573,12 @@ void logMe(int v, char *format, ...)
   struct timeval tv;
   time_t curtime;
   char date[DATE_TIME_LEN];
+  char *t;
+
+  if ((!VERBOSE) && (4 < v))
+    return;
+  if ((!DEBUG) && (5 < v))
+    return;
 
   va_start(va, format);
   va_copy(va2, va);
@@ -492,9 +594,10 @@ void logMe(int v, char *format, ...)
   gettimeofday(&tv, NULL);
   curtime = tv.tv_sec;
   strftime(date, DATE_TIME_LEN, "(%Z %z) %F %T", localtime(&curtime));
-
+  t = xmprintf("%.6d", (int) tv.tv_usec);
   v *= 2;
-  fprintf(stderr, "%s.%.6ld  \e[%sm%-8s sledjchisl: %s\e[0m\n", date, tv.tv_usec, logTypes[v], logTypes[v + 1], ret);
+  fprintf(stderr, "%s.%.2s \e[%sm%-8s %s\e[0m\n", date, t, logTypes[v], logTypes[v + 1], ret);
+  free(t);
   free(ret);
 }
 #define C(...) logMe(0, __VA_ARGS__)
@@ -502,9 +605,115 @@ void logMe(int v, char *format, ...)
 #define W(...) logMe(2, __VA_ARGS__)
 #define T(...) logMe(3, __VA_ARGS__)
 #define I(...) logMe(4, __VA_ARGS__)
-#define D(...) logMe(5, __VA_ARGS__)
-#define d(...) logMe(6, __VA_ARGS__)
-#define t(...) logMe(7, __VA_ARGS__)
+#define V(...) logMe(5, __VA_ARGS__)
+#define D(...) logMe(6, __VA_ARGS__)
+#define d(...) logMe(7, __VA_ARGS__)
+#define t(...) logMe(8, __VA_ARGS__)
+
+
+int shellMeFailVf(char *format, ...)
+{
+  va_list va, va2;
+  int len;
+  char *ret;
+  int result = FALSE;
+
+  va_start(va, format);
+  va_copy(va2, va);
+  // How long is it?
+  len = vsnprintf(0, 0, format, va);
+  len++;
+  va_end(va);
+  // Allocate and do the sprintf()
+  ret = xmalloc(len);
+  vsnprintf(ret, len, format, va2);
+  va_end(va2);
+
+  V(ret);
+  free(ret);
+  return result;
+}
+int shellMeFailVt(char *format, ...)
+{
+  va_list va, va2;
+  int len;
+  char *ret;
+  int result = TRUE;
+
+  va_start(va, format);
+  va_copy(va2, va);
+  // How long is it?
+  len = vsnprintf(0, 0, format, va);
+  len++;
+  va_end(va);
+  // Allocate and do the sprintf()
+  ret = xmalloc(len);
+  vsnprintf(ret, len, format, va2);
+  va_end(va2);
+
+  V(ret);
+  free(ret);
+  return result;
+}
+
+int shellMeFail(char *format, ...)
+{
+  va_list va, va2;
+  int len;
+  char *ret;
+  int result;
+
+  va_start(va, format);
+  va_copy(va2, va);
+  // How long is it?
+  len = vsnprintf(0, 0, format, va);
+  len++;
+  va_end(va);
+  // Allocate and do the sprintf()
+  ret = xmalloc(len);
+  vsnprintf(ret, len, format, va2);
+  va_end(va2);
+
+  result = !WIFEXITED(system(ret));
+  free(ret);
+  return result;
+}
+
+int shellMe(char *format, ...)
+{
+  va_list va, va2;
+  int len;
+  char *ret;
+  int result;
+
+  va_start(va, format);
+  va_copy(va2, va);
+  // How long is it?
+  len = vsnprintf(0, 0, format, va);
+  len++;
+  va_end(va);
+  // Allocate and do the sprintf()
+  ret = xmalloc(len);
+  vsnprintf(ret, len, format, va2);
+  va_end(va2);
+
+  result = system(ret);
+  free(ret);
+  return result;
+}
+
+
+int hasContents(char *file)
+{
+  struct stat st;
+
+  if (0 == lstat(file, &st))
+  {
+    if (0 != st.st_size)
+      return TRUE;
+  }
+  return FALSE;
+}
 
 
 static void addStrL(qlist_t *list, char *s)
@@ -523,6 +732,28 @@ static char *getStrH(qhashtbl_t *hash, char *key)
 }
 
 
+static void bitch(reqData *Rd, char *message, char *log)
+{
+  addStrL(Rd->errors, message);
+  E("%s %s  %s - %s  %s", getStrH(Rd->headers, "REMOTE_ADDR"), Rd->shs.UUID, Rd->shs.name, message, log);
+}
+
+/* "A token cookie that references a non-existent session, its value should be replaced immediately to prevent session fixation."
+https://owasp.org/www-community/attacks/Session_fixation
+    Which describes the problem, but offers no solution.
+    See https://stackoverflow.com/questions/549/the-definitive-guide-to-form-based-website-authentication?rq=1.
+I think this means send a new cookie.
+    I clear out the cookies and send blank ones with -1 maxAge, so they should get deleted.
+*/
+static void bitchSession(reqData *Rd, char *message, char *log)
+{
+  if ('\0' != message[0])
+    addStrL(Rd->errors, message);
+  C("%s %s  %s - %s  %s", getStrH(Rd->headers, "REMOTE_ADDR"), Rd->shs.UUID, Rd->shs.name, message, log);
+  Rd->shs.status = SHS_BOGUS;
+}
+
+
 char *myHMAC(char *in, boolean b64)
 {
   EVP_MD_CTX *mdctx = EVP_MD_CTX_create();      // Gets renamed to EVP_MD_CTX_new() in later versions.
@@ -571,39 +802,371 @@ void PrintTable(lua_State *L)
   }
 }
 
+typedef struct _qLua qLua;
+struct _qLua
+{
+  int type;
+  union
+  {
+    boolean     b;
+    int         i;
+    float       f;
+    char        *s;
+    qtreetbl_t  *t;
+  } v;
+};
 
-int sendTmuxKeys(char *dest, char *keys)
+qLua *qLuaGet(qtreetbl_t *tree, char *key)
 {
-  int ret = 0, i;
-  char *c = xmprintf("%s %s/%s send-keys -t %s:%s '%s'", Tcmd, scRun, Tsocket, Tconsole, dest, keys);
+  return (qLua *) tree->get(tree, key, NULL, false);
+}
+
+void dumpLuaTree(qtreetbl_t *tree, char *name, int depth)
+{
+  qtreetbl_obj_t obj0;
+
+  if (0 == depth)
+    fprintf(stderr, "DUMP Lua table %s -\n%s =\n{\n", name, name);
+  else
+    fprintf(stderr, "%*s[%s] =\n%*s{\n", depth * 2, "", name, depth * 2, "");
+  memset((void*)&obj0, 0, sizeof(obj0)); // must be cleared before call
+  tree->lock(tree);  // lock it when thread condition is expected
+  while(tree->getnext(tree, &obj0, false) == true)
+  {
+    qLua *q0 = obj0.data;
+
+    switch (q0->type)
+    {
+      case LUA_TBOOLEAN :  {fprintf(stderr, "%*s[%s] = %d,\n", (depth + 1) * 2, "", obj0.name, q0->v.b);                break;}
+      case LUA_TINTEGER :  {fprintf(stderr, "%*s[%s] = %d,\n", (depth + 1) * 2, "", obj0.name, q0->v.i);                break;}
+      case LUA_TNUMBER  :  {fprintf(stderr, "%*s[%s] = %f,\n", (depth + 1) * 2, "", obj0.name, q0->v.f);                break;}
+      case LUA_TSTRING  :  {fprintf(stderr, "%*s[%s] = %s,\n", (depth + 1) * 2, "", obj0.name, q0->v.s);                break;}
+      case LUA_TTABLE   :  {dumpLuaTree(q0->v.t, obj0.name, depth + 1);                                                 break;}
+      default           :  {fprintf(stderr, "%*s[%s] ? ??,\n", (depth + 1) * 2, "", obj0.name);         break;}
+    }
+  }
+  tree->unlock(tree);
+  fprintf(stderr, "%*s},\n", depth * 2, "");
+}
+
+qtreetbl_t *lua2tree()
+{
+  qtreetbl_t *ret = qtreetbl(0);
+
+  if (NULL != ret)
+  {
+    qLua q;
+
+    lua_pushnil(L);                                             // +1 nil, first key
+    while(lua_next(L, -2) != 0)                                 // -1 key, +2 next key, value (or 0 if nothing left in table)
+    {
+      // stack now contains: -1 => value; -2 => key; -3 => table
+      // copy the key so that lua_tostring does not modify the original
+      lua_pushvalue(L, -2);
+      // stack now contains: -1 => key; -2 => value; -3 => key; -4 => table
+      char *n = (char *) lua_tostring(L, -1);                   // 0, modifies key copy
+      int t = lua_type(L, -3);
+
+      // Correct the sort order.  Assuming we will never have more than 999,999 sims.  Think that's a safe assumption.
+      /* https://www.hypergridbusiness.com/2021/07/opensim-land-growth/
+            "Total area increased by the equivalent of 2,252 standard regions, for a new record high of 103,625 regions.
+            That’s nearly four times the area of Second Life,"
+      */
+      if ((LUA_TINTEGER == t) || (LUA_TNUMBER == t))
+      {
+        char *tmp = xmprintf("%6s", n);
+        n = tmp;
+      }
+      q.type = lua_type(L, -2);                                 // 0
+      switch(q.type)
+      {
+        case LUA_TBOOLEAN :  {q.v.b = lua_toboolean(L, -2);             break;}
+        case LUA_TINTEGER :  {q.v.i = lua_tointeger(L, -2);             break;}
+        case LUA_TNUMBER  :  {q.v.f = lua_tonumber(L, -2);              break;}
+        case LUA_TSTRING  :  {q.v.s = (char *) lua_tostring(L, -2);     break;}
+        case LUA_TTABLE   :  {lua_pushvalue(L, -2);     q.v.t = lua2tree();     lua_pop(L, 1);          break;}
+
+        default :
+        {
+          q.v.s = (char *) lua_tostring(L, -2);                 // 0
+          E("Unknown Lua variable type for %s = %s is %d", n, q.v.s, q.type);
+          break;
+        }
+      }
+      ret->put(ret, n, &q, sizeof(qLua));
+      if ((LUA_TINTEGER == t) || (LUA_TNUMBER == t))
+        free(n);
+      // pop value + copy of key, leaving original key
+      lua_pop(L, 2);                                            // -2 value and copy of key
+      // stack now contains: -1 => key; -2 => table
+    }
+  }
+  else
+  {
+    D("No memory left.");
+    perror_msg("Unable to allocate memory");
+  }
 
-  i = system(c);
-  if (!WIFEXITED(i))
-    E("tmux send-keys command failed!");
-  free(c);
   return ret;
 }
 
-int sendTmuxCmd(char *dest, char *cmd)
+qtreetbl_t *Lua2tree(char *file, char *var)
 {
-  int ret = 0, i;
-  char *c = xmprintf("%s %s/%s send-keys -t %s:'%s' '%s' Enter", Tcmd, scRun, Tsocket, Tconsole, dest, cmd);
+  qtreetbl_t *ret = NULL;
+  struct stat st;
 
-  i = system(c);
-  if (!WIFEXITED(i))
-    E("tmux send-keys command failed!");
-  free(c);
+  if (0 != lstat(file, &st))
+  {
+    D("No %s file.", file);
+    perror_msg("Unable to stat %s", file);
+  }
+  else
+  {
+    if (luaL_loadfile(L, file))                                         // +1 the chunk or an error message. If something went wrong, error message is at the top of the stack.
+      E("Couldn't load Lua file: %s", lua_tostring(L, -1));             // 0
+    else
+    {
+      if (lua_pcall(L, 0, LUA_MULTRET, 0))                              // +1 result or an error message.  Except we get 0 or error?
+      {
+        E("Failed to run Lua script: %s", lua_tostring(L, -1));         // 0
+        lua_pop(L, 1);                                                  // -1 chunk or error message
+      }
+      else
+      {
+        lua_getglobal(L, var);                                  // +1 the value of var
+        ret = lua2tree();
+        lua_pop(L, 1);                                          // -1 var
+      }
+    }
+    lua_pop(L, 1);                                                      // -1 chunk or error message
+  }
+  return ret;
+}
+
+void freeLuaTree(qtreetbl_t *tree)
+{
+  qtreetbl_obj_t obj0;
+
+  memset((void*)&obj0, 0, sizeof(obj0)); // must be cleared before call
+  tree->lock(tree);  // lock it when thread condition is expected
+  while(tree->getnext(tree, &obj0, false) == true)
+  {
+    qLua *q0 = obj0.data;
+
+    if (LUA_TTABLE == q0->type)
+      freeLuaTree(q0->v.t);
+  }
+  tree->unlock(tree);
+  tree->free(tree);
+}
+
+
+int Lua2hashtbl(char *file, qhashtbl_t *hash, char *var)
+{
+  int ret = FALSE;
+  struct stat st;
+
+  if (0 != lstat(file, &st))
+  {
+    D("No %s file.", file);
+    perror_msg("Unable to stat %s", file);
+    return FALSE;
+  }
+  else
+  {
+    int status = luaL_loadfile(L, file);                                // +1 the chunk or an error message.
+    if (status) // If something went wrong, error message is at the top of the stack.
+      E("Couldn't load Lua file: %s", lua_tostring(L, -1));             // 0
+    else
+    {
+      int result = lua_pcall(L, 0, LUA_MULTRET, 0);                     // +1 result or an error message.  Except we get 0 or error?
+      if (result)
+      {
+        E("Failed to run Lua script: %s", lua_tostring(L, -1));         // 0
+        lua_pop(L, 1);                                                  // -1 chunk or error message
+      }
+      else
+      {
+        lua_getglobal(L, var);                                          // +1 the value of var
+        lua_pushnil(L);                                                 // +1 nil, first key
+        while(lua_next(L, -2) != 0)                                     // -1 key, +2 next key, value (or 0 if nothing left in table)
+        {
+          char *n = (char *) lua_tostring(L, -2);                       // 0
+
+          // Numbers can convert to strings, so check for numbers before checking for strings.
+          // On the other hand, strings that can be converted to numbers also pass lua_isnumber().  sigh
+          if (lua_isnumber(L, -1))                                      // 0
+          {
+            float v = lua_tonumber(L, -1);                              // 0
+            hash->put(hash, n, &v, sizeof(float));
+          }
+          else if (lua_isstring(L, -1))                                 // 0
+            hash->putstr(hash, n, (char *) lua_tostring(L, -1));        // 0
+          else if (lua_isboolean(L, -1))                                // 0
+          {
+            int v = lua_toboolean(L, -1);                               // 0
+            hash->putint(hash, n, v);
+          }
+          else
+          {
+            char *v = (char *) lua_tostring(L, -1);                     // 0
+            E("Unknown Lua variable type for %s = %s", n, v);
+          }
+          lua_pop(L, 1);                                                // -1 value
+        }
+      lua_pop(L, 1);                                            // -1 var
+        ret = TRUE;
+      }
+    }
+  }
+  lua_pop(L, 1);                                                        // -1 chunk or error message
+  return ret;
+}
+
+
+int LuaToHash(reqData *Rd, char *file, char *var, qhashtbl_t *tnm, int ret, struct stat *st, struct timespec *now, char *type)
+{
+  struct timespec then;
+
+  if (-1 == clock_gettime(CLOCK_REALTIME, &then))
+    perror_msg("Unable to get the time.");
+  I("Reading %s file %s", type, file);
+  if (!Lua2hashtbl(file, tnm, var))
+  {
+    bitch(Rd, "Broken thing.", "Can't run file.");
+    ret++;
+  }
+  else
+  {
+        if (-1 == clock_gettime(CLOCK_REALTIME, now))
+          perror_msg("Unable to get the time.");
+        double n = (now->tv_sec * 1000000000.0) + now->tv_nsec;
+        double t = (then.tv_sec * 1000000000.0) + then.tv_nsec;
+        t("Reading %s file took %lf seconds", type, (n - t) / 1000000000.0);
+  }
+
+  return ret;
+}
+
+
+boolean writeLuaDouble(reqData *Rd, int fd, char *file, char *name, double number)
+{
+  boolean ret = TRUE;
+// TODO - putting these in Lua as numbers causes lua_tolstring to barf when we read them.  Though Lua is supposed to convert between numbers and strings.
+  char *t = xmprintf("  ['%s'] = '%f',\n", name, number);       // NOTE - default precision is 6 decimal places.
+  size_t l = strlen(t);
+
+  if (l != writeall(fd, t, l))
+  {
+    perror_msg("Writing %s", file);
+    ret = FALSE;
+  }
+  free(t);
+  return ret;
+}
+
+boolean writeLuaInteger(reqData *Rd, int fd, char *file, char *name, long number)
+{
+  boolean ret = TRUE;
+// TODO - putting these in Lua as numbers causes lua_tolstring to barf when we read them.  Though Lua is supposed to convert between numbers and strings.
+  char *t = xmprintf("  ['%s'] = '%ld',\n", name, number);
+  size_t l = strlen(t);
+
+  if (l != writeall(fd, t, l))
+  {
+    perror_msg("Writing %s", file);
+    ret = FALSE;
+  }
+  free(t);
+  return ret;
+}
+
+boolean writeLuaString(reqData *Rd, int fd, char *file, char *name, char *string)
+{
+  boolean ret = TRUE;
+
+  if (NULL == string)
+    string = getStrH(Rd->stuff, name);
+
+  size_t l = strlen(string);
+  char *t0 = xmalloc(l * 2 + 1);
+  int i, j = 0;
+
+// TODO - maybe escape other non printables as well?
+  for (i = 0; i < l; i++)
+  {
+    // We don't need to escape [] here, coz we are using '' below.  Same applies to ", but do it anyway.
+    switch(string[i])
+    {
+      case '\n':
+      case '\\':
+      case '\'':
+      case '"':
+        t0[j++] = '\\'; break;
+    }
+    if ('\n' == string[i])
+      t0[j++] = 'n';
+    else if ('\r' == string[i])
+      ;
+    else
+      t0[j++] = string[i];
+  }
+  t0[j] = '\0';
+
+  char *t1 = xmprintf("  ['%s'] = '%s',\n", name, t0);
+
+  l = strlen(t1);
+  if (l != writeall(fd, t1, l))
+  {
+    perror_msg("Writing %s to %s", name, file);
+    ret = FALSE;
+  }
+  free(t1);
+  free(t0);
   return ret;
 }
 
+
+void doTmuxCmd(char *format, ...)
+{
+  va_list va, va2;
+  int len;
+  char *ret;
+
+  va_start(va, format);
+  va_copy(va2, va);
+  // How long is it?
+  len = vsnprintf(0, 0, format, va);
+  len++;
+  va_end(va);
+  // Allocate and do the sprintf()
+  ret = xmalloc(len);
+  vsnprintf(ret, len, format, va2);
+  va_end(va2);
+
+  if (shellMeFail("%s %s/%s %s", Tcmd, scRun, Tsocket, ret))
+    E("tmux command failed!  %s", ret);
+  free(ret);
+}
+
+void sendTmuxCmd(char *dest, char *cmd)
+{
+  doTmuxCmd("send-keys -t %s:'%s' '%s' Enter", Tconsole, dest, cmd);
+}
+
+void sendTmuxKeys(char *dest, char *keys)
+{
+  doTmuxCmd("send-keys -t %s:%s '%s'", Tconsole, dest, keys);
+}
+
 void waitTmuxText(char *dest, char *text)
 {
   int i;
   // Using " for the grep pattern, coz ' might be used in a sim name.
 // TODO - should escape \ " ` in text.
-  char *c = xmprintf("sleep 5; %s %s/%s capture-pane -t %s:'%s' -p | grep -F \"%s\" 2>&1 > /dev/null", Tcmd, scRun, Tsocket, Tconsole, dest, text);
+  char *c = xmprintf("sleep 1; %s %s/%s capture-pane -Jt %s -p | grep -E \"%s\" 2>&1 > /dev/null", Tcmd, scRun, Tsocket, dest, text);
 
-  D("Waiting for '%s'.", text);
+  T("Waiting for '%s'.", text);
   do
   {
     i = system(c);
@@ -647,12 +1210,44 @@ float waitLoadAverage(float la, float extra, int timeout)
 // Rob forget to do this, but at least he didn't declare it static.
 struct dirtree *dirtree_handle_callback(struct dirtree *new, int (*callback)(struct dirtree *node));
 
+
+// A sim structure for holding all the stuff from the sim.ini file.
+typedef struct _simData simData;
+struct _simData
+{
+  // portH is the HTTP port for the sim, portU is the UDP port for the sim.
+  int locX, locY, sizeX, sizeY, sizeZ, portH, portU, maxPrims;
+  char *name, *tab, *UUID, *regionType, *estate, *owner;
+  char *paneID;
+  int window, pane, users;
+};
+
 typedef struct _simList simList;
 struct _simList
 {
   int len, num;
   char **sims;
+  qtreetbl_t *byTab, *simsLua, *unsorted, *byUUID;
+  // Stuff for the looping through sims, doing things, and waiting.
+  int doIt;
+  float  la;
+  char *target, *backup;
 };
+simList *ourSims = NULL;
+
+
+static int getIntFromIni(qlisttbl_t *ini, char *name)
+{
+  int ret;
+  char *t = "0";
+
+  t = ini->getstr(ini, name, false);
+  if (NULL == t)
+    t = "0";
+  else if ('"' == t[0])
+    t = qstrunchar(t, '"', '"');
+  return strtol(t, NULL, 10);
+}
 
 static int filterSims(struct dirtree *node)
 {
@@ -672,6 +1267,7 @@ static int filterSims(struct dirtree *node)
     return 0;
 }
 
+/*
 // We particularly don't want \ " `
 char *cleanSimName(char *name)
 {
@@ -690,91 +1286,441 @@ char *cleanSimName(char *name)
 
   return ret;
 }
+*/
 
-simList *getSims()
+static int filterInis(struct dirtree *node)
 {
-  simList *sims = xmalloc(sizeof(simList));
-  memset(sims, 0, sizeof(simList));
-  char *path = xmprintf("%s/config", scRoot);
-  struct dirtree *new = dirtree_add_node(0, path, 0);
-  new->extra = (long) sims;
-  dirtree_handle_callback(new, filterSims);
+    if (!node->parent) return DIRTREE_RECURSE | DIRTREE_SHUTUP;
+    int l = strlen(node->name);
+    if (strncmp(&(node->name[l - 4]), ".ini", 4) == 0)
+    {
+      strncpy((char *) node->parent->extra, node->name, l - 4);
+      return DIRTREE_ABORT;
+    }
+    return 0;
+}
+
+static int filterShinis(struct dirtree *node)
+{
+    if (!node->parent) return DIRTREE_RECURSE | DIRTREE_SHUTUP;
+    int l = strlen(node->name);
+    if ((6 < l) && ((strncmp(&(node->name[l - 6]), ".shini", 6) == 0)))
+    {
+      simList *list = (simList *) node->parent->extra;
+
+      if ((list->num + 1) > list->len)
+      {
+        list->len = list->len + 1;
+        list->sims = xrealloc(list->sims, list->len * sizeof(char *));
+      }
+      list->sims[list->num] = xstrndup(node->name, l - 6);
+      list->num++;
+    }
+    return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Sim wrangling loop.
+////////////////////////////////////////////////////////////////////////////////////////////////////
+typedef void (*simFunction)(simData *simd, char *sim, char *type, int count, int window, int panes, int pane);
+void forEachSim(char *verb, simFunction func, simFunction not)
+{
+  qtreetbl_obj_t obj0, obj1;
+  qLua *q0, *q1;
+  int count = 0, window = 0, panes = 4, pane = 0;
+
+  memset((void*)&obj0, 0, sizeof(obj0));
+  ourSims->simsLua->lock(ourSims->simsLua);
+  while(ourSims->simsLua->getnext(ourSims->simsLua, &obj0, false) == true)
+  {
+    q0 = obj0.data;
+    char *type = "unsorted";
+
+    if (LUA_TTABLE == q0->type)
+    {
+      panes = 4;
+      q1 = q0->v.t->get(q0->v.t, "number",      NULL, false);  if (NULL != q1)  window  = q1->v.f - 1;
+      q1 = q0->v.t->get(q0->v.t, "panes",       NULL, false);  if (NULL != q1)  panes   = q1->v.f;
+      q1 = q0->v.t->get(q0->v.t, "type",        NULL, false);  if (NULL != q1)  type    = q1->v.s;
+      if (0 == panes)
+      {
+        pane = 3;
+        window = 0;
+        type = Ttab;
+      }
+      else if (0 != pane)
+      {
+        pane = 0;
+        window++;
+      }
+
+      if (verb)
+        V("%s sims of type %s, window %d, %d panes per window.", verb, type, window, panes);
+      memset((void*)&obj1, 0, sizeof(obj1));
+      q0->v.t->lock(q0->v.t);
+      while(q0->v.t->getnext(q0->v.t, &obj1, false) == true)
+      {
+        q1 = obj1.data;
+
+        if ((strcmp("number", obj1.name) != 0) && (strcmp("panes", obj1.name) != 0) && (strcmp("type", obj1.name) != 0))
+        {
+          simData *simd = ourSims->byTab->get(ourSims->byTab, q1->v.s, NULL, false);
 
-  qsort(sims->sims, sims->num, sizeof(char *), qstrcmp);
+          if (NULL == simd)
+          {
+            if (not)
+              not(simd, q1->v.s, type, count, window, panes, pane);
+            else
+              E("Sim %s not found in ini list!", q1->v.s);
+          }
+          else
+          {
+            func(simd, q1->v.s, type, count, window, panes, pane);
+            count++;
+            pane++;
+            if (pane >= panes)
+            {
+              pane = 0;
+              window++;
+            }
+          }
+        }
+      }
+      q0->v.t->unlock(q0->v.t);
+    }
+  }
+  ourSims->simsLua->unlock(ourSims->simsLua);
+}
+
+void simNotFound(simData *simd, char *sim, char *type, int count, int window, int panes, int pane)
+{
+  char *path = xmprintf("%s/%s.shini", scEtc, sim);
+  qlisttbl_t *ini = qconfig_parse_file(NULL, path, '=');
+
+  if (NULL == ini)
+    E("Can't find %s", path);
+  else
+  {
+    simd = xzalloc(sizeof(simData));
+    simd->tab = sim;
+    simd->name          = qstrunchar(ini->getstr(ini, "Region.RegionName", true), '"', '"');
+    simd->UUID          = qstrunchar(ini->getstr(ini, "Region.RegionUUID", true), '"', '"');
+//    simd->regionType  = qstrunchar(ini->getstr(ini, "Region.RegionType", true), '"', '"');
+    simd->sizeX         = getIntFromIni(ini, "Region.SizeX");
+    simd->sizeY         = getIntFromIni(ini, "Region.SizeY");
+    simd->sizeZ         = getIntFromIni(ini, "Region.SizeZ");
+// TODO - store a pointer instead of multiple copies of the data.
+    ourSims->byTab->put(ourSims->byTab, sim, simd, sizeof(simData));
+    ourSims->byUUID->put(ourSims->byUUID, simd->UUID, simd, sizeof(simData));
+    if (strcmp("unsorted", type) == 0)
+      ourSims->unsorted->put(ourSims->unsorted, sim, simd, sizeof(simData));
+    ini->free(ini);
+    free(simd);
+  }
   free(path);
-  return sims;
 }
 
+
 void freeSimList(simList *sims)
 {
   int i;
 
+  if (NULL == sims)
+    return;
+
   for (i = 0; i < sims->num; i++)
     free(sims->sims[i]);
   free(sims->sims);
+
+  qtreetbl_obj_t obj;
+  memset((void*) &obj, 0, sizeof(obj));  // start from the minimum.
+  sims->byTab->lock(sims->byTab);
+  while (sims->byTab->getnext(sims->byTab, &obj, false) == true)
+  {
+    char *name = qmemdup(obj.name, obj.namesize);  // keep the name
+    size_t namesize = obj.namesize;                // for removal argument
+    {
+      simData *simd = (simData *) obj.data;
+
+      if (NULL != simd)
+      {
+        free(simd->name);
+//      free(simd->tab);
+        free(simd->UUID);
+//      free(simd->regionType);
+        free(simd->estate);
+        free(simd->owner);
+        free(simd->paneID);
+      }
+    }
+//    sims->byTab->remove_by_obj(sims->byTab, obj.name, obj.namesize);  // remove
+//    obj = sims->byTab->find_nearest(sims->byTab, name, namesize, false); // rewind one step back
+    free(name);  // clean up
+  }
+  sims->byTab->unlock(sims->byTab);
+  sims->byTab->free(sims->byTab);
+  freeLuaTree(sims->simsLua);
+  freeLuaTree(sims->unsorted);
+  freeLuaTree(sims->byUUID);
+  free(sims->target);
+  free(sims->backup);
+
   free(sims);
 }
 
-static int filterInis(struct dirtree *node)
+// Get the details from all the .ini or .shini sim files.
+//   Creates the .shini and sims.lua files if it's an old install.
+simList *getSims()
 {
-    if (!node->parent) return DIRTREE_RECURSE | DIRTREE_SHUTUP;
-    int l = strlen(node->name);
-    if (strncmp(&(node->name[l - 4]), ".ini", 4) == 0)
+  if (NULL != ourSims) return ourSims;
+
+  int i, fd = -1;
+  size_t l;
+  char *file = xmprintf("%s/sims.lua", scEtc);
+
+  ourSims = xzalloc(sizeof(simList));
+  ourSims->byTab = qtreetbl(0);
+  ourSims->unsorted = qtreetbl(0);
+  ourSims->byUUID = qtreetbl(0);
+  ourSims->doIt = FALSE;
+
+  // Read or create simsLua
+  ourSims->simsLua = Lua2tree(file, "sims");
+  if (NULL == ourSims->simsLua)
+  {
+    ourSims->simsLua = qtreetbl(0);
+    ourSims->doIt = TRUE;
+  }
+
+  // Find all the old .ini files, convert them to .shini files if they don't exist.
+  char *path = xmprintf("%s/config", scRoot), *newPath;
+  struct dirtree *new = dirtree_add_node(0, path, 0);
+
+  new->extra = (long) ourSims;
+  dirtree_handle_callback(new, filterSims);
+  free(path);
+  for (i = 0; i < ourSims->num; i++)
+  {
+    char *sim = ourSims->sims[i], *name = xmprintf("%s/config/%s", scRoot, sim);
+    qlisttbl_t *ini;
+    struct dirtree *new = dirtree_add_node(0, name, 0);
+
+    free(name);
+    name = xzalloc(1024);
+    new->extra = (long) name;
+    dirtree_handle_callback(new, filterInis);
+    if ('\0' != name[0])
     {
-      strcpy((char *) node->parent->extra, node->name);
-      return DIRTREE_ABORT;
+      path = xmprintf("%s/config/%s/%s.ini", scRoot, sim, name);
+      newPath = xmprintf("%s/%s.shini", scEtc, name);
+
+      if (!qfile_exist(newPath))
+      {
+        char *cmd = xmprintf("sed -E"
+            " -e 's#\\[Const]#\\[Const]  ; fakeVariableCozOpenSim='' ; pushd ../current/bin; ./sledjchisl $1 `basename $0`; popd ; exit 0#'"
+            " -e 's/mysim=\"[[:digit:]]*\"/mysim=\"%s\"/'"
+            " -e 's/sim\\$\\{Const\\|mysim\\}/\\$\\{Const\\|mysim\\}/g'"
+            " -e '/\\[Startup\\]/d'"
+            " -e '/PIDFile.*/d'"
+            " -e '/LogFile.*/d'"
+            " -e '/StatsLogFile.*/d'"
+            " -e '/ConsoleHistoryFile.*/d'"
+            " %s >%s", name, path, newPath);
+
+        V("Converting %s.ini  ->  %s", path, newPath);
+        D(cmd);
+        if (shellMeFail(cmd))
+          E("sed command failed!");
+        else
+        {
+          if (shellMeFail("chmod ugo+x %s", newPath))
+            E("chmod command failed!");
+
+          char *link = xmprintf("%s/%s.shini", scBin, name);
+          I("Symlinking %s to %s", newPath, link);
+          if (qfile_exist(link))
+          {
+            if (shellMeFail("rm %s", link))
+              E("rm command failed!");
+          }
+          if (0 != symlink(newPath, link))
+            perror_msg("Symlinking %s to %s", newPath, link);
+          free(link);
+        }
+        free(cmd);
+      }
+      free(newPath);
+      free(path);
     }
-    return 0;
-}
+    free(name);
+  }
+//  dumpLuaTree(ourSims->simsLua, "simsLua", 0);
+//  dumpLuaTree(ourSims->byTab, "byTab", 0);
+
+  // Read all the .shini files.
+  forEachSim(NULL, NULL, simNotFound);
+//  dumpLuaTree(ourSims->simsLua, "simsLua", 0);
+//  dumpLuaTree(ourSims->byTab, "byTab", 0);
+//  dumpLuaTree(ourSims->unsorted, "unsorted", 0);
+
+  // Check for any .shini files not in sims.lua, add them to the unsorted list.
+  for (i = 0; i < ourSims->num; i++)
+    free(ourSims->sims[i]);
+  ourSims->num = 0;
+  new = dirtree_add_node(0, scEtc, 0);
+  new->extra = (long) ourSims;
+  dirtree_handle_callback(new, filterShinis);
+  for (i = 0; i < ourSims->num; i++)
+  {
+    simData *simd = ourSims->byTab->get(ourSims->byTab, ourSims->sims[i], NULL, false);
+    if (NULL == simd)
+    {
+      V("Shini NOT found in list - %s/%s.shini", scEtc, ourSims->sims[i]);
+      simNotFound(simd, ourSims->sims[i], "unsorted", 0, 0, 0, 0);
+      ourSims->doIt = TRUE;
+    }
+  }
+//  dumpLuaTree(ourSims->simsLua, "simsLua", 0);
+//  dumpLuaTree(ourSims->byTab, "byTab", 0);
+//  dumpLuaTree(ourSims->unsorted, "unsorted", 0);
 
-char *getSimName(char *sim)
-{
-  char *ret = NULL;
-  char *c = xmprintf("%s/config/%s", scRoot, sim);
-  struct dirtree *new = dirtree_add_node(0, c, 0);
+  // Write the sims.lua_NEW file if needed.
+  if (ourSims->doIt)
+  {
+    char *tnm;
 
-  free(c);
-  c = xzalloc(1024);
-  new->extra = (long) c;
-  dirtree_handle_callback(new, filterInis);
-  if ('\0' != c[0])
-  {
-    char *temp = NULL;
-    regex_t pat;
-    regmatch_t m[2];
-    long len;
-    int fd;
-
-    temp = xmprintf("%s/config/%s/%s", scRoot, sim, c);
-    fd = xopenro(temp);
-    xregcomp(&pat, "RegionName = \"(.+)\"", REG_EXTENDED);
-    do
-    {
-      // TODO - get_line() is slow, and wont help much with DOS and Mac line endings.
-      //        gio_gets() isn't any faster really, but deals with DOS line endings at least.
-      free(temp);
-      temp = get_line(fd);
-      if (temp)
+    if (shellMeFail("mv -f %s/sims.lua %s/sims.lua.BACKUP", scEtc, scEtc))
+      E("mv command failed!");
+
+    free(file);
+    file = xmprintf("%s/sims.lua", scEtc);
+    I("Creating sims %s.", file);
+
+    fd = notstdio(xcreate_stdio(file, O_CREAT | O_WRONLY | O_TRUNC | O_CLOEXEC, S_IRUSR | S_IWUSR));
+    if (-1 != fd)
+    {
+      tnm = "sims =   -- Note these are .shini / tmux tab short names.\n{\n";
+      l = strlen(tnm);
+      if (l != writeall(fd, tnm, l))
+        perror_msg("Writing %s", file);
+
+      qtreetbl_obj_t obj0, obj1;
+      qLua *q0, *q1;
+
+      memset((void*)&obj0, 0, sizeof(obj0));
+      ourSims->simsLua->lock(ourSims->simsLua);
+      while(ourSims->simsLua->getnext(ourSims->simsLua, &obj0, false) == true)
       {
-        if (!regexec(&pat, temp, 2, m, 0))
+        q0 = obj0.data;
+        char *type = "unsorted";
+
+        if (LUA_TTABLE == q0->type)
         {
-          // Return first parenthesized subexpression as string.
-          if (pat.re_nsub > 0)
+          tnm = "  {";
+          l = strlen(tnm);
+          if (l != writeall(fd, tnm, l))
+            perror_msg("Writing %s", file);
+          q1 = q0->v.t->get(q0->v.t, "type",    NULL, false);
+          if (NULL != q1)
+          {
+            type = q1->v.s;
+            tnm = xmprintf("['type'] = '%s'; ", type);
+            l = strlen(tnm);
+            if (l != writeall(fd, tnm, l))
+              perror_msg("Writing %s", file);
+            free(tnm);
+          }
+          q1 = q0->v.t->get(q0->v.t, "number",  NULL, false);
+          if (NULL != q1)
+          {
+            tnm = xmprintf("['number'] = %d; ", (int) q1->v.f);
+            l = strlen(tnm);
+            if (l != writeall(fd, tnm, l))
+              perror_msg("Writing %s", file);
+            free(tnm);
+          }
+          q1 = q0->v.t->get(q0->v.t, "panes",   NULL, false);
+          if (NULL != q1)
+          {
+            tnm = xmprintf("['panes'] = %d; ", (int) q1->v.f);
+            l = strlen(tnm);
+            if (l != writeall(fd, tnm, l))
+              perror_msg("Writing %s", file);
+            free(tnm);
+          }
+
+          if (strcmp("unsorted", type) != 0)
           {
-            ret = xmprintf("%.*s", (int) (m[1].rm_eo - m[1].rm_so), temp + m[1].rm_so);
-            free(temp);
-            break;
+            memset((void*)&obj1, 0, sizeof(obj1));
+            q0->v.t->lock(q0->v.t);
+            while(q0->v.t->getnext(q0->v.t, &obj1, false) == true)
+            {
+              q1 = obj1.data;
+
+              if ((strcmp("number", obj1.name) != 0) && (strcmp("panes", obj1.name) != 0) && (strcmp("type", obj1.name) != 0))
+              {
+                tnm = xmprintf("\n    '%s',", q1->v.s);
+                l = strlen(tnm);
+                if (l != writeall(fd, tnm, l))
+                  perror_msg("Writing %s", file);
+                free(tnm);
+              }
+            }
+            q0->v.t->unlock(q0->v.t);
           }
-        }
+          else
+          {
+            memset((void*)&obj1, 0, sizeof(obj1));
+            ourSims->unsorted->lock(ourSims->unsorted);
+            while(ourSims->unsorted->getnext(ourSims->unsorted, &obj1, false) == true)
+            {
+              simData *simd = obj1.data;
+
+              if ((strcmp("number", obj1.name) != 0) && (strcmp("panes", obj1.name) != 0) && (strcmp("type", obj1.name) != 0))
+              {
+                tnm = xmprintf("\n    '%s',", simd->tab);
+                l = strlen(tnm);
+                if (l != writeall(fd, tnm, l))
+                  perror_msg("Writing %s", file);
+                free(tnm);
+              }
+            }
+            ourSims->unsorted->unlock(ourSims->unsorted);
+          }
+        }
+        tnm = "\n  },\n";
+        l = strlen(tnm);
+        if (l != writeall(fd, tnm, l))
+          perror_msg("Writing %s", file);
       }
-    } while (temp);
-    regfree(&pat);
-    xclose(fd);
+      ourSims->simsLua->unlock(ourSims->simsLua);
+      tnm = "}\nreturn sims\n";
+      l = strlen(tnm);
+      if (l != writeall(fd, tnm, l))
+        perror_msg("Writing %s", file);
+
+      xclose(fd);
+    }
+    freeSimList(ourSims);
+    free(file);
+    // Reread everything.
+    file = xmprintf("%s/sims.lua", scEtc);
+    ourSims = xzalloc(sizeof(simList));
+    ourSims->byTab = qtreetbl(0);
+    ourSims->unsorted = qtreetbl(0);
+    ourSims->doIt = FALSE;
+    ourSims->simsLua = Lua2tree(file, "sims");
+    forEachSim(NULL, NULL, simNotFound);
+//    dumpLuaTree(ourSims->simsLua, "simsLua", 0);
+//    dumpLuaTree(ourSims->byTab, "byTab", 0);
+//    dumpLuaTree(ourSims->unsorted, "unsorted", 0);
   }
-  free(c);
-  return ret;
-}
+  free(file);
 
+//  dumpLuaTree(ourSims->simsLua, "simsLua", 0);
+//  dumpLuaTree(ourSims->byTab, "byTab", 0);
+  return ourSims;
+}
 
 // Expects either "simXX" or "ROBUST".
 int checkSimIsRunning(char *sim)
@@ -783,7 +1729,7 @@ int checkSimIsRunning(char *sim)
   struct stat st;
 
   // Check if it's running.
-  char *path = xmprintf("%s/caches/%s.pid", scRoot, sim);
+  char *path = xmprintf("%s/%s.pid", scRun, sim);
   if (0 == stat(path, &st))
   {
     int fd, i;
@@ -804,20 +1750,27 @@ int checkSimIsRunning(char *sim)
 // I'd rather re-use the toysh command running stuff, since ps is a toy, but that's private.
 // TODO - switch to toybox ps and rm.
         free(path);
-        path = xmprintf("ps -p %s --no-headers -o comm", pid);
+        path = xmprintf("ps -p %s --no-headers -o comm >/dev/null", pid);
         i = system(path);
         if (WIFEXITED(i))
         {
           if (0 != WEXITSTATUS(i))      // No such pid.
           {
             free(path);
-            path = xmprintf("rm -f %s/caches/%s.pid", scRoot, sim);
+            path = xmprintf("rm -f %s/%s.pid", scRun, sim);
             d("%s", path);
             i = system(path);
+            if (WIFEXITED(i))
+            {
+              if (0 != WEXITSTATUS(i))  // No such pid.
+                E("Cannot remove stale PID file %s", path);
+            }
           }
           else
             d("checkSimIsRunning(%s) has PID %s, which is actually running.", sim, pid);
         }
+// TODO - WTF?
+//      free(path);
       }
     }
     free(pid);
@@ -825,7 +1778,7 @@ int checkSimIsRunning(char *sim)
 
   // Now check if it's really really running.  lol
   free(path);
-  path = xmprintf("%s/caches/%s.pid", scRoot, sim);
+  path = xmprintf("%s/%s.pid", scRun, sim);
   if (0 == stat(path, &st))
   {
     D("checkSimIsRunning(%s) -> %s is really really running.", sim, path);
@@ -838,6 +1791,581 @@ int checkSimIsRunning(char *sim)
   return ret;
 }
 
+void findWindow(simData *simd, char *sim, char *type, int count, int window, int panes, int pane)
+{
+  snprintf(toybuf, sizeof(toybuf), "%s/IDs_%d.lua", scTemp, window);
+  qtreetbl_t *IDs = Lua2tree(toybuf, "IDs");
+  snprintf(toybuf, sizeof(toybuf), "%d %d", window, pane);
+  free(simd->paneID);
+  simd->paneID = xmprintf("%s", qLuaGet(IDs, toybuf)->v.s);
+  freeLuaTree(IDs);
+  if (strcmp(backupIARsim, sim) == 0)
+  {
+    ourSims->backup = xstrdup(simd->paneID);
+    V("Found backup sim %s in %s", sim, simd->paneID);
+  }
+}
+
+void prepSims(simData *simd, char *sim, char *type, int count, int window, int panes, int pane)
+{
+  char *path = xmprintf("%s/%s.shini", scEtc, simd->tab);
+  char *newPath = xmprintf("%s/sim%d/%s.ini", scTemp, count, simd->tab);        // Coz OpenSim sucks.
+  char *cmd;
+
+  simd->window = window;
+  simd->pane = pane;
+
+  // Make sure all tmux windows and panes are startned.
+  if (0 == panes)
+  {
+//    doTmuxCmd("split-window -hp 50 -d -t '%s:0.0'", Tconsole);
+//    doTmuxCmd("split-window -vp 50 -d -t '%s:0.1'", Tconsole);
+//    doTmuxCmd("split-window -vp 50 -d -t '%s:0.0'", Tconsole);
+  }
+  else if (0 == pane)
+  {
+    doTmuxCmd("new-window -dc '%s/current/bin' -n '%s' -t '%s:%d'", scRoot, type, Tconsole, window);
+    if (2 <= panes)
+      doTmuxCmd("split-window -hp 50 -d -t '%s:%d.0'", Tconsole, window);
+    if (4 <= panes)
+    {
+      doTmuxCmd("split-window -vp 50 -d -t '%s:%d.1'", Tconsole, window);
+      doTmuxCmd("split-window -vp 50 -d -t '%s:%d.0'", Tconsole, window);
+    }
+    if (8 <= panes)
+    {
+      doTmuxCmd("split-window -hp 50 -d -t '%s:%d.3'", Tconsole, window);
+      doTmuxCmd("split-window -hp 50 -d -t '%s:%d.2'", Tconsole, window);
+      doTmuxCmd("split-window -hp 50 -d -t '%s:%d.1'", Tconsole, window);
+      doTmuxCmd("split-window -hp 50 -d -t '%s:%d.0'", Tconsole, window);
+    }
+  }
+
+  // Create the temporary .ini files.
+  shellMe("echo 'IDs={' >%s/IDs_%d.lua", scTemp, window);
+  doTmuxCmd("list-panes -t %d -F \"['%d #{pane_index}'] = '#{window_id}.#{pane_id}',\" >> %s/IDs_%d.lua", window, window, scTemp, window);
+  shellMe("echo '}\nreturn IDs' >>%s/IDs_%d.lua", scTemp, window);
+
+  findWindow(simd, sim, type, count, window, panes, pane);
+  simd->portH = 8004 + count * 2;
+  simd->portU = 8005 + count * 2;
+  cmd = xmprintf("rm -fr %s/sim%d; mkdir -p %s/sim%d; sed -E"
+    " -e 's@\\[Region\\]@"
+    "    paneID = \"\\%s\"\\n"
+    "\\[Startup\\]\\n"
+    "    PIDFile = \"\\$\\{Paths\\|PIDPath\\}\\/\\$\\{Const\\|mysim\\}\\.pid\"\\n"
+    "    LogFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSim_\\$\\{Const\\|mysim\\}\\.log\"\\n"
+    "    StatsLogFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSimStats_\\$\\{Const\\|mysim\\}\\.log\"\\n"
+    "    ConsoleHistoryFile = \"\\$\\{Paths\\|LogPath\\}\\/OpenSimConsoleHistory_\\$\\{Const\\|mysim\\}\\.txt\"\\n"
+    "\\n\\[Region\\]@'"
+    " -e 's/InternalPort[[:space:]]*=[[:space:]]*[[:digit:]]+/InternalPort = %d/'"
+    " -e 's/InternalPort[[:space:]]*=[[:space:]]*\"[[:digit:]]+\"/InternalPort = %d/'"
+    " -e 's/http_listener_port[[:space:]]*=[[:space:]]*[[:digit:]]+/http_listener_port = %d/'"
+    " -e 's/http_listener_port[[:space:]]*=[[:space:]]*\"[[:digit:]]+\"/http_listener_port = %d/'"
+    " %s >%s",
+    scTemp, count,
+    scTemp, count,
+    simd->paneID,
+    simd->portU,
+    simd->portU,
+    simd->portH,
+    simd->portH,
+    path, newPath);
+  D("Writing .ini file %s with ports %d %d", newPath, simd->portH, simd->portU);
+  if (shellMeFail(cmd))
+    E("sed command failed!");
+  free(cmd);
+  free(newPath);
+  free(path);
+}
+
+// Figure out where the sims are running.
+void findSimsTmux(simData *simd, char *sim, char *type, int count, int window, int panes, int pane)
+{
+  simd->window = window;
+  simd->pane = pane;
+  snprintf(toybuf, sizeof(toybuf), "%s/IDs_%d.lua", scTemp, window);
+  qtreetbl_t *IDs = Lua2tree(toybuf, "IDs");
+  snprintf(toybuf, sizeof(toybuf), "%d %d", window, pane);
+  simd->paneID = xmprintf("%s", qLuaGet(IDs, toybuf)->v.s);
+  freeLuaTree(IDs);
+}
+
+void startSim(simData *simd, char *sim, char *type, int count, int window, int panes, int pane)
+{
+  if (!checkSimIsRunning(simd->tab))
+  {
+    I("Tmux tab [%d:%s](pane %d) tmux ID %s, from %s/sim%d - %s is starting.", window, type, pane, simd->paneID, scTemp, count, simd->name);
+    doTmuxCmd("select-pane -t %s:%s -T '%s'", Tconsole, simd->paneID, simd->tab);
+    snprintf(toybuf, sizeof(toybuf), "mono OpenSim.exe -inidirectory=%s/sim%d", scTemp, count);
+    sendTmuxCmd(simd->paneID, toybuf);
+    if (0 == ourSims->doIt)
+    {
+      snprintf(toybuf, sizeof(toybuf), "INITIALIZATION COMPLETE FOR %s", simd->name);
+      waitTmuxText(simd->paneID, toybuf);
+      I("%s is done starting up.", simd->name);
+      sendTmuxCmd(simd->paneID, "");
+      sendTmuxCmd(simd->paneID, "");
+      ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
+      if (1 < bulkSims)
+        bulkSims = bulkSims / 2;
+    }
+    else
+    {
+// TODO - some compromise, do a premptive load check if we are not doing a wait anyway.
+    }
+    ourSims->doIt = ((count + 1) % bulkSims);
+  }
+}
+
+void stopSim(simData *simd, char *sim, char *type, int count, int window, int panes, int pane)
+{
+  if (checkSimIsRunning(simd->tab))
+  {
+    // Leave empty panes as is.
+    V("Attempting to shut down sim %s.", simd->tab);
+    sendTmuxCmd(simd->paneID, "show users");
+    sleep(1);
+    if (shellMeFail("%s %s/%s capture-pane -Jt '%s' -p | grep -E '^Agents connected: [[:digit:]]*[[:space:]]*$' | tail -n 1 | cut -d ' ' -f 3 >%s/STOP_%s",
+                        Tcmd, scRun, Tsocket, simd->paneID, scTemp, simd->tab))
+        E("Problem with shutting down sim %s - Failed find 'Agents connected'", simd->tab);
+    else
+    {
+      char *cmd = xmprintf("%s/STOP_%s", scTemp, simd->tab);
+      char *r = (char *) qfile_load(cmd, NULL);
+      if (r)
+      {
+        if ('0' == r[0])
+          sendTmuxCmd(simd->paneID, "quit");
+        else
+        {
+          r[strlen(r) - 1] = '\0';
+          simd->users = atoi(r);
+          sendTmuxCmd(simd->paneID, "alert Shutting down this sim, please leave.");
+          sendTmuxCmd(simd->paneID, "region restart bluebox \"Shutting down this sim, please leave.\" 300");
+          sendTmuxCmd(simd->paneID, "region restart notice \"Shutting down this sim, please leave.\" 300");
+          sendTmuxCmd(simd->paneID, "region restart abort \"Shutting down this sim, please leave.\"");
+          W("Not shutting down %s coz %d people are still on it.  They have been warned.", simd->tab, simd->users);
+        }
+        free(r);
+      }
+      else
+        E("Problem with shutting down sim %s - Failed to read file %s", simd->tab, cmd);
+      free(cmd);
+    }
+
+    // There's three things that might happen -
+    //   Sim will quit, tmux pane will go away before we can see the shutdown message.
+    //  pane-exited hook might be useful here.
+    //   Sim will quit, tmux pane wont go away.  Dunno yet if waitTmuxText() will still work.
+    //  pane-died hook might be useful here.
+    //   Sim fails to quit, error message on the pane that we want to read, wont see the shutdown message.
+    // Also sim might not have finished starting up, and may even not be accepting comands yet.
+// TODO - cater for and test them all.
+//         Could also loop on checkSimIsRunning(sim)
+//    snprintf(toybuf, sizeof(toybuf), "[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
+//    waitTmuxText(nm, toybuf);
+//    I("%s is done stopping.", simd->name);
+//    la = waitLoadAverage(la, loadAverageInc, simTimeOut);
+  }
+}
+
+typedef struct _ARList ARList;
+struct _ARList
+{
+  int len, num;
+  char **ARs, *this;
+};
+
+static int filterARs(struct dirtree *node)
+{
+    if (!node->parent) return DIRTREE_RECURSE | DIRTREE_SHUTUP;
+    ARList *list = (ARList *) node->parent->extra;
+    int l0 = strlen(node->name), l1 = strlen(list->this);
+
+// TODO - ignore zero sized ones.
+    if ((4 < l0) && ((strncmp(&(node->name[l0 - 4]), ".iar", 4) == 0) || (strncmp(&(node->name[l0 - 4]), ".oar", 4) == 0)) && (strncmp(node->name, list->this, l1) == 0))
+    {
+      if ((list->num + 1) > list->len)
+      {
+        list->len = list->len + 1;
+        list->ARs = xrealloc(list->ARs, list->len * sizeof(char *));
+      }
+      list->ARs[list->num] = xstrdup(node->name);
+      list->num++;
+    }
+    return 0;
+}
+
+// Forward declare this.
+my_ulonglong dbCount(char *table, char *where);
+void doSimsThing(simData *simd, char *sim, char *type, int count, int window, int panes, int pane)
+{
+  // Check if only doing a single sim.
+  int cont = FALSE, member = false;
+  char *last = strchr(sim, ' ');
+
+  if (FLAG(m))
+  {
+    // check if it's a real user.
+    last[0] = '\0';  last++;
+    // Double check it's a real member.
+    snprintf(toybuf, sizeof(toybuf), "FirstName='%s' and LastName='%s'", sim, last);
+    if (1 == dbCount("UserAccounts", toybuf))
+      member = TRUE;
+    else
+      E("Can't find member %s %s.", sim, last);
+  }
+  else if (NULL != ourSims->target)
+  {
+/* TODO - maybe?
+byTab has the short name as the key, simData as the value.
+    Iterate through it looking for target sims if specified in the sledjchisl arguments.
+        Which can be short name, long name, foo.shini file name.
+        Though short name is a direct lookup, and "foo.shini" we can strip off the .shini and direct lookup the short name.
+        So only need to iterate if it's a long name.
+        Keep in mind the argument might be a user name for IAR backups.  Or perhaps a UUID.
+*/
+    cont = TRUE;
+    snprintf(toybuf, sizeof(toybuf), "%s.shini", simd->tab);
+    if
+    (
+      (strcmp(ourSims->target, simd->name) == 0) ||
+      (strcmp(ourSims->target, simd->tab) == 0)   ||
+      (strcmp(ourSims->target, toybuf) == 0)
+    )
+      cont = FALSE;
+    snprintf(toybuf, sizeof(toybuf), "%s.ini", simd->tab);
+    if (strcmp(ourSims->target, toybuf) == 0)
+      cont = FALSE;
+    snprintf(toybuf, sizeof(toybuf), "sim%d.ini", count);
+    if (strcmp(ourSims->target, toybuf) == 0)
+      cont = FALSE;
+  }
+
+  if (cont)
+    return;
+
+  switch (currentMode)
+  {
+    case START :        // "start 'Welcome sim'" "start Welcome.shini" "Welcome.shini" "start Welcome.ini" "start Welcome"  "start" start everything
+    {
+      startSim(simd, sim, type, count, window, panes, pane);
+      break;
+    }
+
+    case BACKUP :       // "backup -m 'onefang rejected'"  "backup 'Welcome sim'" "backup Welcome.shini" "Welcome.shini backup" "backup Welcome.ini" "backup Welcome"  "backup" backup everything
+    {
+      struct timeval tv;
+      time_t curtime;
+      char date[DATE_TIME_LEN];
+
+      gettimeofday(&tv, NULL);
+      curtime = tv.tv_sec;
+      strftime(date, DATE_TIME_LEN, "%F_%T", localtime(&curtime));
+      if (FLAG(m))
+      {
+        if (member)
+        {
+          I("Member %s %s is being backed up to %s/%s_%s-%s.iar in tmux windo %s.", sim, last, scBackup, sim, last, date, ourSims->backup);
+          snprintf(toybuf, sizeof(toybuf), "save iar -c %s %s / password %s/%s_%s-%s.iar", sim, last, scBackup, sim, last, date);
+          if (NULL != ourSims->backup)
+          {
+            if ('\0' == rSync[0])
+            {
+              I("Running gitar on %s %s", sim, last);
+              shellMeFail("%s/current/bin/sledjchisl gitar -m %s %s %s", scRoot, FLAG(v) ? "-v" : "", sim, last);
+            }
+            sendTmuxCmd(ourSims->backup, toybuf);
+//          if (0 == do)
+            {
+              snprintf(toybuf, sizeof(toybuf), "Saved archive with [[:digit:]]+ items for %s %s", sim, last);
+              waitTmuxText(ourSims->backup, toybuf);
+              I("%s %s is done backing up.", sim, last);
+              sendTmuxCmd(ourSims->backup, "");
+              sendTmuxCmd(ourSims->backup, "");
+              if ('\0' != rSync[0])
+              {
+                if (shellMeFail("time ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 --partial --port=%d --remove-source-files %s/*.iar %s",
+                     rSyncPort, scBackup, rSync))
+                  E("rsync failed");
+              }
+              ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
+            }
+          }
+          else
+            E("Can't find backup sim.");
+        }
+      }
+      else if (checkSimIsRunning(simd->tab))
+      {
+// TODO - should collect names of existing backups, both tmux / ini name and proper name.
+//          Scan backups directory once before this for loop, add details to sims list.
+//            strip off the last bit of file name (YYYY-mm-dd_HH:MM:SS.oar) to get the name
+//              keep in mind some old files had munged names like "Tiffanie_s_Paradise-2021-06-23_05:11:38.oar"
+        I("Sim %s is being backed up to %s/backups/%s-%s.oar.", simd->name, scRoot, simd->tab, date);
+        if ('\0' == rSync[0])
+        {
+          I("Running gitar on %s", simd->tab);
+          shellMeFail("%s/current/bin/sledjchisl gitar %s %s", scRoot, FLAG(v) ? "-v" : "", simd->tab);
+        }
+        snprintf(toybuf, sizeof(toybuf), "save oar --all %s/%s-%s.oar", scBackup, simd->tab, date);
+        sendTmuxCmd(simd->paneID, toybuf);
+//      if (0 == do)
+        {
+          snprintf(toybuf, sizeof(toybuf), "Finished writing out OAR for %s", simd->name);
+          waitTmuxText(simd->paneID, toybuf);
+          I("%s is done backing up.", simd->name);
+          sendTmuxCmd(simd->paneID, "");
+          sendTmuxCmd(simd->paneID, "");
+          if ('\0' != rSync[0])
+          {
+            if (shellMeFail("time ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 --partial --port=%d --remove-source-files %s/*.oar %s",
+                rSyncPort, scBackup, rSync))
+              E("rsync failed");
+          }
+          ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
+        }
+      }
+      break;
+    }
+
+    case GITAR :        // "gitAR -m avatar name"  "gitAR sim name"
+    {
+      /* Work around OpenSims slow database corruption bug by using git to store all old backups.
+        Try to squeeze every last byte out of the tarballs.  Seems to cut the total storage size down to one third the size of just the raw I/OAR files.
+        Saves even more if there's been no changes.
+        On the other hand, these backup files will grow indefinately, the more changes, the faster it grows.  I can live with that for more reliable backups that go back further.
+        Tries to avoid loosing data if things go wrong.  I think the main remaining problem would be running out of space, in which case you have bigger problems to deal with.
+
+        Strategy - unpack the last one, unpack and commit any old I/OARs, pack up the result, delete it's working directory, THEN run the save i/oar.
+        Avoids having to sync with OpenSim finishing the current I/OAR, and as a bonus, an easy to deliver latest I/OAR for people that want it.
+      */
+      char *name = xstrdup(sim);
+
+      if (FLAG(m))
+      {
+        if (member)
+        {
+          free(name);
+          name = xmprintf("%s_%s", sim, last);
+        }
+        else
+        {
+          free(name);
+          return;
+        }
+      }
+
+      char type  = FLAG(m) ? 'I' : 'O';
+      char *gar  = xmprintf("%s-git%cAR", name, type), *gtr  = xmprintf("%s/%s.tar.xz", scBackup, gar);
+      char *dir  = xmprintf("%s/temp_%c_%s", scBackup, type, name);
+      char *glog = xmprintf("%s/log.log", scBackup), *gerr = xmprintf("%s/errors", dir);
+      // Make sure stuff that's already compressed doesn't get compressed by git.
+      // Also tries to protect binaries from mangling.
+      char *gab = xmprintf("%s/%s/.gitattributes", dir, gar), *gad =
+        "*.bvh -delta -diff -text\n"
+        "*.jp2 -delta -diff -text\n"
+        "*.jpg -delta -diff -text\n"
+        "*.llmesh -delta -diff -text\n"
+        "*.ogg -delta -diff -text\n"
+        "*.png -delta -diff -text\n"
+        "*.r32 -delta -diff -text\n"
+        "*.tga -delta -diff -text\n";
+      ARList *ourARs = xzalloc(sizeof(ARList));
+
+      if (qfile_exist(dir))
+      {
+        if (shellMeFail("echo 'Mess left over from last backup in %d, not gonna run!' >>%s", dir, gerr))                E("Cleaning up the mess!");
+        if (shellMeFail("mv %s/*.%car %s 2>&1 >>%s", dir, tolower(type), scBackup, gerr))                               E("Failed cleaning up the mess!");
+        goto gitARend;
+      }
+
+      // Either unpack the old gitAR, or create a new one.
+      qfile_mkdir(dir, S_IRWXU | S_IRGRP | S_IXGRP, true);
+      if (qfile_exist(gtr))
+      {
+        I("Unpacking %s", gtr);
+        if (shellMeFail("cd %s; ionice -c3 nice -n 19 tar -xf %s >>%s", dir, gtr, gerr))                                E("Failed to unpack %s!", gtr);
+        char *t = xmprintf("%s/%s_git%cAR", dir, name, type);
+        // Changed from _ to -, but deal with old archives.
+        if (qfile_exist(t))
+        {
+          if (shellMeFail("mv %s %s/%s", t, dir, gar))                                          E("Failed to move %s!", t);
+        }
+        free(t);
+      }
+      else
+      {
+        qfile_mkdir(gar, S_IRWXU | S_IRGRP | S_IXGRP, true);
+        // git will create gar for us.
+        if (shellMeFail("cd %s; git init --quiet %s >>%s", dir, gar, gerr))                                             E("Failed to git init %s/%s!", dir, gar);
+
+        // Coz git insists.
+        if (shellMeFail("cd %s/%s; git config user.email \"opensim@$(hostname -A | cut -d ' ' -f 1)\"", dir, gar))      E("Failed to git config user.email!");
+        if (shellMeFail("cd %s/%s; git config user.name  \"opensim\"", dir, gar))                                       E("Failed to git config user.name!");
+
+        // Coz git insists on having something comitted before it can change the branch name.
+        if (-1 == qfile_save(gab, gad, strlen(gad), false))                                                             E("Faild to write %s file!", gad);
+        if (shellMeFail("cd %s/%s; git add .gitattributes >>%s", dir, gar, gerr))                                       E("Failed to git add!");
+        V("Committing initial git.");
+        if (shellMeFail("cd %s/%s; git commit -qm \"Initial commit\" >>%s || echo \"ERROR - Could not commit!\" >>%s",
+            dir, gar, glog, gerr))                                                                                      E("Failed to git commit!");
+        if (shellMeFail("cd %s/%s; git branch -m master Domme >>%s", dir, gar, gerr))                                   E("Failed to git branch -m master Domme!");
+      }
+      // Doing these each time, to catch those old ones that didn't have them.
+      // Coz otherwise git commit starts a gc run IN THE BACKGROUD, which screws up trying to tarball it.
+      if (shellMeFail("cd %s/%s; git config gc.autodetach false", dir, gar))                                            E("Failed to git config gc.autodetach!");
+      // Don't want it running in the foreground either, coz it dumps on the console, we do a gc --quiet later anyway.
+      if (shellMeFail("cd %s/%s; git config gc.auto 0", dir, gar))                                                      E("Failed to git config gc.auto!");
+
+      // Git is such a pedantic bitch, let's just fucking ignore any errors it gives due to lack of anything to do.
+      // Even worse the OpenSim devs breaking logout tracking gives git plenty of nothing to do.  lol
+
+      // Loop through the .iar / .oar files in backups, ignoring zero sized files.
+      struct dirtree *new = dirtree_add_node(0, scBackup, 0);
+      int i;
+
+      ourARs->num = 0;
+      ourARs->this = xmprintf("%s-", name);
+      new->extra = (long) ourARs;
+      dirtree_handle_callback(new, filterARs);
+      qsort(ourARs->ARs, ourARs->num, sizeof(char *), qstrcmp);
+      for (i = 0; i < ourARs->num; i++)
+      {
+        I("Adding %s to %s", ourARs->ARs[i], gtr);
+        // Deal with deletions in the inventory / sim, easy method, which becomes a nop for files that stay in the git add below.
+        if (shellMeFail("cd %s/%s; rm -fr * >>%s", dir, gar, gerr))                                                     E("Failed to rm!");
+        if (shellMeFail("cd %s/%s; ionice -c3 nice -n 19 tar -xzf \"%s/%s\" || echo \"ERROR - Could not unpack %s !\" >>%s",
+          dir, gar, scBackup, ourARs->ARs[i], ourARs->ARs[i], gerr))                                                    E("Failed to unpack %s!", ourARs->ARs[i]);
+        if (!hasContents(gerr))
+        {
+          if (shellMeFail("cd %s/%s; git add * >>%s", dir, gar, glog))                                                  E("Failed to git add!");
+          // The \\* bit is to escape the \ from snprintf, which itself escapes the * from the shell.
+          if (shellMeFail("cd %s/%s; git add */\\* >>%s", dir, gar, gerr))                                              E("Failed to git add!");
+          // Gotta add this again, coz of the rm.  Apparently rm removes dotfiles, but add doesn't!
+          if (-1 == qfile_save(gab, gad, strlen(gad), false))                                                           E("Faild to write %s file!", gab);
+          if (shellMeFail("cd %s/%s; git add .gitattributes >>%s", dir, gar, gerr))                                     E("Failed to git add!");
+
+          // Magic needed to figure out if there's anything to commit.
+          // After all the pain to get this to work, there's an ever changing timestamp in archive.xml that screws it up.
+          // Like this system didn't have enough timestamps in it already.  lol
+          // TODO - I could sed out that timestamp, and put it back again based on the OAR file name when extracting.
+          //        IARs don't seem to have the timestamp.
+          int j = shellMe("cd %s/%s; t=$(git status --porcelain) && [ -z \"${t}\" ]", dir, gar);
+          if (!WIFEXITED(j))                                                                                            E("git status failed!");
+          else if (1 == WEXITSTATUS(j))
+          {
+            V("Committing changes from %s", ourARs->ARs[i]);
+            // Note this commit message has to be just the file name, as the ungitAR script uses it.
+            if (shellMeFail("cd %s/%s; git commit -a -qm \"%s\" >>%s || echo \"ERROR - Could not commit %s !\" >>%s ", 
+                            dir, gar, ourARs->ARs[i], ourARs->ARs[i], glog, gerr))                                      E("Failed to git commit!");
+            if (hasContents(gerr))
+            {
+              free(ourARs->ARs[i]);
+              goto gitARend;
+            }
+          }
+          else
+            V("No changes to commit from %s.", ourARs->ARs[i]);
+        }
+        if (!hasContents(gerr))
+        {
+          if (shellMeFail("mv %s/%s %s", scBackup, ourARs->ARs[i], dir))                                                E("Failed to move %s!", ourARs->ARs[i]);
+        }
+        free(ourARs->ARs[i]);
+      }
+
+      if (!hasContents(gerr))
+      {
+        I("Checking git repo %s", gtr);
+        if (shellMeFail("cd %s/%s; git fsck --strict --lost-found --no-progress >>%s || echo \"ERROR - Problem with git fsck %s !\" >>%s ", 
+                    dir, gar, glog, gtr, gerr))                                                                         E("Failed to git fsck!");
+        if (shellMeFail("cd %s/%s; git gc --aggressive --prune=all --quiet >>%s || echo \"ERROR - Problem with git gc %s !\" >>%s ", 
+                    dir, gar, glog, gtr, gerr))                                                                         E("Failed to git gc!");
+        I("Compressing %s", gtr);
+        if (shellMeFail("cd %s; XZ_OPT='-9e' ionice -c3 nice -n 19 tar -c --xz %s -f %s || echo 'ERROR - Could not pack gitAR!' >>%s", 
+            dir, gar, gtr, gerr))                                                                                       E("Failed to git add!");
+      }
+gitARend:
+      if (hasContents(gerr))                                                                                            E("Failed to process the archives, look in %s for errors!", gerr);
+      else
+      {
+        if (shellMeFail("rm -fr %s", dir))                                                                              E("Failed to rm!");
+      }
+      free(ourARs->ARs);
+      free(ourARs->this);
+      free(ourARs);
+      free(gab);
+      free(gerr);
+      free(glog);
+      free(dir);
+      free(gtr);
+      free(gar);
+      free(name);
+      break;
+    }
+
+    case RESTART :      // "restart 'Welcome sim'" "restart Welcome.shini" "Welcome.shini restart" "restart Welcome.ini" "restart Welcome"  "restart" restart everything
+    {
+      I("Tmux tab [%d:%s](pane %d) tmux ID %s, from %s/sim%d - %s is stopping.", window, type, pane, simd->paneID, scTemp, count, simd->name);
+      stopSim(simd, sim, type, count, window, panes, pane);
+      while (checkSimIsRunning(simd->tab))
+        usleep(100000);
+      usleep(100000);
+      startSim(simd, sim, type, count, window, panes, pane);
+      break;
+    }
+
+    case STATUS :       // "status 'Welcome sim'" "status Welcome.shini" "Welcome.shini status" "status Welcome.ini" "status Welcome"  "status" status everything
+    {
+// TODO - report CPU and memory used as well.
+      if (FLAG(m))
+      {
+        ; // Do nothing, this is better done in the calling function, coz it has the details.
+      }
+      else if (checkSimIsRunning(simd->tab))
+        I("%s is running in Tmux tab [%d:%s](pane %d) tmux ID %s, from %s/sim%d", simd->name, window, type, pane, simd->paneID, scTemp, count);
+      else
+        W("%s is not running.", simd->name);
+      break;
+    }
+
+    case STOP : // "stop 'Welcome sim'" "stop Welcome.shini" "Welcome.shini stop" "stop Welcome.ini" "stop Welcome"  "stop" stop everything
+    {
+      stopSim(simd, sim, type, count, window, panes, pane);
+      break;
+     }
+
+    default :
+    {
+      E("Unknown command! %s", toys.optargs[0]);
+      break;
+    }
+  }
+}
+
+void stopSims(simData *simd, char *sim, char *type, int count, int window, int panes, int pane)
+{
+// TODO - should move onto others if this one takes too long, and come back later.
+  // NOTE - these sleeps are guesses, seems to work on my super desktop during testing.
+  if (checkSimIsRunning(simd->tab))
+    T("Tmux tab [%d:%s](pane %d) tmux ID %s, from %s/sim%d - %s has NOT stopped YET.", window, type, pane, simd->paneID, scTemp, count, simd->name);
+  if (simd->users)
+  {
+    ourSims->doIt = 0;
+    W("Not shutting down %s coz %d people are still on it.  They have been warned.", simd->tab, simd->users);
+  }
+  else
+  {
+    while (checkSimIsRunning(simd->tab))
+      usleep(100000);
+    usleep(10000);
+    doTmuxCmd("kill-pane -t %s", simd->paneID);
+    I("Tmux tab [%d:%s](pane %d) tmux ID %s, from %s/sim%d - %s has stopped.", window, type, pane, simd->paneID, scTemp, count, simd->name);
+  }
+}
+
 
 static void PrintEnv(qgrow_t *reply, char *label, char **envp)
 {
@@ -1128,7 +2656,6 @@ static boolean dbCheckError(char *error, char *sql)
   if (2006 == e)
   {
     W("Reconnecting to database.");
-// TODO - still failing to reconnect for dbCount() on coffeegrid.
     freeDb(false);
     return dbConnect();
   }
@@ -1257,6 +2784,8 @@ int dbDoSomething(dbRequest *req, boolean count, ...)
   if (-1 == clock_gettime(CLOCK_REALTIME, &then))
     perror_msg("Unable to get the time.");
 
+// TODO - should factor this out to it's own function, and call that function in dbCount() and dbCountJoin().
+//          Or better yet, finally migrate those functions to using dbDoSomething().
   double n = (dbLast.tv_sec * 1000000000.0) + dbLast.tv_nsec;
   double t = (then.tv_sec * 1000000000.0) + then.tv_nsec;
 
@@ -1701,7 +3230,7 @@ I("count!!!!!!!!!!!!!!!!");
           signed char d = (signed char) c;
 
           memcpy(req->inBind[i].buffer, &d, (size_t) fld->length);
-//T("TINY %d %s %d", i, fld->name, req->inBind[i].buffer_length);
+//V("TINY %d %s %d", i, fld->name, req->inBind[i].buffer_length);
           break;
         }
 
@@ -1711,7 +3240,7 @@ I("count!!!!!!!!!!!!!!!!");
           short int d = (short int) c;
 
           memcpy(req->inBind[i].buffer, &d, (size_t) fld->length);
-//T("SHORT %d %s %d = %d", i, fld->name, req->inBind[i].buffer_length, c);
+//V("SHORT %d %s %d = %d", i, fld->name, req->inBind[i].buffer_length, c);
           break;
         }
 
@@ -1720,7 +3249,7 @@ I("count!!!!!!!!!!!!!!!!");
           int d = va_arg(ap, int);
 
           memcpy(req->inBind[i].buffer, &d, (size_t) fld->length);
-//T("INT24 %d %s %d - %d", i, fld->name, req->inBind[i].buffer_length, d);
+//V("INT24 %d %s %d - %d", i, fld->name, req->inBind[i].buffer_length, d);
           break;
         }
 
@@ -1729,7 +3258,7 @@ I("count!!!!!!!!!!!!!!!!");
           long d = va_arg(ap, long);
 
           memcpy(req->inBind[i].buffer, &d, (size_t) fld->length);
-//T("LONG %d %s %d = %ld", i, fld->name, req->inBind[i].buffer_length, d);
+//V("LONG %d %s %d = %ld", i, fld->name, req->inBind[i].buffer_length, d);
           break;
         }
 
@@ -1738,7 +3267,7 @@ I("count!!!!!!!!!!!!!!!!");
           long long int d = va_arg(ap, long long int);
 
           memcpy(req->inBind[i].buffer, &d, (size_t) fld->length);
-//T("LONGLONG %d %s %d = %lld", i, fld->name, req->inBind[i].buffer_length, d);
+//V("LONGLONG %d %s %d = %lld", i, fld->name, req->inBind[i].buffer_length, d);
           break;
         }
 
@@ -1748,7 +3277,7 @@ I("count!!!!!!!!!!!!!!!!");
           float d = (float) c;
 
           memcpy(req->inBind[i].buffer, &d, (size_t) fld->length);
-//T("FLOAT %d %s %d = %f", i, fld->name, req->inBind[i].buffer_length, d);
+//V("FLOAT %d %s %d = %f", i, fld->name, req->inBind[i].buffer_length, d);
           break;
         }
 
@@ -1757,13 +3286,13 @@ I("count!!!!!!!!!!!!!!!!");
           double d = va_arg(ap, double);
 
           memcpy(req->inBind[i].buffer, &d, (size_t) fld->length);
-//T("DOUBLE %d %s %d = %f", i, fld->name, req->inBind[i].buffer_length, d);
+//V("DOUBLE %d %s %d = %f", i, fld->name, req->inBind[i].buffer_length, d);
           break;
         }
 
         case MYSQL_TYPE_NEWDECIMAL:
         {
-//T("NEWDECIMAL %d %s %d", i, fld->name, req->inBind[i].buffer_length);
+//V("NEWDECIMAL %d %s %d", i, fld->name, req->inBind[i].buffer_length);
           break;
         }
 
@@ -1775,7 +3304,7 @@ I("count!!!!!!!!!!!!!!!!");
           MYSQL_TIME d = va_arg(ap, MYSQL_TIME);
 
           memcpy(req->inBind[i].buffer, &d, (size_t) fld->length);
-//T("DATE / TIME ish %d %s %d", i, fld->name, req->inBind[i].buffer_length);
+//V("DATE / TIME ish %d %s %d", i, fld->name, req->inBind[i].buffer_length);
           break;
         }
 
@@ -1790,7 +3319,7 @@ I("count!!!!!!!!!!!!!!!!");
           *(req->inBind[i].length) = l;
           strncpy(req->inBind[i].buffer, d, (size_t) l);
           ((char *) req->inBind[i].buffer)[l] = '\0';
-//T("STRING / VARSTRING %d %s %d = %s", i, fld->name, req->inBind[i].buffer_length, d);
+//V("STRING / VARSTRING %d %s %d = %s", i, fld->name, req->inBind[i].buffer_length, d);
           break;
         }
 
@@ -1800,19 +3329,19 @@ I("count!!!!!!!!!!!!!!!!");
         case MYSQL_TYPE_LONG_BLOB:
         {
 // TODO - should write this, we will likely need it.  Main problem is - how long is this blob?  Probably should add a length param before the blob.
-//T("BLOBs %d %s %d", i, fld->name, req->inBind[i].buffer_length);
+//V("BLOBs %d %s %d", i, fld->name, req->inBind[i].buffer_length);
           break;
         }
 
         case MYSQL_TYPE_BIT:
         {
-//T("BIT %d %s %d", i, fld->name, req->inBind[i].buffer_length);
+//V("BIT %d %s %d", i, fld->name, req->inBind[i].buffer_length);
           break;
         }
 
         case MYSQL_TYPE_NULL:
         {
-//T("NULL %d %s %d", i, fld->name, req->inBind[i].buffer_length);
+//V("NULL %d %s %d", i, fld->name, req->inBind[i].buffer_length);
           break;
         }
       }
@@ -1988,7 +3517,7 @@ end:
   if (-1 == clock_gettime(CLOCK_REALTIME, &dbLast))
     perror_msg("Unable to get the time.");
   n = (dbLast.tv_sec * 1000000000.0) + dbLast.tv_nsec;
-  T("dbDoSomething(%s) took %lf seconds", req->sql, (n - t) / 1000000000.0);
+  t("dbDoSomething(%s) took %lf seconds", req->sql, (n - t) / 1000000000.0);
 
   return ret;
 }
@@ -2064,7 +3593,7 @@ my_ulonglong dbCount(char *table, char *where)
     perror_msg("Unable to get the time.");
   double n = (now.tv_sec * 1000000000.0) + now.tv_nsec;
   double t = (then.tv_sec * 1000000000.0) + then.tv_nsec;
-//  T("dbCount(%s) took %lf seconds", sql, (n - t) / 1000000000.0);
+//  t("dbCount(%s) took %lf seconds", sql, (n - t) / 1000000000.0);
   free(sql);
   return ret;
 }
@@ -2113,7 +3642,7 @@ my_ulonglong dbCountJoin(char *table, char *select, char *join, char *where)
     perror_msg("Unable to get the time.");
   double n = (now.tv_sec * 1000000000.0) + now.tv_nsec;
   double t = (then.tv_sec * 1000000000.0) + then.tv_nsec;
-//  T("dbCointJoin(%s) took %lf seconds", sql, (n - t) / 1000000000.0);
+//  t("dbCointJoin(%s) took %lf seconds", sql, (n - t) / 1000000000.0);
   free(sql);
   return ret;
 }
@@ -2181,7 +3710,7 @@ gridStats *getStats(MYSQL *db, gridStats *stats)
       return stats;
   }
 
-  I("Getting fresh grid stats.");
+  V("Getting fresh grid stats.");
   if (checkSimIsRunning("ROBUST"))
     replaceStr(stats->stats, "gridOnline", "online");
   else
@@ -2418,6 +3947,44 @@ void outizeCookie(qgrow_t *reply, qhashtbl_t *tbl, char *label)
   reply->addstr(reply, "</pre>\n");
 }
 
+void list2cookie(reqData *Rd, char *cki, qlist_t *list)
+{
+  char *t0 = xstrdup("");
+  qlist_obj_t obj;
+
+  memset((void*)&obj, 0, sizeof(obj)); // must be cleared before call
+  list->lock(list);
+  while (list->getnext(list, &obj, false) == true)
+  {
+    char *t1 = xmprintf("%s\n%s", t0, (char *) obj.data);
+
+    free(t0);
+    t0 = t1;
+  }
+  list->unlock(list);
+  setCookie(Rd, cki, &t0[1]);   // Skip the first empty one.
+// TODO - should set a very short maxAge.
+  free(t0);
+}
+
+qlist_t *cookie2list(qhashtbl_t *cookies, char *cki)
+{
+  qlist_t *ret = NULL;
+  cookie *ck = (cookie *) cookies->get(cookies, cki, NULL, false);
+
+  if (NULL != ck)
+  {
+    if (NULL != ck->value)
+    {
+      qurl_decode(ck->value);
+      ret = qstrtokenizer(ck->value, "\n");
+      free(ck->value);
+    }
+// TODO - should send the "delete this cookie" thing to the browser.
+    cookies->remove(cookies, cki);
+  }
+  return ret;
+}
 
 
 enum fragmentType
@@ -3216,28 +4783,6 @@ https://stackoverflow.com/questions/16891729/best-practices-salting-peppering-pa
 qlisttbl_t *accountLevels = NULL;
 
 
-static void bitch(reqData *Rd, char *message, char *log)
-{
-  addStrL(Rd->errors, message);
-  E("%s %s  %s - %s  %s", getStrH(Rd->headers, "REMOTE_ADDR"), Rd->shs.UUID, Rd->shs.name, message, log);
-}
-
-/* "A token cookie that references a non-existent session, its value should be replaced immediately to prevent session fixation."
-https://owasp.org/www-community/attacks/Session_fixation
-    Which describes the problem, but offers no solution.
-    See https://stackoverflow.com/questions/549/the-definitive-guide-to-form-based-website-authentication?rq=1.
-I think this means send a new cookie.
-    I clear out the cookies and send blank ones with -1 maxAge, so they should get deleted.
-*/
-static void bitchSession(reqData *Rd, char *message, char *log)
-{
-  if ('\0' != message[0])
-    addStrL(Rd->errors, message);
-  C("%s %s  %s - %s  %s", getStrH(Rd->headers, "REMOTE_ADDR"), Rd->shs.UUID, Rd->shs.name, message, log);
-  Rd->shs.status = SHS_BOGUS;
-}
-
-
 // The ancient, insecure since 2011, Second Life / OpenSim password hashing algorithm.
 char *newSLOSsalt(reqData *Rd)
 {
@@ -3263,7 +4808,7 @@ char *checkSLOSpassword(reqData *Rd, char *salt, char *password, char *passwordH
   unsigned char *md5hash = xzalloc(17);
   char *hash = NULL, *passHash = NULL;
 
-T("checkSLOSpassword(%s,  %s,  %s,  ", password, salt, passwordHash, fail);
+t("checkSLOSpassword(%s,  %s,  %s,  ", password, salt, passwordHash, fail);
   // Calculate passHash.
   if (!qhashmd5((void *) password, strlen(password), md5hash))
   {
@@ -3302,72 +4847,6 @@ T("checkSLOSpassword(%s,  %s,  %s,  ", password, salt, passwordHash, fail);
 }
 
 
-int LuaToHash(reqData *Rd, char *file, char *var, qhashtbl_t *tnm, int ret, struct stat *st, struct timespec *now, char *type)
-{
-  struct timespec then;
-
-  if (-1 == clock_gettime(CLOCK_REALTIME, &then))
-    perror_msg("Unable to get the time.");
-  I("Reading %s file %s", type, file);
-  if (0 != stat(file, st))
-  {
-    D("No %s file.", file);
-    perror_msg("Unable to stat %s", file);
-    ret++;
-  }
-  else
-  {
-    int status = luaL_loadfile(Rd->L, file), result;
-
-    if (status)
-    {
-      bitch(Rd, "No such thing.", "Can't load file.");
-      E("Couldn't load file: %s", lua_tostring(Rd->L, -1));
-      ret++;
-    }
-    else
-    {
-      result = lua_pcall(Rd->L, 0, LUA_MULTRET, 0);
-
-      if (result)
-      {
-        bitch(Rd, "Broken thing.", "Can't run file.");
-        E("Failed to run script: %s", lua_tostring(Rd->L, -1));
-        ret++;
-      }
-      else
-      {
-        lua_getglobal(Rd->L, var);
-        lua_pushnil(Rd->L);
-
-        while(lua_next(Rd->L, -2) != 0)
-        {
-          char *n = (char *) lua_tostring(Rd->L, -2);
-
-          if (lua_isstring(Rd->L, -1))
-          {
-            tnm->putstr(tnm, n, (char *) lua_tostring(Rd->L, -1));
-d("Lua reading (%s) %s = %s", type, n, getStrH(tnm, n));
-          }
-          else
-          {
-            char *v = (char *) lua_tostring(Rd->L, -1);
-            W("Unknown Lua variable type for %s = %s", n, v);
-          }
-          lua_pop(Rd->L, 1);
-        }
-
-        if (-1 == clock_gettime(CLOCK_REALTIME, now))
-          perror_msg("Unable to get the time.");
-        double n = (now->tv_sec * 1000000000.0) + now->tv_nsec;
-        double t = (then.tv_sec * 1000000000.0) + then.tv_nsec;
-        T("Reading %s file took %lf seconds", type, (n - t) / 1000000000.0);
-      }
-    }
-  }
-
-  return ret;
-}
 
 
 char *checkLinky(reqData *Rd)
@@ -3380,8 +4859,19 @@ char *checkLinky(reqData *Rd)
     char *t1 = qurl_encode(t0, strlen(t0));
     free(ret);
     ret = xmprintf("<p><font color='red'><b>You have an email waiting with a validation link in it, please check your email. &nbsp; "
+                    "THE FOLLOWING IS REPEATED, COZ PEOPLE JUST DON'T FOLLOW DIRECTIONS!"
                     "It will be from %s@%s, and it might be in your spam folder, coz these sorts of emails sometimes end up there. &nbsp; "
                     "You should add that email address to your contacts, or otherwise let it through your spam filter. &nbsp; "
+                    "It will be from %s@%s, and it might be in your spam folder, coz these sorts of emails sometimes end up there. &nbsp; "
+                    "You should add that email address to your contacts, or otherwise let it through your spam filter. &nbsp; "
+                    "It will be from %s@%s, and it might be in your spam folder, coz these sorts of emails sometimes end up there. &nbsp; "
+                    "You should add that email address to your contacts, or otherwise let it through your spam filter. &nbsp; "
+                    "It will be from %s@%s, and it might be in your spam folder, coz these sorts of emails sometimes end up there. &nbsp; "
+                    "You should add that email address to your contacts, or otherwise let it through your spam filter. &nbsp; "
+                    "If your email client wont let you click the validation link, just copy and paste it into your web browser. &nbsp; "
+                    "If your email client wont let you click the validation link, just copy and paste it into your web browser. &nbsp; "
+                    "If your email client wont let you click the validation link, just copy and paste it into your web browser. &nbsp; "
+                    "If your email client wont let you click the validation link, just copy and paste it into your web browser. &nbsp; "
 //                  "<a href='https://%s%s?hashish=%s'>%s</a>"
                     "</b></font></p>\n",
                     "grid_no_reply", Rd->Host,
@@ -3607,15 +5097,29 @@ t("Write shs %s", tnm4);
           "\n"
           "Please go to this web link to validate your new account -\n"
           "https://%s%s?hashish=%s\n"
+          "THE FOLLOWING IS REPEATED, COZ PEOPLE JUST DON'T FOLLOW DIRECTIONS!"
+          "If your email client wont let you click the validation\n"
+          "link, just copy and paste it into your web browser.\n"
+          "If your email client wont let you click the validation\n"
+          "link, just copy and paste it into your web browser.\n"
+          "If your email client wont let you click the validation\n"
+          "link, just copy and paste it into your web browser.\n"
+          "If your email client wont let you click the validation\n"
+          "link, just copy and paste it into your web browser.\n"
+          "\n"
           "\n"
           "Do not reply to this email.\n"
-          "\n",
+          "\n"
+          "\n"
+          "A copy of the grids Terms of Service that you agreed to\n"
+          "when you created your account is included below.\n"
+          "%s",
           Rd->Host, Rd->Host, Rd->Host,
           getStrH(Rd->stuff, "email"),
           Rd->Host, Rd->Host,
           first, last,
           first, last, Rd->Host, Rd->RUri,
-          Rd->Host, Rd->RUri, t1
+          Rd->Host, Rd->RUri, t1, ToS
         );
         l = strlen(content);
         file = xmprintf("%s/sessions/%s.email", scCache, shs->leaf);
@@ -3628,11 +5132,8 @@ t("Write shs %s", tnm4);
         }
         xclose(fd);
         I("Sending linky email to %s  %s", getStrH(Rd->stuff, "email"), t1);
-        command = xmprintf("sendmail -oi -t <'%s'", file);
-        int i = system(command);
-        if (!WIFEXITED(i))
+        if (shellMeFail("sendmail -oi -t <'%s'", file))
           E("sendmail command failed!");
-        free(command);
         free(file);
         free(content);
         free(t1);
@@ -3729,84 +5230,6 @@ systemFolders sysFolders[] =
   {"Trash",             14},
   {NULL,                -1}
 };
-
-boolean writeLuaDouble(reqData *Rd, int fd, char *file, char *name, double number)
-{
-  boolean ret = TRUE;
-// TODO - putting these in Lua as numbers causes lua_tolstring to barf when we read them.  Though Lua is supposed to convert between numbers and strings.
-  char *t = xmprintf("  ['%s'] = '%f',\n", name, number);       // NOTE - default precision is 6 decimal places.
-  size_t l = strlen(t);
-
-  if (l != writeall(fd, t, l))
-  {
-    perror_msg("Writing %s", file);
-    ret = FALSE;
-  }
-  free(t);
-  return ret;
-}
-
-boolean writeLuaInteger(reqData *Rd, int fd, char *file, char *name, long number)
-{
-  boolean ret = TRUE;
-// TODO - putting these in Lua as numbers causes lua_tolstring to barf when we read them.  Though Lua is supposed to convert between numbers and strings.
-  char *t = xmprintf("  ['%s'] = '%ld',\n", name, number);
-  size_t l = strlen(t);
-
-  if (l != writeall(fd, t, l))
-  {
-    perror_msg("Writing %s", file);
-    ret = FALSE;
-  }
-  free(t);
-  return ret;
-}
-
-boolean writeLuaString(reqData *Rd, int fd, char *file, char *name, char *string)
-{
-  boolean ret = TRUE;
-
-  if (NULL == string)
-    string = getStrH(Rd->stuff, name);
-
-  size_t l = strlen(string);
-  char *t0 = xmalloc(l * 2 + 1);
-  int i, j = 0;
-
-// TODO - maybe escape other non printables as well?
-  for (i = 0; i < l; i++)
-  {
-    // We don't need to escape [] here, coz we are using '' below.  Same applies to ", but do it anyway.
-    switch(string[i])
-    {
-      case '\n':
-      case '\\':
-      case '\'':
-      case '"':
-        t0[j++] = '\\'; break;
-    }
-    if ('\n' == string[i])
-      t0[j++] = 'n';
-    else if ('\r' == string[i])
-      ;
-    else
-      t0[j++] = string[i];
-  }
-  t0[j] = '\0';
-
-  char *t1 = xmprintf("  ['%s'] = '%s',\n", name, t0);
-
-  l = strlen(t1);
-  if (l != writeall(fd, t1, l))
-  {
-    perror_msg("Writing %s to %s", name, file);
-    ret = FALSE;
-  }
-  free(t1);
-  free(t0);
-  return ret;
-}
-
 static void accountWrite(reqData *Rd)
 {
   char *uuid = getStrH(Rd->database, "UserAccounts.PrincipalID"); 
@@ -3855,6 +5278,7 @@ static void accountWrite(reqData *Rd)
       if (!writeLuaString (Rd, fd, file, "aboutMe",     NULL))                  goto notWritten;
       if (!writeLuaString (Rd, fd, file, "vouched",     "off"))                 goto notWritten;
       if (!writeLuaString (Rd, fd, file, "voucher",     NULL))                  goto notWritten;
+      if (!writeLuaString (Rd, fd, file, "approver",    NULL))                  goto notWritten;
       if (!writeLuaString (Rd, fd, file, "link",        link))                  goto notWritten;
       l = strlen(end);
       if (l != writeall(fd, end, l))
@@ -3900,7 +5324,7 @@ notWritten:
             "UserLevel",
             "UserFlags",
             "UserTitle",
-//          "ServiceURLs",      // No worky "text", filled with crap.
+//          "ServiceURLs",      // No worky "text", filled with crap.  Leaving it blank works fine.
             "active",
             NULL
           };
@@ -4051,41 +5475,31 @@ notWritten:
           }
 
           // load iar -m first last / password /opt/opensim_SC/backups/DefaultMember.IAR
-          simList *sims = getSims();
           struct sysinfo info;
           float  la;
 
           sysinfo(&info);
           la = info.loads[0]/65536.0;
 
-          for (i = 0; i < sims->num; i++)
-          {
-            char *sim = sims->sims[i], *name = getSimName(sims->sims[i]);
+          char *name;
+          simData *simd = ourSims->byTab->get(ourSims->byTab, backupIARsim, NULL, false);
 
-            if (checkSimIsRunning(sim))
-            {
-              I("Loading default member IAR for %s %s in sim %s, this might take a couple of minutes.", first, last, name);
-              char *c = xmprintf("%s %s/%s send-keys -t '%s:%d' 'load iar -m %s %s / password /opt/opensim_SC/backups/DefaultMember.IAR' Enter",
-                Tcmd, scRun, Tsocket, Tconsole, i + 1, first, last);
-T(c);
-              int r = system(c);
-              if (!WIFEXITED(r))
-                E("tmux load iar command failed!");
-              else
-              {
-//              memset(toybuf, 0, sizeof(toybuf));
-//              snprintf(toybuf, sizeof(toybuf), "INITIALIZATION COMPLETE FOR %s", name);
-//              waitTmuxText(name, toybuf);
-//              I("%s is done starting up.", name);
-//              la = waitLoadAverage(la, loadAverageInc, simTimeOut);
-              }
-              free(c);
-              free(name);
-              break;
-            }
-            free(name);
+          if (NULL == simd)
+            E("Sim %s not found in ini list!  Can't create inventory for %s %s", backupIARsim, first, last);
+          else
+            name = simd->name;
+
+          if (checkSimIsRunning(backupIARsim))
+          {
+            char *cmd = xmprintf("%d.%d", simd->window, simd->pane);
+            char *c = xmprintf("load iar -m %s %s / password /opt/opensim_SC/backups/DefaultMember.IAR", first, last);
+
+            I("Loading default member IAR for %s %s in sim %s, this might take a couple of minutes.", first, last, name);
+V(c);
+            sendTmuxCmd(cmd, c);
+            free(cmd);
+            free(c);
           }
-          freeSimList(sims);
         }
         free(first);
       }
@@ -4202,15 +5616,6 @@ Maybe -
 DAVEE (Delete, Add, View, Edit, Explore)
 */
 
-//  lua.h has LUA_T* NONE, NIL, BOOLEAN, LIGHTUSERDATA, NUMBER, STRING, TABLE, FUNCTION, USERDATA, THREAD as defines, -1 - 8.
-//  These are the missing ones.  Then later we will have prim, mesh, script, sound, terrain, ...
-#define LUA_TGROUP      42
-#define LUA_TINTEGER    43
-#define LUA_TEMAIL      44
-#define LUA_TPASSWORD   45
-#define LUA_TFILE       46
-#define LUA_TIMAGE      47
-
 #define FLD_NONE        0
 #define FLD_EDITABLE    1
 #define FLD_HIDDEN      2
@@ -4757,8 +6162,8 @@ static int DoBValidate(reqData *Rd, inputForm *iF, inputValue *iV)
     else
     {
       i = atoi(t0);
-// TODO - get this to use current year instead of 2020.
-      if ((1900 > i) || (i > 2020))
+// TODO - get this to use current year instead of 2021.
+      if ((1900 > i) || (i > 2021))
       {
         bitch(Rd, "Please supply a year of birth.", "Out of range.");
         ret++;
@@ -4768,7 +6173,7 @@ static int DoBValidate(reqData *Rd, inputForm *iF, inputValue *iV)
         bitch(Rd, "Please supply a proper year of birth.", "Out of range, too old.");
         ret++;
       }
-      else if (i >2004)
+      else if (i >2005)
       {
         bitch(Rd, "This grid is Adult rated, you are too young.", "Out of range, too young.");
         ret++;
@@ -5035,6 +6440,7 @@ static void accountViewWeb(reqData *Rd, inputForm *oF, inputValue *oV)
         *level          = getStrH(Rd->database, "UserAccounts.UserLevel"),
         *email          = getStrH(Rd->database, "UserAccounts.Email"),
         *voucher        = getStrH(Rd->database, "Lua.voucher"),
+        *approver       = getStrH(Rd->database, "Lua.approver"),
         *about          = getStrH(Rd->database, "Lua.aboutMe");
   time_t crtd = atol(getStrH(Rd->database, "UserAccounts.Created"));
 
@@ -5047,6 +6453,7 @@ static void accountViewWeb(reqData *Rd, inputForm *oF, inputValue *oV)
     Rd->reply->addstrf(Rd->reply, "<p><font size='5'><span style='font-size: x-large'><b>Email :</b></span></font> %s</p>", email);
     Rd->reply->addstrf(Rd->reply, "<p><font size='5'><span style='font-size: x-large'><b>UUID :</b></span></font> %s</p>", getStrH(Rd->database, "UserAccounts.PrincipalID"));
     Rd->reply->addstrf(Rd->reply, "<p><font size='5'><span style='font-size: x-large'><b>Voucher :</b></span></font> %s</p>", voucher);
+    Rd->reply->addstrf(Rd->reply, "<p><font size='5'><span style='font-size: x-large'><b>Approver :</b></span></font> %s</p>", approver);
     HTMLtextArea(Rd->reply, "aboutMe", "About", 7, 50, 4, 16384, "", "off", "true", "soft", about, FALSE, TRUE);
     accountWebSubs(Rd, oF);
   accountWebFooter(Rd, oF);
@@ -5058,6 +6465,7 @@ static void accountEditWeb(reqData *Rd, inputForm *oF, inputValue *oV)
         *level          = getStrH(Rd->database, "UserAccounts.UserLevel"),
         *email          = getStrH(Rd->database, "UserAccounts.Email"),
         *voucher        = getStrH(Rd->database, "Lua.voucher"),
+        *approver       = getStrH(Rd->database, "Lua.approver"),
         *about          = getStrH(Rd->database, "Lua.aboutMe"),
         *lvl            = getLevel(atoi(level));
   short lv              = atoi(level);
@@ -5078,6 +6486,7 @@ static void accountEditWeb(reqData *Rd, inputForm *oF, inputValue *oV)
     {
       qlisttbl_obj_t obj;
 
+      HTMLhidden(Rd->reply, "approver", approver);
       HTMLselect(Rd->reply, "level", "level");
       memset((void*)&obj, 0, sizeof(obj)); // must be cleared before call
       accountLevels->lock(accountLevels);
@@ -5228,7 +6637,7 @@ d("accountRead() UUID %s, name %s %s", uuid, first, last);
 
   if (0 == rt)
   {
-T("Found Lua record.");
+V("Found Lua record.");
     ret += 1;
     Rd->database->putstr(Rd->database, "UserAccounts.FirstName",        first);
     Rd->database->putstr(Rd->database, "UserAccounts.LastName",         last);
@@ -5249,6 +6658,7 @@ T("Found Lua record.");
     Rd->database->putstr(Rd->database, "Lua.aboutMe",                   getStrH(tnm, "aboutMe"));
     Rd->database->putstr(Rd->database, "Lua.vouched",                   getStrH(tnm, "vouched"));
     Rd->database->putstr(Rd->database, "Lua.voucher",                   getStrH(tnm, "voucher"));
+    Rd->database->putstr(Rd->database, "Lua.approver",                  getStrH(tnm, "approver"));
   }
 //  else if (rows)
   if (rows)
@@ -5257,7 +6667,7 @@ T("Found Lua record.");
     if (1 == rt)
     {
       ret = rt;
-T("Found database record.");
+V("Found database record.");
       dbPull(Rd, "UserAccounts", rows);
 
       char *name = xmprintf("%s %s", getStrH(Rd->database, "UserAccounts.FirstName"), getStrH(Rd->database, "UserAccounts.LastName"));
@@ -5330,9 +6740,9 @@ static int accountDelSub(reqData *Rd, inputForm *iF, inputValue *iV)
   }
   else
   {
-//      check if logged in user is allowed to delete this account
-//      delete user record
-//      log the user out if they are logged in
+// TODO - check if logged in user is allowed to delete this account
+// TODO - delete user record
+// TODO - log the user out if they are logged in
   }
   return ret;
 }
@@ -5425,7 +6835,8 @@ static int accountSaveSub(reqData *Rd, inputForm *iF, inputValue *iV)
 {
   int ret = 0;
   // Using body[user] here, coz we got to this page via a URL query.
-  char *uuid = Rd->shs.UUID,    *first = getStrH(Rd->body, "user"),     *last = NULL;
+  char  *uuid = Rd->shs.UUID,   *first = getStrH(Rd->body, "user"),     *last = NULL,
+        *level          = getStrH(Rd->database, "UserAccounts.UserLevel");
   int c = accountRead(Rd, NULL, first, last);
 
   if (1 != c)
@@ -5435,6 +6846,24 @@ static int accountSaveSub(reqData *Rd, inputForm *iF, inputValue *iV)
   }
   else if ((0 == ret) && (strcmp("POST", Rd->Method) == 0))
   {
+    char *lvl = getStrH(Rd->body, "level");
+    qlisttbl_obj_t obj;
+
+    if (strcmp(level, lvl) != 0)
+    {
+      if (200 <= Rd->shs.level)
+      {
+        I("%s %s approved by %s.", getStrH(Rd->database, "UserAccounts.FirstName"), getStrH(Rd->database, "UserAccounts.LastName"), Rd->shs.name);
+        Rd->stuff->putstr(Rd->stuff,    "approver",             Rd->shs.name);
+      }
+      else
+      {
+        bitch(Rd, "Cannot change level.", "User level not high enough.");
+        lvl = level;
+        Rd->stuff->putstr(Rd->stuff,    "approver",             getStrH(Rd->database, "Lua.approver"));
+      }
+    }
+
     Rd->stuff->putstr(Rd->stuff,    "email",            getStrH(Rd->database, "UserAccounts.Email"));
     Rd->stuff->putstr(Rd->stuff,    "created",          getStrH(Rd->database, "UserAccounts.Created"));
     Rd->stuff->putstr(Rd->stuff,    "flags",            getStrH(Rd->database, "UserAccounts.UserFlags"));
@@ -5449,15 +6878,14 @@ static int accountSaveSub(reqData *Rd, inputForm *iF, inputValue *iV)
     Rd->stuff->putstr(Rd->stuff,    "vouched",          getStrH(Rd->database, "Lua.vouched"));
     Rd->stuff->putstr(Rd->stuff,    "voucher",          getStrH(Rd->database, "Lua.voucher"));
 
-    char *lvl = getStrH(Rd->body, "level");
-    qlisttbl_obj_t obj;
-
     memset((void*)&obj, 0, sizeof(obj)); // must be cleared before call
     accountLevels->lock(accountLevels);
     while(accountLevels->getnext(accountLevels, &obj, NULL, false) == true)
     {
       if (strcmp(lvl, (char *) obj.data) == 0)
+      {
         Rd->database->putstr(Rd->database, "UserAccounts.UserLevel", obj.name);
+      }
     }
     accountLevels->unlock(accountLevels);
     accountWrite(Rd);
@@ -5496,6 +6924,7 @@ static int accountValidateSub(reqData *Rd, inputForm *iF, inputValue *iV)
     Rd->stuff->putstr(Rd->stuff,    "aboutMe",          getStrH(Rd->database, "Lua.aboutMe"));
     Rd->stuff->putstr(Rd->stuff,    "vouched",          getStrH(Rd->database, "Lua.vouched"));
     Rd->stuff->putstr(Rd->stuff,    "voucher",          getStrH(Rd->database, "Lua.voucher"));
+    Rd->stuff->putstr(Rd->stuff,    "approver",         getStrH(Rd->database, "Lua.approver"));
     Rd->shs.level = -100;
     Rd->database->putstr(Rd->database, "UserAccounts.UserLevel", "-100");
     accountWrite(Rd);
@@ -5564,8 +6993,8 @@ d("Sub accountEditSub %s  %s %s", uuid, first, last);
   }
   else
   {
-//      check if logged in user is allowed to make these changes
-//      update user record
+// TODO - check if logged in user is allowed to make these changes
+// TODO - update user record
   }
   return ret;
 }
@@ -6330,11 +7759,96 @@ void account_html(char *file, reqData *Rd, HTMLfile *thisFile)
 }
 
 
+void forEachMember(char *verb, simFunction func, simFunction not)
+{
+  char *last = xstrdup("0");
+
+  if (BACKUP == currentMode)
+  {
+    char *file = xmprintf("%s/.lastTime", scBackup);
+
+    free(last);
+    last = (char *) qfile_load(file, NULL);
+    if (shellMeFail("date +%%s > %s", file))
+      E("date command failed!");
+    free(file);
+    if ((NULL == last) || (NULL != ourSims->target))
+    {
+      free(last);
+      last = xstrdup("0");
+    }
+  }
+
+  static dbRequest *users = NULL;
+  if (NULL == users)
+  {
+    static char *szi[] = {NULL};
+    static char *szo[] = {"FirstName", "LastName", "UserLevel", "Online", "LastRegionID", NULL};
+    users = xzalloc(sizeof(dbRequest));
+    users->table = "UserAccounts,GridUser";
+    users->inParams  = szi;
+    users->outParams = szo;
+    users->where = xmprintf("UserAccounts.PrincipalID=LEFT(GridUser.UserID,36) and GridUser.Login>%s order by LastName,FirstName", last);
+    dbRequests->addfirst(dbRequests, &users, sizeof(dbRequest *));
+  }
+
+  dbDoSomething(users, FALSE);
+  rowData *rows = users->rows;
+  if (rows)
+  {
+    qhashtbl_t *row;
+
+    while (NULL != (row = rows->rows->getat(rows->rows, 0, NULL, true)))
+    {
+      char *firstName = row->getstr(row, "FirstName", false);
+      char *lastName = row->getstr(row, "LastName", false);
+      char *name = xmprintf("%s %s", firstName, lastName);
+
+      if ((NULL == ourSims->target) || (strcmp(ourSims->target, name) == 0))
+      {
+        if (STATUS == currentMode)
+        {
+          char *level = row->getstr(row, "UserLevel", false);
+          char *online = row->getstr(row, "Online", false);
+          char *region = row->getstr(row, "LastRegionID", false);
+          simData *simd = ourSims->byUUID->get(ourSims->byUUID, region, NULL, false);
+
+          if (NULL != simd)
+            region = simd->name;
+          if (strcmp("False", online) == 0)
+            region = "";
+
+          I("Member level %s, online %s, name %s %s  @ %s", level, online, firstName, lastName, region);
+        }
+        func(NULL, name, "Member", 0, 0, 0, 0);
+      }
+
+      free(name);
+      row->free(row);
+      rows->rows->removefirst(rows->rows);
+    }
+    free(rows->fieldNames);
+    rows->rows->free(rows->rows);
+    free(rows);
+  }
+  free(last);
+}
+
+
 static void cleanup(void) 
 {
-// TODO - not sure why, but this gets called twice on quitting sometimes.
   C("Caught signal, or quitting, cleaning up.");
 
+  char *cmd = xmprintf("%s/sledjchisl.socket", scRun);
+
+  if (isWeb && qfile_exist(cmd))
+  {
+    V("Deleting web socket.");
+    if (shellMeFail("rm %s/sledjchisl.socket", scRun))
+      E("rm command failed!");
+  }
+  free(cmd);
+
   if (accountPages)
   {
     qhashtbl_obj_t obj;
@@ -6396,32 +7910,75 @@ static void cleanup(void)
   }
   if (configs)          configs->free(configs);
   configs = NULL;
+
+/*  tmux should clean up it's own socket.  Doesn't seem to care anyway.
+  cmd = xmprintf("%s/%s", scRun, Tsocket);
+  if (qfile_exist(cmd))
+  {
+    if (shellMeFail("rm %s/%s", scRun, Tsocket))
+      E("rm command failed!");
+  }
+  free(cmd);
+*/
 }
 
 
+int scanForConfigs(char **cPaths)
+{
+  int result = FALSE, i;
+  struct stat st;
+
+  for (i = 0; cPaths[i]; i++)
+  {
+    if (('/' == cPaths[i][0]) || ('~' == cPaths[i][0]))
+      snprintf(toybuf, sizeof(toybuf), "%s", cPaths[i]);
+    else
+      snprintf(toybuf, sizeof(toybuf), "%s/%s", pwd, cPaths[i]);
+
+    if (qfile_exist(toybuf))
+    {
+      I("Loading configuration file (maybe) - %s", toybuf);
+      Lua2hashtbl(toybuf, configs, "config");
+      result = TRUE;
+    }
+  }
+  return result;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Main function.
+////////////////////////////////////////////////////////////////////////////////////////////////////
 void sledjchisl_main(void)
 {
   char *cmd = *toys.optargs;
-  char *tmp;
+  char *tmp, *t0 = NULL, *t1 = NULL;
   struct stat statbuf;
   int status, result, i;
   void *vd;
 
+  if(FLAG(v))
+    VERBOSE = TRUE;
+
+  V("SledjChisl command - %s", toys.argv[0]);
+  V("SledjChisl arguments - %d %d", toys.optc, toys.optflags);
+  for (i = 0; i < toys.optc; i++)
+    V("           argument %d %s", i, toys.optargs[i] );
+
   configs = qhashtbl(0, 0);
   L = luaL_newstate();
 
-  I("libfcgi version: %s", FCGI_VERSION);
-  I("Lua version: %s", LUA_RELEASE);
-  I("LuaJIT version: %s", LUAJIT_VERSION);
-  I("MariaDB / MySQL client version: %s", mysql_get_client_info());
-  I("OpenSSL version: %s", OPENSSL_VERSION_TEXT);
-  I("qLibc version: qLibc only git tags for version numbers.  Sooo, 2.4.4, unless I forgot to update this.");
-  I("toybox version: %s", TOYBOX_VERSION);
-
+  V("libfcgi version: %s", FCGI_VERSION);
+  V("Lua version: %s", LUA_RELEASE);
+  V("LuaJIT version: %s", LUAJIT_VERSION);
+  V("MariaDB / MySQL client version: %s", mysql_get_client_info());
+  V("OpenSSL version: %s", OPENSSL_VERSION_TEXT);
+  V("qLibc version: qLibc only git tags for version numbers.  Sooo, 2.4.4, unless I forgot to update this.");
+  V("toybox version: %s", TOYBOX_VERSION);
   dbRequests = qlist(0);
   sigatexit(cleanup);
 
-  pwd = getcwd(0, 0);
+  pwd = xgetcwd();
+  V("Running in directory %s", pwd);
 
   if (-1 == fstat(STDIN_FILENO, &statbuf))
   {
@@ -6453,23 +8010,26 @@ void sledjchisl_main(void)
   int ngroups;
 
   pw = xgetpwuid(euid);
-  I("Running as user %s", pw->pw_name);
+  V("Running as user %s", pw->pw_name);
 
   grp = xgetgrgid(egid);
   ngroups = getgroups(i, groups);
   if (ngroups < 0) perror_exit("getgroups");
-  D("User is in group %s", grp->gr_name);
+  V("User is in group %s", grp->gr_name);
   for (i = 0; i < ngroups; i++) {
     if (groups[i] != egid)
     {
       if ((grp = getgrgid(groups[i])))
-        D("User is in group %s", grp->gr_name);
+        V("User is in group %s", grp->gr_name);
       else
-        D("User is in group %u", groups[i]);
+        V("User is in group %u", groups[i]);
     }
   }
 
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Read configuration.
+////////////////////////////////////////////////////////////////////////////////////////////////////
 /*  From http://luajit.org/install.html -
 To change or extend the list of standard libraries to load, copy
 src/lib_init.c to your project and modify it accordingly. Make sure the
@@ -6477,88 +8037,137 @@ jit library is loaded or the JIT compiler will not be activated.
 */
   luaL_openlibs(L); // Load Lua libraries.
 
-  // Load the config scripts.
+/* Load the config scripts.
+Normally we start in /opt/opensim_SC/current/bin
+    sledjchisl here is a symlink to ../src/build/toybox/toybox  or  ../src/build/toybox/generated/unstripped/toybox
+    So that .sledjChisl.conf.lua is found, which is normally a symlink to ../src/.sledjChisl.conf.lua
+
+Other possibilities -
+    Normally sledjchisl isn't in the path, though it is once our tmux is running.
+    No doubt someone will put it in the path, so then we can start anywhere.
+    Someone could run it from a downloaded opensim-SC and run it from that bin, then it's not installed.
+*/
   char *cPaths[] =
   {
-    ".sledjChisl.conf.lua",
     "/etc/sledjChisl.conf.lua",
 //    "/etc/sledjChisl.d/*.lua",
     "~/.sledjChisl.conf.lua",
 //    "~/.config/sledjChisl/*.lua",
     NULL
   };
-  struct stat st;
 
+  char *oPaths[] =
+  {
+    ".sledjChisl.conf.lua",
+    "./etc/sledjChisl.conf.lua",
+    NULL
+  };
 
-  for (i = 0; cPaths[i]; i++)
+  result = scanForConfigs(cPaths);
+  result = result | scanForConfigs(oPaths);
+  if (result)
   {
-    memset(toybuf, 0, sizeof(toybuf));
-    if (('/' == cPaths[i][0]) || ('~' == cPaths[i][0]))
-      snprintf(toybuf, sizeof(toybuf), "%s", cPaths[i]);
-    else
-      snprintf(toybuf, sizeof(toybuf), "%s/%s", pwd, cPaths[i]);
-    if (0 != lstat(toybuf, &st))
-      continue;
-    I("Loading configuration file - %s", toybuf);
-    status = luaL_loadfile(L, toybuf);
-    if (status) // If something went wrong, error message is at the top of the stack.
-      E("Couldn't load file: %s", lua_tostring(L, -1));
-    else
+    if ((tmp = configs->getstr(configs, "scRoot",   false))             != NULL)  {scRoot               = tmp;                          V("Setting scRoot = %s", scRoot);}
+    snprintf(toybuf, sizeof(toybuf), "%s/current/bin", scRoot);
+    t0 = realpath(pwd, NULL);
+    t1 = realpath(toybuf, NULL);
+    if (strcmp(t0, t1) != 0)
     {
-      result = lua_pcall(L, 0, LUA_MULTRET, 0);
-      if (result)
-        E("Failed to run script: %s", lua_tostring(L, -1));
+      I("Not in the configured scRoot.  %s != %s", t0, t1);
+      if (qfile_exist(toybuf))
+      {
+        chdir(toybuf);
+        free(pwd);
+        pwd = xgetcwd();
+        I("Now running in directory %s", pwd);
+        free(t0);
+        t0 = realpath(pwd, NULL);
+        result = scanForConfigs(cPaths);
+        result = result | scanForConfigs(oPaths);
+      }
       else
       {
-        lua_getglobal(L, "config");
-        lua_pushnil(L);
-        while(lua_next(L, -2) != 0)
-        {
-          char *n = (char *) lua_tostring(L, -2);
-
-          // Numbers can convert to strings, so check for numbers before checking for strings.
-          // On the other hand, strings that can be converted to numbers also pass lua_isnumber().  sigh
-          if (lua_isnumber(L, -1))
-          {
-            float v = lua_tonumber(L, -1);
-            configs->put(configs, n, &v, sizeof(float));
-          }
-          else if (lua_isstring(L, -1))
-            configs->putstr(configs, n, (char *) lua_tostring(L, -1));
-          else if (lua_isboolean(L, -1))
-          {
-            int v = lua_toboolean(L, -1);
-            configs->putint(configs, n, v);
-          }
-          else
-          {
-            char *v = (char *) lua_tostring(L, -1);
-            E("Unknown config variable type for %s = %s", n, v);
-          }
-          lua_pop(L, 1);
-        }
+        C("The configured scRoot doesn't exist!  Might need to actually install this.  %s", scRoot);
+        goto finished;
       }
     }
+    free(t1);
   }
-  DEBUG = configs->getint(configs, "debug");
-  D("Setting DEBUG = %d", DEBUG);
-  if ((vd  = configs->get   (configs, "loadAverageInc", NULL, false))   != NULL)  {loadAverageInc       =       *((float *) vd);        D("Setting loadAverageInc = %f", loadAverageInc);}
-  if ((vd  = configs->get   (configs, "simTimeOut",     NULL, false))   != NULL)  {simTimeOut           = (int) *((float *) vd);        D("Setting simTimeOut = %d", simTimeOut);}
-  if ((tmp = configs->getstr(configs, "scRoot",   false))               != NULL)  {scRoot               = tmp;                          D("Setting scRoot = %s", scRoot);}
-  if ((tmp = configs->getstr(configs, "scUser",   false))               != NULL)  {scUser               = tmp;                          D("Setting scUser = %s", scUser);}
-  if ((tmp = configs->getstr(configs, "Tconsole", false))               != NULL)  {Tconsole             = tmp;                          D("Setting Tconsole = %s", Tconsole);}
-  if ((tmp = configs->getstr(configs, "Tsocket",  false))               != NULL)  {Tsocket              = tmp;                          D("Setting Tsocket = %s", Tsocket);}
-  if ((tmp = configs->getstr(configs, "Ttab",     false))               != NULL)  {Ttab                 = tmp;                          D("Setting Ttab = %s", Ttab);}
-  if ((tmp = configs->getstr(configs, "webRoot",  false))               != NULL)  {webRoot              = tmp;                          D("Setting webRoot = %s", webRoot);}
-  if ((tmp = configs->getstr(configs, "URL",      false))               != NULL)  {URL                  = tmp;                          D("Setting URL = %s", URL);}
-  if ((vd  = configs->get   (configs, "seshRenew",      NULL, false))   != NULL)  {seshRenew            = (int) *((float *) vd);        D("Setting seshRenew = %d", seshRenew);}
-  if ((vd  = configs->get   (configs, "idleTimeOut",    NULL, false))   != NULL)  {idleTimeOut          = (int) *((float *) vd);        D("Setting idleTimeOut = %d", idleTimeOut);}
-  if ((vd  = configs->get   (configs, "seshTimeOut",    NULL, false))   != NULL)  {seshTimeOut          = (int) *((float *) vd);        D("Setting seshTimeOut = %d", seshTimeOut);}
-  if ((vd  = configs->get   (configs, "newbieTimeOut",  NULL, false))   != NULL)  {newbieTimeOut        = (int) *((float *) vd);        D("Setting newbieTimeOut = %d", newbieTimeOut);}
-  if ((tmp = configs->getstr(configs, "ToS",      false))               != NULL)  {ToS                  = tmp;                          D("Setting ToS = %s", ToS);}
-  if ((tmp = configs->getstr(configs, "webIframers", false))            != NULL)  {webIframers          = tmp;                          D("Setting webIframers = %s", webIframers);}
 
+  if (result)
+  {
+    DEBUG = configs->getint(configs, "debug");
+    V("Setting DEBUG = %d", DEBUG);
+    if ((vd  = configs->get   (configs, "loadAverageInc", NULL, false)) != NULL)  {loadAverageInc       =       *((float *) vd);        V("Setting loadAverageInc = %f", loadAverageInc);}
+    if ((vd  = configs->get   (configs, "simTimeOut",     NULL, false)) != NULL)  {simTimeOut           = (int) *((float *) vd);        V("Setting simTimeOut = %d", simTimeOut);}
+    if ((vd  = configs->get   (configs, "bulkSims",       NULL, false)) != NULL)  {bulkSims             = (int) *((float *) vd);        V("Setting bulkSims = %d", bulkSims);}
+    if ((tmp = configs->getstr(configs, "scRoot",   false))             != NULL)  {scRoot               = tmp;                          V("Setting scRoot = %s", scRoot);}
+    if ((tmp = configs->getstr(configs, "scUser",   false))             != NULL)  {scUser               = tmp;                          V("Setting scUser = %s", scUser);}
+    if ((tmp = configs->getstr(configs, "Tconsole", false))             != NULL)  {Tconsole             = tmp;                          V("Setting Tconsole = %s", Tconsole);}
+    if ((tmp = configs->getstr(configs, "Tsocket",  false))             != NULL)  {Tsocket              = tmp;                          V("Setting Tsocket = %s", Tsocket);}
+    if ((tmp = configs->getstr(configs, "Ttab",     false))             != NULL)  {Ttab                 = tmp;                          V("Setting Ttab = %s", Ttab);}
+    if ((tmp = configs->getstr(configs, "backupIARsim",         false)) != NULL)  {backupIARsim         = tmp;                          V("Setting backupIARsim = %s", backupIARsim);}
+    if ((tmp = configs->getstr(configs, "rsync",                false)) != NULL)  {rSync                = tmp;                          V("Setting rsync = %s", rSync);}
+    if ((vd  = configs->getstr(configs, "rsyncPort",            false)) != NULL)  {rSyncPort            = (int) *((float *) vd);        V("Setting rsyncPort = %s", rSyncPort);}
+    if ((tmp = configs->getstr(configs, "webRoot",  false))             != NULL)  {webRoot              = tmp;                          V("Setting webRoot = %s", webRoot);}
+    if ((tmp = configs->getstr(configs, "URL",      false))             != NULL)  {URL                  = tmp;                          V("Setting URL = %s", URL);}
+    if ((vd  = configs->get   (configs, "seshRenew",      NULL, false)) != NULL)  {seshRenew            = (int) *((float *) vd);        V("Setting seshRenew = %d", seshRenew);}
+    if ((vd  = configs->get   (configs, "idleTimeOut",    NULL, false)) != NULL)  {idleTimeOut          = (int) *((float *) vd);        V("Setting idleTimeOut = %d", idleTimeOut);}
+    if ((vd  = configs->get   (configs, "seshTimeOut",    NULL, false)) != NULL)  {seshTimeOut          = (int) *((float *) vd);        V("Setting seshTimeOut = %d", seshTimeOut);}
+    if ((vd  = configs->get   (configs, "newbieTimeOut",  NULL, false)) != NULL)  {newbieTimeOut        = (int) *((float *) vd);        V("Setting newbieTimeOut = %d", newbieTimeOut);}
+    if ((tmp = configs->getstr(configs, "ToS",      false))             != NULL)  {ToS                  = tmp;                          V("Setting ToS = %s", ToS);}
+    if ((tmp = configs->getstr(configs, "webIframers", false))          != NULL)  {webIframers          = tmp;                          V("Setting webIframers = %s", webIframers);}
+  }
+  else
+  {
+    C("No sledjChisl.conf.lua found!");
+    goto finished;
+  }
 
+  snprintf(toybuf, sizeof(toybuf), "%s/current/bin", scRoot);
+  t1 = realpath(toybuf, NULL);
+  if ((NULL != t0) && (strcmp(t0, t1)))
+    C("scRoot moved unexpectedly, check your sledjChisl.conf.lua files!  %s != %s", t0, t1);
+  free(t1);
+  free(t0);
+
+
+/* TODO - stuff that used to be in InstallItAll.sh
+Grab old database details from the config/config.ini file.
+
+Check the external requirements are met.
+    sudo apt install mariadb-server libmariadbclient-dev tmux mono-complete mono-devel nunit uuid-runtime uuid-dev libapache2-mod-fcgid libssl1.0-dev spawn-fcgi
+    sudo apt install nant
+
+Make sure the database is running.
+    sudo /etc/init.d/mysql restart
+
+Setup the database stuff.
+    create database if not exists $MYSQL_DB;
+    create user if not exists '$MYSQL_USER' identified by '$MYSQL_PASSWORD';
+    create user if not exists '$MYSQL_USER'@localhost identified by '$MYSQL_PASSWORD';
+    grant all on $MYSQL_DB.* to '$MYSQL_USER';
+    grant all on $MYSQL_DB.* to '$MYSQL_USER'@localhost;
+    FLUSH PRIVILEGES;
+
+Deal with the system user.
+    sudo adduser --system --shell /bin/bash --group ${OS_USER}
+    sudo addgroup ${USER} ${OS_USER}
+
+Copy the tmux config to user's homes.
+
+Copy this version of opensim-SC to /opt/opensim-SC, and make the current symlink to it.
+
+Copy correct config/config.ini to there.
+    Put new database credentials in config/config.ini
+
+Build the OpenSim.
+*/
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Sort out directories.
+////////////////////////////////////////////////////////////////////////////////////////////////////
   // Use a FHS compatible setup -
   if (strcmp("/", scRoot) == 0)
   {
@@ -6570,6 +8179,7 @@ jit library is loaded or the JIT compiler will not be activated.
     scCache     = "/var/cache/opensim_SC";
     scData      = "/var/lib/opensim_SC";
     scLog       = "/var/log/opensim_SC";
+    scTemp      = "/tmp";
   }
   else if (strcmp("/usr/local", scRoot) == 0)
   {
@@ -6581,6 +8191,7 @@ jit library is loaded or the JIT compiler will not be activated.
     scCache     = "/var/local/cache/opensim_SC";
     scData      = "/var/local/lib/opensim_SC";
     scLog       = "/var/local/log/opensim_SC";
+    scTemp      = "/tmp";
   }
   else  // A place for everything to live, like /opt/opensim_SC
   {
@@ -6595,6 +8206,7 @@ jit library is loaded or the JIT compiler will not be activated.
     // Don't want it in the path.
     // Could put the .dlls into lib.  Most of the rest is config files or common assets.
     // Or just slowly migrate opensim stuff to FHS.
+// TODO - free these.  Though valgrind isn't bitching about them.
     scBin       = xmprintf("%s%s/bin",          slsh, scRoot);
     scEtc       = xmprintf("%s%s/etc",          slsh, scRoot);
     scLib       = xmprintf("%s%s/lib",          slsh, scRoot);
@@ -6603,50 +8215,125 @@ jit library is loaded or the JIT compiler will not be activated.
     scCache     = xmprintf("%s%s/var/cache",    slsh, scRoot);
     scData      = xmprintf("%s%s/var/lib",      slsh, scRoot);
     scLog       = xmprintf("%s%s/var/log",      slsh, scRoot);
+    scTemp      = xmprintf("%s%s/tmp",          slsh, scRoot);
   }
 
+// A bit chicken and egg here.
+// We need to be the correct user to set the correct perms on the scRun directory
+// But we wont be the correct user until we run tmux as that user.
+// The path to sledjchisl.socket needs to be readable by the www-data group.    So the FCGI socket will work.
+// AND it needs to be group sticky on opensimsc group.                          So the tmux socket will work.
+// Put both in scRun, and make it other readable?
+// TODO - No idea of the SECURITY HOLE that might cause.
+  if(!qfile_exist(scRun))
+  {
+    W("Creating the proper %s directory.", scRun);
+    if (shellMeFail("sudo -Hu %s mkdir -p %s", scUser, scRun))
+    {
+        C("Can't make the %s directory.", scRun);
+        goto finished;
+    }
+    else
+    {
+      if (shellMeFail("sudo -Hu %s chmod 2755 %s", scUser, scRun))
+      {
+        C("Can't set proper permissions for the %s directory.", scRun);
+        goto finished;
+      }
+    }
+  }
 
-// TODO - still a bit chicken and egg here about the tmux socket and reading configs from scEtc /.sledjChisl.conf.lua
   if (!isWeb)
   {
-    I("Outputting to a terminal, not a web server.");
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Figure out what and where we are.
+////////////////////////////////////////////////////////////////////////////////////////////////////
+    V("Outputting to a terminal, not a web server.");
     // Check if we are already running inside the proper tmux server.
     char *eTMUX = getenv("TMUX");
-    memset(toybuf, 0, sizeof(toybuf));
+
     snprintf(toybuf, sizeof(toybuf), "%s/%s", scRun, Tsocket);
     if (((eTMUX) && (0 == strncmp(toybuf, eTMUX, strlen(toybuf)))))
     {
-      I("Running inside the proper tmux server. %s", eTMUX);
+      V("Running inside the proper tmux server. %s", eTMUX);
       isTmux = TRUE;
     }
     else
-      I("Not running inside the proper tmux server, starting it. %s == %s", eTMUX, toybuf);
+      V("Not running inside the proper tmux server. %s == %s", eTMUX, toybuf);
   }
 
+// Note this block of code assumes we are running inside current/bin.  Which RunIt.sh does for us.  Earlier code also tries to ensure this.
+  if (!isTmux)
+  {     // Let's see if the proper tmux server is even running.
+    i = shellMe("%s %s/%s -q list-sessions 2>/dev/null | grep -q %s:", Tcmd, scRun, Tsocket, Tconsole);
+    if (WIFEXITED(i))
+    {
+      if (0 != WEXITSTATUS(i))  // No such session, create it.
+      {
+        char *pre = xmprintf("sudo -Hu %s ", scUser);
+
+        memset(toybuf, 0, sizeof(toybuf));
+        if (strcmp(pw->pw_name, scUser) == 0)
+        {
+            I("Not running inside the proper tmux server, starting it.");
+            pre = xmprintf("");
+        }
+        else
+        {
+            I("Not running inside the proper tmux server, starting it with sudo.");
+            // The sudo is only so that the session is owned by opensim, otherwise it's owned by whoever ran this script, which is a likely SECURITY HOLE.
+            // After the session is created, we rely on the scRun directory to be group sticky, so that anyone in the opensim group can attach to the tmux socket.
+            pre = xmprintf("sudo -Hu %s ", scUser);
+        }
+        snprintf(toybuf, sizeof(toybuf),
+          "%s %s %s/%s set-option -g default-command 'export PATH=%s:$PATH; bash'\\; "
+          // Set x,y to huge values, to work around an OpenSim bug.
+          "new-session -d -x 256 -y 420 -s %s -n '%s' bash -c 'export PATH=%s:$PATH; /usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s/current/bin; bash' \\; "
+          "split-window -vp 50 -d -t '%s:0.0' \\; "
+          "split-window -hp 50 -d -t '%s:0.1' \\; "
+          "split-window -hp 50 -d -t '%s:0.0' "
+          // TODO - remove this once we handle the fcgi stuff ourselves.
+          // Make the FCGI socket world read / write, coz we can't set it to group www-data, since -G only works for root, and we ain't root.
+          // TODO - BIG SECURITY HOLE???
+          "bash -c 'export PATH=%s:$PATH; "
+          "spawn-fcgi -n -u %s -s %s/sledjchisl.socket -M 0666 -G www-data  -- /usr/bin/valgrind --leak-check=full sledjchisl; "
+          "cd %s/current/bin; bash'"
+          ,
+          pre, Tcmd, scRun, Tsocket, scBin, Tconsole, Ttab, scBin, scRoot, Tconsole, Tconsole, Tconsole, scBin, scUser, scRun, scBin, scRoot);
+        free(pre);
+        if (shellMeFail(toybuf))
+          E("tmux new-session command failed!  %s", toybuf);
+        else
+        {
+          if (shellMeFail("%s %s/%s select-pane -t 1 -T 'SledjChisl' \\; select-pane -t @0.%%3 -T 'FCGI web server'", Tcmd, scRun, Tsocket))
+            E("tmux select-pane command failed!");
+        }
+        // toybox argument parsing is half working.
+        if (!FLAG(q))
+        {
+          V("Joining the session.");
+          // Join the session.
+          if (shellMeFail("%s %s/%s select-window -t '%s' \\; attach-session -t '%s'", Tcmd, scRun, Tsocket, Tconsole, Tconsole))
+            E("tmux attach-session command failed!  %s", toybuf);
+        }
+        else
+          V("NOT joining the session.");
+        goto finished;
+      }
+    }
+    else
+      E("tmux list-sessions command failed!  %s", toybuf);
+  }
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Other start up stuff.
+////////////////////////////////////////////////////////////////////////////////////////////////////
+  getSims();
   if (isTmux || isWeb)
   {
     char *d;
 
-    // Doing this here coz at this point we should be the correct user.
-    if ((! qfile_exist(scBin))    && (! qfile_mkdir(scBin,      S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scBin);
-    if ((! qfile_exist(scEtc))    && (! qfile_mkdir(scEtc,      S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scEtc);
-    if ((! qfile_exist(scLib))    && (! qfile_mkdir(scLib,      S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scLib);
-    if ((! qfile_exist(scRun))    && (! qfile_mkdir(scRun,      S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_ISGID, true)))  C("Unable to create path %s", scRun);
-    if ((! qfile_exist(scBackup)) && (! qfile_mkdir(scBackup,   S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scBackup);
-// TODO - the path to scCache/sledjchisl.socket needs to be readable by the www-data group.     So the FCGI socket will work.
-//          AND it needs to be group sticky on opensimsc group.                                 So the tmux socket will work.
-//          So currently scCache is www-data readable, and scRun is group sticky.
-    if ((! qfile_exist(scCache))  && (! qfile_mkdir(scCache,    S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scCache);
-    if ((! qfile_exist(scData))   && (! qfile_mkdir(scData,     S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scData);
-    if ((! qfile_exist(scLog))    && (! qfile_mkdir(scLog,      S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scLog);
-    tmp = xmprintf("%s/sessions", scCache);
-    if ((! qfile_exist(tmp))      && (! qfile_mkdir(tmp,        S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", tmp);
-    free(tmp);
-    tmp = xmprintf("%s/users", scData);
-    if ((! qfile_exist(tmp))      && (! qfile_mkdir(tmp,        S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", tmp);
-    free(tmp);
-
-
     mimeTypes = qhashtbl(0, 0);
     mimeTypes->putstr(mimeTypes, "gz",          "application/gzip");
     mimeTypes->putstr(mimeTypes, "js",          "application/javascript");
@@ -6674,13 +8361,15 @@ jit library is loaded or the JIT compiler will not be activated.
 //    mimeTypes->putstr(mimeTypes, "markdown",  "text/markdown");
     mimeTypes->putstr(mimeTypes, "txt",         "text/plain");
 
-    memset(toybuf, 0, sizeof(toybuf));
-    snprintf(toybuf, sizeof(toybuf), "%s/config/config.ini", scRoot);
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Connect to database.
+////////////////////////////////////////////////////////////////////////////////////////////////////
 // TODO - it looks like OpenSim invented their own half arsed backwards INI file include system.
 //          I doubt qLibc supports it, like it supports what seems to be the standard include system.
 //          Not sure if we need to worry about it just yet.
 // TODO - this leaks memory, but it's a bug in qLibc.  Send the bug fix upstream.
+    snprintf(toybuf, sizeof(toybuf), "%s/config/config.ini", scRoot);
     qlisttbl_t *qconfig = qconfig_parse_file(NULL, toybuf, '=');
     if (NULL == qconfig)
     {
@@ -6745,8 +8434,262 @@ jit library is loaded or the JIT compiler will not be activated.
   }
 
 
-  if (isWeb)
+  if (!isWeb)
+  {
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Start of OpenSim wrangling section.
+////////////////////////////////////////////////////////////////////////////////////////////////////
+    struct sysinfo info;
+    // TODO - See https://stackoverflow.com/questions/2693948/how-do-i-retrieve-the-number-of-processors-on-c-linux, there are more portable ways, this seems to be GNU specific.
+    int cpus = (int) sysconf(_SC_NPROCESSORS_CONF), cpusOnline = (int) sysconf(_SC_NPROCESSORS_ONLN);
+
+    ourSims->doIt = 1;
+    if (0 == bulkSims)
+      bulkSims = (cpusOnline / 3) - 1;
+    sysinfo(&info);
+    ourSims->la = info.loads[0]/65536.0;
+    I("There are %i CPUs, %i of them are online.  Doing %i sims at once.  LoadAverage = %f", cpus, cpusOnline, bulkSims, ourSims->la);
+
+    if (0 == toys.optc)
+      ;
+    else if (strcmp(toys.optargs[0], "backup") == 0)
+      currentMode = BACKUP;
+    else if (strcmp(toys.optargs[0], "gitar") == 0)
+      currentMode = GITAR;
+    else if (strcmp(toys.optargs[0], "restart") == 0)
+      currentMode = RESTART;
+    else if (strcmp(toys.optargs[0], "start") == 0)
+      currentMode = START;
+    else if (strcmp(toys.optargs[0], "status") == 0)
+      currentMode = STATUS;
+    else if (strcmp(toys.optargs[0], "stop") == 0)
+      currentMode = STOP;
+    if (2 == toys.optc)
+      ourSims->target = xstrdup(toys.optargs[1]);
+    else if (3 == toys.optc)
+      ourSims->target = xmprintf("%s %s", toys.optargs[1], toys.optargs[2]);
+    else
+      ourSims->target = NULL;
+//V("Doing %s for %s  '%s'  %s %s", modeStrings[currentMode], FLAG(m) ? "member" : "", ourSims->target, FLAG(q) ? "quiet" : "", FLAG(a) ? "all" : "");
+
+    // Start ROBUST or join the tmux session, or just figure out where the sims are running in tmux.
+    if ((START == currentMode) && !checkSimIsRunning("ROBUST"))
+    {
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Sort out directories, part 2
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+      // Doing this here coz at this point we should be the correct user, and we only want to do this during initial startup.
+      /* From man 7 inode -
+        S_ISUID     04000   set-user-ID bit
+        S_ISGID     02000   set-group-ID bit (see below)
+        S_ISVTX     01000   sticky bit (see below)
+
+        S_IRWXU     00700   owner has read, write, and execute permission
+        S_IRUSR     00400   owner has read permission
+        S_IWUSR     00200   owner has write permission
+        S_IXUSR     00100   owner has execute permission
+
+        S_IRWXG     00070   group has read, write, and execute permission
+        S_IRGRP     00040   group has read permission
+        S_IWGRP     00020   group has write permission
+        S_IXGRP     00010   group has execute permission
+
+        S_IRWXO     00007   others (not in group) have read, write, and execute permission
+        S_IROTH     00004   others have read permission
+        S_IWOTH     00002   others have write permission
+        S_IXOTH     00001   others have execute permission
+
+        The set-group-ID bit (S_ISGID) has several special uses.  For a directory, it indicates that BSD semantics is to be used for that directory: files created there inherit their group
+        ID  from the directory, not from the effective group ID of the creating process, and directories created there will also get the S_ISGID bit set.  For a file that does not have the
+        group execution bit (S_IXGRP) set, the set-group-ID bit indicates mandatory file/record locking.
+
+        The sticky bit (S_ISVTX) on a directory means that a file in that directory can be renamed or deleted only by the owner of the file, by the owner of the directory,
+        and by a  privileged process
+      */
+      V("Making directories in %s.", scRoot);
+      if ((! qfile_exist(scBin))          && (! qfile_mkdir(scBin,      S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scBin);
+      if ((! qfile_exist(scEtc))          && (! qfile_mkdir(scEtc,      S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scEtc);
+      if ((! qfile_exist(scLib))          && (! qfile_mkdir(scLib,      S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scLib);
+      if ((! qfile_exist(scBackup))        && (! qfile_mkdir(scBackup,  S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scBackup);
+      if ((! qfile_exist(scCache))        && (! qfile_mkdir(scCache,    S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scCache);
+      if ((! qfile_exist(scData))         && (! qfile_mkdir(scData,     S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scData);
+      if ((! qfile_exist(scLog))          && (! qfile_mkdir(scLog,      S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scLog);
+      if ((! qfile_exist(scTemp))         && (! qfile_mkdir(scTemp,     S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", scTemp);
+      tmp = xmprintf("%s/sessions", scCache);
+      if ((! qfile_exist(tmp))            && (! qfile_mkdir(tmp,        S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", tmp);
+      free(tmp);
+      tmp = xmprintf("%s/users", scData);
+      if ((! qfile_exist(tmp))            && (! qfile_mkdir(tmp,        S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", tmp);
+      free(tmp);
+      tmp = xmprintf("%s/db", scData);
+      if ((! qfile_exist(tmp))            && (! qfile_mkdir(tmp,        S_IRWXU | S_IRGRP | S_IXGRP, true)))  C("Unable to create path %s", tmp);
+      free(tmp);
+
+/* TODO - tighten up security.
+Make sure correct permissions are set everywhere.
+    sudo chown -R ${OS_USER}:${OS_USER} ${OS_PATH}
+
+Create the /opt/opensim-SC directory structure.
+        AssetFiles/data         Think OpenSim creates all the sub directories itself?
+        AssetFiles/tmp/spool    Think OpenSim creates all the sub directories itself?
+        config/config.ini       (move that etc/config.ini later)
+.       var/backups             Copy examples/var/backups/*.IAR files, which are the newbie starter inventories.
+.       var/cache               Think OpenSim creates all the sub directories itself?
+.       var/run                 HAS to be setup correctly BEFORE we try to start up tmux.
+        web                     // Fill it with default web stuff from current -> example..
+*/
+      I("Securing directories and files in %s.  This might take awhile.", scRoot);
+      if (shellMeFail("chmod    u=rw,go=        %s/config/*.ini",                       scRoot))        C("Can't set proper permissions for %s/config*.ini",                    scRoot);
+      if (shellMeFail("chmod    u=rw,go=        %s/config/ROBUST/*.ini",                scRoot))        C("Can't set proper permissions for %s/config/ROBUST/*.ini",            scRoot);
+      if (shellMeFail("chmod    u=rw,go=        %s/.sledjChisl.conf.lua",               scEtc))         C("Can't set proper permissions for %s/.sledjChisl.conf.lua",           scEtc);
+      if (shellMeFail("chmod    ug+rw           %s/config",                             scRoot))        C("Can't set proper permissions for %s/config",                         scRoot);
+      if (shellMeFail("chmod    g+s             %s/config",                             scRoot))        C("Can't set proper permissions for %s/config",                         scRoot);
+      if (shellMeFail("chmod    u=rw,go=        %s/config/*.ini",                       scRoot))        C("Can't set proper permissions for %s/config/*.ini",                   scRoot);
+      if (shellMeFail("chmod    u=rw,go=        %s/config/ROBUST/*.ini",                scRoot))        C("Can't set proper permissions for %s/configROBUST/*.ini",             scRoot);
+
+      if (shellMeFail("chmod    ug=rwx,o=       %s/AssetFiles",                         scRoot))        C("Can't set proper permissions for %s/AssetFiles",                     scRoot);
+      if (shellMeFail("chmod -fR        ug=rw,o=,a+X    %s",                            scBackup))      C("Can't set proper permissions for %s",                                scBackup);
+      if (shellMeFail("chmod -fR        a=r,ug=rw,a+X   %s",                            scBin))         C("Can't set proper permissions for %s",                                scBin);
+      if (shellMeFail("chmod -fR        ug=rw,o=,a+X    %s",                            scCache))       C("Can't set proper permissions for %s",                                scCache);
+      if (shellMeFail("chmod    ug=rwx,o=       %s",                                    scCache))       C("Can't set proper permissions for %s",                                scCache);
+      if (shellMeFail("chmod -fR        a=r,ug=rw,a+X   %s",                            scData))        C("Can't set proper permissions for %s",                                scData);
+      if (shellMeFail("chmod -fR        a=r,ug=rw,a+X   %s",                            scEtc))         C("Can't set proper permissions for %s",                                scEtc);
+      if (shellMeFail("chmod    u=rw,go=        %s/.sledjChisl.conf.lua",               scEtc))         C("Can't set proper permissions for %s/.sledjChisl.conf.lua",           scEtc);
+      if (shellMeFail("chmod    g+s             %s",                                    scEtc))         C("Can't set proper permissions for %s",                                scEtc);
+      if (shellMeFail("chmod    a+x             %s/*.shini",                            scEtc))         C("Can't set proper permissions for %s/*.shini",                        scEtc);
+      if (shellMeFail("chmod -fR        a=r,ug=rw,a+X   %s",                            scLib))         C("Can't set proper permissions for %s",                                scLib);
+      if (shellMeFail("chmod -fR        a=r,ug=rw,a+X   %s",                            scLog))         C("Can't set proper permissions for %s",                                scLog);
+      if (shellMeFail("chmod -fR        a=r,ug=rw,a+X   %s",                            scTemp))        C("Can't set proper permissions for %s",                                scTemp);
+
+//      if (shellMeFail("chmod -R       a+x             %s/current/*.sh",               scRoot))        C("Can't set proper permissions for %s/current/*.sh",                   scRoot);
+//      if (shellMeFail("chmod -R       a+x             %s/current/scripts/*.sh",       scRoot))        C("Can't set proper permissions for %s/current/scripts/*.sh",           scRoot);
+//      if (shellMeFail("chmod -R       a+x             %s/current/scripts/install/*.sh",       scRoot))        C("Can't set proper permissions for %s/current/scripts/install/*.sh",   scRoot);
+//      if (shellMeFail("chmod  a+x             %s/current/scripts/show-console",       scRoot))        C("Can't set proper permissions for %s/current/scripts/show-console",   scRoot);
+//      if (shellMeFail("chmod  a+x             %s/current/scripts/start-sim",          scRoot))        C("Can't set proper permissions for %s/current/scripts/start-sim",      scRoot);
+
+      char *newPath = xmprintf("%s/current/bin/sledjchisl", scRoot);
+      tmp = xmprintf("%s/sledjchisl", scBin);
+      V("Symlinking %s to %s", newPath, tmp);
+      if (qfile_exist(tmp))
+      {
+        if (shellMeFail("rm %s", tmp))
+        E("rm command failed!");
+      }
+      if (0 != symlink(newPath, tmp))
+        perror_msg("Symlinking %s to %s", newPath, tmp);
+      free(tmp);
+      free(newPath);
+
+      char *c = xmprintf("cd %s/current/bin", scRoot);
+      I("ROBUST is starting up.");
+      sendTmuxCmd("@0.%1", c);
+      free(c);
+      c = xmprintf("mono Robust.exe -inidirectory=%s/config/ROBUST", scRoot);
+      sendTmuxCmd("@0.%1", c);
+      free(c);
+      doTmuxCmd("select-pane -t @0.%%1 -T 'ROBUST'", Tcmd, scRun, Tsocket);
+
+      // Create all the tmux windows, panes, and temporary .ini files coz OpenSim sucketh.
+      forEachSim("Prepping", prepSims, NULL);
+      waitTmuxText("@0.%1", "INITIALIZATION COMPLETE FOR ROBUST");
+      I("ROBUST is done starting up.");
+    }
+    else if ((0 == toys.optc) && (checkSimIsRunning("ROBUST")))
+    {
+      // Join the session.
+      doTmuxCmd("select-window -t '%s' \\; attach-session -t '%s'", Tconsole, Tconsole);
+      goto finished;
+    }
+    else        // Find out where the sims are in tmux.
+      forEachSim(NULL, findSimsTmux, NULL);
+
+    if (FLAG(m))
+    {
+      // Do stuff with the members.
+      ourSims->doIt = 1;
+      // Find the correct window to do backups in.
+      forEachSim(NULL, findWindow, NULL);
+      forEachMember("Doing", doSimsThing, NULL);
+    }
+    else
+    {
+// TODO if stopping all the sims, I'd want to do them in reverse order.
+      if ((STOP == currentMode) && (NULL == ourSims->target))
+        I("Stopping all the sims.");
+      // Do stuff with the sims.
+      ourSims->doIt = 1;
+      forEachSim("Doing", doSimsThing, NULL);
+    }
+
+    if ((STOP == currentMode) && (NULL == ourSims->target))
+    {
+      // Stop all the sims.
+      ourSims->doIt = 1;
+      forEachSim(NULL, stopSims, NULL);
+
+      if (ourSims->doIt)
+      {
+        if (checkSimIsRunning("ROBUST"))
+        {
+          I("Stopping ROBUST.");
+          sendTmuxCmd("@0.%1", "quit");
+          while (checkSimIsRunning("ROBUST"))
+            usleep(100000);
+          usleep(100000);
+          sendTmuxCmd("@0.%1", "exit");
+          usleep(100000);
+          sendTmuxCmd("@0.%1", "exit");
+          I("ROBUST has stopped in tmux ID @0.%%1.");
+        }
+
+        if (FLAG(a))
+        {
+          I("Closing all the other windows.");
+          // First figure out what panes and windows are left.
+          shellMeFail("echo 'IDs={' >%s/IDs_ALL.lua", scTemp);
+          doTmuxCmd("list-panes -s -F '\"#{window_id}.#{pane_id}\",' >> %s/IDs_ALL.lua", scTemp);
+          shellMeFail("echo '}\nreturn IDs' >>%s/IDs_ALL.lua", scTemp);
+          snprintf(toybuf, sizeof(toybuf), "%s/IDs_ALL.lua", scTemp);
+          qtreetbl_t *IDs = Lua2tree(toybuf, "IDs");
+
+          if (shellMeFail("rm -fr %s/*", scTemp))
+            E("rm command failed!  %s/*", scTemp);
+
+          qtreetbl_obj_t obj0;
+          memset((void*)&obj0, 0, sizeof(obj0));
+          IDs->lock(IDs);
+          while(IDs->getnext(IDs, &obj0, false) == true)
+          {
+            qLua *q0 = obj0.data;
+
+            if ('0' != q0->v.s[1])
+              doTmuxCmd("kill-pane -t %s", q0->v.s);
+          }
+          IDs->unlock(IDs);
+
+          I("Closing the original window.");
+          memset((void*)&obj0, 0, sizeof(obj0));
+          IDs->lock(IDs);
+          while(IDs->getnext(IDs, &obj0, false) == true)
+          {
+            qLua *q0 = obj0.data;
+
+            if ('0' == q0->v.s[1])
+            doTmuxCmd("kill-pane -t %s", q0->v.s);
+          }
+          IDs->unlock(IDs);
+
+          freeLuaTree(IDs);
+        }
+      }
+    }
+  }
+  else
   {
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Start of web wrangling section.
+////////////////////////////////////////////////////////////////////////////////////////////////////
     char **initialEnv = environ;
     char *tmp0, *tmp1;
     int count = 0, entries, bytes;
@@ -6767,6 +8710,9 @@ jit library is loaded or the JIT compiler will not be activated.
     }
     printEnv(environ);
 
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// Web processing loop.
+////////////////////////////////////////////////////////////////////////////////////////////////////
 /*
 ?    https://stackoverflow.com/questions/30707792/how-to-disable-buffering-with-apache2-and-mod-proxy-fcgi
     https://z-issue.com/wp/apache-2-4-the-event-mpm-php-via-mod_proxy_fcgi-and-php-fpm-with-vhosts/
@@ -6893,7 +8839,7 @@ t("BODY");
         free(Body);
         santize(Rd->body);
 
-        I("%s %s://%s%s -> %s%s", Rd->Method, Rd->Scheme, Rd->Host, Rd->RUri, webRoot, Rd->Path);
+        D("%s %s://%s%s -> %s%s", Rd->Method, Rd->Scheme, Rd->Host, Rd->RUri, webRoot, Rd->Path);
         D("Started FCGI web request ROLE = %s, body is %s bytes, pid %d.", Role, Length, getpid());
 
         if (NULL == Rd->Path)
@@ -7084,6 +9030,7 @@ sendReply:
 
 fcgiDone:
         FCGI_Finish();
+        snprintf(toybuf, sizeof(toybuf), " for %s %s://%s%s -> %s%s", Rd->Method, Rd->Scheme, Rd->Host, Rd->RUri, webRoot, Rd->Path);
         if (NULL != Rd->outQuery)       free(Rd->outQuery);
         if (NULL != Rd->shs.name)       free(Rd->shs.name);
         Rd->shs.name = NULL;
@@ -7109,122 +9056,18 @@ fcgiDone:
           perror_msg("Unable to get the time.");
         double n = (now.tv_sec * 1000000000.0) + now.tv_nsec;
         double t = (Rd->then.tv_sec * 1000000000.0) + Rd->then.tv_nsec;
-        I("Finished web request, took %lf seconds", (n - t) / 1000000000.0);
+        T("Finished web request, took %lf seconds%s", (n - t) / 1000000000.0, toybuf);
         free(Rd);
     }
 
     FCGI_fprintf(FCGI_stderr, "Stopped SledjChisl web server.\n");
-    D("Stopped SledjChisl web server.");
-
-    goto finished;
+    V("Stopped SledjChisl web server.");
   }
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// End of web wrangling section.
+////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-  if (!isTmux)
-  {     // Let's see if the proper tmux server is even running.
-    memset(toybuf, 0, sizeof(toybuf));
-    snprintf(toybuf, sizeof(toybuf), "%s %s/%s -q list-sessions 2>/dev/null | grep -q %s:", Tcmd, scRun, Tsocket, Tconsole);
-    i = system(toybuf);
-    if (WIFEXITED(i))
-    {
-      if (0 != WEXITSTATUS(i))  // No such sesion, create it.
-      {
-        memset(toybuf, 0, sizeof(toybuf));
-        // The sudo is only so that the session is owned by opensim, otherwise it's owned by whoever ran this script, which is a likely security hole.
-        // After the session is created, we rely on the scRun directory to be group sticky, so that anyone in the opensim group can attach to the tmux socket.
-        snprintf(toybuf, sizeof(toybuf), 
-          "sudo -Hu %s %s %s/%s new-session -d -s %s  -n '%s' \\; split-window -bhp 50 -t '%s:' bash -c '/usr/bin/valgrind --leak-check=full ./sledjchisl; cd %s; bash'",
-          scUser, Tcmd, scRun, Tsocket, Tconsole, Ttab, Tconsole, scRoot);
-        i = system(toybuf);
-        if (!WIFEXITED(i))
-          E("tmux new-session command failed!  %s", toybuf);
-      }
-      // Join the session.
-      memset(toybuf, 0, sizeof(toybuf));
-      snprintf(toybuf, sizeof(toybuf), "%s %s/%s select-window -t '%s' \\; attach-session -t '%s'", Tcmd, scRun, Tsocket, Tconsole, Tconsole);
-      i = system(toybuf);
-      if (!WIFEXITED(i))
-        E("tmux attach-session command failed!  %s", toybuf);
-      goto finished;
-    }
-    else
-      E("tmux list-sessions command failed!  %s", toybuf);
-  }
-
-
-  simList *sims = getSims();
-  if (1)
-  {
-    struct sysinfo info;
-    float  la;
-
-    sysinfo(&info);
-    la = info.loads[0]/65536.0;
-
-    if (!checkSimIsRunning("ROBUST"))
-    {
-      char *d = xmprintf("%s.{right}", Ttab);
-      char *c = xmprintf("cd %s/current/bin", scRoot);
-
-      I("ROBUST is starting up.");
-      sendTmuxCmd(d, c);
-      free(c);
-      c = xmprintf("mono Robust.exe -inidirectory=%s/config/ROBUST", scRoot);
-      sendTmuxCmd(d, c);
-      free(c);
-      waitTmuxText(d, "INITIALIZATION COMPLETE FOR ROBUST");
-      I("ROBUST is done starting up.");
-      la = waitLoadAverage(la, loadAverageInc / 3.0, simTimeOut / 3);
-      free(d);
-    }
-
-    for (i = 0; i < sims->num; i++)
-    {
-      char *sim = sims->sims[i], *name = getSimName(sims->sims[i]);
-
-      if (!checkSimIsRunning(sim))
-      {
-        char *nm = cleanSimName(name);
-
-        I("%s is starting up.", name);
-        memset(toybuf, 0, sizeof(toybuf));
-        snprintf(toybuf, sizeof(toybuf), "%s %s/%s new-window -dn '%s' -t '%s:%d' 'cd %s/current/bin; mono OpenSim.exe -inidirectory=%s/config/%s'",
-          Tcmd, scRun, Tsocket, nm, Tconsole, i + 1, scRoot, scRoot, sim);
-        int r = system(toybuf);
-        if (!WIFEXITED(r))
-          E("tmux new-window command failed!");
-        else
-        {
-          memset(toybuf, 0, sizeof(toybuf));
-          snprintf(toybuf, sizeof(toybuf), "INITIALIZATION COMPLETE FOR %s", name);
-          waitTmuxText(nm, toybuf);
-          I("%s is done starting up.", name);
-          la = waitLoadAverage(la, loadAverageInc, simTimeOut);
-        }
-        free(nm);
-      }
-      free(name);
-    }
-
-  }
-  else if (!strcmp(cmd, "create"))      // "create name x,y size"
-  {
-  }
-  else if (!strcmp(cmd, "start"))       // "start sim01"  "start Welcome"  "start" start everything
-  {
-// TODO - check if sim is down, but tmux window is still up, and close the tmux window first.
-  }
-  else if (!strcmp(cmd, "backup"))      // "backup onefang rejected"  "backup sim01"  "backup Welcome"  "backup" backup everything
-  {                                     // If it's not a sim code, and not a sim name, it's an account inventory.
-  }
-  else if (!strcmp(cmd, "gitAR"))       // "gitAR i name"
-  {
-  }
-  else if (!strcmp(cmd, "stop"))        // "stop sim01"  "stop Welcome"  "stop" stop everything
-  {
-  }
-
-  freeSimList(sims);
 
 /*
   double sum;
@@ -7289,6 +9132,8 @@ fcgiDone:
 */
 
 finished:
+  freeSimList(ourSims);
+  ourSims = NULL;
 
   // An example of calling a toy directly.
 //  printf("\n\n");
@@ -7298,6 +9143,4 @@ finished:
 
   puts("This is the end my friend.");
   fflush(stdout);
-
-  cleanup();
 }