diff --git a/app/Common b/app/Common
index f619d08..7d521a9 160000
--- a/app/Common
+++ b/app/Common
@@ -1 +1 @@
-Subproject commit f619d08bdb061c515b06ef223a1b4fa14d157cf1
+Subproject commit 7d521a921990b5a05d98782babc85cc6ee54eb0c
diff --git a/app/Main.hs b/app/Main.hs
index 7565718..1929475 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -5,7 +5,7 @@ import           Data.Proxy
 import qualified Network.Wai as Wai
 import qualified Network.Wai.Handler.Warp             as Wai
 import qualified Network.Wai.Middleware.RequestLogger as Wai
-import qualified Servant
+import Servant.API
 
 import qualified Common.FrontEnd.Routes as FE
 import qualified Common.FrontEnd.Action as FE
diff --git a/app/Parsing/BodyParser.hs b/app/Parsing/BodyParser.hs
new file mode 100644
index 0000000..0bd38d9
--- /dev/null
+++ b/app/Parsing/BodyParser.hs
@@ -0,0 +1,14 @@
+module Parsing.BodyParser
+    ( PostPart (..)
+    , parsePostBody
+    , collectBacklinks
+    , Backlinks
+    ) where
+
+import Data.Text (Text)
+
+import Common.Parsing.PostPartType
+import Common.Parsing.PostBodyUtils
+
+parsePostBody :: Text -> IO [ PostPart ]
+parsePostBody = undefined
diff --git a/chandlr-server.cabal b/chandlr-server.cabal
index 42249e5..675b206 100644
--- a/chandlr-server.cabal
+++ b/chandlr-server.cabal
@@ -69,6 +69,25 @@ executable chandlr-server
                     Common.Network.CatalogPostType
                     Common.Network.ClientTypes
                     Common.Network.HttpTypes
+                    Common.AttachmentType
+                    Common.Component.BodyRender
+                    Common.Component.CatalogGrid
+                    Common.Component.Thread.Embed
+                    Common.Component.Thread.Files
+                    Common.Component.Thread.Intro
+                    Common.Component.Thread.Model
+                    Common.Component.ThreadView
+                    Common.Component.TimeControl
+                    Common.Network.BoardType
+                    Common.Network.PostType
+                    Common.Network.SiteType
+                    Common.Network.ThreadType
+                    Common.Network.Units
+                    Common.Parsing.EmbedParser
+                    Common.Parsing.PostBodyUtils
+                    Common.Parsing.PostPartType
+                    Common.Parsing.QuoteLinkParser
+                    Parsing.BodyParser
 
     -- LANGUAGE extensions used by modules in this package.
     -- other-extensions:
@@ -84,7 +103,8 @@ executable chandlr-server
                       miso,
                       parsec,
                       filepath,
-                      containers
+                      containers,
+                      servant
 
     -- Directories containing source files.
     hs-source-dirs:   app