diff --git a/rsc/scripts/setup_database.sql b/rsc/scripts/setup_database.sql
index 5c4e284..f831ead 100644
--- a/rsc/scripts/setup_database.sql
+++ b/rsc/scripts/setup_database.sql
@@ -32,6 +32,14 @@ INSERT OR IGNORE INTO InventoryItems (name, type, durability) VALUES
 		("potion", "consumable", 100)
 ;
 
+--DEBUG: Test cases
+INSERT INTO LiveCharacters
+
 --DEBUG: this is supposed to archive the dead characters
-INSERT INTO DeadCharacters (uid, owner, handle, avatar, birth) SELECT uid, owner, handle, avatar, birth FROM LiveCharacters;
-DELETE FROM LiveCharacters WHERE uid IN (SELECT uid FROM DeadCharacters);
+--Insert into DeadCharacters From LiveCharacters all characters who's HP has reached zero or below
+INSERT INTO DeadCharacters (uid, owner, handle, avatar, birth)
+	SELECT uid, owner, handle, avatar, birth FROM LiveCharacters WHERE
+		SELECT character FROM CharacterStatistics WHERE
+			SELECT uid FROM CombatStatistics WHERE health <= 0;
+
+DELETE FROM LiveCharacters WHERE uid IN (SELECT uid FROM DeadCharacters);
\ No newline at end of file
diff --git a/rsc/scripts/setup_server.sql b/rsc/scripts/setup_server.sql
index a5c75fe..b64848a 100644
--- a/rsc/scripts/setup_server.sql
+++ b/rsc/scripts/setup_server.sql
@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS LiveCharacters (
 
 	--metadata
 	owner		INTEGER REFERENCES UserAccounts(uid),
-	handle		varchar(100) UNIQUE,
+	handle		varchar(100),
 	avatar		varchar(100),
 	birth		timestamp NOT NULL DEFAULT (datetime()),