diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index ad376453..6de0d567 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -1618,6 +1618,40 @@ class Database:
                              pdata[p]['street2Bets'],
                              pdata[p]['street3Bets'],
                              pdata[p]['street4Bets'],
+                             pdata[p]['position'],
+                             pdata[p]['tourneyTypeId'],
+                             pdata[p]['startCards'],
+                             pdata[p]['street0_3BChance'],
+                             pdata[p]['street0_3BDone'],
+                             pdata[p]['otherRaisedStreet1'],
+                             pdata[p]['otherRaisedStreet2'],
+                             pdata[p]['otherRaisedStreet3'],
+                             pdata[p]['otherRaisedStreet4'],
+                             pdata[p]['foldToOtherRaisedStreet1'],
+                             pdata[p]['foldToOtherRaisedStreet2'],
+                             pdata[p]['foldToOtherRaisedStreet3'],
+                             pdata[p]['foldToOtherRaisedStreet4'],
+                             pdata[p]['stealAttemptChance'],
+                             pdata[p]['stealAttempted'],
+                             pdata[p]['foldBbToStealChance'],
+                             pdata[p]['foldedBbToSteal'],
+                             pdata[p]['foldSbToStealChance'],
+                             pdata[p]['foldedSbToSteal'],
+                             pdata[p]['foldToStreet1CBChance'],
+                             pdata[p]['foldToStreet1CBDone'],
+                             pdata[p]['foldToStreet2CBChance'],
+                             pdata[p]['foldToStreet2CBDone'],
+                             pdata[p]['foldToStreet3CBChance'],
+                             pdata[p]['foldToStreet3CBDone'],
+                             pdata[p]['foldToStreet4CBChance'],
+                             pdata[p]['foldToStreet4CBDone'],
+                             pdata[p]['street1CheckCallRaiseChance'],
+                             pdata[p]['street1CheckCallRaiseDone'],
+                             pdata[p]['street2CheckCallRaiseChance'],
+                             pdata[p]['street2CheckCallRaiseDone'],
+                             pdata[p]['street3CheckCallRaiseChance'],
+                             pdata[p]['street3CheckCallRaiseDone'],
+                             pdata[p]['street4CheckCallRaiseChance']
                             ) )
 
         q = """INSERT INTO HandsPlayers (
@@ -1665,9 +1699,50 @@ class Database:
             street1Bets,
             street2Bets,
             street3Bets,
-            street4Bets
+            street4Bets,
+            position,
+            tourneyTypeId,
+            startCards,
+            street0_3BChance,
+            street0_3BDone,
+            otherRaisedStreet1,
+            otherRaisedStreet2,
+            otherRaisedStreet3,
+            otherRaisedStreet4,
+            foldToOtherRaisedStreet1,
+            foldToOtherRaisedStreet2,
+            foldToOtherRaisedStreet3,
+            foldToOtherRaisedStreet4,
+            stealAttemptChance,
+            stealAttempted,
+            foldBbToStealChance,
+            foldedBbToSteal,
+            foldSbToStealChance,
+            foldedSbToSteal,
+            foldToStreet1CBChance,
+            foldToStreet1CBDone,
+            foldToStreet2CBChance,
+            foldToStreet2CBDone,
+            foldToStreet3CBChance,
+            foldToStreet3CBDone,
+            foldToStreet4CBChance,
+            foldToStreet4CBDone,
+            street1CheckCallRaiseChance,
+            street1CheckCallRaiseDone,
+            street2CheckCallRaiseChance,
+            street2CheckCallRaiseDone,
+            street3CheckCallRaiseChance,
+            street3CheckCallRaiseDone,
+            street4CheckCallRaiseChance
            )
            VALUES (
+                %s, %s, %s, %s,
+                %s, %s, %s, %s, %s,
+                %s, %s, %s, %s, %s,
+                %s, %s, %s, %s, %s,
+                %s, %s, %s, %s, %s,
+                %s, %s, %s, %s, %s,
+                %s, %s, %s, %s, %s,
                 %s, %s, %s, %s, %s,
                 %s, %s, %s, %s, %s,
                 %s, %s, %s, %s, %s,
@@ -1679,42 +1754,6 @@ class Database:
                 %s, %s, %s, %s, %s
             )"""
 
