diff --git a/pyfpdb/FpdbSQLQueries.py b/pyfpdb/FpdbSQLQueries.py
index 98e0a6c9..acebca04 100644
--- a/pyfpdb/FpdbSQLQueries.py
+++ b/pyfpdb/FpdbSQLQueries.py
@@ -26,621 +26,685 @@ import os
 
 class FpdbSQLQueries:
 
-        def __init__(self, db):
-                self.query = {}
-                self.dbname = db
+    def __init__(self, db):
+        self.query = {}
+        self.dbname = db
 
-#Boilerplate code.
-#               if(self.dbname == 'MySQL InnoDB'):
-#                       self.query[''] = """ """
-#               elif(self.dbname == 'PostgreSQL'):
-#               elif(self.dbname == 'SQLite'):
+    	################################
+    	# List tables
+    	################################
+        if(self.dbname == 'MySQL InnoDB'):
+    		self.query['list_tables'] = """SHOW TABLES"""
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['list_tables'] = """SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['list_tables'] = """ """
+
+    	##################################################################
+            # Drop Tables - MySQL, PostgreSQL and SQLite all share same syntax
+            ##################################################################
+
+    	if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL') or (self.dbname == 'SQLite'):
+    		self.query['drop_table'] = """DROP TABLE IF EXISTS """
 
 
-		################################
-		# List tables
-		################################
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['list_tables'] = """SHOW TABLES"""
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['list_tables'] = """SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'"""
-		elif(self.dbname == 'SQLite'):
-			self.query['list_tables'] = """ """
+    	################################
+    	# Create Tables
+    	################################
 
