diff --git a/.gitignore b/.gitignore
index c79e34a..3f0a7aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ __pycache__
 .vscode
 checkpoints
 spark-warehouse
-scratchpad.py
\ No newline at end of file
+scratchpad.py
+benchmarks
\ No newline at end of file
diff --git a/bench.py b/bench.py
new file mode 100644
index 0000000..f444b5c
--- /dev/null
+++ b/bench.py
@@ -0,0 +1,48 @@
+import sys
+import json
+from cassandra.cluster import Cluster
+
+sys.path.append("config/db")
+
+from db_read_csv_txs import db_insert_csv_txs
+import os
+
+
+config = json.load(open("./settings.json"))
+
+cluster = Cluster(config['cassandra_addresses'],
+                    port=config['cassandra_port'])
+session = cluster.connect(config['cassandra_keyspace'])
+print(f"Connection OK")
+
+file = "/home/osboxes/Downloads/zec_tx_inputs.csv"
+num_rows = 128
+
+db_insert_csv_txs(config, file, skip=0, limit=num_rows)
+
+algorithms = [
+    'rik_merge',
+    'sve_merge',
+    'hoc_merge',
+    'nik_merge',
+    'rob_merge',
+    'agf_merge',
+    'agf_opt_merge',
+    'che_merge',
+    'ale_merge',
+    'nik_rew_merge_skip'
+]
+
+for algo in algorithms:
+    os.system(f"mkdir -p benchmarks/partition/{algo}")
+
+for i in range(16):
+    for algo in algorithms:
+        os.system(f"ALGO={algo} ./submit_partition.sh | sed '1d' | sed '2d' > benchmarks/partition/{algo}/{num_rows}.txt")
+        os.system(f"rm -rf ./checkpoints")
+    #os.system(f"./submit_graph.sh | sed '1d' | sed '2d' > benchmarks/graph/{num_rows}.txt")
+    #os.system(f"rm -rf ./checkpoints")
+
+    db_insert_csv_txs(config, file, skip=num_rows, limit=num_rows*2)
+    num_rows = num_rows*2
+    print(num_rows)
diff --git a/config/db/__pycache__/db_read_csv_txs.cpython-310.pyc b/config/db/__pycache__/db_read_csv_txs.cpython-310.pyc
index 4a32599..bd57896 100644
Binary files a/config/db/__pycache__/db_read_csv_txs.cpython-310.pyc and b/config/db/__pycache__/db_read_csv_txs.cpython-310.pyc differ
diff --git a/config/db/db_read_csv_txs.py b/config/db/db_read_csv_txs.py
index 2a714f7..49750e1 100644
--- a/config/db/db_read_csv_txs.py
+++ b/config/db/db_read_csv_txs.py
@@ -3,7 +3,7 @@ from cassandra.query import BoundStatement, BatchStatement
 import csv
 
 
