diff --git a/client.go b/client.go
index 84edb3e6..31d80381 100644
--- a/client.go
+++ b/client.go
@@ -9,29 +9,45 @@ package dns
 
 // This completely mirrors server.go impl.
 import (
-        "os"
+	"os"
+//        "net"
 )
 
 type QueryHandler interface {
-        QueryDNS(w RequestWriter, q *Msg)
+	QueryDNS(w RequestWriter, q *Msg)
 }
 
 
 // A RequestWriter interface is used by an DNS query handler to
 // construct an DNS request.
 type RequestWriter interface {
-        RemoteAddr() string
+	RemoteAddr() string
 
-        Write([]byte) (int, os.Error)
+	Write([]byte) (int, os.Error)
 }
 
+/*
+type conn struct {
+	remoteAddr net.Addr  // address of remote side (sans port)
+	port       int       // port of the remote side, needed TODO(mg)
+	handler    Handler   // request handler
+	request    []byte    //  the request
+	w          chan *Msg //
+	hijacked   bool      // connection has been hijacked by hander TODO(mg)
+}
+
+type response struct {
+	conn *conn
+	req  *Msg
+}
+*/
 
 // QueryMux is an DNS request multiplexer. It matches the
 // zone name of each incoming request against a list of 
 // registered patterns add calls the handler for the pattern
 // that most closely matches the zone name.
 type QueryMux struct {
-        m map[string]QueryHandler
+	m map[string]QueryHandler
 }
 
 // NewQueryMux allocates and returns a new QueryMux.
@@ -48,7 +64,7 @@ type HandlerQueryFunc func(RequestWriter, *Msg)
 
 // QueryDNS calls f(w, reg)
 func (f HandlerQueryFunc) QueryDNS(w RequestWriter, r *Msg) {
-        f(w, r)
+	f(w, r)
 }
 
 // Helper handlers
@@ -56,50 +72,50 @@ func (f HandlerQueryFunc) QueryDNS(w RequestWriter, r *Msg) {
 
 // reusing zoneMatch from server.go
 func (mux *QueryMux) match(zone string) QueryHandler {
-        var h QueryHandler
-        var n = 0
-        for k, v := range mux.m {
-                if !zoneMatch(k, zone) {
-                        continue
-                }
-                if h == nil || len(k) > n {
-                        n = len(k)
-                        h = v
-                }
-        }
-        return h
+	var h QueryHandler
+	var n = 0
+	for k, v := range mux.m {
+		if !zoneMatch(k, zone) {
+			continue
+		}
+		if h == nil || len(k) > n {
+			n = len(k)
+			h = v
+		}
+	}
+	return h
 }
 
 func (mux *QueryMux) Handle(pattern string, handler QueryHandler) {
-        if pattern == "" {
-                panic("dns: invalid pattern " + pattern)
-        }
-        if pattern[len(pattern)-1] != '.' {             // no ending .
-                mux.m[pattern + "."] = handler
-        } else {
-                mux.m[pattern]= handler
-        }
+	if pattern == "" {
+		panic("dns: invalid pattern " + pattern)
+	}
+	if pattern[len(pattern)-1] != '.' { // no ending .
+		mux.m[pattern+"."] = handler
+	} else {
+		mux.m[pattern] = handler
+	}
 }
 
 func (mux *QueryMux) HandleQueryFunc(pattern string, handler func(RequestWriter, *Msg)) {
-        mux.Handle(pattern, HandlerQueryFunc(handler))
+	mux.Handle(pattern, HandlerQueryFunc(handler))
 }
 
 func (mux *QueryMux) QueryDNS(w RequestWriter, request *Msg) {
-        h := mux.match(request.Question[0].Name)
-        if h == nil {
-//                h = RefusedHandler()
-// something else
-        }
-        h.QueryDNS(w, request)
+	h := mux.match(request.Question[0].Name)
+	if h == nil {
+		//                h = RefusedHandler()
+		// something else
+	}
+	h.QueryDNS(w, request)
 }
 
 type Client struct {
-        Network string  // if "tcp" a TCP query will be initiated, otherwise an UDP one
-        Attempts int    // number of attempts
-        Handler QueryHandler    // handler to invoke, dns.DefaultQueryMux if nil
-        ReadTimeout     int64   // the net.Conn.SetReadTimeout value for new connections
-        WriteTimeout    int64   // the net.Conn.SetWriteTimeout value for new connections
+	Network      string       // if "tcp" a TCP query will be initiated, otherwise an UDP one
+	Attempts     int          // number of attempts
+	Handler      QueryHandler // handler to invoke, dns.DefaultQueryMux if nil
+	ReadTimeout  int64        // the net.Conn.SetReadTimeout value for new connections
+	WriteTimeout int64        // the net.Conn.SetWriteTimeout value for new connections
 }
 
 
@@ -109,20 +125,19 @@ type Client struct {
 // read requests and then call handler to reply to them.
 // Handler is typically nil, in which case the DefaultServeMux is used.
 func Query(w chan *Msg, handler QueryHandler) os.Error {
-        clnt := &Client{Handler: handler}
-        return clnt.Query(w)
+	clnt := &Client{Handler: handler}
+	return clnt.Query(w)
 }
 
 func (clnt *Client) Query(w chan *Msg) os.Error {
-        handler := clnt.Handler
-        if handler == nil {
-                handler = DefaultQueryMux
-        }
-        return nil
+	handler := clnt.Handler
+	if handler == nil {
+		handler = DefaultQueryMux
+	}
+	return nil
 }
 
 func (clnt *Client) ListenAndQuery(w chan *Msg) os.Error {
-        
-        return nil
+	/* ... */
+	return nil
 }
-