-#            position,
-#            tourneyTypeId,
-#            startCards,
-#            street0_3BChance,
-#            street0_3BDone,
-#            otherRaisedStreet1,
-#            otherRaisedStreet2,
-#            otherRaisedStreet3,
-#            otherRaisedStreet4,
-#            foldToOtherRaisedStreet1,
-#            foldToOtherRaisedStreet2,
-#            foldToOtherRaisedStreet3,
-#            foldToOtherRaisedStreet4,
-#            stealAttemptChance,
-#            stealAttempted,
-#            foldBbToStealChance,
-#            foldedBbToSteal,
-#            foldSbToStealChance,
-#            foldedSbToSteal,
-#            foldToStreet1CBChance,
-#            foldToStreet1CBDone,
-#            foldToStreet2CBChance,
-#            foldToStreet2CBDone,
-#            foldToStreet3CBChance,
-#            foldToStreet3CBDone,
-#            foldToStreet4CBChance,
-#            foldToStreet4CBDone,
-#            street1CheckCallRaiseChance,
-#            street1CheckCallRaiseDone,
-#            street2CheckCallRaiseChance,
-#            street2CheckCallRaiseDone,
-#            street3CheckCallRaiseChance,
-#            street3CheckCallRaiseDone,
-#            street4CheckCallRaiseChance,
-#            street4CheckCallRaiseDone,
-
         q = q.replace('%s', self.sql.query['placeholder'])
 
         #print "DEBUG: inserts: %s" %inserts
diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py
index e4072d8a..c1edb737 100644
--- a/pyfpdb/DerivedStats.py
+++ b/pyfpdb/DerivedStats.py
@@ -53,6 +53,27 @@ class DerivedStats():
                 self.handsplayers[player[1]]['street%dCBChance' %i] = False
                 self.handsplayers[player[1]]['street%dCBDone' %i] = False
 
+            #FIXME - Everything below this point is incomplete.
+            self.handsplayers[player[1]]['position']            = 2
+            self.handsplayers[player[1]]['tourneyTypeId']       = 0
+            self.handsplayers[player[1]]['startCards']          = 0
+            self.handsplayers[player[1]]['street0_3BChance']    = False
+            self.handsplayers[player[1]]['street0_3BDone']      = False
+            self.handsplayers[player[1]]['stealAttemptChance']  = False
+            self.handsplayers[player[1]]['stealAttempted']      = False
+            self.handsplayers[player[1]]['foldBbToStealChance'] = False
+            self.handsplayers[player[1]]['foldBbToStealChance'] = False
+            self.handsplayers[player[1]]['foldSbToStealChance'] = False
+            self.handsplayers[player[1]]['foldedSbToSteal']     = False
+            self.handsplayers[player[1]]['foldedBbToSteal']     = False
+            for i in range(1,5):
+                self.handsplayers[player[1]]['otherRaisedStreet%d' %i]          = False
+                self.handsplayers[player[1]]['foldToOtherRaisedStreet%d' %i]    = False
+                self.handsplayers[player[1]]['foldToStreet%dCBChance' %i]       = False
+                self.handsplayers[player[1]]['foldToStreet%dCBDone' %i]         = False
+                self.handsplayers[player[1]]['street%dCheckCallRaiseChance' %i] = False
+                self.handsplayers[player[1]]['street%dCheckCallRaiseDone' %i]   = False
+
         self.assembleHands(self.hand)
         self.assembleHandsPlayers(self.hand)
 
@@ -149,6 +170,7 @@ class DerivedStats():
             for i, card in enumerate(hcs[:7], 1):
                 self.handsplayers[player[1]]['card%s' % i] = Card.encodeCard(card)
 
+
         # position,
             #Stud 3rd street card test
             # denny501: brings in for $0.02
@@ -159,16 +181,6 @@ class DerivedStats():
             # u.pressure: folds                 (Seat 1)
             # 123smoothie: calls $0.02
             # gashpor: calls $0.02
-        # tourneyTypeId,
-        # startCards,
-        # street0_3BChance,street0_3BDone,
-        # otherRaisedStreet1-4
-        # foldToOtherRaisedStreet1-4
-        # stealAttemptChance,stealAttempted,
-        # foldBbToStealChance,foldedBbToSteal,
-        # foldSbToStealChance,foldedSbToSteal,
-        # foldToStreet1-4CBChance, foldToStreet1-4CBDone,
-        # street1-4CheckCallRaiseChance, street1-4CheckCallRaiseDone,
 
         # Additional stats
         # 3betSB, 3betBB