@@ 1,12 1,17 @@ 
 package main
 
+import "flag"
 import "fmt"
 import "log"
+import "os"
 import "./gorcon" // Relative imports! Woo hoo!
 
 var _ = fmt.Println
 var _ = log.Println
 
+var serverFlag = flag.String("server", "", "Address and port of rcon server (ex. 127.0.0.1:27015)")
+var passwdFlag = flag.String("password", "", "Password for rcon authentication")
+
 type response struct {
     Id  int32
     Type gorcon.CmdType

          
@@ 14,14 19,24 @@ type response struct {
 }
 
 func main() {
+    flag.Parse()
+
+    if *serverFlag == "" {
+        fmt.Fprintf(os.Stderr, "Invalid value for -server flag %s:\n", os.Args[0])
+        flag.Usage()
+        return
+    }
+
     log.Println("Hello, world!")
 
-    client, err := gorcon.NewClient("74.91.117.120:27017")
+    client, err := gorcon.NewClient(*serverFlag)
     if err != nil {
         log.Panicln(err)
     }
 
-    errch := client.Auth("hunter2")
+    log.Println("Connected to server")
+
+    errch := client.Auth(*passwdFlag)
     select {
     case err := <-errch:
         if err != nil {