diff --git a/command.rkt b/command.rkt
index 4fd0896..631ceb8 100644
--- a/command.rkt
+++ b/command.rkt
@@ -1,40 +1,28 @@
 #lang racket/base
-(require (for-syntax racket/base))
 
-;; Handle commands from raco
+(provide (all-defined-out))
 
-(define-for-syntax args (current-command-line-arguments))
-(define-for-syntax arg-command-name (with-handlers ([exn:fail? (λ(exn) #f)]) (vector-ref args 0)))
-
-(define-for-syntax arg-project-directory
-  (with-handlers ([exn:fail? (λ(exn) (current-directory))])
-    (path->complete-path (simplify-path (string->path (vector-ref args 1))))))
-
-(define-for-syntax (command-error error-string)
-  `(displayln (string-append "Error: ", error-string)))
-
-;; we work in syntax layer because requiring pollen/server is slow.
-(define-syntax (just-a-hook-for-the-macro stx)
-  (datum->syntax stx 
-                 (case arg-command-name
-                   [(#f "help") ' (displayln "Pollen commands:
+(define (handle-help)
+  `(displayln "Pollen commands:
 start       starts project server
 render      renders all files in project directory
 clone       copies rendered files to desktop
-[filename]  renders individual file")]
-                   [("start")
-                    (if (not (directory-exists? arg-project-directory))
-                        (command-error (format "~a is not a directory" arg-project-directory))
-                        `(begin 
-                           (require pollen/server pollen/world)
-                           (parameterize ([world:current-project-root ,arg-project-directory])
-                             (start-server))))]
-                   [else (if (regexp-match #rx"(shit|fuck)" arg-command-name)
-                             (displayln (let ([responses '("Cursing at free software? Really?" "How uncouth." "Same to you, buddy.")])
-                                          (list-ref responses (random (length responses)))))
-                             (command-error (format "unknown command ~a" arg-command-name)))])))
+[filename]  renders individual file"))
+
+(define (handle-start directory)
+  (if (not (directory-exists? directory))
+      (error (format "~a is not a directory" directory))
+      `(begin 
+         (require pollen/server pollen/world)
+         (parameterize ([world:current-project-root ,directory])
+           (start-server)))))
+
+(define (handle-else command)
+  `(if (regexp-match #rx"(shit|fuck)" ,command)
+       (displayln (let ([responses '("Cursing at free software? Really?" "How uncouth." "Same to you, buddy.")])
+                    (list-ref responses (random (length responses)))))
+       (displayln (format "unknown command ~a" ,command))))
 
-(just-a-hook-for-the-macro)
 
 
 
diff --git a/info.rkt b/info.rkt
index 58d0131..65b4382 100644
--- a/info.rkt
+++ b/info.rkt
@@ -2,4 +2,4 @@
 (define collection "pollen")
 (define scribblings '(("scribblings/pollen.scrbl" ())))
 (define deps '("txexpr" "sugar" "markdown"))
-(define raco-commands '(("pollen" pollen/command "issue Pollen command" #f)))
+(define raco-commands '(("pollen" pollen/raco "issue Pollen command" #f)))
diff --git a/raco.rkt b/raco.rkt
new file mode 100644
index 0000000..51aa1bd
--- /dev/null
+++ b/raco.rkt
@@ -0,0 +1,27 @@
+#lang racket/base
+(require (for-syntax racket/base pollen/command))
+
+;; Handle commands from raco
+
+(define-for-syntax args (current-command-line-arguments))
+(define-for-syntax arg-command-name (with-handlers ([exn:fail? (λ(exn) #f)]) (vector-ref args 0)))
+
+(define-for-syntax arg-project-directory
+  (with-handlers ([exn:fail? (λ(exn) (current-directory))])
+    (path->complete-path (simplify-path (string->path (vector-ref args 1))))))
+
+(define-for-syntax (command-error error-string)
+  `(displayln (string-append "Error: ", error-string)))
+
+;; we work in syntax layer because 'start' has to require pollen/server,
+;; which is slow, and needs to happen at the top level.
+(define-syntax (select-syntax-for-command stx)
+  (datum->syntax stx 
+                 (case arg-command-name
+                   [(#f "help") (handle-help)]
+                   [("start") (handle-start arg-project-directory)]
+                   [else (handle-else arg-command-name)])))
+
+(select-syntax-for-command)
+
+