-def db_insert_csv_txs(config, tx_file):
+def db_insert_csv_txs(config, tx_file, skip=0, limit=-1):
     print(" == DB TX INSERTION SCRIPT == ")
 
     print(
@@ -13,18 +13,32 @@ def db_insert_csv_txs(config, tx_file):
     session = cluster.connect(config['cassandra_keyspace'])
     print(f"Connection OK")
 
-    with open(tx_file, newline='') as tx_csv:
+    statement = session.prepare(
+            f"INSERT INTO {config['tx_table_name']} (tx_id,address,value,tx_hash,block_id,timestamp) VALUES(?,?,?,?,?,?);")
+    boundStatement = BoundStatement(statement)
+
+    with open(tx_file, newline='') as (tx_csv):
         rowreader = csv.reader(tx_csv, dialect="excel")
         next(rowreader)  # skip header
 
-        statement = session.prepare(
-            f"INSERT INTO {config['tx_table_name']} (tx_id,address,value,tx_hash,block_id,timestamp) VALUES(?,?,?,?,?,?);")
-        boundStatement = BoundStatement(statement)
         batchStatement = BatchStatement()
 
-        for row in rowreader:
+        batch_count = 0
+
+        for i, row in enumerate(rowreader):
+            if i < skip:
+                continue
+            if i == limit:
+                break
+
             batchStatement.add(boundStatement.bind(
                 [int(row[0]), str(row[1]), int(row[2]), str(row[3]), int(row[4]), int(row[5])]))
+            batch_count += 1
+            if batch_count > 256:
+                session.execute(batchStatement)
+                batchStatement = BatchStatement()
+                batch_count = 0
+
         session.execute(batchStatement)
 
     print("Done!")
diff --git a/config/db/tables/transactions/CREATE.sql b/config/db/tables/transactions/CREATE.sql
index 1e1e9a6..405b40c 100644
--- a/config/db/tables/transactions/CREATE.sql
+++ b/config/db/tables/transactions/CREATE.sql
@@ -1,9 +1,9 @@
 CREATE TABLE transactions(
-    tx_id INT,
+    tx_id bigint,
     address TEXT,
-    value INT,
+    value bigint,
     tx_hash TEXT,
-    block_id INT,
+    block_id bigint,
     timestamp TIMESTAMP,
     PRIMARY KEY (tx_id, address)
 ) WITH CLUSTERING ORDER BY (address DESC);
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 450b13a..4fffa2f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,6 @@
 import sys
 import json
+from cassandra.cluster import Cluster
 
 sys.path.append("config/db")
 
@@ -9,4 +10,13 @@ from db_read_csv_txs import db_insert_csv_txs
 config = json.load(open("./settings.json"))
 
 db_setup(config)
-db_insert_csv_txs(config, "./small_test_data.csv")
\ No newline at end of file
+
+
+cluster = Cluster(config['cassandra_addresses'],
+                    port=config['cassandra_port'])
+session = cluster.connect(config['cassandra_keyspace'])
+print(f"Connection OK")
+
+#db_insert_csv_txs(config, "./small_test_data.csv", skip=0, limit=1500)
+#res = session.execute('SELECT COUNT(*) FROM transactions')
+#print(res.one()[0])
diff --git a/src/spark/main_graphs.py b/src/spark/main_graphs.py
index e4c31f0..795c18f 100644
--- a/src/spark/main_graphs.py
+++ b/src/spark/main_graphs.py
@@ -68,16 +68,19 @@ transactions_as_edges = tx_df \
 g = GraphFrame(addresses_as_vertices, transactions_as_edges)
 components = g.connectedComponents(algorithm='graphframes')
 
-master.write_connected_components_as_clusters(components)
+#master.write_connected_components_as_clusters(components)
 
-if(debug):
-    clusters = components \
-        .groupBy('component') \
-        .agg(F.collect_list('id')) \
-        .collect()
 
-    for cluster in clusters:
-        print(sorted(cluster['collect_list(id)'])) 
+
+clusters = components \
+    .groupBy('component') \
+    .agg(F.collect_list('id')) \
+    .collect()
+
+#print(len(clusters))
+
+#for cluster in clusters:
+#    print(sorted(cluster['collect_list(id)'])) 
 
 end = time.time()
-print("ELAPSED TIME:", end-start)
\ No newline at end of file
+print(end-start, end='')
\ No newline at end of file
diff --git a/src/spark/main_partition.py b/src/spark/main_partition.py
index 4102c88..9879d03 100644
--- a/src/spark/main_partition.py
+++ b/src/spark/main_partition.py
@@ -1,16 +1,20 @@
 import json
 from typing import Iterable, List, Set
-
+import networkx
+import heapq
+from itertools import chain
+from collections import deque
+import os
 from pyspark.sql import SparkSession, DataFrame, Row
 from pyspark.sql import functions as F
 
 import time
 start = time.time()
 
-
 config = json.load(open("./settings.json"))
 debug = config['debug']
 
+union_find_algo_name = os.environ['ALGO']
 
 class Master:
     spark: SparkSession
@@ -31,60 +35,280 @@ class Master:
 
     def get_tx_dataframe(self) -> DataFrame:
         return self.spark.table(self.TX_TABLE)
-
 # end class Master
 
-def merge_lists_distinct(*lists: "Iterable[List[str]]") -> List[str]:
-    accum = set()
-    for lst in lists:
-        accum = accum.union(set(lst))
-    return list(accum)
 
-def check_lists_overlap(list1, list2):
-    return any(x in list1 for x in list2)
+def rik_merge(lsts):
+    """Rik. Poggi"""
+    sets = (set(e) for e in lsts if e)
+    results = [next(sets)]
+    for e_set in sets:
+        to_update = []
+        for i,res in enumerate(results):
+            if not e_set.isdisjoint(res):
+                to_update.insert(0,i)
 
-def cluster_step(clusters: "List[List[str]]", addresses: "List[List[str]]"):
-    #if there are no more sets of addresses to consider, we are done
-    if(len(addresses) == 0):
-        return clusters
-
-    tx = addresses[0]
-    matching_clusters = []
-    new_clusters = []
-
-    for cluster in clusters:
-        if(check_lists_overlap(tx, cluster)):
-            matching_clusters.append(cluster)
+        if not to_update:
+            results.append(e_set)
         else:
-            new_clusters.append(cluster)
+            last = results[to_update.pop(-1)]
+            for i in to_update:
+                last |= results[i]
+                del results[i]
+            last |= e_set
 
-    new_clusters.append(merge_lists_distinct(tx, *matching_clusters))
+    return results
 
-    return cluster_step(new_clusters,addresses[1:])
+
+def sve_merge(lsts):
+    """Sven Marnach"""
+    sets = {}
+    for lst in lsts:
+        s = set(lst)
+        t = set()
+        for x in s:
+            if x in sets:
+                t.update(sets[x])
+            else:
+                sets[x] = s
+        for y in t:
+            sets[y] = s
+        s.update(t)
+    ids = set()
+    result = []
+    for s in sets.values():
+        if id(s) not in ids:
+            ids.add(id(s))
+            result.append(s)
+    return result
+
+
+def hoc_merge(lsts):    # modified a bit to make it return sets
+    """hochl"""
+    s = [set(lst) for lst in lsts if lst]
+    i,n = 0,len(s)
+    while i < n-1:
+        for j in range(i+1, n):
+            if s[i].intersection(s[j]):
+                s[i].update(s[j])
+                del s[j]
+                n -= 1
+                break
+        else:
+            i += 1
+    return [set(i) for i in s]
+
+
+def nik_merge(lsts):
+    """Niklas B."""
+    sets = [set(lst) for lst in lsts if lst]
+    merged = 1
+    while merged:
+        merged = 0
+        results = []
+        while sets:
+            common, rest = sets[0], sets[1:]
+            sets = []
+            for x in rest:
+                if x.isdisjoint(common):
+                    sets.append(x)
+                else:
+                    merged = 1
+                    common |= x
+            results.append(common)
+        sets = results
+    return sets
+
+
+
+def rob_merge(lsts):
+    """robert king"""
+    lsts = [sorted(l) for l in lsts]   # I changed this line
+    one_list = heapq.merge(*[zip(l,[i]*len(l)) for i,l in enumerate(lsts)])
+    previous = next(one_list)
+
+    d = {i:i for i in range(len(lsts))}
+    for current in one_list:
+        if current[0]==previous[0]:
+            d[current[1]] = d[previous[1]]
+        previous=current
+
+    groups=[[] for i in range(len(lsts))]
+    for k in d:
+        groups[d[k]].append(lsts[k])
+
+    return [set(chain(*g)) for g in groups if g]
+
+
+def agf_merge(lsts):
+    """agf"""
+    newsets, sets = [set(lst) for lst in lsts if lst], []
+    while len(sets) != len(newsets):
+        sets, newsets = newsets, []
+        for aset in sets:
+            for eachset in newsets:
+                if not aset.isdisjoint(eachset):
+                    eachset.update(aset)
+                    break
+            else:
+                newsets.append(aset)
+    return newsets
+
+
+def agf_opt_merge(lists):
+    """agf (optimized)"""
+    sets = deque(set(lst) for lst in lists if lst)
+    results = []
+    disjoint = 0
+    current = sets.pop()
+    while True:
+        merged = False
+        newsets = deque()
+        for _ in range(disjoint, len(sets)):
+            this = sets.pop()
+            if not current.isdisjoint(this):
+                current.update(this)
+                merged = True
+                disjoint = 0
+            else:
+                newsets.append(this)
+                disjoint += 1
+        if sets:
+            newsets.extendleft(sets)
+        if not merged:
+            results.append(current)
+            try:
+                current = newsets.pop()
+            except IndexError:
+                break
+            disjoint = 0
+        sets = newsets
+    return results
+
+
+def che_merge(lsts):
+    """ChessMaster"""
+    results, sets = [], [set(lst) for lst in lsts if lst]
+    upd, isd, pop = set.update, set.isdisjoint, sets.pop
+    while sets:
+        if not [upd(sets[0],pop(i)) for i in range(len(sets)-1,0,-1) if not isd(sets[0],sets[i])]:
+            results.append(pop(0))
+    return results
+
+
+def locatebin(bins, n):
+    """Find the bin where list n has ended up: Follow bin references until
+    we find a bin that has not moved.
+    
+    """
+    while bins[n] != n:
+        n = bins[n]
+    return n
+
+
+def ale_merge(data):
+    """alexis"""
+    bins = list(range(len(data)))  # Initialize each bin[n] == n
+    nums = dict()
+
+    data = [set(m) for m in data ]  # Convert to sets    
+    for r, row in enumerate(data):
+        for num in row:
+            if num not in nums:
+                # New number: tag it with a pointer to this row's bin
+                nums[num] = r
+                continue
+            else:
+                dest = locatebin(bins, nums[num])
+                if dest == r:
+                    continue # already in the same bin
+
+                if dest > r:
+                    dest, r = r, dest   # always merge into the smallest bin
+
+                data[dest].update(data[r]) 
+                data[r] = None
+                # Update our indices to reflect the move
+                bins[r] = dest
+                r = dest 
+
+    # Filter out the empty bins
+    have = [ m for m in data if m ]
+    #print len(have), "groups in result"  #removed this line
+    return have
+
+
+def nik_rew_merge_skip(lsts):
+    """Nik's rewrite"""
+    sets = list(map(set,lsts))
+    results = []
+    while sets:
+        first, rest = sets[0], sets[1:]
+        merged = False
+        sets = []
+        for s in rest:
+            if s and s.isdisjoint(first):
+                sets.append(s)
+            else:
+                first |= s
+                merged = True
+        if merged:
+            sets.append(first)
+        else:
+            results.append(first)
+    return results
+
+def union_find(clusters: "List[List[str]]", addresses: "List[List[str]]"):
+    data = clusters + addresses
+    match union_find_algo_name:
+        case 'rik_merge':
+            return rik_merge(data)
+        case 'sve_merge':
+            return sve_merge(data)
+        case 'hoc_merge':
+            return hoc_merge(data)
+        case 'nik_merge':
+            return nik_merge(data)
+        case 'rob_merge':
+            return rob_merge(data)
+        case 'agf_merge':
+            return agf_merge(data)
+        case 'agf_opt_merge':
+            return agf_opt_merge(data)
+        case 'che_merge':
+            return che_merge(data)
+        case 'ale_merge':
+            return ale_merge(data)
+        case 'nik_rew_merge_skip':
+            return nik_rew_merge_skip(data)
+        case _:
+            raise NameError("Unset or unknown algorithm")
 
 def cluster_partition(iter: "Iterable[Row]") -> Iterable:
-    yield cluster_step([], list(map(lambda row: row['addresses'], iter)))
+    yield union_find([], list(map(lambda row: row['addresses'], iter)))
     
 master = Master(config)
 master.spark.catalog.clearCache()
 master.spark.sparkContext.setCheckpointDir(config['spark_checkpoint_dir'])
 tx_df = master.get_tx_dataframe()
 
+
 #Turn transactions into a list of ('id', [addr, addr, ...])
 tx_grouped = tx_df \
     .groupBy('tx_id') \
-    .agg(F.collect_set('address').alias('addresses')) \
-    .orderBy('tx_id') \
+    .agg(F.collect_set('address').alias('addresses'))
 
 res = tx_grouped \
     .repartition(5) \
     .rdd \
     .mapPartitions(cluster_partition) \
-    .fold([], cluster_step)
+    .fold([], union_find)
 
+"""
 for cluster in res:
     print()
     print(sorted(cluster))
+"""
 
 end = time.time()
-print("ELAPSED TIME:", end-start)
+print(end-start, end='')
diff --git a/src/spark/naive_implementation.py b/src/spark/naive_implementation.py
new file mode 100644
index 0000000..155f91e
--- /dev/null
+++ b/src/spark/naive_implementation.py
@@ -0,0 +1,68 @@
+from typing import Iterable, List, Set
+
+def merge_lists_distinct(*lists: "Iterable[List[str]]") -> List[str]:
+    accum = set()
+    for lst in lists:
+        accum = accum.union(set(lst))
+    return list(accum)
+
+def check_lists_overlap(list1, list2):
+    return any(x in list1 for x in list2)
+
+def cluster_step(clusters: "List[List[str]]", addresses: "List[List[str]]"):
+    #if there are no more sets of addresses to consider, we are done
+    if(len(addresses) == 0):
+        return clusters
+
+    tx = addresses[0]
+    matching_clusters = []
+    new_clusters = []
+
+    for cluster in clusters:
+        if(check_lists_overlap(tx, cluster)):
+            matching_clusters.append(cluster)
+        else:
+            new_clusters.append(cluster)
+
+    new_clusters.append(merge_lists_distinct(tx, *matching_clusters))
+
+    return cluster_step(new_clusters,addresses[1:])
+
+def cluster_step_iter(clusters: "List[List[str]]", addresses: "List[List[str]]"):
+
+    clstr = clusters
+    addrs = addresses
+
+    while True:
+        if(len(addrs) == 0):
+            break
+
+        tx = addrs[0]
+        matching_clusters = []
+        new_clusters = []
+
+        for cluster in clstr:
+            if(check_lists_overlap(tx, cluster)):
+                matching_clusters.append(cluster)
+            else:
+                new_clusters.append(cluster)
+
+        new_clusters.append(merge_lists_distinct(tx, *matching_clusters))
+        clstr = new_clusters
+        addrs = addrs[1:]
+
+    return clstr
+
+def cluster_n(clusters: "List[List[str]]", addresses: "List[List[str]]"):
+    tx_sets = map(set, clusters+addresses)
+    unions = []
+    for tx in tx_sets:
+        temp = []
+        for s in unions:
+            if not s.isdisjoint(tx):
+                tx = s.union(tx)
+            else:
+                temp.append(s)
+        temp.append(tx)
+        unions = temp
+    return unions
\ No newline at end of file