-		##################################################################
-        	# Drop Tables - MySQL, PostgreSQL and SQLite all share same syntax
-        	##################################################################
+    	################################
+    	# Create Settings
+    	################################
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createSettingsTable'] = """CREATE TABLE Settings (
+    					                version SMALLINT NOT NULL)
+    							ENGINE=INNODB""" 
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createSettingsTable'] =  """CREATE TABLE Settings (version SMALLINT)"""
 
-		if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL') or (self.dbname == 'SQLite'):
-			self.query['drop_table'] = """DROP TABLE IF EXISTS """
-
-
-		################################
-		# Create Tables
-		################################
-
-		################################
-		# Create Settings
-		################################
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createSettingsTable'] = """CREATE TABLE Settings (
-						                version SMALLINT NOT NULL)
-								ENGINE=INNODB""" 
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createSettingsTable'] =  """CREATE TABLE Settings (version SMALLINT)"""
-
-		elif(self.dbname == 'SQLite'):
+    	elif(self.dbname == 'SQLite'):
                         #Probably doesn't work.
-			self.query['createSettingsTable'] = """ """
+    		self.query['createSettingsTable'] = """ """
 
 
-		################################
-		# Create Sites
-		################################
+    	################################
+    	# Create Sites
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createSitesTable'] = """CREATE TABLE Sites (
-						id SMALLINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-						name varchar(32) NOT NULL,
-						currency char(3) NOT NULL)
-						ENGINE=INNODB""" 
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createSitesTable'] = """CREATE TABLE Sites (
-						id SERIAL UNIQUE, PRIMARY KEY (id),
-						name varchar(32),
-						currency char(3))"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createSitesTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createSitesTable'] = """CREATE TABLE Sites (
+    					id SMALLINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    					name varchar(32) NOT NULL,
+    					currency char(3) NOT NULL)
+    					ENGINE=INNODB""" 
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createSitesTable'] = """CREATE TABLE Sites (
+    					id SERIAL UNIQUE, PRIMARY KEY (id),
+    					name varchar(32),
+    					currency char(3))"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createSitesTable'] = """ """
 
 
-		################################
-		# Create Gametypes
-		################################
+    	################################
+    	# Create Gametypes
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
-						id SMALLINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-						siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
-						type char(4) NOT NULL,
-						base char(4) NOT NULL,
-						category varchar(9) NOT NULL,
-						limitType char(2) NOT NULL,
-						hiLo char(1) NOT NULL,
-						smallBlind int,
-						bigBlind int,
-						smallBet int NOT NULL,
-						bigBet int NOT NULL)
-						ENGINE=INNODB""" 
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
-						id SERIAL UNIQUE, PRIMARY KEY (id),
-						siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
-						type char(4),
-						base char(4),
-						category varchar(9),
-						limitType char(2),
-						hiLo char(1),
-						smallBlind int,
-						bigBlind int,
-						smallBet int,
-						bigBet int)"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createGametypesTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
+    					id SMALLINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    					siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
+    					type char(4) NOT NULL,
+    					base char(4) NOT NULL,
+    					category varchar(9) NOT NULL,
+    					limitType char(2) NOT NULL,
+    					hiLo char(1) NOT NULL,
+    					smallBlind int,
+    					bigBlind int,
+    					smallBet int NOT NULL,
+    					bigBet int NOT NULL)
+    					ENGINE=INNODB""" 
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createGametypesTable'] = """CREATE TABLE Gametypes (
+    					id SERIAL UNIQUE, PRIMARY KEY (id),
+    					siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
+    					type char(4),
+    					base char(4),
+    					category varchar(9),
+    					limitType char(2),
+    					hiLo char(1),
+    					smallBlind int,
+    					bigBlind int,
+    					smallBet int,
+    					bigBet int)"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createGametypesTable'] = """ """
 
 
-		################################
-		# Create Players
-		################################
+    	################################
+    	# Create Players
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createPlayersTable'] = """CREATE TABLE Players (
-					        id INT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-					        name VARCHAR(32) CHARACTER SET utf8 NOT NULL,
-					        siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
-					        comment text,
-					        commentTs DATETIME)
-						ENGINE=INNODB""" 
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createPlayersTable'] = """CREATE TABLE Players (
-						id SERIAL UNIQUE, PRIMARY KEY (id),
-						name VARCHAR(32),
-						siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
-						comment text,
-						commentTs timestamp without time zone)"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createPlayersTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createPlayersTable'] = """CREATE TABLE Players (
+    				        id INT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    				        name VARCHAR(32) CHARACTER SET utf8 NOT NULL,
+    				        siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
+    				        comment text,
+    				        commentTs DATETIME)
+    					ENGINE=INNODB""" 
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createPlayersTable'] = """CREATE TABLE Players (
+    					id SERIAL UNIQUE, PRIMARY KEY (id),
+    					name VARCHAR(32),
+    					siteId INTEGER, FOREIGN KEY (siteId) REFERENCES Sites(id),
+    					comment text,
+    					commentTs timestamp without time zone)"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createPlayersTable'] = """ """
 
 
-		################################
-		# Create Autorates
-		################################
+    	################################
+    	# Create Autorates
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
-					        id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-					        playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
-					        gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-					        description varchar(50) NOT NULL,
-					        shortDesc char(8) NOT NULL,
-					        ratingTime DATETIME NOT NULL,
-					        handCount int NOT NULL)
-						ENGINE=INNODB""" 
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
-					        id BIGSERIAL UNIQUE, PRIMARY KEY (id),
-					        playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
-					        gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-					        description varchar(50),
-					        shortDesc char(8),
-					        ratingTime timestamp without time zone,
-						handCount int)"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createAutoratesTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
+    				        id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    				        playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
+    				        gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+    				        description varchar(50) NOT NULL,
+    				        shortDesc char(8) NOT NULL,
+    				        ratingTime DATETIME NOT NULL,
+    				        handCount int NOT NULL)
+    					ENGINE=INNODB""" 
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createAutoratesTable'] = """CREATE TABLE Autorates (
+    				        id BIGSERIAL UNIQUE, PRIMARY KEY (id),
+    				        playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
+    				        gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+    				        description varchar(50),
+    				        shortDesc char(8),
+    				        ratingTime timestamp without time zone,
+    					handCount int)"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createAutoratesTable'] = """ """
 
 
-		################################
-		# Create Hands
-		################################
+    	################################
+    	# Create Hands
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createHandsTable'] = """CREATE TABLE Hands (
-					        id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-					        tableName VARCHAR(20) NOT NULL,
-					        siteHandNo BIGINT NOT NULL,
-					        gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-					        handStart DATETIME NOT NULL,
-					        importTime DATETIME NOT NULL,
-					        seats SMALLINT NOT NULL,
-					        maxSeats SMALLINT NOT NULL,
-					        comment TEXT,
-					        commentTs DATETIME)
-						ENGINE=INNODB""" 
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createHandsTable'] = """CREATE TABLE Hands (
-						id BIGSERIAL UNIQUE, PRIMARY KEY (id),
-						tableName VARCHAR(20),
-						siteHandNo BIGINT,
-						gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-						handStart timestamp without time zone,
-						importTime timestamp without time zone,
-						seats SMALLINT,
-						maxSeats SMALLINT,
-						comment TEXT,
-						commentTs timestamp without time zone)"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createHandsTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createHandsTable'] = """CREATE TABLE Hands (
+    				        id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    				        tableName VARCHAR(20) NOT NULL,
+    				        siteHandNo BIGINT NOT NULL,
+    				        gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+    				        handStart DATETIME NOT NULL,
+    				        importTime DATETIME NOT NULL,
+    				        seats SMALLINT NOT NULL,
+    				        maxSeats SMALLINT NOT NULL,
+    				        comment TEXT,
+    				        commentTs DATETIME)
+    					ENGINE=INNODB""" 
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createHandsTable'] = """CREATE TABLE Hands (
+    					id BIGSERIAL UNIQUE, PRIMARY KEY (id),
+    					tableName VARCHAR(20),
+    					siteHandNo BIGINT,
+    					gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+    					handStart timestamp without time zone,
+    					importTime timestamp without time zone,
+    					seats SMALLINT,
+    					maxSeats SMALLINT,
+    					comment TEXT,
+    					commentTs timestamp without time zone)"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createHandsTable'] = """ """
 
 
-		################################
-		# Create Gametypes
-		################################
+    	################################
+    	# Create Gametypes
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createBoardCardsTable'] = """CREATE TABLE BoardCards (
-					        id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-					        handId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
-					        card1Value smallint NOT NULL,
-					        card1Suit char(1) NOT NULL,
-					        card2Value smallint NOT NULL,
-					        card2Suit char(1) NOT NULL,
-					        card3Value smallint NOT NULL,
-					        card3Suit char(1) NOT NULL,
-					        card4Value smallint NOT NULL,
-					        card4Suit char(1) NOT NULL,
-					        card5Value smallint NOT NULL,
-					        card5Suit char(1) NOT NULL)
-						ENGINE=INNODB""" 
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createBoardCardsTable'] = """CREATE TABLE BoardCards (
-						id BIGSERIAL UNIQUE, PRIMARY KEY (id),
-						handId BIGINT, FOREIGN KEY (handId) REFERENCES Hands(id),
-						card1Value smallint,
-						card1Suit char(1),
-						card2Value smallint,
-						card2Suit char(1),
-						card3Value smallint,
-						card3Suit char(1),
-						card4Value smallint,
-						card4Suit char(1),
-						card5Value smallint,
-						card5Suit char(1))"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createBoardCardsTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createBoardCardsTable'] = """CREATE TABLE BoardCards (
+    				        id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    				        handId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
+    				        card1Value smallint NOT NULL,
+    				        card1Suit char(1) NOT NULL,
+    				        card2Value smallint NOT NULL,
+    				        card2Suit char(1) NOT NULL,
+    				        card3Value smallint NOT NULL,
+    				        card3Suit char(1) NOT NULL,
+    				        card4Value smallint NOT NULL,
+    				        card4Suit char(1) NOT NULL,
+    				        card5Value smallint NOT NULL,
+    				        card5Suit char(1) NOT NULL)
+    					ENGINE=INNODB""" 
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createBoardCardsTable'] = """CREATE TABLE BoardCards (
+    					id BIGSERIAL UNIQUE, PRIMARY KEY (id),
+    					handId BIGINT, FOREIGN KEY (handId) REFERENCES Hands(id),
+    					card1Value smallint,
+    					card1Suit char(1),
+    					card2Value smallint,
+    					card2Suit char(1),
+    					card3Value smallint,
+    					card3Suit char(1),
+    					card4Value smallint,
+    					card4Suit char(1),
+    					card5Value smallint,
+    					card5Suit char(1))"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createBoardCardsTable'] = """ """
 
 
-		################################
-		# Create TourneyTypes
-		################################
+    	################################
+    	# Create TourneyTypes
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
-					        id SMALLINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-					        siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
-					        buyin INT NOT NULL,
-					        fee INT NOT NULL,
-					        knockout INT NOT NULL,
-					        rebuyOrAddon BOOLEAN NOT NULL)
-						ENGINE=INNODB""" 
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
-						id SERIAL, PRIMARY KEY (id),
-						siteId INT, FOREIGN KEY (siteId) REFERENCES Sites(id),
-						buyin INT,
-						fee INT,
-						knockout INT,
-						rebuyOrAddon BOOLEAN)"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createTourneyTypesTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
+    				        id SMALLINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    				        siteId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (siteId) REFERENCES Sites(id),
+    				        buyin INT NOT NULL,
+    				        fee INT NOT NULL,
+    				        knockout INT NOT NULL,
+    				        rebuyOrAddon BOOLEAN NOT NULL)
+    					ENGINE=INNODB""" 
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createTourneyTypesTable'] = """CREATE TABLE TourneyTypes (
+    					id SERIAL, PRIMARY KEY (id),
+    					siteId INT, FOREIGN KEY (siteId) REFERENCES Sites(id),
+    					buyin INT,
+    					fee INT,
+    					knockout INT,
+    					rebuyOrAddon BOOLEAN)"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createTourneyTypesTable'] = """ """
 
 
-		################################
-		# Create Tourneys
-		################################
+    	################################
+    	# Create Tourneys
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
-						id INT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-						tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
-						siteTourneyNo BIGINT NOT NULL,
-						entries INT NOT NULL,
-						prizepool INT NOT NULL,
-						startTime DATETIME NOT NULL,
-						comment TEXT,
-						commentTs DATETIME)
-						ENGINE=INNODB"""
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
-						id SERIAL UNIQUE, PRIMARY KEY (id),
-						tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
-						siteTourneyNo BIGINT,
-						entries INT,
-						prizepool INT,
-						startTime timestamp without time zone,
-						comment TEXT,
-						commentTs timestamp without time zone)"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createTourneysTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
+    					id INT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    					tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+    					siteTourneyNo BIGINT NOT NULL,
+    					entries INT NOT NULL,
+    					prizepool INT NOT NULL,
+    					startTime DATETIME NOT NULL,
+    					comment TEXT,
+    					commentTs DATETIME)
+    					ENGINE=INNODB"""
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createTourneysTable'] = """CREATE TABLE Tourneys (
+    					id SERIAL UNIQUE, PRIMARY KEY (id),
+    					tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+    					siteTourneyNo BIGINT,
+    					entries INT,
+    					prizepool INT,
+    					startTime timestamp without time zone,
+    					comment TEXT,
+    					commentTs timestamp without time zone)"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createTourneysTable'] = """ """
 
-		################################
-		# Create HandsPlayers
-		################################
+    	################################
+    	# Create HandsPlayers
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
-						id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-						handId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
-						playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
-						startCash INT NOT NULL,
-						position CHAR(1),
-						seatNo SMALLINT NOT NULL,
-						ante INT,
-					
-						card1Value smallint NOT NULL,
-						card1Suit char(1) NOT NULL,
-						card2Value smallint NOT NULL,
-						card2Suit char(1) NOT NULL,
-						card3Value smallint,
-						card3Suit char(1),
-						card4Value smallint,
-						card4Suit char(1),
-						card5Value smallint,
-						card5Suit char(1),
-						card6Value smallint,
-						card6Suit char(1),
-						card7Value smallint,
-						card7Suit char(1),
-					
-						winnings int NOT NULL,
-						rake int NOT NULL,
-						comment text,
-						commentTs DATETIME,
-					
-						tourneysPlayersId BIGINT UNSIGNED, FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id))
-						ENGINE=INNODB"""
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
-						id BIGSERIAL UNIQUE, PRIMARY KEY (id),
-						handId BIGINT, FOREIGN KEY (handId) REFERENCES Hands(id),
-						playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
-						startCash INT,
-						position CHAR(1),
-						seatNo SMALLINT,
-						ante INT,
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
+    					id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    					handId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handId) REFERENCES Hands(id),
+    					playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
+    					startCash INT NOT NULL,
+    					position CHAR(1),
+    					seatNo SMALLINT NOT NULL,
+    					ante INT,
+    				
+    					card1Value smallint NOT NULL,
+    					card1Suit char(1) NOT NULL,
+    					card2Value smallint NOT NULL,
+    					card2Suit char(1) NOT NULL,
+    					card3Value smallint,
+    					card3Suit char(1),
+    					card4Value smallint,
+    					card4Suit char(1),
+    					card5Value smallint,
+    					card5Suit char(1),
+    					card6Value smallint,
+    					card6Suit char(1),
+    					card7Value smallint,
+    					card7Suit char(1),
+    				
+    					winnings int NOT NULL,
+    					rake int NOT NULL,
+    					comment text,
+    					commentTs DATETIME,
+    				
+    					tourneysPlayersId BIGINT UNSIGNED, FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id))
+    					ENGINE=INNODB"""
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createHandsPlayersTable'] = """CREATE TABLE HandsPlayers (
+    					id BIGSERIAL UNIQUE, PRIMARY KEY (id),
+    					handId BIGINT, FOREIGN KEY (handId) REFERENCES Hands(id),
+    					playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
+    					startCash INT,
+    					position CHAR(1),
+    					seatNo SMALLINT,
+    					ante INT,
 
-						card1Value smallint,
-						card1Suit char(1),
-						card2Value smallint,
-						card2Suit char(1),
-						card3Value smallint,
-						card3Suit char(1),
-						card4Value smallint,
-						card4Suit char(1),
-						card5Value smallint,
-						card5Suit char(1),
-						card6Value smallint,
-						card6Suit char(1),
-						card7Value smallint,
-						card7Suit char(1),
+    					card1Value smallint,
+    					card1Suit char(1),
+    					card2Value smallint,
+    					card2Suit char(1),
+    					card3Value smallint,
+    					card3Suit char(1),
+    					card4Value smallint,
+    					card4Suit char(1),
+    					card5Value smallint,
+    					card5Suit char(1),
+    					card6Value smallint,
+    					card6Suit char(1),
+    					card7Value smallint,
+    					card7Suit char(1),
 
-						winnings int,
-						rake int,
-						comment text,
-						commentTs timestamp without time zone,
-						tourneysPlayersId BIGINT, FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id))"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createHandsPlayersTable'] = """ """
+    					winnings int,
+    					rake int,
+    					comment text,
+    					commentTs timestamp without time zone,
+    					tourneysPlayersId BIGINT, FOREIGN KEY (tourneysPlayersId) REFERENCES TourneysPlayers(id))"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createHandsPlayersTable'] = """ """
 
 
-		################################
-		# Create TourneysPlayers
-		################################
+    	################################
+    	# Create TourneysPlayers
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
-						id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-						tourneyId INT UNSIGNED NOT NULL, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
-						playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
-						payinAmount INT NOT NULL,
-						rank INT NOT NULL,
-						winnings INT NOT NULL,
-						comment TEXT,
-						commentTs DATETIME)
-						ENGINE=INNODB"""
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
-						id BIGSERIAL UNIQUE, PRIMARY KEY (id),
-						tourneyId INT, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
-						playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
-						payinAmount INT,
-						rank INT,
-						winnings INT,
-						comment TEXT,
-						commentTs timestamp without time zone)"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createTourneysPlayersTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
+    					id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    					tourneyId INT UNSIGNED NOT NULL, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
+    					playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
+    					payinAmount INT NOT NULL,
+    					rank INT NOT NULL,
+    					winnings INT NOT NULL,
+    					comment TEXT,
+    					commentTs DATETIME)
+    					ENGINE=INNODB"""
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createTourneysPlayersTable'] = """CREATE TABLE TourneysPlayers (
+    					id BIGSERIAL UNIQUE, PRIMARY KEY (id),
+    					tourneyId INT, FOREIGN KEY (tourneyId) REFERENCES Tourneys(id),
+    					playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
+    					payinAmount INT,
+    					rank INT,
+    					winnings INT,
+    					comment TEXT,
+    					commentTs timestamp without time zone)"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createTourneysPlayersTable'] = """ """
 
 
-		################################
-		# Create HandsActions
-		################################
+    	################################
+    	# Create HandsActions
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
-						id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-						handPlayerId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handPlayerId) REFERENCES HandsPlayers(id),
-						street SMALLINT NOT NULL,
-						actionNo SMALLINT NOT NULL,
-						action CHAR(5) NOT NULL,
-						allIn BOOLEAN NOT NULL,
-						amount INT NOT NULL,
-						comment TEXT,
-						commentTs DATETIME)
-						ENGINE=INNODB"""
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
-						id BIGSERIAL UNIQUE, PRIMARY KEY (id),
-						handPlayerId BIGINT, FOREIGN KEY (handPlayerId) REFERENCES HandsPlayers(id),
-						street SMALLINT,
-						actionNo SMALLINT,
-						action CHAR(5),
-						allIn BOOLEAN,
-						amount INT,
-						comment TEXT,
-						commentTs timestamp without time zone)"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createHandsActionsTable'] = """ """
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
+    					id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    					handPlayerId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handPlayerId) REFERENCES HandsPlayers(id),
+    					street SMALLINT NOT NULL,
+    					actionNo SMALLINT NOT NULL,
+    					action CHAR(5) NOT NULL,
+    					allIn BOOLEAN NOT NULL,
+    					amount INT NOT NULL,
+    					comment TEXT,
+    					commentTs DATETIME)
+    					ENGINE=INNODB"""
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createHandsActionsTable'] = """CREATE TABLE HandsActions (
+    					id BIGSERIAL UNIQUE, PRIMARY KEY (id),
+    					handPlayerId BIGINT, FOREIGN KEY (handPlayerId) REFERENCES HandsPlayers(id),
+    					street SMALLINT,
+    					actionNo SMALLINT,
+    					action CHAR(5),
+    					allIn BOOLEAN,
+    					amount INT,
+    					comment TEXT,
+    					commentTs timestamp without time zone)"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createHandsActionsTable'] = """ """
 
 
-		################################
-		# Create HudCache
-		################################
+    	################################
+    	# Create HudCache
+    	################################
 
-		if(self.dbname == 'MySQL InnoDB'):
-			self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
-						id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
-						gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-						playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
-						activeSeats SMALLINT NOT NULL,
-						position CHAR(1),
-						tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
-						
-						HDs INT NOT NULL,
-						street0VPI INT NOT NULL,
-						street0Aggr INT NOT NULL,
-						street0_3B4BChance INT NOT NULL,
-						street0_3B4BDone INT NOT NULL,
-						
-						street1Seen INT NOT NULL,
-						street2Seen INT NOT NULL,
-						street3Seen INT NOT NULL,
-						street4Seen INT NOT NULL,
-						sawShowdown INT NOT NULL,
-						
-						street1Aggr INT NOT NULL,
-						street2Aggr INT NOT NULL,
-						street3Aggr INT NOT NULL,
-						street4Aggr INT NOT NULL,
-						
-						otherRaisedStreet1 INT NOT NULL,
-						otherRaisedStreet2 INT NOT NULL,
-						otherRaisedStreet3 INT NOT NULL,
-						otherRaisedStreet4 INT NOT NULL,
-						foldToOtherRaisedStreet1 INT NOT NULL,
-						foldToOtherRaisedStreet2 INT NOT NULL,
-						foldToOtherRaisedStreet3 INT NOT NULL,
-						foldToOtherRaisedStreet4 INT NOT NULL,
-						wonWhenSeenStreet1 FLOAT NOT NULL,
-						wonAtSD FLOAT NOT NULL,
-						
-						stealAttemptChance INT NOT NULL,
-						stealAttempted INT NOT NULL,
-						foldBbToStealChance INT NOT NULL,
-						foldedBbToSteal INT NOT NULL,
-						foldSbToStealChance INT NOT NULL,
-						foldedSbToSteal INT NOT NULL,
-						
-						street1CBChance INT NOT NULL,
-						street1CBDone INT NOT NULL,
-						street2CBChance INT NOT NULL,
-						street2CBDone INT NOT NULL,
-						street3CBChance INT NOT NULL,
-						street3CBDone INT NOT NULL,
-						street4CBChance INT NOT NULL,
-						street4CBDone INT NOT NULL,
-						
-						foldToStreet1CBChance INT NOT NULL,
-						foldToStreet1CBDone INT NOT NULL,
-						foldToStreet2CBChance INT NOT NULL,
-						foldToStreet2CBDone INT NOT NULL,
-						foldToStreet3CBChance INT NOT NULL,
-						foldToStreet3CBDone INT NOT NULL,
-						foldToStreet4CBChance INT NOT NULL,
-						foldToStreet4CBDone INT NOT NULL,
-						
-						totalProfit INT NOT NULL,
-						
-						street1CheckCallRaiseChance INT NOT NULL,
-						street1CheckCallRaiseDone INT NOT NULL,
-						street2CheckCallRaiseChance INT NOT NULL,
-						street2CheckCallRaiseDone INT NOT NULL,
-						street3CheckCallRaiseChance INT NOT NULL,
-						street3CheckCallRaiseDone INT NOT NULL,
-						street4CheckCallRaiseChance INT NOT NULL,
-						street4CheckCallRaiseDone INT NOT NULL)
-						ENGINE=INNODB"""
-		elif(self.dbname == 'PostgreSQL'):
-			self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
-						id BIGSERIAL UNIQUE, PRIMARY KEY (id),
-						gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
-						playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
-						activeSeats SMALLINT,
-						position CHAR(1),
-						tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+    	if(self.dbname == 'MySQL InnoDB'):
+    		self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
+    					id BIGINT UNSIGNED UNIQUE AUTO_INCREMENT NOT NULL, PRIMARY KEY (id),
+    					gametypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+    					playerId INT UNSIGNED NOT NULL, FOREIGN KEY (playerId) REFERENCES Players(id),
+    					activeSeats SMALLINT NOT NULL,
+    					position CHAR(1),
+    					tourneyTypeId SMALLINT UNSIGNED NOT NULL, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
+    					
+    					HDs INT NOT NULL,
+    					street0VPI INT NOT NULL,
+    					street0Aggr INT NOT NULL,
+    					street0_3B4BChance INT NOT NULL,
+    					street0_3B4BDone INT NOT NULL,
+    					
+    					street1Seen INT NOT NULL,
+    					street2Seen INT NOT NULL,
+    					street3Seen INT NOT NULL,
+    					street4Seen INT NOT NULL,
+    					sawShowdown INT NOT NULL,
+    					
+    					street1Aggr INT NOT NULL,
+    					street2Aggr INT NOT NULL,
+    					street3Aggr INT NOT NULL,
+    					street4Aggr INT NOT NULL,
+    					
+    					otherRaisedStreet1 INT NOT NULL,
+    					otherRaisedStreet2 INT NOT NULL,
+    					otherRaisedStreet3 INT NOT NULL,
+    					otherRaisedStreet4 INT NOT NULL,
+    					foldToOtherRaisedStreet1 INT NOT NULL,
+    					foldToOtherRaisedStreet2 INT NOT NULL,
+    					foldToOtherRaisedStreet3 INT NOT NULL,
+    					foldToOtherRaisedStreet4 INT NOT NULL,
+    					wonWhenSeenStreet1 FLOAT NOT NULL,
+    					wonAtSD FLOAT NOT NULL,
+    					
+    					stealAttemptChance INT NOT NULL,
+    					stealAttempted INT NOT NULL,
+    					foldBbToStealChance INT NOT NULL,
+    					foldedBbToSteal INT NOT NULL,
+    					foldSbToStealChance INT NOT NULL,
+    					foldedSbToSteal INT NOT NULL,
+    					
+    					street1CBChance INT NOT NULL,
+    					street1CBDone INT NOT NULL,
+    					street2CBChance INT NOT NULL,
+    					street2CBDone INT NOT NULL,
+    					street3CBChance INT NOT NULL,
+    					street3CBDone INT NOT NULL,
+    					street4CBChance INT NOT NULL,
+    					street4CBDone INT NOT NULL,
+    					
+    					foldToStreet1CBChance INT NOT NULL,
+    					foldToStreet1CBDone INT NOT NULL,
+    					foldToStreet2CBChance INT NOT NULL,
+    					foldToStreet2CBDone INT NOT NULL,
+    					foldToStreet3CBChance INT NOT NULL,
+    					foldToStreet3CBDone INT NOT NULL,
+    					foldToStreet4CBChance INT NOT NULL,
+    					foldToStreet4CBDone INT NOT NULL,
+    					
+    					totalProfit INT NOT NULL,
+    					
+    					street1CheckCallRaiseChance INT NOT NULL,
+    					street1CheckCallRaiseDone INT NOT NULL,
+    					street2CheckCallRaiseChance INT NOT NULL,
+    					street2CheckCallRaiseDone INT NOT NULL,
+    					street3CheckCallRaiseChance INT NOT NULL,
+    					street3CheckCallRaiseDone INT NOT NULL,
+    					street4CheckCallRaiseChance INT NOT NULL,
+    					street4CheckCallRaiseDone INT NOT NULL)
+    					ENGINE=INNODB"""
+    	elif(self.dbname == 'PostgreSQL'):
+    		self.query['createHudCacheTable'] = """CREATE TABLE HudCache (
+    					id BIGSERIAL UNIQUE, PRIMARY KEY (id),
+    					gametypeId INT, FOREIGN KEY (gametypeId) REFERENCES Gametypes(id),
+    					playerId INT, FOREIGN KEY (playerId) REFERENCES Players(id),
+    					activeSeats SMALLINT,
+    					position CHAR(1),
+    					tourneyTypeId INT, FOREIGN KEY (tourneyTypeId) REFERENCES TourneyTypes(id),
 
-						HDs INT,
-						street0VPI INT,
-						street0Aggr INT,
-						street0_3B4BChance INT,
-						street0_3B4BDone INT,
-						street1Seen INT,
-						street2Seen INT,
-						street3Seen INT,
-						street4Seen INT,
-						sawShowdown INT,
-						street1Aggr INT,
-						street2Aggr INT,
-						street3Aggr INT,
-						street4Aggr INT,
-						otherRaisedStreet1 INT,
-						otherRaisedStreet2 INT,
-						otherRaisedStreet3 INT,
-						otherRaisedStreet4 INT,
-						foldToOtherRaisedStreet1 INT,
-						foldToOtherRaisedStreet2 INT,
-						foldToOtherRaisedStreet3 INT,
-						foldToOtherRaisedStreet4 INT,
-						wonWhenSeenStreet1 FLOAT,
-						wonAtSD FLOAT,
+    					HDs INT,
+    					street0VPI INT,
+    					street0Aggr INT,
+    					street0_3B4BChance INT,
+    					street0_3B4BDone INT,
+    					street1Seen INT,
+    					street2Seen INT,
+    					street3Seen INT,
+    					street4Seen INT,
+    					sawShowdown INT,
+    					street1Aggr INT,
+    					street2Aggr INT,
+    					street3Aggr INT,
+    					street4Aggr INT,
+    					otherRaisedStreet1 INT,
+    					otherRaisedStreet2 INT,
+    					otherRaisedStreet3 INT,
+    					otherRaisedStreet4 INT,
+    					foldToOtherRaisedStreet1 INT,
+    					foldToOtherRaisedStreet2 INT,
+    					foldToOtherRaisedStreet3 INT,
+    					foldToOtherRaisedStreet4 INT,
+    					wonWhenSeenStreet1 FLOAT,
+    					wonAtSD FLOAT,
 
-						stealAttemptChance INT,
-						stealAttempted INT,
-						foldBbToStealChance INT,
-						foldedBbToSteal INT,
-						foldSbToStealChance INT,
-						foldedSbToSteal INT,
+    					stealAttemptChance INT,
+    					stealAttempted INT,
+    					foldBbToStealChance INT,
+    					foldedBbToSteal INT,
+    					foldSbToStealChance INT,
+    					foldedSbToSteal INT,
 
-						street1CBChance INT,
-						street1CBDone INT,
-						street2CBChance INT,
-						street2CBDone INT,
-						street3CBChance INT,
-						street3CBDone INT,
-						street4CBChance INT,
-						street4CBDone INT,
+    					street1CBChance INT,
+    					street1CBDone INT,
+    					street2CBChance INT,
+    					street2CBDone INT,
+    					street3CBChance INT,
+    					street3CBDone INT,
+    					street4CBChance INT,
+    					street4CBDone INT,
 
-						foldToStreet1CBChance INT,
-						foldToStreet1CBDone INT,
-						foldToStreet2CBChance INT,
-						foldToStreet2CBDone INT,
-						foldToStreet3CBChance INT,
-						foldToStreet3CBDone INT,
-						foldToStreet4CBChance INT,
-						foldToStreet4CBDone INT,
+    					foldToStreet1CBChance INT,
+    					foldToStreet1CBDone INT,
+    					foldToStreet2CBChance INT,
+    					foldToStreet2CBDone INT,
+    					foldToStreet3CBChance INT,
+    					foldToStreet3CBDone INT,
+    					foldToStreet4CBChance INT,
+    					foldToStreet4CBDone INT,
 
-						totalProfit INT,
+    					totalProfit INT,
 
-						street1CheckCallRaiseChance INT,
-						street1CheckCallRaiseDone INT,
-						street2CheckCallRaiseChance INT,
-						street2CheckCallRaiseDone INT,
-						street3CheckCallRaiseChance INT,
-						street3CheckCallRaiseDone INT,
-						street4CheckCallRaiseChance INT,
-						street4CheckCallRaiseDone INT)"""
-		elif(self.dbname == 'SQLite'):
-			self.query['createHudCacheTable'] = """ """
+    					street1CheckCallRaiseChance INT,
+    					street1CheckCallRaiseDone INT,
+    					street2CheckCallRaiseChance INT,
+    					street2CheckCallRaiseDone INT,
+    					street3CheckCallRaiseChance INT,
+    					street3CheckCallRaiseDone INT,
+    					street4CheckCallRaiseChance INT,
+    					street4CheckCallRaiseDone INT)"""
+    	elif(self.dbname == 'SQLite'):
+    		self.query['createHudCacheTable'] = """ """
 
