diff --git a/cmd/hspnet.go b/cmd/hspnet.go
index 1c11716..0c516d9 100644
--- a/cmd/hspnet.go
+++ b/cmd/hspnet.go
@@ -83,7 +83,7 @@ func StartServer(addr *hsp.Adddress) {
 
 	router := server.NewRouter()
 
-	router.AddRoute("/", Index)
+	router.AddRoute("*", Index)
 
 	srv.SetListener(handler)
 
@@ -116,7 +116,10 @@ func StartServer(addr *hsp.Adddress) {
 }
 
 func StartSession(addr *hsp.Adddress) {
-	fmt.Println("Starting session on", addr.String())
+	url := addr.String() + addr.Route
+	fmt.Println("Starting session on", url)
+
+	c := client.NewClient()
 
 	rl, err := readline.New("> ")
 	if err != nil {
@@ -125,15 +128,13 @@ func StartSession(addr *hsp.Adddress) {
 
 	defer rl.Close()
 
-	c := client.NewClient()
-
 	for {
 		line, err := rl.Readline()
 		if err != nil {
 			break
 		}
 
-		c.SendText(addr.String(), line)
+		c.SendText(url, line)
 	}
 }
 
@@ -143,23 +144,33 @@ func main() {
 
 	var host string
 	var service string
+	var address string
 
-	flag.StringVar(&host, "host", "localhost", "specify target host (default: localhost)")
-	flag.StringVar(&service, "port", "998", "specify target port (default: 998)")
+	flag.StringVar(&host, "host", "localhost", "specify server host (default: localhost)")
+	flag.StringVar(&service, "port", "998", "specify server port (default: 998)")
+	flag.StringVar(&address, "addr", "localhost:998", "specify target address (default: :998)")
 
 	flag.Parse()
 
-	a := fmt.Sprintf("%s:%s", host, service)
-	addr, err := hsp.ParseAddress(a)
-	if err != nil {
-		fmt.Printf("ERR: Invalid address %s: %v\n", a, err)
-		return
-	}
-
 	if listening {
+		a := fmt.Sprintf("%s:%s", host, service)
+		addr, err := hsp.ParseAddress(a)
+		if err != nil {
+			fmt.Printf("ERR: Invalid address %s: %v\n", a, err)
+			return
+		}
+
 		StartServer(addr)
 		return
 	}
 
+	addr, err := hsp.ParseAddress(address)
+	if err != nil {
+		fmt.Printf("ERR: Invalid address %s: %v\n", address, err)
+		return
+	}
 	StartSession(addr)
 }
+
+
+
diff --git a/hsp/constants.go b/hsp/constants.go
index bba176f..286b2c7 100644
--- a/hsp/constants.go
+++ b/hsp/constants.go
@@ -31,6 +31,7 @@ const (
 	STATUS_SUCCESS     = 0
 	STATUS_NOTFOUND    = 69
 	STATUS_INTERNALERR = 129
+	STATUS_RECEIVED    = 1
 )
 
 var DATA_FORMATS map[string]string = map[string]string{
diff --git a/hsp/server/router.go b/hsp/server/router.go
index 5a27c71..c7c5fa2 100644
--- a/hsp/server/router.go
+++ b/hsp/server/router.go
@@ -1,7 +1,6 @@
 package server
 
 import (
-	"fmt"
 	"log"
 	"net"
 
@@ -9,19 +8,14 @@ import (
 )
 
 type RouteHandler func(req *hsp.Request) *hsp.Response
-type StreamHandler func(req *hsp.Request, stream chan []byte)
 
 type Router struct {
 	routes    map[string]RouteHandler
-	streamers map[string]StreamHandler
-	streamMaxSize uint64
-	streamBufferSize uint16
 }
 
 func NewRouter() *Router {
 	return &Router{
 		routes: make(map[string]RouteHandler),
-		streamers: make(map[string]StreamHandler),
 	}
 }
 
@@ -32,21 +26,6 @@ func (r *Router) AddRoute(pathname string, handler RouteHandler) {
 	r.routes[pathname] = handler
 }
 
-func (r *Router) AddStreamer(pathname string, handler StreamHandler) {
-	if _, ok := r.streamers[pathname]; ok {
-		log.Printf("WARN: Rewriting existing streamer '%s'\n", pathname)
-	}
-	r.streamers[pathname] = handler
-}
-
-func (r *Router) SetStreamMaxSize(size uint64) {
-	r.streamMaxSize = size
-}
-
-func (r *Router) SetStreamBufferSize(size uint16) {
-	r.streamBufferSize = size
-}
-
 func (r *Router) Handle(conn net.Conn) error {
 	defer conn.Close()
 
@@ -62,69 +41,14 @@ func (r *Router) Handle(conn net.Conn) error {
 	if route, ok := packet.Headers["route"]; ok {
 		req := hsp.NewRequest(conn, packet)
 
-		switch req.GetRequestKind() {
-		case "single-hit":
-			if handler, ok := r.routes[route]; ok {
-				res := handler(req)
-				_, err := dupl.WritePacket(res.ToPacket())
-				return err
-			} else if fallback, ok := r.routes["*"]; ok {
-				res := fallback(req)
-				_, err := dupl.WritePacket(res.ToPacket())
-				return err
-			}
-		case "stream":
-			if handler, ok := r.streamers[route]; ok {
-				info, err := req.GetStreamInfo()
-				if err != nil {
-					_, err = dupl.WritePacket(hsp.NewErrorResponse(err).ToPacket())
-					return err
-				}
-
-				streamSize := uint64(min(info.TotalBytes, r.streamMaxSize))
-				bufferSize := uint16(min(info.BufferSize, r.streamBufferSize))
-
-				res := hsp.NewStatusResponse(hsp.STATUS_SUCCESS)
-				res.AddHeader(hsp.H_XSTREAM, fmt.Sprintf("%d:%d", streamSize, bufferSize))
-				res.AddHeader(hsp.H_XSTREAM_KEY, "0") // TODO: generate id
-
-				_, err = dupl.WritePacket(res.ToPacket())
-				if err != nil {
-					return err
-				}
-
-				req := hsp.NewRequest(conn, res.ToPacket())
-				bc := make(chan []byte)
-
-				go func() {
-					handler(req, bc)
-				}()
-
-				buf := make([]byte, bufferSize)
-				var totalReceived uint64
-				totalReceived = 0
-				for totalReceived < streamSize {
-					n, err := conn.Read(buf)
-					if err != nil || n <= 0 {
-						break
-					}
-					if n > 0 {
-						totalReceived += uint64(n)
-					}
-				}
-
-				res = hsp.NewStatusResponse(hsp.STATUS_SUCCESS)
-				res.AddHeader(hsp.H_XSTREAM, fmt.Sprintf("%d:0", streamSize - totalReceived))
-				res.AddHeader(hsp.H_XSTREAM_KEY, "0") // TODO: generate id
-				_, err = dupl.WritePacket(res.ToPacket())
-
-				conn.Close()
-				close(bc)
-
-				return err
-			}
-		default:
-			return fmt.Errorf("Unsupported request kind: %s", req.GetRequestKind())
+		if handler, ok := r.routes[route]; ok {
+			res := handler(req)
+			_, err := dupl.WritePacket(res.ToPacket())
+			return err
+		} else if fallback, ok := r.routes["*"]; ok {
+			res := fallback(req)
+			_, err := dupl.WritePacket(res.ToPacket())
+			return err
 		}
 	}
 
diff --git a/hspnet b/hspnet
new file mode 100755
index 0000000..890f6ba
Binary files /dev/null and b/hspnet differ