diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 823b4fc..ff169db 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,9 @@
     <list default="true" id="377cceba-08b5-47e5-aead-ba5d96f09aa9" name="Default Changelist" comment="add Route.resolve">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/rest/RestResource.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/rest/RestResource.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/rest/RestRouteResult.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/rest/RestRouteResult.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/rest/RestRouter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/rest/RestRouter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/util/WrappingRouter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/util/DelegatingRouter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/duncpro/jroute/SmokeTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/duncpro/jroute/SmokeTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/router/Router.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/router/Router.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/router/TreeRouter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/router/TreeRouter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/util/DelegatingRouter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/duncpro/jroute/util/DelegatingRouter.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -239,7 +237,8 @@
       <workItem from="1660419996798" duration="1839000" />
       <workItem from="1660427010812" duration="5460000" />
       <workItem from="1660432755377" duration="1607000" />
-      <workItem from="1660558378320" duration="462000" />
+      <workItem from="1660558378320" duration="486000" />
+      <workItem from="1660558937116" duration="160000" />
     </task>
     <servers />
   </component>
diff --git a/build.gradle.kts b/build.gradle.kts
index 219893a..68eb50d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.duncpro"
-version = "1.0-SNAPSHOT-10"
+version = "1.0-SNAPSHOT-11"
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/com/duncpro/jroute/router/Router.java b/src/main/java/com/duncpro/jroute/router/Router.java
index 0228e80..0a1cda3 100644
--- a/src/main/java/com/duncpro/jroute/router/Router.java
+++ b/src/main/java/com/duncpro/jroute/router/Router.java
@@ -31,6 +31,11 @@ default void add(String routeString, E endpoint) throws RouteConflictException {
      */
     Set<PositionedEndpoint<E>> getAllEndpoints(Route prefix);
 
+    /**
+     * Returns the endpoint which exists at the given {@link Route} (if any).
+     */
+    Optional<E> getEndpoint(Route at);
+
     /**
      * @throws RouteConflictException if the given endpoint conflicts with a pre-existing endpoint within the router.
      */
diff --git a/src/main/java/com/duncpro/jroute/router/TreeRouter.java b/src/main/java/com/duncpro/jroute/router/TreeRouter.java
index 214c291..ba77f16 100644
--- a/src/main/java/com/duncpro/jroute/router/TreeRouter.java
+++ b/src/main/java/com/duncpro/jroute/router/TreeRouter.java
@@ -41,6 +41,11 @@ public Set<PositionedEndpoint<E>> getAllEndpoints(Route prefix) {
                 .orElse(Collections.emptySet());
     }
 
+    @Override
+    public Optional<E> getEndpoint(Route at) {
+        return findNode(at).flatMap(RouteTreeNode::getEndpoint);
+    }
+
     private Optional<RouteTreeNode<E>> findNode(Route route) {
         RouteTreeNode<E> prefixNode = rootRoute;
 
diff --git a/src/main/java/com/duncpro/jroute/util/DelegatingRouter.java b/src/main/java/com/duncpro/jroute/util/DelegatingRouter.java
index a3b94bc..402521e 100644
--- a/src/main/java/com/duncpro/jroute/util/DelegatingRouter.java
+++ b/src/main/java/com/duncpro/jroute/util/DelegatingRouter.java
@@ -40,4 +40,9 @@ public E getOrAdd(Route route, Supplier<E> endpointFactory) {
     public Set<PositionedEndpoint<E>> getAllEndpoints(Route prefix) {
         return underlyingRouter.getAllEndpoints(prefix);
     }
+
+    @Override
+    public Optional<E> getEndpoint(Route at) {
+        return underlyingRouter.getEndpoint(at);
+    }
 }