-		################################
-		# Queries used in GuiGraphViewer
-		################################
+    	################################
+    	# Queries used in GuiGraphViewer
+    	################################
 
 
-		# Returns all cash game handIds and the money won(winnings is the final pot)
-		# by the playerId for a single site.
-		if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
-			self.query['getRingWinningsAllGamesPlayerIdSite'] = """SELECT handId, winnings FROM HandsPlayers 
-					INNER JOIN Players ON HandsPlayers.playerId = Players.id 
-					INNER JOIN Hands ON Hands.id = HandsPlayers.handId
-					WHERE Players.name = %s AND Players.siteId = %s AND (tourneysPlayersId IS NULL)
-					ORDER BY handStart"""
-		elif(self.dbname == 'SQLite'):
-			#Probably doesn't work.
-			self.query['getRingWinningsAllGamesPlayerIdSite'] = """SELECT handId, winnings FROM HandsPlayers
-					INNER JOIN Players ON HandsPlayers.playerId = Players.id 
-					INNER JOIN Hands ON Hands.id = HandsPlayers.handId
-					WHERE Players.name = %s AND Players.siteId = %s AND (tourneysPlayersId IS NULL)
-					ORDER BY handStart"""
+    	# Returns all cash game handIds and the money won(winnings is the final pot)
+    	# by the playerId for a single site.
+    	if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
+    		self.query['getRingWinningsAllGamesPlayerIdSite'] = """SELECT handId, winnings FROM HandsPlayers 
+    				INNER JOIN Players ON HandsPlayers.playerId = Players.id 
+    				INNER JOIN Hands ON Hands.id = HandsPlayers.handId
+    				WHERE Players.name = %s AND Players.siteId = %s AND (tourneysPlayersId IS NULL)
+    				ORDER BY handStart"""
+    	elif(self.dbname == 'SQLite'):
+    		#Probably doesn't work.
+    		self.query['getRingWinningsAllGamesPlayerIdSite'] = """SELECT handId, winnings FROM HandsPlayers
+    				INNER JOIN Players ON HandsPlayers.playerId = Players.id 
+    				INNER JOIN Hands ON Hands.id = HandsPlayers.handId
+    				WHERE Players.name = %s AND Players.siteId = %s AND (tourneysPlayersId IS NULL)
+    				ORDER BY handStart"""
 
