diff --git a/src/EventListener/MatchfundingListener.php b/src/EventListener/MatchfundingListener.php
new file mode 100644
index 0000000..948b784
--- /dev/null
+++ b/src/EventListener/MatchfundingListener.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\EventListener;
+
+use App\Entity\Gateway\Charge;
+use App\Service\Matchfunding\MatchfundingService;
+use Doctrine\Bundle\DoctrineBundle\Attribute\AsEntityListener;
+use Doctrine\ORM\Event\PostPersistEventArgs;
+use Doctrine\ORM\Events;
+
+#[AsEntityListener(
+    event: Events::postPersist,
+    method: 'processMatchfunding',
+    entity: Charge::class
+)]
+final class MatchfundingListener
+{
+    public function __construct(
+        private MatchfundingService $matchfunding,
+    ) {}
+
+    public function processMatchfunding(Charge $charge, PostPersistEventArgs $event)
+    {
+        $this->matchfunding->match($charge);
+    }
+}
diff --git a/src/EventListener/MatchfundingTransactionsListener.php b/src/EventListener/MatchfundingTransactionsListener.php
deleted file mode 100644
index bba13fa..0000000
--- a/src/EventListener/MatchfundingTransactionsListener.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace App\EventListener;
-
-use App\Entity\Accounting\Transaction;
-use App\Entity\Matchfunding\MatchCallSubmissionStatus;
-use App\Entity\Project\Project;
-use App\Matchfunding\Formula\FormulaLocator;
-use Doctrine\Bundle\DoctrineBundle\Attribute\AsEntityListener;
-use Doctrine\ORM\Event\PostPersistEventArgs;
-use Doctrine\ORM\Events;
-
-#[AsEntityListener(
-    event: Events::postPersist,
-    method: 'processTransaction',
-    entity: Transaction::class
-)]
-final class MatchfundingTransactionsListener
-{
-    public function __construct(
-        private FormulaLocator $formulaLocator,
-    ) {}
-
-    /**
-     * Generates matched Transactions for Transactions inside a MatchCall.
-     */
-    public function processTransaction(
-        Transaction $transaction,
-        PostPersistEventArgs $event,
-    ) {
-        $target = $transaction->getTarget()->getOwner();
-
-        if (!$target instanceof Project) {
-            return;
-        }
-
-        $submissions = $target->getMatchCallSubmissions();
-
-        foreach ($submissions as $submission) {
-            if ($submission->getStatus() !== MatchCallSubmissionStatus::Accepted) {
-                continue;
-            }
-
-            // $call = $submission->getCall();
-            // $strategy = $this->formulaLocator->get($call->getFormulaName());
-            // $match = $strategy->match($transaction->getMoney());
-
-            // if ($match->getId() !== null) {
-            //     return;
-            // }
-
-            // $event->getObjectManager()->persist($match);
-            // $event->getObjectManager()->flush();
-        }
-    }
-}