@@ -16,32 +16,34 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
-(import (prefix sqlite3 sqlite3:))
-
 (declare (unit tasks))
-(declare (uses db))
-(declare (uses rmt))
-(declare (uses common))
-(declare (uses pgdb))
+;; (declare (uses db))
+;; (declare (uses rmt))
+;; (declare (uses common))
+;; (declare (uses pgdb))
 
 ;; (import pgdb) ;; pgdb is a module
 
 (declare (uses commonmod))
-(import commonmod)
-
 (declare (uses configfmod))
-(import configfmod)
-
 (declare (uses dbmod))
+
+(module tasks
+*
+
+(import scheme chicken data-structures extras)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
+(import (prefix sqlite3 sqlite3:))
+(import commonmod)
+(import configfmod)
 (import dbmod)
 
 (include "task_records.scm")
-(include "db_records.scm")
+;; (include "db_records.scm")
 
 ;;======================================================================
 ;; Tasks db
 ;;======================================================================
 
@@ -1055,5 +1057,6 @@
 	    (tasks:sync-to-postgres configdat dest)
 	    (begin
 	      (debug:print 0 *default-log-port* "ERROR: unable to create an area record")
 	      #f)))))
 
+)