diff --git a/other/websockify.clj b/other/websockify.clj
index 9e8fdba..dcf8fd1 100644
--- a/other/websockify.clj
+++ b/other/websockify.clj
@@ -2,6 +2,7 @@
   (:use ring.adapter.jetty)
 
   (:import
+   
    ;; Netty TCP Client 
    [java.util.concurrent Executors]
    [java.net InetSocketAddress]
@@ -22,13 +23,6 @@
      WebSocket WebSocketClientFactory WebSocketClient
      WebSocketServlet]))
 
-(defonce settings (atom {}))
-
-;; WebSocket client to TCP target mappings
-
-(defonce clients (atom {}))
-(defonce targets (atom {}))
-
 
 ;; TCP / NIO
 
@@ -73,14 +67,71 @@
 
 ;; WebSockets
 
+;; http://wiki.eclipse.org/Jetty/Feature/WebSockets
+(defn make-websocket-servlet [open close message]
+  (proxy [org.eclipse.jetty.websocket.WebSocketServlet] []
+    (doGet [request response]
+      ;;(println "doGet" request)
+      (.. (proxy-super getServletContext)
+          (getNamedDispatcher (proxy-super getServletName))
+          (forward request response)))
+    (doWebSocketConnect [request response]
+      (println "doWebSocketConnect")
+      (reify org.eclipse.jetty.websocket.WebSocket$OnTextMessage
+        (onOpen [this connection] (open this connection))
+        (onClose [this code message] (close this code message))
+        (onMessage [this data] (message this data))))))
+
+(defn websocket-server
+  [port & {:keys [open close message ws-path web]
+           :or {open (fn [_ conn]
+                       (println "New websocket client:" conn))
+                close (fn [_ code reason]
+                        (println "Websocket client closed:" code reason))
+                message (fn [_ data]
+                          (println "Websocket message:" data))
+                
+                ws-path "/websocket"}}]
+  (let [http-servlet (doto (ServletHolder. (DefaultServlet.))
+                       (.setInitParameter "dirAllowed" "true")
+                       (.setInitParameter "resourceBase" web))
+        ws-servlet (ServletHolder.
+                    (make-websocket-servlet open close message))
+        context (doto (ServletContextHandler.)
+                  (.setContextPath "/")
+                  (.addServlet ws-servlet ws-path))
+        connector (doto (BlockingChannelConnector.)
+                    (.setPort port)
+                    (.setMaxIdleTime Integer/MAX_VALUE))
+        server (doto (Server.)
+                 (.setHandler context)
+                 (.addConnector connector))]
+    
+    (when web (.addServlet context http-servlet "/"))
+    server))
+
+
+
+;; Websockify
+
+(defonce settings (atom {}))
+
+;; WebSocket client to TCP target mappings
+
+(defonce clients (atom {}))
+(defonce targets (atom {}))
+
+
 (defn target-open [ctx e]
   (println "Connected to target")
   #_(println "channelConnected:" e))
+
 (defn target-close [ctx e]
   #_(println "channelDisconnected:" e)
   (println "Target closed")
   (when-let [channel (get @targets (.getChannel ctx))]
     (.disconnect channel)))
+
 (defn target-message [ctx e]
   (let [channel (.getChannel ctx)
         client (get @targets channel)
@@ -93,77 +144,62 @@
     #_(println "sending to client:" (.toString b64 0 blen CharsetUtil/UTF_8))
     (.sendMessage client (.toString b64 0 blen CharsetUtil/UTF_8))))
 
+(defn client-open [this connection]
+  #_(println "Got WebSocket connection:" connection)
+  (println "New client")
+  (let [target (netty-client
+                (:target-host @settings)
+                (:target-port @settings)
+                target-open target-close target-message)]
+    (swap! clients assoc this {:client connection
+                               :target target})
+    (swap! targets assoc target connection)))
 
-;; http://wiki.eclipse.org/Jetty/Feature/WebSockets
-(defn make-websocket-handler []
-  (reify org.eclipse.jetty.websocket.WebSocket$OnTextMessage
-    (onOpen [this connection]
-      #_(println "Got WebSocket connection:" connection)
-      (println "New client")
-      (let [target (netty-client
-                    "localhost" 5901
-                    target-open target-close target-message)]
-        (swap! clients assoc this {:client connection
-                                   :target target})
-        (swap! targets assoc target connection)))
-    (onClose [this code message]
-      (println "WebSocket connection closed")
-      (when-let [target (:target (get @clients this))]
-        (println "Closing target")
-        (.close target)
-        (println "Target closed")
-        (swap! targets dissoc target))
-      (swap! clients dissoc this))
-    (onMessage [this data]
-      #_(println "WebSocket onMessage:" data)
-      (let [target (:target (get @clients this))
-            cbuf (ChannelBuffers/copiedBuffer data CharsetUtil/UTF_8)
-            decbuf (Base64/decode cbuf)
-            rlen (.readableBytes decbuf)]
-        #_(println "Sending" rlen "bytes to target")
-        #_(println "Sending to target:" (.toString decbuf 0 rlen CharsetUtil/UTF_8))
-        (.write target decbuf)))))
+(defn client-close [this code message]
+  (println "WebSocket connection closed")
+  (when-let [target (:target (get @clients this))]
+    (println "Closing target")
+    (.close target)
+    (println "Target closed")
+    (swap! targets dissoc target))
+  (swap! clients dissoc this))
 
-(defn make-websocket-servlet []
-  (proxy [org.eclipse.jetty.websocket.WebSocketServlet] []
-    (doGet [request response]
-      ;(println "doGet" request)
-      (.. (proxy-super getServletContext)
-          (getNamedDispatcher (proxy-super getServletName))
-          (forward request response)))
-    (doWebSocketConnect [request response]
-      (println "doWebSocketConnect")
-      (make-websocket-handler))))
+(defn client-message [this data]
+  #_(println "WebSocket onMessage:" data)
+  (let [target (:target (get @clients this))
+        cbuf (ChannelBuffers/copiedBuffer data CharsetUtil/UTF_8)
+        decbuf (Base64/decode cbuf)
+        rlen (.readableBytes decbuf)]
+    #_(println "Sending" rlen "bytes to target")
+    #_(println "Sending to target:" (.toString decbuf 0 rlen CharsetUtil/UTF_8))
+    (.write target decbuf)))
 
-(defn start-websocket-server
+(defn start-websockify
   [& {:keys [listen-port target-host target-port web]
       :or {listen-port 6080
            target-host "localhost"
            target-port 5900
            }}]
+  
   (reset! clients {})
   (reset! targets {})
-  (let [http-servlet (doto (ServletHolder. (DefaultServlet.))
-                      (.setInitParameter "dirAllowed" "true")
-                      (.setInitParameter "resourceBase" web))
-        ws-servlet (ServletHolder. (make-websocket-servlet))
-        context (doto (ServletContextHandler.)
-                  (.setContextPath "/")
-                  (.addServlet ws-servlet "/websockify"))
-        connector (doto (BlockingChannelConnector.)
-                    (.setPort listen-port)
-                    (.setMaxIdleTime Integer/MAX_VALUE))
-        server (doto (Server.)
-                 (.setHandler context)
-                 (.addConnector connector)
-                 (.start))]
+
+  (reset! settings {:target-host target-host
+                    :target-port target-port})
+  (let [server (websocket-server listen-port
+                                 :web web
+                                 :ws-path "/websockify"
+                                 :open client-open
+                                 :close client-close
+                                 :message client-message)]
+    
+    (.start server)
+    
     (if web
-      (do
-        (println "Serving web requests from:" web)
-        (.addServlet context http-servlet "/"))
+      (println "Serving web requests from:" web)
       (println "Not serving web requests"))
     
-    (defn stop []
+    (defn stop-websockify []
       (doseq [client (vals @clients)]
         (.disconnect (:client client))
         (.close (:target client)))