diff --git a/htoml.cabal b/htoml.cabal
index 77bfcbe..0c273a9 100644
--- a/htoml.cabal
+++ b/htoml.cabal
@@ -33,6 +33,7 @@ library
   exposed-modules:        Text.Toml
                         , Text.Toml.Parser
                         , Text.Toml.Types
+                        , Text.Toml.Pretty
   ghc-options:            -Wall
   hs-source-dirs:         src
   default-language:       Haskell2010
@@ -42,7 +43,8 @@ library
                         , unordered-containers   >= 0.2
                         , vector                 >= 0.10
                         , aeson                  >= 0.8
-                        , text                   >= 1.0    && < 2
+                        , text                   >= 1.0    && < 2.0.0
+                        , pretty                 >= 1.1    && < 2.0.0
                         , time                   -any
                         , old-locale             -any
 
diff --git a/src/Text/Toml.hs b/src/Text/Toml.hs
index 02a4d4d..471ff51 100644
--- a/src/Text/Toml.hs
+++ b/src/Text/Toml.hs
@@ -5,6 +5,7 @@ import           Data.Set         (empty)
 import           Text.Parsec
 
 import           Text.Toml.Parser
+import           Text.Toml.Pretty hiding (empty)
 
 
 -- | Parse a 'Text' that results in 'Either' a 'String'
diff --git a/src/Text/Toml/Pretty.hs b/src/Text/Toml/Pretty.hs
new file mode 100644
index 0000000..ba68919
--- /dev/null
+++ b/src/Text/Toml/Pretty.hs
@@ -0,0 +1,86 @@
+{-# LANGUAGE OverloadedStrings #-}
+-- -----------------------------------------------------------------
+-- |
+-- Module    : Text.Toml.Pretty
+-- Authors   : Johan Backman      <johback@student.chalmers.se>
+--             Hampus Ramström    <hampusr@student.chalmers.se>
+--
+-- Display TOML nodes using pretty printing combinators.
+-- -----------------------------------------------------------------
+
+module Text.Toml.Pretty (
+    module Text.Toml.Pretty,
+    module Text.PrettyPrint.HughesPJ,
+    ) where
+
+import Text.Toml.Types
+import Text.PrettyPrint.HughesPJ
+
+import qualified Data.HashMap.Strict as M
+import qualified Data.Vector         as V
+import           Data.Time.Clock     (UTCTime)
+import           Data.Time.Format    (formatTime, defaultTimeLocale)
+import qualified Data.Text           as T
+
+ppNode :: Node -> Doc
+ppNode n = case n of
+    (VTable v)    -> ppTable v
+    (VTArray v)   -> ppTArray v ""
+    (VString v)   -> ppTomlString v
+    (VInteger v)  -> ppInteger $ fromIntegral v
+    (VFloat v)    -> ppFloat v
+    (VBoolean v)  -> ppBoolean v
+    (VDatetime v) -> ppDateTime v
+    (VArray v)    -> ppArray v
+
+ppTomlString :: T.Text -> Doc
+ppTomlString str = doubleQuotes $ hcat $ map ppChar (T.unpack str)
+    where ppChar '\\' = text "\\\\"
+          ppChar '\"' = text "\\\""
+          ppChar c    = char c
+
+ppDateTime :: UTCTime -> Doc
+ppDateTime t = hcat $ map ppDate (show f_date)
+    where f_date      = formatTime defaultTimeLocale "%FT%TZ" t
+          ppDate '\"' = text ""
+          ppDate c    = char c
+
+ppInteger :: Integer -> Doc
+ppInteger = integer
+
+ppFloat :: Double -> Doc
+ppFloat = double
+
+ppBoolean :: Bool -> Doc
+ppBoolean True  = text "true"
+ppBoolean False = text "false"
+
+ppArray :: V.Vector Node -> Doc
+ppArray va = brackets $ fsep $ punctuate comma $ map ppNode (V.toList va)
+
+ppTable :: Table -> Doc
+ppTable tb | M.null tb = empty
+           | otherwise = findTTitle (M.toList tb) True [text ""]
+
+findTTitle :: [(T.Text, Node)] -> Bool -> [Doc] -> Doc
+findTTitle []                    True     ti = brackets $ hcat ti
+findTTitle [(t, VTArray v)]      True  _  = ppTArray v t
+findTTitle ((t, VTArray v) : xs) True  ti = ppTArray v t $$ findTTitle xs True ti
+findTTitle [(t, VTArray v)]      False ti = ppTArray v (T.pack (render (hcat ti) ++ "." ++ T.unpack t))
+findTTitle ((t, VTArray v) : xs) False ti = ppTArray v (T.pack (render (hcat ti) ++ "." ++ T.unpack t)) $$ findTTitle xs False ti
+findTTitle [(t, VTable  v)]      _     ti = findTTitle (M.toList v) True $ ti ++ [text $ T.unpack t]
+findTTitle ((t, VTable  v) : xs) b     ti = findTTitle (M.toList v) True (ti ++ [text $ T.unpack t]) $$ findTTitle xs b ti
+findTTitle [v]                   False _  = vcat (tableToList [v])
+findTTitle (v:xs)                False ti = vcat (tableToList [v]) $$ findTTitle xs False ti 
+findTTitle v                     _    [_] = vcat (tableToList v)
+findTTitle v                     _     ti = brackets (hcat $ punctuate (char '.') (tail ti)) $$ vcat (tableToList v)
+
+tableToList :: [(T.Text, Node)] -> [Doc]
+tableToList = map (fsep . f)
+    where f (x, y) = punctuate (space <> equals) [text $ T.unpack x, ppNode y]
+
+ppTArray :: V.Vector Table -> T.Text -> Doc
+ppTArray v t | V.toList v == [] = pt
+             | otherwise = vcat $ map ((\ x -> dBrackets pt $$ findTTitle x False [pt]) . M.toList) (V.toList v)
+    where pt              = text $ T.unpack t
+          dBrackets x = brackets $ brackets x