diff --git a/README.md b/README.md
index f620b25..b543ba3 100644
--- a/README.md
+++ b/README.md
@@ -2,51 +2,92 @@
 
 [![Deploy to Fastly](https://deploy.edgecompute.app/button)](https://deploy.edgecompute.app/deploy)
 
-Install this starter kit to use Fanout. It routes incoming requests through the Fanout GRIP proxy and on to an origin. It also provides some endpoints for testing subscriptions without an origin.
-
-There is no need to modify this starter kit. It is production-ready for typical Fanout usage that coordinates with an origin. However, if you would like to implement Fanout logic at the edge, this starter kit is also a good starting point for that, and you can modify it to fit your needs. See the test endpoints for inspiration.
+Install this starter kit to use [Fanout](https://www.fastly.com/documentation/guides/concepts/real-time-messaging/fanout/), the real-time message broker operating at Fastly's edge. This starter kit routes incoming requests through the Fanout GRIP proxy and on to an origin. It also provides some endpoints for testing real-time messages without needing an origin.
 
 **For more details about this and other starter kits for Compute, see the [Fastly Documentation Hub](https://www.fastly.com/documentation/solutions/starters/)**.
 
+For the basic case, this starter kit may be used as-is to forward all traffic through Fanout to an origin.
+
+If you would like to implement Fanout logic at the edge, this starter kit is also a good starting point for that, and you can modify it to fit your needs. See the test endpoints for inspiration.
+
+## How it works
+
+For test requests (Paths under `/test/`), the app is actually invoked twice.
+
+1. Initially, a client request arrives at the app without having been routed through the Fanout proxy yet. The app checks for this via the presence of a `Grip-Sig` header. If that header is not present, the app calls `createFanoutHandoff(request, 'self')` and exits. This tells the subsystem that the connection should be routed through Fanout, and is used for HTTP requests controlled by GRIP.
+
+2. Since `self` refers to the same app, a second request is made to the same app, this time coming through Fanout. The app checks for this, and then handles the request accordingly (in `handleTest()`).
+
+Non-test requests are simply forwarded through the Fanout proxy and on to the origin.
+
+> [!IMPORTANT]
+> The starter kit forwards all non-test traffic through Fanout to the origin. In a production environment, be selective about the requests you send through Fanout. See [What to hand off to Fanout](https://www.fastly.com/documentation/guides/concepts/real-time-messaging/fanout/#what-to-hand-off-to-fanout) for a discussion on this topic.
+
 ## Setup
 
-The app expects a configured backend named "origin" where Fanout-capable requests should be forwarded to.
+The app expects a configured backend named `"origin"`. It forwards all non-test requests through Fanout to this backend.
+
+Additionally, for the test endpoints to work, the app expects a configured backend named `"self"` that points back to app itself. For example, if the service has a domain `foo.edgecompute.app`, then you'll need to create a backend on the service named `"self"` with the destination host set to `foo.edgecompute.app` and port 443. Also set "Override Host" to the same host value.
+
+You'll also need to [enable Fanout](https://www.fastly.com/documentation/guides/concepts/real-time-messaging/fanout/#enable-fanout) on your Fastly service to run this application. To enable Fanout on your service, type:
+
+```shell
+fastly products --enable=fanout
+```
 
-Additionally, for the test endpoints to work, the app expects a configured backend named "self" that points back to app itself. For example, if the service has a domain `foo.edgecompute.app`, then you'll need to create a backend on the service named "self" with the destination host set to `foo.edgecompute.app` and port 443. Also set "Override Host" to the same host value.
+## Local testing
+
+To test Fanout features in the local testing environment, first obtain [Pushpin](https://pushpin.org), the open-source GRIP proxy server that Fastly Fanout is based upon, and make sure it is available on the system path.
+
+Create a Fastly Compute project based on this starter kit.
+
+```term
+mkdir my-fanout-project
+cd my-fanout-project
+npm create @fastly/compute@latest -- --language=javascript --starter-kit=fanout
+```
+
+The `fastly.toml` file included in this starter kit includes a `local_server.pushpin` section:
+```toml
+[local_server.pushpin]
+enable = true
+```
+
+Run the starter kit:
+```term
+fastly compute serve
+```
+
+The Fastly CLI starts Pushpin and then starts the starter kit app at http://localhost:7676/.  
 
 ## Test Endpoints
 
-For requests made to domains ending in `.edgecompute.app`, the app will handle requests to the following endpoints without forwarding to the origin:
+The app handles requests to the following endpoints at the edge:
 
-* `/test/websocket`: bi-directional WebSocket
 * `/test/stream`: HTTP streaming of `text/plain`
 * `/test/sse`: SSE (streaming of `text/event-stream`)
 * `/test/long-poll`: Long-polling
+* `/test/websocket`: bidirectional WebSocket
+  * In the example, the WebSocket endpoint is set up to echo back any messages it receives from the client.
 
-Connecting to any of these endpoints will subscribe the connection to channel "test". The WebSocket endpoint echoes back any messages it receives from the client.
+Connecting to any of these endpoints subscribes the connection to channel `"test"`.
 
-Data can be sent to the connections via the GRIP publish endpoint at `https://api.fastly.com/service/{service-id}/publish/`. For example, here's a curl command to send a WebSocket message:
+On the local testing environment, data can be sent to the connections via the GRIP publish endpoint at `http://localhost:5561/publish/`. For example, here's a curl command to send a WebSocket message:
 
 ```sh
 curl \
-  -H "Authorization: Bearer {fastly-api-token}" \
   -d '{"items":[{"channel":"test","formats":{"ws-message":{"content":"hello"}}}]}' \
-  https://api.fastly.com/service/{service-id}/publish/
+  http://localhost:5561/publish/
 ```
 
-## How it works
-
-Non-test requests are simply forwarded through the Fanout proxy and on to the origin.
+Once deployed to your Fastly service, the GRIP publish endpoint is at `https://api.fastly.com/service/{service-id}/publish/`. Here's the same example on Fastly service:
 
-For test requests, the app is actually invoked twice.
-
-1. Initially, a client request arrives at the app without having been routed through the Fanout proxy yet. The app checks for this via the presence of a `Grip-Sig` header. If that header is not present, the app calls `createFanoutHandoff(request, 'self')` and exits. This tells the subsystem that the connection should be routed through Fanout, and is used for HTTP requests controlled by GRIP.
-
-2. Since `self` refers to the same app, a second request is made to the same app, this time coming through Fanout. The app checks for this, and then handles the request accordingly (in `handleTest()`).
-
-## Note
-
-This app is not currently supported in Fastly's [local development server](https://www.fastly.com/documentation/guides/compute/testing/#running-a-local-testing-server), as the development server does not support Fanout features. To experiment with Fanout, you will need to publish this project to your Fastly Compute service. using the `fastly compute publish` command.
+```sh
+curl \
+  -H "Authorization: Bearer {fastly-api-token}" \
+  -d '{"items":[{"channel":"test","formats":{"ws-message":{"content":"hello"}}}]}' \
+  https://api.fastly.com/service/{service-id}/publish/
+```
 
 ## Security issues
 
diff --git a/fastly.toml b/fastly.toml
index 63f4a78..d4a8d6f 100644
--- a/fastly.toml
+++ b/fastly.toml
@@ -1,5 +1,5 @@
 # This file describes a Fastly Compute package. To learn more visit:
-# https://developer.fastly.com/reference/fastly-toml/
+# https://www.fastly.com/documentation/reference/compute/fastly-toml
 
 authors = ["<oss@fastly.com>"]
 description = "Enables Fanout on a service, forwarding to a backend."
@@ -7,6 +7,18 @@ language = "javascript"
 manifest_version = 3
 name = "Fanout forwarding starter kit for JavaScript"
 
+[local_server.pushpin]
+enable = true
+
+[local_server.backends]
+[local_server.backends.origin]
+url = "https://example.com/"
+override_host = "example.com"
+
+[local_server.backends.self]
+url = "http://localhost:7676/"
+override_host = "localhost:7676"
+
 [scripts]
 build = "npm run build"
 post_init = "npm install"
diff --git a/src/index.js b/src/index.js
index 46b2668..a56cdaf 100644
--- a/src/index.js
+++ b/src/index.js
@@ -35,8 +35,8 @@ async function handleRequest(event) {
     request.headers.set('X-Forwarded-Proto', 'https');
   }
 
-  // Request is a test request - from client, or from Fanout
-  if (host.endsWith('.edgecompute.app') && path.startsWith('/test/')) {
+  // Request is a test request
+  if (path.startsWith('/test/')) {
 
     if (request.headers.has('Grip-Sig')) {
       // Request is from Fanout, handle it here