diff --git a/src/github.com/matrix-org/dendrite/cmd/federation-api-proxy/main.go b/src/github.com/matrix-org/dendrite/cmd/federation-api-proxy/main.go
new file mode 100644
index 00000000..d1cba69e
--- /dev/null
+++ b/src/github.com/matrix-org/dendrite/cmd/federation-api-proxy/main.go
@@ -0,0 +1,124 @@
+// Copyright 2017 Vector Creations Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"flag"
+	"fmt"
+	log "github.com/Sirupsen/logrus"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"os"
+	"strings"
+	"time"
+)
+
+const usage = `Usage: %s
+
+Create a single endpoint URL which remote matrix servers can be pointed at.
+
+The server-server API in Dendrite is split across multiple processes
+which listen on multiple ports. You cannot point a Matrix server at
+any of those ports, as there will be unimplemented functionality.
+In addition, all server-server API processes start with the additional
+path prefix '/api', which Matrix servers will be unaware of.
+
+This tool will proxy requests for all server-server URLs and forward
+them to their respective process. It will also add the '/api' path
+prefix to incoming requests.
+
+THIS TOOL IS FOR TESTING AND NOT INTENDED FOR PRODUCTION USE.
+
+Arguments:
+
+`
+
+var (
+	federationAPIURL = flag.String("federation-api-url", "", "The base URL of the listening 'dendrite-federation-api-server' process. E.g. 'http://localhost:4200'")
+	bindAddress      = flag.String("bind-address", ":8448", "The listening port for the proxy.")
+	certFile         = flag.String("tls-cert", "server.crt", "The X509 certificate to use for TLS")
+	keyFile          = flag.String("tls-key", "server.key", "The PEM private key to use for TLS")
+)
+
+func makeProxy(targetURL string) (*httputil.ReverseProxy, error) {
+	if !strings.HasSuffix(targetURL, "/") {
+		targetURL += "/"
+	}
+	// Check that we can parse the URL.
+	_, err := url.Parse(targetURL)
+	if err != nil {
+		return nil, err
+	}
+	return &httputil.ReverseProxy{
+		Director: func(req *http.Request) {
+			// URL.Path() removes the % escaping from the path.
+			// The % encoding will be added back when the url is encoded
+			// when the request is forwarded.
+			// This means that we will lose any unessecary escaping from the URL.
+			// Pratically this means that any distinction between '%2F' and '/'
+			// in the URL will be lost by the time it reaches the target.
+			path := req.URL.Path
+			path = "api" + path
+			log.WithFields(log.Fields{
+				"path":   path,
+				"url":    targetURL,
+				"method": req.Method,
+			}).Print("proxying request")
+			newURL, err := url.Parse(targetURL + path)
+			if err != nil {
+				// We already checked that we can parse the URL
+				// So this shouldn't ever get hit.
+				panic(err)
+			}
+			// Copy the query parameters from the request.
+			newURL.RawQuery = req.URL.RawQuery
+			req.URL = newURL
+		},
+	}, nil
+}
+
+func main() {
+	flag.Usage = func() {
+		fmt.Fprintf(os.Stderr, usage, os.Args[0])
+		flag.PrintDefaults()
+	}
+
+	flag.Parse()
+
+	if *federationAPIURL == "" {
+		flag.Usage()
+		fmt.Fprintln(os.Stderr, "no --federation-api-url specified.")
+		os.Exit(1)
+	}
+
+	federationProxy, err := makeProxy(*federationAPIURL)
+	if err != nil {
+		panic(err)
+	}
+
+	http.Handle("/", federationProxy)
+
+	srv := &http.Server{
+		Addr:         *bindAddress,
+		ReadTimeout:  1 * time.Minute, // how long we wait for the client to send the entire request (after connection accept)
+		WriteTimeout: 5 * time.Minute, // how long the proxy has to write the full response
+	}
+
+	fmt.Println("Proxying requests to:")
+	fmt.Println("  /*                       => ", *federationAPIURL+"/api/*")
+	fmt.Println("Listening on ", *bindAddress)
+	panic(srv.ListenAndServeTLS(*certFile, *keyFile))
+}
diff --git a/src/github.com/matrix-org/dendrite/federationapi/writers/send.go b/src/github.com/matrix-org/dendrite/federationapi/writers/send.go
new file mode 100644
index 00000000..2b0a888f
--- /dev/null
+++ b/src/github.com/matrix-org/dendrite/federationapi/writers/send.go
@@ -0,0 +1,73 @@
+package writers
+
+import (
+	"encoding/json"
+	"github.com/matrix-org/dendrite/clientapi/jsonerror"
+	"github.com/matrix-org/dendrite/federationapi/config"
+	"github.com/matrix-org/dendrite/roomserver/api"
+	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/util"
+	"net/http"
+	"time"
+)
+
+// Send implements /_matrix/federation/v1/send/{txnID}
+func Send(
+	req *http.Request,
+	txnID gomatrixserverlib.TransactionID,
+	now time.Time,
+	cfg config.FederationAPI,
+	keys gomatrixserverlib.KeyRing,
+) util.JSONResponse {
+	request, errResp := gomatrixserverlib.VerifyHTTPRequest(req, now, cfg.ServerName, keys)
+	if request == nil {
+		return errResp
+	}
+
+	var content gomatrixserverlib.Transaction
+	if err := json.Unmarshal(request.Content(), &content); err != nil {
+		return util.JSONResponse{
+			Code: 400,
+			JSON: jsonerror.BadJSON("The request body could not be decoded into valid JSON. " + err.Error()),
+		}
+	}
+
+	content.Origin = request.Origin()
+	content.TransactionID = txnID
+	content.Destination = cfg.ServerName
+
+	// TODO: process the transaction.
+
+	return util.JSONResponse{
+		Code: 200,
+		JSON: gomatrixserverlib.RespSend{},
+	}
+}
+
+func processTransaction(t gomatrixserverlib.Transaction, query api.RoomserverQueryAPI) {
+
+}
+
+func processEvent(e gomatrixserverlib.Event, query api.RoomserverQueryAPI) error {
+	refs := e.PrevEvents()
+	prevEventIDs := make([]string, len(refs))
+	for i := range refs {
+		prevEventIDs[i] = refs[i].EventID
+	}
+
+	needed := gomatrixserverlib.StateNeededForAuth([]gomatrixserverlib.Event{e})
+
+	request := api.QueryStateAfterEventsRequest{
+		RoomID:       e.RoomID(),
+		PrevEventIDs: prevEventIDs,
+		StateToFetch: needed.Tuples(),
+	}
+	var response api.QueryStateAfterEventsResponse
+	if err := query.QueryStateAfterEvents(&request, &response); err != nil {
+		return err
+	}
+
+	// TODO process the event.
+
+	return nil
+}