 ;;}}}
 ;;{{{ Setup:
 
-
 (defvar emacspeak-maths-server-program
   (expand-file-name "math-server.js"
                     (file-name-directory (or load-file-name default-directory)))
   "NodeJS implementation of math-server.")
-
+;;;###autoload
 (defun emacspeak-maths-start ()
   "Start Node math-server, and connect to it."
+  (interactive)
   (declare (special emacspeak-maths-inferior-program
                     emacspeak-maths emacspeak-maths-server-program))
-  (let* ((server (make-comint "Maths" emacspeak-maths-inferior-program))
-         (client (open-network-stream "math" "math" "localhost" 5000)))
+  (let ((server
+         (make-comint "Server-Maths" emacspeak-maths-inferior-program nil emacspeak-maths-server-program))
+        (client nil))
+    (accept-process-output (get-buffer-process server))
+    (setq client (open-network-stream "Client-Math" "*Client-Math*" "localhost" 5000))
     (setf emacspeak-maths
           (make-emacspeak-maths
            :output (get-buffer-create "*Spoken Math*")

           :server-process (get-buffer-process server)
           :client-process client
           :client-buffer (process-buffer client)))
    (set-process-filter client #'emacspeak-maths-process-filter)))

;;}}}
(provide 'emacspeak-maths)

  server-buffer ; comint buffer
  server-process ; node process handle
  client-buffer ; network socket stream
  client-process ; network connection
  output ; where output is displayed
  results
  )
