diff --git a/src/FreightOrder/FreightOrderRepository.php b/src/FreightOrder/FreightOrderRepository.php
new file mode 100644
index 0000000..2034216
--- /dev/null
+++ b/src/FreightOrder/FreightOrderRepository.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace FreightQuote\FreightOrder;
+
+interface FreightOrderRepository
+{
+    public function find(int $id): ?FreightOrder;
+
+    public function save(FreightOrder $freightOrder): FreightOrder;
+}
diff --git a/tests/Fakes/FreightOrder/FakeFreightOrderRepository.php b/tests/Fakes/FreightOrder/FakeFreightOrderRepository.php
index 4eaf7ac..b18fb2c 100644
--- a/tests/Fakes/FreightOrder/FakeFreightOrderRepository.php
+++ b/tests/Fakes/FreightOrder/FakeFreightOrderRepository.php
@@ -2,12 +2,58 @@
 
 namespace Tests\Fakes\FreightOrder;
 
+use FreightQuote\FreightOrder\FreightOrderRepository;
 use FreightQuote\FreightOrder\FreightOrder;
 
-class FakeFreightOrderRepository
+class FakeFreightOrderRepository implements FreightOrderRepository
 {
-    public function find(): ?FreightOrder
+    /**
+     * @var FreightOrder[]
+     */
+    private array $existingFreightOrders = [];
+
+    public function find(int $id): ?FreightOrder
     {
-        return new FreightOrder();
+        foreach ($this->existingFreightOrders as $freightOrder) {
+            if ($freightOrder->getId() === $id) {
+                return new FreightOrder(
+                    $freightOrder->getId(),
+                    $freightOrder->getShipFrom(),
+                    $freightOrder->getShipTo(),
+                    $freightOrder->getPickupDate(),
+                    $freightOrder->getDeliveryDeadline(),
+                    $freightOrder->getLoadDetails(),
+                    $freightOrder->getNotes(),
+                    $freightOrder->getFileAttachments(),
+                );
+            }
+        }
+
+        return null;
+    }
+
+    public function save(FreightOrder $freightOrder): FreightOrder
+    {
+        $id = $freightOrder->getId();
+        if ($id === null) {
+            $id = $this->getNextId();
+            $freightOrder->setId($id);
+        }
+        $this->existingFreightOrders[$id] = $freightOrder;
+        return new FreightOrder(
+            $freightOrder->getId(),
+            $freightOrder->getShipFrom(),
+            $freightOrder->getShipTo(),
+            $freightOrder->getPickupDate(),
+            $freightOrder->getDeliveryDeadline(),
+            $freightOrder->getLoadDetails(),
+            $freightOrder->getNotes(),
+            $freightOrder->getFileAttachments(),
+        );
+    }
+
+    private function getNextId(): int
+    {
+        return count($this->existingFreightOrders);
     }
 }