diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 392681eb..2cade5de 100755
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -49,6 +49,7 @@ class Database:
         self.import_options = c.get_import_parameters()
         self.type = db_params['db-type']
         self.backend = db_params['db-backend']
+        self.db_server = db_params['db-server']
         # where possible avoid creating new SQL instance by using the global one passed in
         if sql == None:
             self.sql = SQL.Sql(type = self.type, db_server = db_params['db-server'])
diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 455c1e27..2468fecf 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -31,6 +31,7 @@ import re
 
 import fpdb_simple
 import fpdb_db
+import Database
 import fpdb_parse_logic
 import Configuration
 
@@ -57,7 +58,8 @@ class Importer:
         self.settings   = settings
         self.caller     = caller
         self.config     = config
-        self.fdb        = None
+        self.database   = None       # database will be the main db interface eventually
+        self.fdb        = None       # fdb may disappear or just hold the simple db connection
         self.cursor     = None
         self.filelist   = {}
         self.dirlist    = {}
@@ -75,6 +77,7 @@ class Importer:
         self.settings.setdefault("minPrint", 30)
         self.settings.setdefault("handCount", 0)
         
+        self.database = Database.Database(self.config)  # includes .connection and .sql variables
         self.fdb = fpdb_db.fpdb_db()   # sets self.fdb.db self.fdb.cursor and self.fdb.sql
         self.fdb.do_connect(self.config)
         self.fdb.db.rollback()
@@ -392,8 +395,9 @@ class Importer:
                     self.hand=hand
 
                     try:
-                        handsId = fpdb_parse_logic.mainParser(self.settings, self.fdb
-                                                           , self.siteIds[site], category, hand, self.config)
+                        handsId = fpdb_parse_logic.mainParser( self.settings, self.fdb
+                                                             , self.siteIds[site], category, hand
+                                                             , self.config, self.database )
                         self.fdb.db.commit()
 
                         stored += 1
diff --git a/pyfpdb/fpdb_parse_logic.py b/pyfpdb/fpdb_parse_logic.py
index eff8179f..bb361f63 100644
--- a/pyfpdb/fpdb_parse_logic.py
+++ b/pyfpdb/fpdb_parse_logic.py
@@ -21,10 +21,13 @@ import fpdb_simple
 import Database
 
 #parses a holdem hand
-def mainParser(settings, fdb, siteID, category, hand, config):
+def mainParser(settings, fdb, siteID, category, hand, config, db = None):
     backend = settings['db-backend']
-    #This is redundant - hopefully fdb will be a Database object in an interation soon
-    db = Database.Database(config, 'fpdb', '')
+    if db == None:
+        #This is redundant - hopefully fdb will be a Database object in an iteration soon
+        db = Database.Database(c = config, sql = None)
+    else:
+        db = db
     category = fpdb_simple.recogniseCategory(hand[0])
 
     base = "hold" if category == "holdem" or category == "omahahi" or category == "omahahilo" else "stud"