-		# Returns the profit for a given ring game handId, Total pot - money invested by playerId
-		if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
-			self.query['getRingProfitFromHandId'] = """SELECT SUM(amount) FROM HandsActions
-					INNER JOIN HandsPlayers ON HandsActions.handPlayerId = HandsPlayers.id
-					INNER JOIN Players ON HandsPlayers.playerId = Players.id 
-					WHERE Players.name = %s AND HandsPlayers.handId = %s 
-					AND Players.siteId = %s AND (tourneysPlayersId IS NULL)"""
-		elif(self.dbname == 'SQLite'):
-			#Probably doesn't work.
-			self.query['getRingProfitFromHandId'] = """SELECT SUM(amount) FROM HandsActions
-					INNER JOIN HandsPlayers ON HandsActions.handPlayerId = HandsPlayers.id
-					INNER JOIN Players ON HandsPlayers.playerId = Players.id 
-					WHERE Players.name = %s AND HandsPlayers.handId = %s 
-					AND Players.siteId = %s AND (tourneysPlayersId IS NULL)"""
+    	# Returns the profit for a given ring game handId, Total pot - money invested by playerId
+    	if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
+    		self.query['getRingProfitFromHandId'] = """SELECT SUM(amount) FROM HandsActions
+    				INNER JOIN HandsPlayers ON HandsActions.handPlayerId = HandsPlayers.id
+    				INNER JOIN Players ON HandsPlayers.playerId = Players.id 
+    				WHERE Players.name = %s AND HandsPlayers.handId = %s 
+    				AND Players.siteId = %s AND (tourneysPlayersId IS NULL)"""
+    	elif(self.dbname == 'SQLite'):
+    		#Probably doesn't work.
+    		self.query['getRingProfitFromHandId'] = """SELECT SUM(amount) FROM HandsActions
+    				INNER JOIN HandsPlayers ON HandsActions.handPlayerId = HandsPlayers.id
+    				INNER JOIN Players ON HandsPlayers.playerId = Players.id 
+    				WHERE Players.name = %s AND HandsPlayers.handId = %s 
+    				AND Players.siteId = %s AND (tourneysPlayersId IS NULL)"""
 
