@@ -40,12 +40,13 @@
 (define (set-fn fn-name fn)
   (hash-table-set! *functions* fn-name fn))
 
 (include "altdb.scm")
 
-
-(defstruct remote
+;; remote connection information - moved to alldat
+;;
+#;(defstruct remote
   (hh-dat            #f) ;; (exec-fn 'common:get-homehost)) ;; homehost record ( addr . hhflag )
   (server-url        #f) ;; (if *toppath* (exec-fn 'server:check-if-running *toppath*))) ;; (server:check-if-running *toppath*) #f))
   (last-server-check 0)  ;; last time we checked to see if the server was alive
   (conndat           #f)
   (transport         *transport-type*)
@@ -198,15 +199,36 @@
 ;; ALLDATA
 ;;======================================================================
 ;;
 ;; attempt to consolidate a bunch of global information into one struct to toss around
 (defstruct alldat
-  (toppath           #f)
+  (areapath          #f) ;; i.e. toppath
+  (mtconfig          #f)
+  (log-port          #f)
+  (areadat           #f) ;; i.e. runremote
+  (rmt-mutex         (make-mutex))
+  (db-sync-mutex     (make-mutex))
   (read-only-queries api:read-only-queries)
-  (write-queries     api:write-queries))
+  (write-queries     api:write-queries)
+
+  ;; database related
+  (tmppath           #f) ;; tmp path for dbs
+
+  ;; runremote fields
+  (hh-dat            #f) ;; (exec-fn 'common:get-homehost)) ;; homehost record ( addr . hhflag )
+  (server-url        #f) ;; (if *toppath* (exec-fn 'server:check-if-running *toppath*))) ;; (server:check-if-running *toppath*) #f))
+  (last-server-check 0)  ;; last time we checked to see if the server was alive
+  (conndat           #f)
+  (transport         *transport-type*)
+  (server-timeout    #f) ;; (exec-fn 'server:expiration-timeout))
+  (force-server      #f)
+  (ro-mode           #f)  
+  (ro-mode-checked   #f) ;; flag that indicates we have checked for ro-mode
+  (ulex:conn         #f) ;; ulex db conn is not exactly a db connector, more like a network connector 
+  )
 
-(define *alldata* (make-alldat))
+(define *alldat* (make-alldat))
 
 ;; Some of these routines use:
 ;;
 ;;     http://www.cs.toronto.edu/~gfb/scheme/simple-macros.html
 ;;