diff --git a/src/Draco.JsonRpc/IJsonRpcConnection.cs b/src/Draco.JsonRpc/IJsonRpcConnection.cs
new file mode 100644
index 0000000000..49a804ac9d
--- /dev/null
+++ b/src/Draco.JsonRpc/IJsonRpcConnection.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Draco.JsonRpc;
+
+/// <summary>
+/// Represents a JSON RPC connection.
+/// </summary>
+public interface IJsonRpcConnection
+{
+    /// <summary>
+    /// Registers an RPC method handler.
+    /// </summary>
+    /// <param name="handler">The handler to register.</param>
+    public void AddHandler(IJsonRpcMethodHandler handler);
+
+    /// <summary>
+    /// Starts the connection to listen for messages.
+    /// </summary>
+    /// <returns>The task that completes when the listening stops.</returns>
+    public Task ListenAsync();
+
+    /// <summary>
+    /// Stops the connection.
+    /// </summary>
+    public void Shutdown();
+}
diff --git a/src/Draco.JsonRpc/JsonRpcConnection.cs b/src/Draco.JsonRpc/JsonRpcConnection.cs
index cd546f3e54..8b9a93f10a 100644
--- a/src/Draco.JsonRpc/JsonRpcConnection.cs
+++ b/src/Draco.JsonRpc/JsonRpcConnection.cs
@@ -20,7 +20,7 @@ namespace Draco.JsonRpc;
 /// </summary>
 /// <typeparam name="TMessage">The message type.</typeparam>
 /// <typeparam name="TError">The error message type.</typeparam>
-public abstract class JsonRpcConnection<TMessage, TError>
+public abstract class JsonRpcConnection<TMessage, TError> : IJsonRpcConnection
     where TMessage : IJsonRpcMessage
 {
     private interface IOutgoingRequest
@@ -87,10 +87,8 @@ private enum ConsumerState
         SingleWriter = false,
     });
 
-    // TODO: Doc
     public void AddHandler(IJsonRpcMethodHandler handler) => this.methodHandlers.Add(handler.Method, handler);
 
-    // TODO: Doc
     public Task ListenAsync() => Task.WhenAll(this.ReaderLoop(), this.WriterLoop());
 
     private Task WriterLoop() => Task.Run(async () =>