diff --git a/quad/quad/main.rkt b/quad/quad/main.rkt
index 679f2fe9..7675a093 100644
--- a/quad/quad/main.rkt
+++ b/quad/quad/main.rkt
@@ -1,8 +1,11 @@
 #lang racket/base
-(require "top.rkt")
-(provide (except-out (all-from-out racket/base) #%top)
-         (rename-out [~top #%top]))
+(require "quads.rkt")
+(provide (all-from-out racket/base "quads.rkt"))
 
 
-(module reader syntax/module-reader
-  #:language 'quad)
\ No newline at end of file
+(module reader racket/base
+  (require br/reader-utils "parse.rkt" "tokenize.rkt")
+  
+  (define-read-and-read-syntax (source-path input-port)
+    #`(module quad-mod 
+        #,(parse source-path (tokenize input-port)))))
diff --git a/quad/quad/quadlang-test.rkt b/quad/quad/quadlang-test.rkt
new file mode 100644
index 00000000..5a7092d0
--- /dev/null
+++ b/quad/quad/quadlang-test.rkt
@@ -0,0 +1,3 @@
+#lang quad
+
+(quad #f "Meg is an ally." (quad #f 'page-break) "Meg is an ally.")
\ No newline at end of file
diff --git a/quad/quad/typeset.rkt b/quad/quad/typeset.rkt
index 5f50452e..0d3349bc 100644
--- a/quad/quad/typeset.rkt
+++ b/quad/quad/typeset.rkt
@@ -15,5 +15,5 @@
                                         (block-quads->lines block-quads)))))))))))
 
 
-(define input (quad #f "Meg is" (quad #f 'line-break) " an ally."))
+(define input (quad #f "Meg is an ally." (quad #f 'page-break) "Meg is an ally."))
 (syntax->datum (parse (tokenize input)))