diff --git a/src/Ubc/Parse/Syntax/Language.hs b/src/Ubc/Parse/Syntax/Language.hs
index b1c7f87..f3bfb7c 100644
--- a/src/Ubc/Parse/Syntax/Language.hs
+++ b/src/Ubc/Parse/Syntax/Language.hs
@@ -55,8 +55,37 @@ languageDef = LanguageDef {
         , identLetter = alphaNum <|> char '_'
         , opStart = oneOf "+-*/%"
         , opLetter = oneOf "+-*/%"
-        , reservedNames = [ "struct", "u32", "i32", "f32", "if", "then", "else" ]
-        , reservedOpNames = [ "+", "-", "*", "/", "%" ]
+        , reservedNames =       [ "struct"
+                                , "u32"
+                                , "i32"
+                                , "f32"
+                                , "if"
+                                , "unless"
+                                , "then"
+                                , "else" 
+                                , "while"
+                                , "until"
+                                ]
+        , reservedOpNames =     [ "+"
+                                , "-"
+                                , "*"
+                                , "/"
+                                , "%"
+                                , "<<"
+                                , ">>"
+                                , ">="
+                                , "<="
+                                , "<"
+                                , ">"
+                                , "=="
+                                , "!="
+                                , "&"
+                                , "^"
+                                , "|"
+                                , "&&"
+                                , "||"
+                                , "="
+                                ]
         , caseSensitive = True
         }