diff --git a/hsrc/Syntax/AST.hs b/hsrc/Syntax/AST.hs
index 74621b7..41be43b 100644
--- a/hsrc/Syntax/AST.hs
+++ b/hsrc/Syntax/AST.hs
@@ -36,7 +36,7 @@ data Show a => Decl a =
     DeclData a [Type] QualifiedName [QualifiedName] [DataClause a]
   | DeclType a [Type]
   | DeclNewtype a [Type]
-  | DeclClass a [Type] 
+  | DeclClass a [Type] QualifiedName [QualifiedName] [ClassClause a]
   | DeclInstance a [Type]
   | DeclValue a [Type] Type QualifiedName (Expr a)
   | DeclExport a (Decl a)
@@ -46,7 +46,7 @@ addTypeRestrictions :: Show a => [Type] -> Decl a -> Decl a
 addTypeRestrictions rs (DeclData     s _ a b c)   = DeclData s rs a b c
 addTypeRestrictions rs (DeclType     s _)         = DeclType s rs
 addTypeRestrictions rs (DeclNewtype  s _)         = DeclNewtype s rs
-addTypeRestrictions rs (DeclClass    s _)         = DeclClass s rs
+addTypeRestrictions rs (DeclClass    s _ a b c)   = DeclClass s rs a b c
 addTypeRestrictions rs (DeclInstance s _)         = DeclInstance s rs
 addTypeRestrictions rs (DeclValue    s _ n a b)   = DeclValue s rs n a b
 addTypeRestrictions rs (DeclExport   s d)         =
@@ -55,6 +55,9 @@ addTypeRestrictions rs (DeclExport   s d)         =
 data DataClause a = DataClause a QualifiedName [Maybe QualifiedName] [Type]
  deriving (Show)
 
+data ClassClause a = ClassClause a QualifiedName Type (Maybe (Expr a))
+ deriving (Show)
+
 data Show a => Expr a =
     Const  a ConstVal
   | VarRef a QualifiedName
diff --git a/hsrc/Syntax/Parser.y b/hsrc/Syntax/Parser.y
index 7ca799f..7a29210 100644
--- a/hsrc/Syntax/Parser.y
+++ b/hsrc/Syntax/Parser.y
@@ -197,7 +197,58 @@ newtype_decl :: { Decl Position }
 -- Class Declarations -------------------------------------------------------
 
 class_decl :: { Decl Position }
-  : 'class'       { undefined }
+  : 'class' type_ident class_args '{' class_items '}'
+  { DeclClass $1 [] $2 $3 $5 }
+
+class_args :: { [QualifiedName] }
+  : VAL_IDENT            { [makeQualified $1] }
+  | class_args VAL_IDENT { $1 ++ [makeQualified $2] }
+
+class_items :: { [ClassClause Position] }
+  : class_item             { [$1] }
+  | class_items class_item { $1 ++ [$2] }
+
+class_item :: { ClassClause Position }
+  : value_ident maybe_clargs cl_retarg maybe_body ';'
+  {% case ($2, $4) of
+      (Nothing, Nothing) -> return (ClassClause $5 $1 $3 Nothing)
+      (Just as, Nothing) -> 
+         let types = map snd as
+         in return (ClassClause $5 $1 (buildFunType types $3) Nothing)
+      (Nothing, Just bd) -> return (ClassClause $5 $1 $3 (Just bd))
+      (Just as, Just bd) ->
+         let types = map snd as
+             names = sequence (map fst as)
+         in case names of
+              Nothing  ->
+                raiseP "Can't have class implementation without argument names."
+              Just nms -> return (ClassClause $5 $1 (buildFunType types $3)
+                                    (Just $ Lambda $5 nms bd))
+  }
+
+maybe_clargs :: { Maybe [(Maybe QualifiedName, Type)] }
+  :                      { Nothing }
+  | '(' clargs ')'       { Just $2 }
+
+clargs :: { [(Maybe QualifiedName, Type)] }
+  : class_arg            { [$1] }
+  | clargs ',' class_arg { $1 ++ [$3] }
+
+class_arg :: { (Maybe QualifiedName, Type) }
+  : value_ident '::' bang_type { (Just $1, $3) }
+  |                  bang_type { (Nothing, $1) }
+
+cl_retarg :: { Type }
+  : '::' bang_type             { $2 }
+
+maybe_body :: { Maybe (Expr Position) }
+  :                            { Nothing }
+  | '=' expression             { Just $2 }
+  | '{' statements '}'         { Just (Block $1 $2) }
+
+type_ident :: { QualifiedName }
+  : TYPE_IDENT           { makeQualified $1 }
+  | '(' OP_IDENT ')'     { makeQualified $2 }
 
 -- Instance Declarations ----------------------------------------------------
 
@@ -446,7 +497,13 @@ postProcessDeclVal builder name margs mrettype (src, body) = do
                       return (TVar name Star)
                     Just x ->
                       return x
-      let ftype = foldr TAp final_type atypes
+      let ftype = buildFunType atypes final_type
       return (builder src [] ftype name (Lambda src anames body))
+
+buildFunType :: [Type] -> Type -> Type
+buildFunType [] finaltype = finaltype
+buildFunType (first:rest) finaltype =
+  TAp (TAp arrow first) (buildFunType rest finaltype)
+ where arrow = (TVar (makeQualified' "Data.Function") Star)
 }