-		if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
-			self.query['getRingProfitAllHandsPlayerIdSite'] = """
-				SELECT hp.handId, hp.winnings, SUM(ha.amount), hp.winnings - SUM(ha.amount)
-				FROM HandsPlayers hp
-				INNER JOIN Players pl      ON hp.playerId     = pl.id
-				INNER JOIN Hands h         ON h.id            = hp.handId
-				INNER JOIN HandsActions ha ON ha.handPlayerId = hp.id
-				WHERE pl.name   = %s
-				AND   pl.siteId = %s
-				AND   hp.tourneysPlayersId IS NULL
-				GROUP BY hp.handId, hp.winnings, h.handStart
-				ORDER BY h.handStart"""
-		elif(self.dbname == 'SQLite'):
-		#Probably doesn't work.
-			self.query['getRingProfitAllHandsPlayerIdSite'] = """
-				SELECT hp.handId, hp.winnings, SUM(ha.amount), hp.winnings - SUM(ha.amount)
-				FROM HandsPlayers hp
-				INNER JOIN Players pl      ON hp.playerId     = pl.id
-				INNER JOIN Hands h         ON h.id            = hp.handId
-				INNER JOIN HandsActions ha ON ha.handPlayerId = hp.id
-				WHERE pl.name   = %s
-				AND   pl.siteId = %s
-				AND   hp.tourneysPlayersId IS NULL
-				GROUP BY hp.handId, hp.winnings, h.handStart
-				ORDER BY h.handStart"""
+    	if(self.dbname == 'MySQL InnoDB') or (self.dbname == 'PostgreSQL'):
+    		self.query['getRingProfitAllHandsPlayerIdSite'] = """
+    			SELECT hp.handId, hp.winnings, SUM(ha.amount), hp.winnings - SUM(ha.amount)
+    			FROM HandsPlayers hp
+    			INNER JOIN Players pl      ON hp.playerId     = pl.id
+    			INNER JOIN Hands h         ON h.id            = hp.handId
+    			INNER JOIN HandsActions ha ON ha.handPlayerId = hp.id
+    			WHERE pl.name   = %s
+    			AND   pl.siteId = %s
+    			AND   hp.tourneysPlayersId IS NULL
+    			GROUP BY hp.handId, hp.winnings, h.handStart
+    			ORDER BY h.handStart"""
+    	elif(self.dbname == 'SQLite'):
+    	#Probably doesn't work.
+    		self.query['getRingProfitAllHandsPlayerIdSite'] = """
+    			SELECT hp.handId, hp.winnings, SUM(ha.amount), hp.winnings - SUM(ha.amount)
+    			FROM HandsPlayers hp
+    			INNER JOIN Players pl      ON hp.playerId     = pl.id
+    			INNER JOIN Hands h         ON h.id            = hp.handId
+    			INNER JOIN HandsActions ha ON ha.handPlayerId = hp.id
+    			WHERE pl.name   = %s
+    			AND   pl.siteId = %s
+    			AND   hp.tourneysPlayersId IS NULL
+    			GROUP BY hp.handId, hp.winnings, h.handStart
+    			ORDER BY h.handStart"""
+
+        if(self.dbname == 'MySQL InnoDB'):
+            self.query['playerStats'] = """
+                SELECT stats.gametypeId
+                     ,stats.base
+                     ,stats.limitType
+                     ,stats.name
+                     ,format(stats.bigBlind/100,2) as BigBlind
+                     ,stats.n
+                     ,stats.vpip
+                     ,stats.pfr
+                     ,stats.saw_f
+                     ,stats.sawsd
+                     ,stats.wtsdwsf
+                     ,stats.wmsd
+                     ,stats.FlAFq
+                     ,stats.TuAFq
+                     ,stats.RvAFq
+                     ,stats.PFAFq
+                     ,hprof2.sum_profit/100 as Net
+                     ,(hprof2.sum_profit/stats.bigBlind)/(stats.n/100) as BBlPer100
+                FROM
+                    (select # stats from hudcache
+                            gt.base
+                           ,upper(gt.limitType) limitType
+                           ,s.name
+                           ,gt.bigBlind
+                           ,hc.gametypeId
+                           ,sum(HDs) as n
+                           ,round(100*sum(street0VPI)/sum(HDs)) as vpip
+                           ,round(100*sum(street0Aggr)/sum(HDs)) as pfr
+                           ,round(100*sum(street1Seen)/sum(HDs)) AS saw_f
+                           ,round(100*sum(sawShowdown)/sum(HDs)) AS sawsd
+                           ,round(100*sum(sawShowdown)/sum(street1Seen)) AS wtsdwsf
+                           ,round(100*sum(wonAtSD)/sum(sawShowdown))     AS wmsd
+                           ,round(100*sum(street1Aggr)/sum(street1Seen)) AS FlAFq
+                           ,round(100*sum(street2Aggr)/sum(street2Seen)) AS TuAFq
+                           ,round(100*sum(street3Aggr)/sum(street3Seen)) AS RvAFq
+                           ,round(100*(sum(street1Aggr)+sum(street2Aggr)+sum(street3Aggr))
+
+                /(sum(street1Seen)+sum(street2Seen)+sum(street3Seen))) AS PFAFq
+                     from Gametypes gt
+                          inner join Sites s on s.Id = gt.siteId
+                          inner join HudCache hc on hc.gameTypeId = gt.Id
+                     where gt.limittype = 'nl'
+                     and   hc.playerId in (3)   # use <player_test> here?
+                                                # use <gametype_test> here ?
+                     group by hc.gametypeId
+                    ) stats
+                inner join
+                    ( select # profit from handsplayers/handsactions
+                             hprof.gameTypeId, sum(hprof.profit) sum_profit
+                      from
+                          (select hp.handId, h.gameTypeId, hp.winnings, SUM(ha.amount)
+                costs, hp.winnings - SUM(ha.amount) profit
+                          from HandsPlayers hp
+                          inner join Hands h         ON h.id            = hp.handId
+                          inner join HandsActions ha ON ha.handPlayerId = hp.id
+                          where hp.playerId in (3)   # use <player_test> here?
+                                                     # use <gametype_test> here ?
+                          and   hp.tourneysPlayersId IS NULL
+                          group by hp.handId, h.gameTypeId, hp.position, hp.winnings
+                         ) hprof
+                      group by hprof.gameTypeId
+                     ) hprof2
+                    on hprof2.gameTypeId = stats.gameTypeId
+                order by stats.base, stats.limittype, stats.bigBlind"""
+        elif(self.dbname == 'PostgreSQL'):
+            self.query['playerStats'] = """ """
+        elif(self.dbname == 'SQLite'):
+            self.query['playerStats'] = """ """
 
         if(self.dbname == 'MySQL InnoDB'):
             self.query['playerStatsByPosition'] = """
@@ -733,10 +797,10 @@ class FpdbSQLQueries:
                 where 1 = 1
                 order by stats.base, stats.limittype, stats.bigBlind, stats.pl_position, BBlPer100 desc
             """
-		elif(self.dbname == 'PostgreSQL'):
-            self.query = """ """
-		elif(self.dbname == 'SQLite'):
-            self.query = """ """
+        elif(self.dbname == 'PostgreSQL'):
+            self.query['playerStatsByPosition'] = """ """
+        elif(self.dbname == 'SQLite'):
+            self.query['playerStatsByPosition'] = """ """
 
 if __name__== "__main__":
         from optparse import OptionParser