       :author "Jeff Rose"}
   overtone.sc.server
   (:import [java.util.concurrent TimeoutException])
-  (:use [overtone.sc.machinery.server connection comms ]
-   [overtone.util.lib :only [await-promise!]]
-        [overtone.libs event]
-;;        [overtone.sc.machinery defaults allocator]
-;;
-        )
+  (:use [overtone.libs event]
+        [overtone.sc.machinery.server connection comms ]
+        [overtone.util.lib :only [await-promise!]])
   (:require [overtone.util.log :as log]))
 
 (def OVERTONE-VERSION {:major 0

  (snd \"/foo\" 1 2.0 \"eggs\")"
  [path & args]
  (when-not (connected?)
    (throw (Exception. "Unable to send messages to an disconnected server. Please boot or connect to a server.")))
  (apply server-snd path args))

(defn recv

  []
  @server-status*)

(defn connected?
  "Returns true if the server is currently connected"
  []
  (= :connected (server-status)))

(defn disconnected?
  "Returns true if the server is currently disconnected"
  []
  (= :disconnected (server-status)))

(defmacro at
