diff --git a/socket_send.go b/socket_send.go
deleted file mode 100644
index 5a0fafa..0000000
--- a/socket_send.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/localhots/yeast/unit"
-)
-
-func main() {
-	u := unit.New("uuid")
-	msg := []byte("{}")
-
-	fmt.Println("Sending message:", string(msg))
-	resp, _ := u.Send(msg)
-	fmt.Println("Reply recieved:", string(resp))
-}
diff --git a/unit_send.go b/unit_send.go
new file mode 100644
index 0000000..4e1e99d
--- /dev/null
+++ b/unit_send.go
@@ -0,0 +1,25 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+
+	"github.com/localhots/yeast/unit"
+)
+
+func main() {
+	var (
+		name string
+		msg  string
+	)
+
+	flag.StringVar(&name, "unit", "", "Unit name")
+	flag.StringVar(&msg, "msg", "", "Message")
+	flag.Parse()
+
+	u := unit.New(name)
+
+	fmt.Println("Sending message:", msg)
+	resp, _ := u.Call([]byte(msg))
+	fmt.Println("Reply recieved:", string(resp))
+}