diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
index c3addac..860c1c0 100644
--- a/src/NQP/Actions.pm
+++ b/src/NQP/Actions.pm
@@ -22,8 +22,8 @@ method postcircumfix:sym<[ ]>($/) {
 }
 
 method value($/) {
-    my $past := $<quote_EXPR>
-                ?? $<quote_EXPR>.ast
+    my $past := $<quote>
+                ?? $<quote>.ast
                 !! PAST::Val.new( :value($<integer>.ast) );
     make $past;
 }
@@ -31,3 +31,9 @@ method value($/) {
 method nulltermish($/) {
     make $<noun> ?? $<noun>.ast !! 0;
 }
+
+method quote:sym<apos>($/) { make $<quote_EXPR>.ast; }
+method quote:sym<dblq>($/) { make $<quote_EXPR>.ast; }
+method quote:sym<qq>($/)   { make $<quote_EXPR>.ast; }
+method quote:sym<q>($/)    { make $<quote_EXPR>.ast; }
+
diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
index 54d7d6a..939e253 100644
--- a/src/NQP/Grammar.pm
+++ b/src/NQP/Grammar.pm
@@ -30,14 +30,14 @@ token postcircumfix:sym<[ ]> {
 
 token value {
     | <integer>
-    | <quote_EXPR>
+    | <quote>
 }
 
 proto token quote { <...> }
-token quote:sym<' '> { <?[']>            <quote_EXPR: ':q'>  }
-token quote:sym<" "> { <?["]>            <quote_EXPR: ':qq'> }
-token quote:sym<q>   { 'q'  <![(]> <.ws> <quote_EXPR: ':q'>  }
-token quote:sym<qq>  { 'qq' <![(]> <.ws> <quote_EXPR: ':qq'> }
+token quote:sym<apos> { <?[']>            <quote_EXPR: ':q'>  }
+token quote:sym<dblq> { <?["]>            <quote_EXPR: ':qq'> }
+token quote:sym<q>    { 'q'  <![(]> <.ws> <quote_EXPR: ':q'>  }
+token quote:sym<qq>   { 'qq' <![(]> <.ws> <quote_EXPR: ':qq'> }
 
 token nulltermish { 
     | <OPER=noun=noun> 
diff --git a/src/cheats/hll-grammar.pir b/src/cheats/hll-grammar.pir
index 898482d..ba031bb 100644
--- a/src/cheats/hll-grammar.pir
+++ b/src/cheats/hll-grammar.pir
@@ -274,7 +274,7 @@ position C<pos>.
     start = repeat start, len
     stop = repeat stop, len
   bracket_end:
-    .return (start, stop)
+    .return (start, stop, pos)
 
   err_colon_delim:
     self.'panic'('Colons may not be used to delimit quoting constructs')
@@ -290,11 +290,40 @@ position C<pos>.
 .sub 'quote_EXPR' :method
     .param pmc args            :slurpy
 
+    .local pmc quotemod, true
+    .lex '%*QUOTEMOD', quotemod
+    quotemod = new ['Hash']
+
+    true = box 1
+    
+
+  args_loop:
+    unless args goto args_done
+    .local string mod
+    mod = shift args
+    mod = substr mod, 1
+    quotemod[mod] = true
+    if mod == 'qq' goto opt_qq
+    if mod == 'b' goto opt_b
+    goto args_loop
+  opt_qq:
+    quotemod['s'] = true
+    quotemod['a'] = true
+    quotemod['h'] = true
+    quotemod['f'] = true
+    quotemod['c'] = true
+    quotemod['b'] = true
+  opt_b:
+    quotemod['q'] = true
+    goto args_loop
+  args_done:
+
     .local pmc cur
     .local string target
     .local int pos
 
     (cur, pos, target) = self.'!cursor_start'()
+
     .local pmc start, stop
     (start, stop) = self.'peek_delimiters'(target, pos) 
 
@@ -312,6 +341,18 @@ position C<pos>.
 .end
 
 
+.sub 'quotemod_check' :method
+    .param string mod
+
+    $P0 = find_dynamic_lex '%*QUOTEMOD'
+    $P1 = $P0[mod]
+    unless null $P1 goto done
+    $P1 = new ['Undef']
+  done:
+    .return ($P1)
+.end
+
+
 .sub 'starter' :method
     .local pmc cur
     .local string target, start
@@ -335,18 +376,18 @@ position C<pos>.
 
 .sub 'stopper' :method
     .local pmc cur
-    .local string target, start
+    .local string target, stop
     .local int pos
 
     (cur, pos, target) = self.'!cursor_start'()
 
     $P0 = find_dynamic_lex '$*QUOTE_STOP'
     if null $P0 goto fail
-    start = $P0
+    stop = $P0
 
-    $I0 = length start
+    $I0 = length stop
     $S0 = substr target, pos, $I0
-    unless $S0 == start goto fail
+    unless $S0 == stop goto fail
     pos += $I0
     cur.'!cursor_pass'(pos, 'stopper')
   fail: