     @waitingReplies = {}
     @kiteList = {}
     @commands = 
-      'kite.who': (opts, cb)->
-        cb false, @getChannelNameForKite()
-
-      'kite.join': (opts, cb)->
+      'kite.who': (options, callback)->
+        callback false, @getChannelNameForKite()
+
+      'kite.join': (options, callback)->
         channelName = opts.args[0]
         kiteName    = opts.args[1]
         if not @kiteList[channelName]
           @kiteList[channelName] = []
         if kiteName not in @kiteList[channelName] 
           @kiteList[channelName].push kiteName
-        if cb
-          cb false, true
-
-      'kite.consume': (opts, cb)=>
+        if callback
+          callback false, true
+
+      'kite.consume': (options, callback)=>
         @mergenData.lpop @getChannelNameForGenericName(), (err, val)=>
           if not val
             return

      console.log "pushed to ", channel, datastr
      @sendCommand channel, "kite.consume", datastr

  sendCommand: (channel, cmd, args, cb=false)->
    # this broadcasts command to the said channel
    @callbackid++
    data = {

    @sendCommand(from, "reply-#{cmdid}", ['function not found', false])


  queueCommand:(channel, cmd, args, callback=null)->

    if not channel
      channel = @getChannelNameForGenericName()
