diff --git a/.envrc b/.envrc
new file mode 100644
index 00000000..3550a30f
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.github/wait-for-postgres.sh b/.github/wait-for-postgres.sh
new file mode 100755
index 00000000..769da03a
--- /dev/null
+++ b/.github/wait-for-postgres.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+until psql -h "localhost" -U "postgres" finagle_postgres_test -c '\q'; do
+  >&2 echo "Postgres is unavailable - sleeping"
+  sleep 1
+done
+
+>&2 echo "Postgres is up - executing command"
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..002e45b2
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,221 @@
+# This file was automatically generated by sbt-github-actions using the
+# githubWorkflowGenerate task. You should add and commit this file to
+# your git repository. It goes without saying that you shouldn't edit
+# this file by hand! Instead, if you wish to make changes, you should
+# change your sbt build configuration to revise the workflow description
+# to meet your needs, then regenerate this file.
+
+name: Continuous Integration
+
+on:
+  pull_request:
+    branches: ['**', '!update/**', '!pr/**']
+  push:
+    branches: ['**', '!update/**', '!pr/**']
+    tags: [v*]
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: Build and Test
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        scala: [2.13]
+        java: [temurin@8]
+        project: [rootJVM]
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' reload +update
+
+      - name: Start up Postgres
+        run: docker-compose up -d
+
+      - name: Check that workflows are up to date
+        run: sbt githubWorkflowCheck
+
+      - name: Check formatting
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' scalafmtCheckAll 'project /' scalafmtSbtCheck
+
+      - name: Test
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
+
+      - name: Check binary compatibility
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
+
+      - name: Generate API documentation
+        if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
+        run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
+
+      - name: Make target directories
+        if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
+        run: mkdir -p quill-finagle-postgres/.jvm/target finagle-postgres/.jvm/target finagle-postgres-shapeless/.jvm/target project/target
+
+      - name: Compress target directories
+        if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
+        run: tar cf targets.tar quill-finagle-postgres/.jvm/target finagle-postgres/.jvm/target finagle-postgres-shapeless/.jvm/target project/target
+
+      - name: Upload target directories
+        if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
+        uses: actions/upload-artifact@v3
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
+          path: targets.tar
+
+  publish:
+    name: Publish Artifacts
+    needs: [build]
+    if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java: [temurin@8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt reload +update
+
+      - name: Download target directories (2.13, rootJVM)
+        uses: actions/download-artifact@v3
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
+
+      - name: Inflate target directories (2.13, rootJVM)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
+      - name: Import signing key
+        if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+        run: echo $PGP_SECRET | base64 -di | gpg --import
+
+      - name: Import signing key and strip passphrase
+        if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+        run: |
+          echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg
+          echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
+          (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
+
+      - name: Publish
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
+        run: sbt tlCiRelease
+
+  dependency-submission:
+    name: Submit Dependencies
+    if: github.event_name != 'pull_request'
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java: [temurin@8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt reload +update
+
+      - name: Submit Dependencies
+        uses: scalacenter/sbt-dependency-submission@v2
+        with:
+          modules-ignore: rootjs_2.13 docs_2.13 rootjvm_2.13 rootnative_2.13
+          configs-ignore: test scala-tool scala-doc-tool test-internal
+
+  site:
+    name: Generate Site
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java: [temurin@8]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt reload +update
+
+      - name: Generate site
+        run: sbt docs/tlSite
+
+      - name: Publish site
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
+        uses: peaceiris/actions-gh-pages@v3.9.3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: site/target/docs/site
+          keep_files: true
diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml
new file mode 100644
index 00000000..547aaa43
--- /dev/null
+++ b/.github/workflows/clean.yml
@@ -0,0 +1,59 @@
+# This file was automatically generated by sbt-github-actions using the
+# githubWorkflowGenerate task. You should add and commit this file to
+# your git repository. It goes without saying that you shouldn't edit
+# this file by hand! Instead, if you wish to make changes, you should
+# change your sbt build configuration to revise the workflow description
+# to meet your needs, then regenerate this file.
+
+name: Clean
+
+on: push
+
+jobs:
+  delete-artifacts:
+    name: Delete Artifacts
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Delete artifacts
+        run: |
+          # Customize those three lines with your repository and credentials:
+          REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
+
+          # A shortcut to call GitHub API.
+          ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
+
+          # A temporary file which receives HTTP response headers.
+          TMPFILE=/tmp/tmp.$$
+
+          # An associative array, key: artifact name, value: number of artifacts of that name.
+          declare -A ARTCOUNT
+
+          # Process all artifacts on this repository, loop on returned "pages".
+          URL=$REPO/actions/artifacts
+          while [[ -n "$URL" ]]; do
+
+            # Get current page, get response headers in a temporary file.
+            JSON=$(ghapi --dump-header $TMPFILE "$URL")
+
+            # Get URL of next page. Will be empty if we are at the last page.
+            URL=$(grep '^Link:' "$TMPFILE" | tr ',' '\n' | grep 'rel="next"' | head -1 | sed -e 's/.*<//' -e 's/>.*//')
+            rm -f $TMPFILE
+
+            # Number of artifacts on this page:
+            COUNT=$(( $(jq <<<$JSON -r '.artifacts | length') ))
+
+            # Loop on all artifacts on this page.
+            for ((i=0; $i < $COUNT; i++)); do
+
+              # Get name of artifact and count instances of this name.
+              name=$(jq <<<$JSON -r ".artifacts[$i].name?")
+              ARTCOUNT[$name]=$(( $(( ${ARTCOUNT[$name]} )) + 1))
+
+              id=$(jq <<<$JSON -r ".artifacts[$i].id?")
+              size=$(( $(jq <<<$JSON -r ".artifacts[$i].size_in_bytes?") ))
+              printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size
+              ghapi -X DELETE $REPO/actions/artifacts/$id
+            done
+          done
diff --git a/.gitignore b/.gitignore
index 2d03ddc1..71db9455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,31 @@
-target
-*.class
-*.iml
-*.iws
-*.ipr
-.idea
-.classpath
-.project
-.cache
-logging.properties
-.DS_Store
-local.*
+# sbt
+target/
+project/plugins/project/
+boot/
+lib_managed/
+src_managed/
+
+# vim
+*.sw?
+
+# intellij
+.idea/
+
+# ignore [ce]tags files
+tags
+
+# metals
+.metals/
+.bsp/
+.bloop/
+metals.sbt
+.vscode
+
+# npm
+node_modules/
+
+#direnv
+.direnv/
+
+#macOS
+.DS_Store
\ No newline at end of file
diff --git a/.scalafmt.conf b/.scalafmt.conf
new file mode 100644
index 00000000..a7657978
--- /dev/null
+++ b/.scalafmt.conf
@@ -0,0 +1,8 @@
+version = 3.7.1
+runner.dialect = scala213
+
+fileOverride {
+  "glob:**/scala-3/**" {
+    runner.dialect = scala3
+  }
+}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..f0b72634
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,14 @@
+# Code of Conduct
+
+We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other such characteristics.
+
+Everyone is expected to follow the [Scala Code of Conduct] when discussing the project on the available communication channels.
+
+
+## Moderation
+
+If you have any questions, concerns, or moderation requests, please contact a member of the project.
+
+- [Iván Molina Rebolledo](mailto:ivan@deal-engine.com)
+
+[Scala Code of Conduct]: https://scala-lang.org/conduct/
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 00000000..bf8cf247
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,3 @@
+finagle-postgres
+Copyright 2023 Twitter
+Licensed under Apache License 2.0 (see LICENSE)
diff --git a/README.md b/README.md
index f8c79aa4..e2224732 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # Finagle Postgres
-[![Build status](https://img.shields.io/travis/finagle/finagle-postgres/master.svg)](http://travis-ci.org/finagle/finagle-postgres)
-[![Maven Central](https://img.shields.io/maven-central/v/io.github.finagle/finagle-postgres_2.12.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.finagle/finagle-postgres_2.12)
-[![Join the chat at https://gitter.im/finagle/finagle-postgres](https://badges.gitter.im/finagle/finagle-postgres.svg)](https://gitter.im/finagle/finagle-postgres?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Continuous Integration](https://github.com/deal-engine/finagle-postgres/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/deal-engine/finagle-postgres/actions/workflows/ci.yml)
+[![Maven Central](https://img.shields.io/maven-central/v/io.github.deal-engine/finagle-postgres_2.13.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.deal-engine/finagle-postgres_2.13)
 
 This library provides [PostgreSQL][postgres] database support for
 [Finagle][finagle].
@@ -13,7 +12,7 @@ This library provides [PostgreSQL][postgres] database support for
 [vkostyukov]: https://github.com/vkostyukov/finagle-postgres
 
 ## Documentation
-See [the GitHub Pages](https://finagle.github.io/finagle-postgres)
+See [the GitHub Pages](https://deal-engine.github.io/finagle-postgres)
 
 ## Using the Postgres client
 
@@ -24,7 +23,7 @@ dependency.
 
 ```scala
 libraryDependencies ++= Seq(
-  "io.github.finagle" %% "finagle-postgres" % "0.12.0"
+  "io.github.deal-engine" %% "finagle-postgres" % "<release>"
 )
 ```
 
@@ -72,11 +71,14 @@ With the database and variables in place, all tests will be executed. More detai
 See [CHANGELOG.md](CHANGELOG.md)
 
 ## Contributors
+* [Iván Molina Rebolledo](https://github.com/ivanmoreau) (current maintainer)
+
+### Past
 * [Mairbek Khadikov][mairbek] (project creator)
 * [The Factory][thefactory]
 * [Vladimir Kostyukov][vkostyukov]
 * [Jeremy Smith](https://github.com/jeremyrsmith)
-* [Leon Maia](https://github.com/leonmaia) (current maintainer)
+* [Leon Maia](https://github.com/leonmaia)
 
 ## License
 
diff --git a/build.sbt b/build.sbt
index d7f75ab4..d8f80870 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,133 +1,118 @@
-import ReleaseTransformations._
+// https://typelevel.org/sbt-typelevel/faq.html#what-is-a-base-version-anyway
+ThisBuild / tlBaseVersion := "0.14" // your current series x.y
 
-lazy val buildSettings = Seq(
-  organization := "io.github.finagle",
-  scalaVersion := "2.13.2",
-  crossScalaVersions := Seq("2.12.11", "2.13.2"),
-  fork in Test := true
+ThisBuild / organization := "io.github.deal-engine"
+ThisBuild / organizationName := "Deal Engine"
+ThisBuild / startYear := Some(2023)
+ThisBuild / licenses := Seq(License.Apache2)
+ThisBuild / developers := List(
+  // your GitHub handle and name
+  tlGitHubDev("ivanmoreau", "Iván Molina Rebolledo"),
+  tlGitHubDev("IvanAtDealEngine", "Iván Molina Rebolledo")
 )
 
-def circeTestingVersion(scalaV: String) = {
-  if (scalaV.startsWith("2.11")) "0.11.2" else "0.12.3"
-}
+// publish to s01.oss.sonatype.org (set to true to publish to oss.sonatype.org instead)
+ThisBuild / tlSonatypeUseLegacyHost := false
+
+// publish website from this branch
+ThisBuild / tlSitePublishBranch := Some("master")
 
-val baseSettings = Seq(
-  resolvers += Resolver.bintrayRepo("jeremyrsmith", "maven"),
-  libraryDependencies ++= Seq(
-    "com.twitter" %% "finagle-core" % "21.4.0",
-    "com.twitter" %% "finagle-netty4" % "21.4.0",
-    "org.scalatest" %% "scalatest" % "3.2.8" % "test,it",
-    "org.scalatestplus" %% "scalatestplus-scalacheck" % "3.1.0.0-RC2" % "test,it",
-    "org.scalacheck" %% "scalacheck" % "1.15.3" % "test,it",
-    "org.scalamock" %% "scalamock" % "4.4.0" % "test,it",
-    "io.circe" %% "circe-testing" % circeTestingVersion(scalaVersion.value) % "test,it"
+ThisBuild / tlFatalWarnings := false
+ThisBuild / tlCiHeaderCheck := false
+ThisBuild / githubWorkflowBuildPreamble ++= Seq(
+  WorkflowStep.Run(
+    commands = List("docker-compose up -d"),
+    name = Some("Start up Postgres")
   )
 )
 
-lazy val publishSettings = Seq(
-  publishMavenStyle := true,
-  publishArtifact := true,
-  publishTo := {
-    val nexus = "https://oss.sonatype.org/"
-    if (isSnapshot.value)
-      Some("snapshots" at nexus + "content/repositories/snapshots")
-    else
-      Some("releases" at nexus + "service/local/staging/deploy/maven2")
-  },
-  publishArtifact in Test := false,
-  pgpSecretRing := file("local.secring.gpg"),
-  pgpPublicRing := file("local.pubring.gpg"),
-  releasePublishArtifactsAction := PgpKeys.publishSigned.value,
-  releaseIgnoreUntrackedFiles := true,
-  licenses := Seq(
-    "Apache 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")
-  ),
-  homepage := Some(url("https://finagle.github.io/finagle-postgres")),
-  autoAPIMappings := true,
-  scmInfo := Some(
-    ScmInfo(
-      url("https://github.com/finagle/finagle-postgres"),
-      "scm:git:git@github.com:finagle/finagle-postgres.git"
-    )
-  ),
-  releaseVersionBump := sbtrelease.Version.Bump.Minor,
-  releaseProcess := {
-    Seq[ReleaseStep](
-      checkSnapshotDependencies,
-      inquireVersions,
-      releaseStepCommandAndRemaining("+clean"),
-      releaseStepCommandAndRemaining("+test"),
-      setReleaseVersion,
-      commitReleaseVersion,
-      tagRelease,
-      releaseStepCommandAndRemaining("+publishSigned"),
-      setNextVersion,
-      commitNextVersion,
-      releaseStepCommand("sonatypeReleaseAll"),
-      pushChanges
-    )
-  },
-  pomExtra :=
-    <developers>
-      <developer>
-        <id>finagle</id>
-        <name>Finagle OSS</name>
-        <url>https://twitter.com/finagle</url>
-      </developer>
-    </developers>
-)
+val Scala213 = "2.13.8"
+ThisBuild / crossScalaVersions := Seq(Scala213)
+ThisBuild / scalaVersion := Scala213 // the default Scala
 
-lazy val allSettings = baseSettings ++ buildSettings ++ publishSettings
+val Versions = {
+  class Versions {
+    val twitter = "22.12.0"
+    val circeTesting = "0.14.5"
+    val scalaTest = "3.2.16"
+    val scalaTestCheck = "3.2.16.0"
+    val scalacheck = "1.17.0"
+    val scalamock = "5.2.0"
+    val quill = "4.6.1"
+  }
+  new Versions
+}
 
-lazy val shapelessRef = LocalProject("finagle-postgres-shapeless")
+lazy val root =
+  tlCrossRootProject.aggregate(
+    `finagle-postgres`,
+    `finagle-postgres-shapeless`,
+    `finagle-postgres-quill`
+  )
 
-lazy val `finagle-postgres` = project
-  .in(file("."))
-  .settings(moduleName := "finagle-postgres")
-  .settings(allSettings)
-  .configs(IntegrationTest)
-  .aggregate(shapelessRef)
+lazy val `finagle-postgres` = crossProject(JVMPlatform)
+  .crossType(CrossType.Pure)
+  .in(file("finagle-postgres"))
+  .settings(
+    name := "finagle-postgres",
+    scalacOptions ++= Seq(
+      "-language:implicitConversions"
+    ),
+    libraryDependencies ++= Seq(
+      "com.twitter" %% "finagle-core" % Versions.twitter,
+      "com.twitter" %% "finagle-netty4" % Versions.twitter,
+      "org.scalatest" %% "scalatest" % Versions.scalaTest % Test,
+      "org.scalatestplus" %% "scalacheck-1-17" % Versions.scalaTestCheck % Test,
+      "org.scalacheck" %% "scalacheck" % Versions.scalacheck % Test,
+      "org.scalamock" %% "scalamock" % Versions.scalamock % Test,
+      "io.circe" %% "circe-testing" % Versions.circeTesting % Test
+    )
+  )
 
-lazy val `finagle-postgres-shapeless` = project
-  .settings(moduleName := "finagle-postgres-shapeless")
-  .settings(allSettings)
+lazy val `finagle-postgres-quill` = crossProject(JVMPlatform)
+  .crossType(CrossType.Pure)
+  .in(file("quill-finagle-postgres"))
   .settings(
+    name := "finagle-postgres-quill",
+    tlVersionIntroduced := Map("2.13" -> "0.14.1"),
     libraryDependencies ++= Seq(
-      "com.chuusai" %% "shapeless" % "2.3.3",
-      "io.github.jeremyrsmith" %% "patchless-core" % "1.0.7"
+      "io.getquill" %% "quill-sql" % Versions.quill,
+      "org.scalatest" %% "scalatest" % Versions.scalaTest % Test,
+      "org.scalatestplus" %% "scalacheck-1-17" % Versions.scalaTestCheck % Test,
+      "org.scalacheck" %% "scalacheck" % Versions.scalacheck % Test
     )
   )
-  .configs(IntegrationTest)
   .dependsOn(`finagle-postgres`)
 
-val scaladocVersionPath = settingKey[String]("Path to this version's ScalaDoc")
-val scaladocLatestPath = settingKey[String]("Path to latest ScalaDoc")
-val tutPath = settingKey[String]("Path to tutorials")
+lazy val `finagle-postgres-shapeless` = crossProject(JVMPlatform)
+  .crossType(CrossType.Pure)
+  .in(file("finagle-postgres-shapeless"))
+  .settings(
+    name := "finagle-postgres-shapeless",
+    libraryDependencies ++= Seq(
+      "com.chuusai" %% "shapeless" % "2.3.10",
+      "io.github.jeremyrsmith" %% "patchless-core" % "1.0.7",
+      "com.twitter" %% "finagle-core" % Versions.twitter,
+      "com.twitter" %% "finagle-netty4" % Versions.twitter,
+      "org.scalatest" %% "scalatest" % Versions.scalaTest % Test,
+      "org.scalatestplus" %% "scalacheck-1-17" % Versions.scalaTestCheck % Test,
+      "org.scalacheck" %% "scalacheck" % Versions.scalacheck % Test,
+      "org.scalamock" %% "scalamock" % Versions.scalamock % Test,
+      "io.circe" %% "circe-testing" % Versions.circeTesting % Test
+    )
+  )
+  .dependsOn(`finagle-postgres`)
 
 lazy val docs = project
-  .settings(moduleName := "finagle-postgres-docs", buildSettings)
-  .enablePlugins(GhpagesPlugin, ScalaUnidocPlugin)
+  .in(file("site"))
+  .enablePlugins(TypelevelSitePlugin)
   .settings(
-    scaladocVersionPath := ("api/" + version.value),
-    scaladocLatestPath := (if (isSnapshot.value) "api/latest-snapshot"
-                           else "api/latest"),
-    tutPath := "doc",
-    includeFilter in makeSite := (includeFilter in makeSite).value || "*.md" || "*.yml",
-    addMappingsToSiteDir(
-      mappings in (ScalaUnidoc, packageDoc),
-      scaladocLatestPath
-    ),
-    addMappingsToSiteDir(
-      mappings in (ScalaUnidoc, packageDoc),
-      scaladocVersionPath
-    ),
-    ghpagesNoJekyll := false,
-    git.remoteRepo := "git@github.com:finagle/finagle-postgres"
+    tlSiteIsTypelevelProject := None,
+    tlSiteHelium ~= {
+      import laika.helium.config._
+      _.site.topNavigationBar(homeLink =
+        IconLink.internal(laika.ast.Path.Root / "main.md", HeliumIcon.home)
+      )
+    }
   )
-  .dependsOn(`finagle-postgres`, `finagle-postgres-shapeless`)
-
-parallelExecution in Test := false
-
-scalacOptions ++= Seq(
-  "-deprecation"
-)
+  .dependsOn(`finagle-postgres`.jvm, `finagle-postgres-shapeless`.jvm)
diff --git a/docker-compose.yml b/docker-compose.yml
index 48dc8ad9..58a8659c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,12 @@
-version: '3'
+version: '3.1'
 
 services:
-  db:
+  postgres:
     image: postgres:9.6
-    ports:
-      - "5432:5432"
     environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_DB=finagle_postgres_test
+      POSTGRES_USER: postgres
+      POSTGRES_DB: finagle_postgres_test
+    ports:
+      - 5432:5432
     volumes:
-      - ./src/test/resources/extensions.sql:/docker-entrypoint-initdb.d/init.sql
+      - ./finagle-postgres/src/test/resources/extensions.sql:/docker-entrypoint-initdb.d/init.sql
diff --git a/docs/src/main/tut/01-installation.md b/docs/01-installation.md
similarity index 74%
rename from docs/src/main/tut/01-installation.md
rename to docs/01-installation.md
index ef0c15c6..6e96e3b9 100644
--- a/docs/src/main/tut/01-installation.md
+++ b/docs/01-installation.md
@@ -1,8 +1,3 @@
----
-title: Installation
-layout: default
----
-
 # Installation
 
 Add the following to build.sbt
@@ -17,4 +12,4 @@ libraryDependencies ++= Seq(
 
 This brings in the latest snapshot version, which is `0.4.0-SNAPSHOT`.
 
-Next, read about [Basic Usage](02-basic-usage.html)
+Next, read about [Basic Usage](02-basic-usage.md)
diff --git a/docs/src/main/tut/02-basic-usage.md b/docs/02-basic-usage.md
similarity index 96%
rename from docs/src/main/tut/02-basic-usage.md
rename to docs/02-basic-usage.md
index 7635b59b..2d36f1fa 100644
--- a/docs/src/main/tut/02-basic-usage.md
+++ b/docs/02-basic-usage.md
@@ -11,7 +11,7 @@ the client builder accessed by `com.twitter.finagle.Postgres.Client()`:
 
 ```scala mdoc:invisible
 import com.twitter.util.Await
-object dontrun {
+//object dontrun {
 ```
 
 ```scala mdoc
@@ -30,7 +30,7 @@ val client = Postgres.Client()
 ```scala mdoc:invisible
 
     Await.result(client.close())
-}
+//}
 ```
 
 ## Configuration
@@ -63,5 +63,5 @@ Since you'll typically will want to interact with Postgres at the level of queri
 requests and responses, use `.newRichClient(destination: String)` to create a `com.twitter.finagle.postgres.Client`,
 which provides the main API for using the PostgreSQL database.
 
-Next, read about [Simple Queries](03-simple-queries.html)
+Next, read about [Simple Queries](03-simple-queries.md)
 
diff --git a/docs/src/main/tut/03-simple-queries.md b/docs/03-simple-queries.md
similarity index 94%
rename from docs/src/main/tut/03-simple-queries.md
rename to docs/03-simple-queries.md
index c58c24b2..5b956a63 100644
--- a/docs/src/main/tut/03-simple-queries.md
+++ b/docs/03-simple-queries.md
@@ -1,8 +1,3 @@
----
-title: Simple Queries
-layout: default
----
-
 # Simple queries
 
 Finagle-postgres can use PostgreSQL's simple query interface to perform queries. These queries are limited, because they
@@ -12,7 +7,7 @@ could be a vector for SQL injection attacks.
 
 Still, it can be useful to try them out.
 
-```scala mdoc:invisible
+```scala mdoc:compile-only
 import com.twitter.finagle.Postgres
 import com.twitter.util.Await
 // create the client based on environment variables
@@ -26,12 +21,6 @@ val client = {
     .newRichClient(sys.env("PG_HOST_PORT"))
 }
   
-Await.result(client.execute("DROP TABLE IF EXISTS demo"))
-```
-
-```scala mdoc
-import com.twitter.util.Await
-
 // execute a query that has no results - i.e. CREATE TABLE, UPDATE, INSERT, DELETE, etc.
 val create = Await.result {
   client.execute("CREATE TABLE demo(id serial PRIMARY KEY, foo text)")
@@ -90,8 +79,4 @@ decode the column. Currently, instances are supplied for the following Scala typ
 New `ValueDecoder` instances can be specified for other types; take a look at the existing instances for guidance. We
 are happy to accept instances for built-in Scala or Java types into finagle-postgres!
 
-Next, read about [Parameterized Queries](04-parameterized-queries.html)
-
-```scala mdoc:invisible
-Await.result(client.close())
-```
+Next, read about [Parameterized Queries](04-parameterized-queries.md)
diff --git a/docs/src/main/tut/04-parameterized-queries.md b/docs/04-parameterized-queries.md
similarity index 82%
rename from docs/src/main/tut/04-parameterized-queries.md
rename to docs/04-parameterized-queries.md
index 19aff761..f0b51f73 100644
--- a/docs/src/main/tut/04-parameterized-queries.md
+++ b/docs/04-parameterized-queries.md
@@ -1,16 +1,15 @@
----
-title: Parameterized Queries
-layout: default
----
-
-# Parameterized queries
+ Parameterized queries
 
 Since most database-driven applications will need to use user-supplied data as parameters to their queries,
 finagle-postgres supports parameterized queries through its prepared statement interface:
 
-```scala mdoc:invisible
+```scala mdoc:compile-only
 import com.twitter.finagle.Postgres
+import com.twitter.finagle.postgres.Param._
+import com.twitter.finagle.postgres.values.ValueEncoder._
+
 import com.twitter.util.Await
+
 // create the client based on environment variables
 val client = {
   Postgres.Client()
@@ -21,11 +20,6 @@ val client = {
     .withBinaryParams(true)
     .newRichClient(sys.env("PG_HOST_PORT"))
 }  
-Await.result(client.execute("DROP TABLE IF EXISTS demo"))
-```
-
-```scala mdoc
-import com.twitter.util.Await
 
 // execute a query that has no results - i.e. CREATE TABLE, UPDATE, INSERT, DELETE, etc.
 val create = Await.result {
@@ -33,11 +27,11 @@ val create = Await.result {
 }
 
 val insert = Await.result {
-  client.prepareAndExecute("INSERT INTO demo(foo) VALUES ($1)", "foo")
+  client.prepareAndExecute("INSERT INTO demo(foo) VALUES ($1)", "foo": String)
 }
 
 // execute a query that has results - a function is given to treat the rows
-val select = client.prepareAndQuery("SELECT * FROM demo WHERE foo = $1", "foo") {
+val select = client.prepareAndQuery("SELECT * FROM demo WHERE foo = $1", "foo": String) {
   row => row.get[String]("foo")
 }
 
@@ -48,8 +42,4 @@ Here, we used `prepareAndExecute` and `prepareAndQuery` rather than just `execut
 number of *parameters* in addition to the SQL query. The given parameters are encoded and sent separately from the
 query, which means they won't be a potential vector for SQL injection attacks.
 
-Next, read about [Automatic case class marshalling](05-automatic-case-class-marshalling.html)
-
-```scala mdoc:invisible
-Await.result(client.close())
-```
\ No newline at end of file
+Next, read about [Automatic case class marshalling](05-automatic-case-class-marshalling.md)
diff --git a/docs/src/main/tut/05-automatic-case-class-marshalling.md b/docs/05-automatic-case-class-marshalling.md
similarity index 88%
rename from docs/src/main/tut/05-automatic-case-class-marshalling.md
rename to docs/05-automatic-case-class-marshalling.md
index bd28e207..957091b0 100644
--- a/docs/src/main/tut/05-automatic-case-class-marshalling.md
+++ b/docs/05-automatic-case-class-marshalling.md
@@ -1,8 +1,3 @@
----
-title: Automatic Case Class Marshalling
-layout: default
----
-
 # Automatic `case class` marshalling
 
 As we've seen earlier, `SELECT` queries using the finagle-postgres API must specify a function which operates on a `Row`
@@ -11,7 +6,7 @@ function: `Future[Seq[T]]`.
 
 This typically results in a pattern like this:
 
-```scala mdoc:invisible
+```scala mdoc:compile-only
 import com.twitter.finagle.Postgres
 import com.twitter.util.Await
 // create the client based on environment variables
@@ -27,10 +22,8 @@ val client = {
 
 Await.result(client.execute("DROP TABLE IF EXISTS demo"))
 Await.result(client.prepareAndExecute("CREATE TABLE demo(id serial PRIMARY KEY, foo text)"))
-Await.result(client.prepareAndExecute("INSERT INTO demo (foo) VALUES ($1)", "foo"))
-```
+Await.result(client.prepareAndExecute("INSERT INTO demo (foo) VALUES ($1)", "foo": String))
 
-```scala mdoc
 case class Demo(id: Int, foo: String)
 
 val select = client.prepareAndQuery("SELECT * FROM demo") {
@@ -47,7 +40,7 @@ As you can see, this probably gets verbose and repetitive for rows which have a
 there must be a better way, and thanks to [shapeless](https://github.com/milessabin/shapeless), there is! Importing
 `com.twitter.finagle.postgres.generic._` enriches `client` with an additional operation, `queryAs`:
 
-```scala mdoc
+```scala
 import com.twitter.finagle.postgres.generic._
 
 val result = Await.result {
@@ -59,8 +52,4 @@ This method automatically decodes the rows into the specified case class. By def
 for accessing the fields in the table; this can be overridden by importing `com.twitter.finagle.postgres.generic.ColumnNamer.identity._`
 to instead do nothing to convert column names.
 
-Next, read about [Query DSL](06-query-dsl.html)
-
-```scala mdoc:invisible
-Await.result(client.close())
-```
\ No newline at end of file
+Next, read about [Query DSL](06-query-dsl.md)
diff --git a/docs/src/main/tut/06-query-dsl.md b/docs/06-query-dsl.md
similarity index 94%
rename from docs/src/main/tut/06-query-dsl.md
rename to docs/06-query-dsl.md
index 29ab50c4..51da2311 100644
--- a/docs/src/main/tut/06-query-dsl.md
+++ b/docs/06-query-dsl.md
@@ -1,8 +1,3 @@
----
-title: Query DSL
-layout: default
----
-
 # Query DSL
 
 Currently, finagle-postgres offers a rudimentary DSL which provides a slightly nicer syntax for defining and running
@@ -11,7 +6,7 @@ queries. The DSL lives in the `com.twitter.finagle.postgres.generic._` import.
 The abstraction provided is the `Query[T]` data type, which captures a query and its parameters. It's used in conjunction
 with the `QueryContext` implicit enrichment, which provides a `sql` String interpolator:
 
-```scala mdoc:invisible
+```scala mdoc:compile-only
 import com.twitter.finagle.Postgres
 import com.twitter.util.Await
 // create the client based on environment variables
@@ -26,11 +21,9 @@ val client = {
 }  
 Await.result(client.execute("DROP TABLE IF EXISTS demo"))
 Await.result(client.prepareAndExecute("CREATE TABLE demo(id serial PRIMARY KEY, foo text)"))
-Await.result(client.prepareAndExecute("INSERT INTO demo(foo) VALUES ($1)", "foo"))
+Await.result(client.prepareAndExecute("INSERT INTO demo(foo) VALUES ($1)", "foo": String))
 case class Demo(id: Int, foo: String)
-```
 
-```scala mdoc
 import com.twitter.finagle.postgres.generic._
 
 def insert(foo: String) = sql"INSERT INTO demo (foo) VALUES ($foo)"
@@ -57,7 +50,7 @@ For other types of values (like single-column results, for example) there is als
 from the current type of a query (i.e. `Row` for a freshly created `Query[Row]`) to some other type `T`, and appends the
 function to the continuation that will map the rows. For example:
 
-```scala mdoc
+```scala 
 def count(input: String) = sql"SELECT count(*) FROM demo WHERE foo = $input".map {
   row => row.get[Long]("count")
 }
@@ -71,6 +64,3 @@ class` with a `count` column); since there is only one row expected, we also `ma
 just the first row using `_.head`.
 
 A more in-depth query DSL is planned, but this is the extent of what's currently offered.
-```scala mdoc:invisible
-Await.result(client.close())
-```
\ No newline at end of file
diff --git a/docs/directory.conf b/docs/directory.conf
new file mode 100644
index 00000000..336f9810
--- /dev/null
+++ b/docs/directory.conf
@@ -0,0 +1,10 @@
+laika.navigationOrder = [
+  main.md
+  index.md
+  01-installation.md
+  02-basic-usage.md
+  03-single-queries.md
+  04-parameterized-queries.md
+  05-automatic-case-class-marshalling.md
+  06-query-dsl.md
+]
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 00000000..8cf6cb72
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,8 @@
+# Finagle-postgres guide
+
+1. [Installation](01-installation.md)
+2. [Basic Usage](02-basic-usage.md)
+3. [Simple Queries](03-simple-queries.md)
+4. [Parameterized Queries](04-parameterized-queries.md)
+5. [Automatic Case Class Marshalling](05-automatic-case-class-marshalling.md)
+6. [Query DSL](06-query-dsl.md)
\ No newline at end of file
diff --git a/docs/src/site/index.md b/docs/main.md
similarity index 82%
rename from docs/src/site/index.md
rename to docs/main.md
index 9fba405a..7028d584 100644
--- a/docs/src/site/index.md
+++ b/docs/main.md
@@ -1,8 +1,3 @@
----
-layout: default
-title: finagle-postgres
----
-
 # finagle-postgres
 
 Finagle-postgres is an asynchronous [PostgreSQL](https://postgresql.org) client library for [Finagle](https://twitter.github.io/finagle).
@@ -20,12 +15,7 @@ It provides the following features:
 
 
 ## Documentation
-To get started with finagle-postgres, check out the [Guide](doc/).
-
-Detailed API documentation is available:
-
-* For the [latest release build](api/latest)
-* For the [latest snapshot build](api/latest-snapshot)
+To get started with finagle-postgres, check out the [Guide](index.md).
 
 ## License
 
diff --git a/docs/src/main/tut/index.md b/docs/src/main/tut/index.md
deleted file mode 100644
index 1f62e069..00000000
--- a/docs/src/main/tut/index.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: Finagle-postgres Guide
-layout: default
----
-
-# Finagle-postgres guide
-
-1. [Installation](01-installation.html)
-2. [Basic Usage](02-basic-usage.html)
-3. [Simple Queries](03-simple-queries.html)
-4. [Parameterized Queries](04-parameterized-queries.html)
-5. [Automatic Case Class Marshalling](05-automatic-case-class-marshalling.html)
-6. [Query DSL](06-query-dsl.html)
\ No newline at end of file
diff --git a/docs/src/site/_config.yml b/docs/src/site/_config.yml
deleted file mode 100755
index 0bed95a3..00000000
--- a/docs/src/site/_config.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Setup
-title:        finagle-postgres
-tagline:      Asynchronous Scala PostgreSQL client using Finagle
-baseurl:      "/finagle-postgres"
-#paginate:     1
-
-# About/contact
-author:
-  name:       Jeremy Smith
-  url:        http://jeremyrsmith.github.io 
-
-# Gems
-gems:
-  - jekyll-paginate
-  - kramdown
-  - rouge
-
-#Others
-markdown: kramdown
-
-kramdown:
-  input: GFM
-  syntax_highlighter: rouge
-  highlighter: rouge
-
diff --git a/docs/src/site/_includes/head.html b/docs/src/site/_includes/head.html
deleted file mode 100755
index 2efdbbfa..00000000
--- a/docs/src/site/_includes/head.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<head>
-  <meta charset="UTF-8">
-  <title>{{ site.title }}</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="theme-color" content="#157878">
-  <link rel="stylesheet" href="{{ site.baseurl }}/css/normalize.css">
-  <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
-  <link rel="stylesheet" href="{{ site.baseurl }}/css/cayman.css">
-  <link rel="stylesheet" href="{{ site.baseurl }}/css/code.css">
-</head>
diff --git a/docs/src/site/_includes/page-footer.html b/docs/src/site/_includes/page-footer.html
deleted file mode 100755
index af165f99..00000000
--- a/docs/src/site/_includes/page-footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<footer class="site-footer">
-  <span class="site-footer-owner"><a href="{{ site.url }}{{ site.baseurl }}">{{ site.title }}</a> is maintained by <a href="{{ site.author.url }}">{{ site.author.name }}</a>.</span>
-  <span class="site-footer-credits">This page was generated by <a href="https://pages.github.com">GitHub Pages</a> using the <a href="https://github.com/pietromenna/jekyll-cayman-theme">Cayman theme</a> by <a href="http://github.com/jasonlong">Jason Long</a>.</span>
-</footer>
diff --git a/docs/src/site/_includes/page-header.html b/docs/src/site/_includes/page-header.html
deleted file mode 100755
index 87089d63..00000000
--- a/docs/src/site/_includes/page-header.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<section class="page-header">
-  <h1 class="project-name"><a href="{{ site.baseurl }}">{{ site.title }}</a></h1>
-  <h2 class="project-tagline">{{ site.tagline }}</h2>
-  <a href="https://github.com/finagle/finagle-postgres" class="btn">View on GitHub</a>
-  <a href="https://gitter.im/finagle/finagle-postgres?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge" class="btn badge">
-    <img src="https://badges.gitter.im/finagle/finagle-postgres.svg" alt="Gitter Chat" />
-  </a>
-  <a href="https://maven-badges.herokuapp.com/maven-central/com.github.finagle/finagle-postgres_2.11" class="btn badge">
-    <img src="https://img.shields.io/maven-central/v/io.github.finagle/finagle-postgres_2.11.svg" alt="Maven Central" />
-  </a>
-  <a href="https://travis-ci.org/finagle/finagle-postgres" class="btn badge">
-    <img src="https://img.shields.io/travis/finagle/finagle-postgres/master.svg" alt="Build Status" />
-  </a>
-</section>
diff --git a/docs/src/site/_layouts/default.html b/docs/src/site/_layouts/default.html
deleted file mode 100755
index 8a21bd71..00000000
--- a/docs/src/site/_layouts/default.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-us">
-  
-  {% include head.html %}
-
-  <body>
-    {% include page-header.html %}
-
-    <section class="main-content">
-      
-      {{ content }}
-
-      {% include page-footer.html %}
-
-    </section>
-
-  </body>
-</html>
diff --git a/docs/src/site/_layouts/post.html b/docs/src/site/_layouts/post.html
deleted file mode 100755
index 5b12153c..00000000
--- a/docs/src/site/_layouts/post.html
+++ /dev/null
@@ -1,7 +0,0 @@
----
-layout: default
----
-<h2>{{ page.title }}</h2>
-<p class="meta">{{ page.date | date_to_string }}</p>
-
-{{ content }}
\ No newline at end of file
diff --git a/docs/src/site/css/cayman.css b/docs/src/site/css/cayman.css
deleted file mode 100755
index dfd68d7d..00000000
--- a/docs/src/site/css/cayman.css
+++ /dev/null
@@ -1,235 +0,0 @@
-* {
-  box-sizing: border-box; }
-
-body {
-  padding: 0;
-  margin: 0;
-  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 16px;
-  line-height: 1.5;
-  color: #606c71; }
-
-a {
-  color: #1e6bb8;
-  text-decoration: none; }
-  a:hover {
-    text-decoration: underline; }
-
-.btn {
-  display: inline-block;
-  margin-bottom: 1rem;
-  color: rgba(255, 255, 255, 0.7);
-  background-color: rgba(255, 255, 255, 0.08);
-  border-color: rgba(255, 255, 255, 0.2);
-  border-style: solid;
-  border-width: 1px;
-  border-radius: 0.3rem;
-  transition: color 0.2s, background-color 0.2s, border-color 0.2s; }
-  .btn:hover {
-    color: rgba(255, 255, 255, 0.8);
-    text-decoration: none;
-    background-color: rgba(255, 255, 255, 0.2);
-    border-color: rgba(255, 255, 255, 0.3); }
-  .btn + .btn {
-    margin-left: 1rem; }
-  @media screen and (min-width: 64em) {
-    .btn {
-      padding: 0.75rem 1rem; } }
-  @media screen and (min-width: 42em) and (max-width: 64em) {
-    .btn {
-      padding: 0.6rem 0.9rem;
-      font-size: 0.9rem; } }
-  @media screen and (max-width: 42em) {
-    .btn {
-      display: block;
-      width: 100%;
-      padding: 0.75rem;
-      font-size: 0.9rem; }
-      .btn + .btn {
-        margin-top: 1rem;
-        margin-left: 0; } }
-
-.btn img { vertical-align: middle }
-
-.page-header {
-  color: #fff;
-  text-align: center;
-  background-color: #159957;
-  background-image: linear-gradient(120deg, #155799, #159957); }
-  @media screen and (min-width: 64em) {
-    .page-header {
-      padding: 1rem 6rem; } }
-  @media screen and (min-width: 42em) and (max-width: 64em) {
-    .page-header {
-      padding: 1rem 4rem; } }
-  @media screen and (max-width: 42em) {
-    .page-header {
-      padding: 1rem 1rem; } }
-
-.project-name {
-  margin-top: 0;
-  margin-bottom: 0.1rem; }
-  @media screen and (min-width: 64em) {
-    .project-name {
-      font-size: 3.25rem; } }
-  @media screen and (min-width: 42em) and (max-width: 64em) {
-    .project-name {
-      font-size: 2.25rem; } }
-  @media screen and (max-width: 42em) {
-    .project-name {
-      font-size: 1.75rem; } }
-
-.project-name a { color: white; text-decoration: none }
-.project-name a:hover { text-decoration: underline }
-
-.project-tagline {
-  margin-bottom: 2rem;
-  font-weight: normal;
-  opacity: 0.7; }
-  @media screen and (min-width: 64em) {
-    .project-tagline {
-      font-size: 1.25rem; } }
-  @media screen and (min-width: 42em) and (max-width: 64em) {
-    .project-tagline {
-      font-size: 1.15rem; } }
-  @media screen and (max-width: 42em) {
-    .project-tagline {
-      font-size: 1rem; } }
-
-.main-content {
-  word-wrap: break-word; }
-  .main-content :first-child {
-    margin-top: 0; }
-  @media screen and (min-width: 64em) {
-    .main-content {
-      max-width: 64rem;
-      padding: 2rem 6rem;
-      margin: 0 auto;
-      font-size: 1.1rem; } }
-  @media screen and (min-width: 42em) and (max-width: 64em) {
-    .main-content {
-      padding: 2rem 4rem;
-      font-size: 1.1rem; } }
-  @media screen and (max-width: 42em) {
-    .main-content {
-      padding: 2rem 1rem;
-      font-size: 1rem; } }
-  .main-content img {
-    max-width: 100%; }
-  .main-content h1, .main-content h2, .main-content h3, .main-content h4, .main-content h5, .main-content h6 {
-    margin-top: 2rem;
-    margin-bottom: 1rem;
-    font-weight: normal;
-    color: #159957; }
-  .main-content p {
-    margin-bottom: 1em; }
-  .main-content code {
-    padding: 2px 4px;
-    font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
-    font-size: 0.9rem;
-    color: #383e41;
-    background-color: #f3f6fa;
-    border-radius: 0.3rem; }
-  .main-content pre {
-    padding: 0.8rem;
-    margin-top: 0;
-    margin-bottom: 1rem;
-    font: 1rem Consolas, "Liberation Mono", Menlo, Courier, monospace;
-    color: #567482;
-    word-wrap: normal;
-    background-color: #f3f6fa;
-    border: solid 1px #dce6f0;
-    border-radius: 0.3rem; }
-    .main-content pre > code {
-      padding: 0;
-      margin: 0;
-      font-size: 0.9rem;
-      color: #567482;
-      word-break: normal;
-      white-space: pre;
-      background: transparent;
-      border: 0; }
-  .main-content .highlight {
-    margin-bottom: 1rem; }
-    .main-content .highlight pre {
-      margin-bottom: 0;
-      word-break: normal; }
-  .main-content .highlight pre, .main-content pre {
-    padding: 0.8rem;
-    overflow: auto;
-    font-size: 0.9rem;
-    line-height: 1.45;
-    border-radius: 0.3rem;
-    -webkit-overflow-scrolling: touch; }
-  .main-content pre code, .main-content pre tt {
-    display: inline;
-    max-width: initial;
-    padding: 0;
-    margin: 0;
-    overflow: initial;
-    line-height: inherit;
-    word-wrap: normal;
-    background-color: transparent;
-    border: 0; }
-    .main-content pre code:before, .main-content pre code:after, .main-content pre tt:before, .main-content pre tt:after {
-      content: normal; }
-  .main-content ul, .main-content ol {
-    margin-top: 0; }
-  .main-content blockquote {
-    padding: 0 1rem;
-    margin-left: 0;
-    color: #819198;
-    border-left: 0.3rem solid #dce6f0; }
-    .main-content blockquote > :first-child {
-      margin-top: 0; }
-    .main-content blockquote > :last-child {
-      margin-bottom: 0; }
-  .main-content table {
-    display: block;
-    width: 100%;
-    overflow: auto;
-    word-break: normal;
-    word-break: keep-all;
-    -webkit-overflow-scrolling: touch; }
-    .main-content table th {
-      font-weight: bold; }
-    .main-content table th, .main-content table td {
-      padding: 0.5rem 1rem;
-      border: 1px solid #e9ebec; }
-  .main-content dl {
-    padding: 0; }
-    .main-content dl dt {
-      padding: 0;
-      margin-top: 1rem;
-      font-size: 1rem;
-      font-weight: bold; }
-    .main-content dl dd {
-      padding: 0;
-      margin-bottom: 1rem; }
-  .main-content hr {
-    height: 2px;
-    padding: 0;
-    margin: 1rem 0;
-    background-color: #eff0f1;
-    border: 0; }
-
-.site-footer {
-  padding-top: 2rem;
-  margin-top: 2rem;
-  border-top: solid 1px #eff0f1; }
-  @media screen and (min-width: 64em) {
-    .site-footer {
-      font-size: .8rem; } }
-  @media screen and (min-width: 42em) and (max-width: 64em) {
-    .site-footer {
-      font-size: 1rem; } }
-  @media screen and (max-width: 42em) {
-    .site-footer {
-      font-size: 0.9rem; } }
-
-.site-footer-owner {
-  display: block;
-  font-weight: bold; }
-
-.site-footer-credits {
-  color: #819198; }
diff --git a/docs/src/site/css/code.css b/docs/src/site/css/code.css
deleted file mode 100644
index b612739a..00000000
--- a/docs/src/site/css/code.css
+++ /dev/null
@@ -1,61 +0,0 @@
-.main-content pre.highlight code .hll { background-color: #ffffcc }
-.main-content pre.highlight code .c { color: #999988; font-style: italic } /* Comment */
-.main-content pre.highlight code .err { color: #a61717; background-color: #e3d2d2 } /* Error */
-.main-content pre.highlight code .k { color: #000000; font-weight: bold } /* Keyword */
-.main-content pre.highlight code .o { color: #000000; font-weight: bold } /* Operator */
-.main-content pre.highlight code .cm { color: #999988; font-style: italic } /* Comment.Multiline */
-.main-content pre.highlight code .cp { color: #999999; font-weight: bold; font-style: italic } /* Comment.Preproc */
-.main-content pre.highlight code .c1 { color: #999988; font-style: italic } /* Comment.Single */
-.main-content pre.highlight code .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
-.main-content pre.highlight code .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
-.main-content pre.highlight code .ge { color: #000000; font-style: italic } /* Generic.Emph */
-.main-content pre.highlight code .gr { color: #aa0000 } /* Generic.Error */
-.main-content pre.highlight code .gh { color: #999999 } /* Generic.Heading */
-.main-content pre.highlight code .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
-.main-content pre.highlight code .go { color: #888888 } /* Generic.Output */
-.main-content pre.highlight code .gp { color: #555555 } /* Generic.Prompt */
-.main-content pre.highlight code .gs { font-weight: bold } /* Generic.Strong */
-.main-content pre.highlight code .gu { color: #aaaaaa } /* Generic.Subheading */
-.main-content pre.highlight code .gt { color: #aa0000 } /* Generic.Traceback */
-.main-content pre.highlight code .kc { color: #000000; font-weight: bold } /* Keyword.Constant */
-.main-content pre.highlight code .kd { color: #000000; font-weight: bold } /* Keyword.Declaration */
-.main-content pre.highlight code .kn { color: #000000; font-weight: bold } /* Keyword.Namespace */
-.main-content pre.highlight code .kp { color: #000000; font-weight: bold } /* Keyword.Pseudo */
-.main-content pre.highlight code .kr { color: #000000; font-weight: bold } /* Keyword.Reserved */
-.main-content pre.highlight code .kt { color: #445588; font-weight: bold } /* Keyword.Type */
-.main-content pre.highlight code .m { color: #009999 } /* Literal.Number */
-.main-content pre.highlight code .s { color: #d01040 } /* Literal.String */
-.main-content pre.highlight code .na { color: #008080 } /* Name.Attribute */
-.main-content pre.highlight code .nb { color: #0086B3 } /* Name.Builtin */
-.main-content pre.highlight code .nc { color: #445588; font-weight: bold } /* Name.Class */
-.main-content pre.highlight code .no { color: #008080 } /* Name.Constant */
-.main-content pre.highlight code .nd { color: #3c5d5d; font-weight: bold } /* Name.Decorator */
-.main-content pre.highlight code .ni { color: #800080 } /* Name.Entity */
-.main-content pre.highlight code .ne { color: #990000; font-weight: bold } /* Name.Exception */
-.main-content pre.highlight code .nf { color: #990000; font-weight: bold } /* Name.Function */
-.main-content pre.highlight code .nl { color: #990000; font-weight: bold } /* Name.Label */
-.main-content pre.highlight code .nn { color: #555555 } /* Name.Namespace */
-.main-content pre.highlight code .nt { color: #000080 } /* Name.Tag */
-.main-content pre.highlight code .nv { color: #008080 } /* Name.Variable */
-.main-content pre.highlight code .ow { color: #000000; font-weight: bold } /* Operator.Word */
-.main-content pre.highlight code .w { color: #bbbbbb } /* Text.Whitespace */
-.main-content pre.highlight code .mf { color: #009999 } /* Literal.Number.Float */
-.main-content pre.highlight code .mh { color: #009999 } /* Literal.Number.Hex */
-.main-content pre.highlight code .mi { color: #009999 } /* Literal.Number.Integer */
-.main-content pre.highlight code .mo { color: #009999 } /* Literal.Number.Oct */
-.main-content pre.highlight code .sb { color: #d01040 } /* Literal.String.Backtick */
-.main-content pre.highlight code .sc { color: #d01040 } /* Literal.String.Char */
-.main-content pre.highlight code .sd { color: #d01040 } /* Literal.String.Doc */
-.main-content pre.highlight code .s2 { color: #d01040 } /* Literal.String.Double */
-.main-content pre.highlight code .se { color: #d01040 } /* Literal.String.Escape */
-.main-content pre.highlight code .sh { color: #d01040 } /* Literal.String.Heredoc */
-.main-content pre.highlight code .si { color: #d01040 } /* Literal.String.Interpol */
-.main-content pre.highlight code .sx { color: #d01040 } /* Literal.String.Other */
-.main-content pre.highlight code .sr { color: #009926 } /* Literal.String.Regex */
-.main-content pre.highlight code .s1 { color: #d01040 } /* Literal.String.Single */
-.main-content pre.highlight code .ss { color: #990073 } /* Literal.String.Symbol */
-.main-content pre.highlight code .bp { color: #999999 } /* Name.Builtin.Pseudo */
-.main-content pre.highlight code .vc { color: #008080 } /* Name.Variable.Class */
-.main-content pre.highlight code .vg { color: #008080 } /* Name.Variable.Global */
-.main-content pre.highlight code .vi { color: #008080 } /* Name.Variable.Instance */
-.main-content pre.highlight code .il { color: #009999 } /* Literal.Number.Integer.Long */
diff --git a/docs/src/site/css/normalize.css b/docs/src/site/css/normalize.css
deleted file mode 100755
index 30366a6e..00000000
--- a/docs/src/site/css/normalize.css
+++ /dev/null
@@ -1,424 +0,0 @@
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-
-/**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
- */
-
-html {
-  font-family: sans-serif; /* 1 */
-  -ms-text-size-adjust: 100%; /* 2 */
-  -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-/**
- * Remove default margin.
- */
-
-body {
-  margin: 0;
-}
-
-/* HTML5 display definitions
-   ========================================================================== */
-
-/**
- * Correct `block` display not defined for any HTML5 element in IE 8/9.
- * Correct `block` display not defined for `details` or `summary` in IE 10/11
- * and Firefox.
- * Correct `block` display not defined for `main` in IE 11.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-menu,
-nav,
-section,
-summary {
-  display: block;
-}
-
-/**
- * 1. Correct `inline-block` display not defined in IE 8/9.
- * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
- */
-
-audio,
-canvas,
-progress,
-video {
-  display: inline-block; /* 1 */
-  vertical-align: baseline; /* 2 */
-}
-
-/**
- * Prevent modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-/**
- * Address `[hidden]` styling not present in IE 8/9/10.
- * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
- */
-
-[hidden],
-template {
-  display: none;
-}
-
-/* Links
-   ========================================================================== */
-
-/**
- * Remove the gray background color from active links in IE 10.
- */
-
-a {
-  background-color: transparent;
-}
-
-/**
- * Improve readability when focused and also mouse hovered in all browsers.
- */
-
-a:active,
-a:hover {
-  outline: 0;
-}
-
-/* Text-level semantics
-   ========================================================================== */
-
-/**
- * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
- */
-
-abbr[title] {
-  border-bottom: 1px dotted;
-}
-
-/**
- * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
- */
-
-b,
-strong {
-  font-weight: bold;
-}
-
-/**
- * Address styling not present in Safari and Chrome.
- */
-
-dfn {
-  font-style: italic;
-}
-
-/**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari, and Chrome.
- */
-
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
-
-/**
- * Address styling not present in IE 8/9.
- */
-
-mark {
-  background: #ff0;
-  color: #000;
-}
-
-/**
- * Address inconsistent and variable font size in all browsers.
- */
-
-small {
-  font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
- */
-
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sup {
-  top: -0.5em;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-/* Embedded content
-   ========================================================================== */
-
-/**
- * Remove border when inside `a` element in IE 8/9/10.
- */
-
-img {
-  border: 0;
-}
-
-/**
- * Correct overflow not hidden in IE 9/10/11.
- */
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
-/* Grouping content
-   ========================================================================== */
-
-/**
- * Address margin not present in IE 8/9 and Safari.
- */
-
-figure {
-  margin: 1em 40px;
-}
-
-/**
- * Address differences between Firefox and other browsers.
- */
-
-hr {
-  box-sizing: content-box;
-  height: 0;
-}
-
-/**
- * Contain overflow in all browsers.
- */
-
-pre {
-  overflow: auto;
-}
-
-/**
- * Address odd `em`-unit font size rendering in all browsers.
- */
-
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
-}
-
-/* Forms
-   ========================================================================== */
-
-/**
- * Known limitation: by default, Chrome and Safari on OS X allow very limited
- * styling of `select`, unless a `border` property is set.
- */
-
-/**
- * 1. Correct color not being inherited.
- *    Known issue: affects color of disabled elements.
- * 2. Correct font properties not being inherited.
- * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
- */
-
-button,
-input,
-optgroup,
-select,
-textarea {
-  color: inherit; /* 1 */
-  font: inherit; /* 2 */
-  margin: 0; /* 3 */
-}
-
-/**
- * Address `overflow` set to `hidden` in IE 8/9/10/11.
- */
-
-button {
-  overflow: visible;
-}
-
-/**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
- * Correct `select` style inheritance in Firefox.
- */
-
-button,
-select {
-  text-transform: none;
-}
-
-/**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- *    `input` and others.
- */
-
-button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
-  -webkit-appearance: button; /* 2 */
-  cursor: pointer; /* 3 */
-}
-
-/**
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-html input[disabled] {
-  cursor: default;
-}
-
-/**
- * Remove inner padding and border in Firefox 4+.
- */
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  border: 0;
-  padding: 0;
-}
-
-/**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
- */
-
-input {
-  line-height: normal;
-}
-
-/**
- * It's recommended that you don't attempt to style these elements.
- * Firefox's implementation doesn't respect box-sizing, padding, or width.
- *
- * 1. Address box sizing set to `content-box` in IE 8/9/10.
- * 2. Remove excess padding in IE 8/9/10.
- */
-
-input[type="checkbox"],
-input[type="radio"] {
-  box-sizing: border-box; /* 1 */
-  padding: 0; /* 2 */
-}
-
-/**
- * Fix the cursor style for Chrome's increment/decrement buttons. For certain
- * `font-size` values of the `input`, it causes the cursor style of the
- * decrement button to change from `default` to `text`.
- */
-
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-
-/**
- * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
- *    (include `-moz` to future-proof).
- */
-
-input[type="search"] {
-  -webkit-appearance: textfield; /* 1 */ /* 2 */
-  box-sizing: content-box;
-}
-
-/**
- * Remove inner padding and search cancel button in Safari and Chrome on OS X.
- * Safari (but not Chrome) clips the cancel button when the search input has
- * padding (and `textfield` appearance).
- */
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-/**
- * Define consistent border, margin, and padding.
- */
-
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
-}
-
-/**
- * 1. Correct `color` not being inherited in IE 8/9/10/11.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
-  border: 0; /* 1 */
-  padding: 0; /* 2 */
-}
-
-/**
- * Remove default vertical scrollbar in IE 8/9/10/11.
- */
-
-textarea {
-  overflow: auto;
-}
-
-/**
- * Don't inherit the `font-weight` (applied by a rule above).
- * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
- */
-
-optgroup {
-  font-weight: bold;
-}
-
-/* Tables
-   ========================================================================== */
-
-/**
- * Remove most spacing between table cells.
- */
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-td,
-th {
-  padding: 0;
-}
diff --git a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/ColumnNamer.scala b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/ColumnNamer.scala
index a5b5c9fb..1e1c5024 100644
--- a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/ColumnNamer.scala
+++ b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/ColumnNamer.scala
@@ -15,15 +15,25 @@ object ColumnNamer {
     implicit object snake extends ColumnNamer {
 
       private val camelRegexes = List(
-        """([a-z])([A-Z]+)""".r -> ((m: Match) => s"${m.group(1)}_${m.group(2)}"),
-        """([A-Z]+)([A-Z])([a-z])""".r -> ((m: Match) => s"${m.group(1)}_${m.group(2)}${m.group(3)}"),
-        """([^0-9_])([0-9])""".r -> ((m: Match) => s"${m.group(1)}_${m.group(2)}"),
-        """([0-9])([^0-9_])""".r -> ((m: Match) => s"${m.group(1)}_${m.group(2)}")
+        """([a-z])([A-Z]+)""".r -> ((m: Match) =>
+          s"${m.group(1)}_${m.group(2)}"
+        ),
+        """([A-Z]+)([A-Z])([a-z])""".r -> ((m: Match) =>
+          s"${m.group(1)}_${m.group(2)}${m.group(3)}"
+        ),
+        """([^0-9_])([0-9])""".r -> ((m: Match) =>
+          s"${m.group(1)}_${m.group(2)}"
+        ),
+        """([0-9])([^0-9_])""".r -> ((m: Match) =>
+          s"${m.group(1)}_${m.group(2)}"
+        )
       )
 
-      def apply(scalaName: String): String = camelRegexes.foldLeft(scalaName) {
-        case (str, (regex, replacer)) => regex.replaceAllIn(str, replacer)
-      }.toLowerCase()
+      def apply(scalaName: String): String = camelRegexes
+        .foldLeft(scalaName) { case (str, (regex, replacer)) =>
+          regex.replaceAllIn(str, replacer)
+        }
+        .toLowerCase()
     }
   }
 
diff --git a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Columns.scala b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Columns.scala
index 545a93b4..e3f2db9e 100644
--- a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Columns.scala
+++ b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Columns.scala
@@ -9,21 +9,24 @@ case class Columns private (names: List[String]) extends QueryParam {
   @inline final def params: Seq[Param[_]] = Seq.empty
   @inline final def placeholders(start: Int): Seq[String] = names
 
-  def as(name: String) = copy(names = names.map(n => s"""$name.$n AS "$name.$n""""))
+  def as(name: String) =
+    copy(names = names.map(n => s"""$name.$n AS "$name.$n""""))
   def join(that: Columns) = Columns(names ++ that.names)
 }
 
 object Columns {
-  def apply[T <: Product](implicit columnsOf: ColumnsOf[T]) = new Columns(columnsOf.columns)
+  def apply[T <: Product](implicit columnsOf: ColumnsOf[T]) = new Columns(
+    columnsOf.columns
+  )
 }
 
 case class ColumnsOf[T <: Product] private (columns: List[String])
 
 object ColumnsOf {
   implicit def derive[T <: Product, L <: HList, K <: HList](implicit
-    gen: LabelledGeneric.Aux[T, L],
-    keys: Keys.Aux[L, K],
-    toList: ToList[K, Symbol],
-    columnNamer: ColumnNamer
+      gen: LabelledGeneric.Aux[T, L],
+      keys: Keys.Aux[L, K],
+      toList: ToList[K, Symbol],
+      columnNamer: ColumnNamer
   ): ColumnsOf[T] = ColumnsOf[T](toList(keys()).map(s => columnNamer(s.name)))
-}
\ No newline at end of file
+}
diff --git a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Query.scala b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Query.scala
index 07087791..4f98037e 100644
--- a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Query.scala
+++ b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Query.scala
@@ -8,7 +8,11 @@ import com.twitter.util.Future
 
 import scala.language.existentials
 
-case class Query[T](parts: Seq[String], queryParams: Seq[QueryParam], cont: Row => T) {
+case class Query[T](
+    parts: Seq[String],
+    queryParams: Seq[QueryParam],
+    cont: Row => T
+) {
 
   def stream(client: PostgresClient): AsyncStream[T] = {
     val (queryString, params) = impl
@@ -25,41 +29,55 @@ case class Query[T](parts: Seq[String], queryParams: Seq[QueryParam], cont: Row
 
   def map[U](fn: T => U): Query[U] = copy(cont = cont andThen fn)
 
-  def as[U](implicit rowDecoder: RowDecoder[U], columnNamer: ColumnNamer): Query[U] = {
+  def as[U](implicit
+      rowDecoder: RowDecoder[U],
+      columnNamer: ColumnNamer
+  ): Query[U] = {
     copy(cont = row => rowDecoder(row)(columnNamer))
   }
 
   private def impl: (String, Seq[Param[_]]) = {
-    val (last, placeholders, params) = queryParams.foldLeft((1, Queue.empty[Seq[String]], Queue.empty[Param[_]])) {
-      case ((start, placeholders, params), next) =>
-        val nextPlaceholders = next.placeholders(start)
-        val nextParams = Queue(next.params: _*)
-        (start + nextParams.length, placeholders enqueue nextPlaceholders, params ++ nextParams)
+    val (last, placeholders, params) = queryParams.foldLeft(
+      (1, Queue.empty[Seq[String]], Queue.empty[Param[_]])
+    ) { case ((start, placeholders, params), next) =>
+      val nextPlaceholders = next.placeholders(start)
+      val nextParams = Queue(next.params: _*)
+      (
+        start + nextParams.length,
+        placeholders enqueue nextPlaceholders,
+        params ++ nextParams
+      )
     }
 
-    val queryString = parts.zipAll(placeholders, "", Seq.empty).flatMap {
-      case (part, ph) => Seq(part, ph.mkString(", "))
-    }.mkString
+    val queryString = parts
+      .zipAll(placeholders, "", Seq.empty)
+      .flatMap { case (part, ph) =>
+        Seq(part, ph.mkString(", "))
+      }
+      .mkString
 
     (queryString, params)
   }
 
-
 }
 
 object Query {
   implicit class RowQueryOps(val self: Query[Row]) extends AnyVal {
     def ++(that: Query[Row]): Query[Row] = Query[Row](
-      parts = if(self.parts.length > self.queryParams.length)
-        (self.parts.dropRight(1) :+ (self.parts.lastOption.getOrElse("") + that.parts.headOption.getOrElse(""))) ++ that.parts.drop(1)
-      else
-        self.parts ++ that.parts,
+      parts =
+        if (self.parts.length > self.queryParams.length)
+          (self.parts.dropRight(1) :+ (self.parts.lastOption.getOrElse(
+            ""
+          ) + that.parts.headOption.getOrElse(""))) ++ that.parts.drop(1)
+        else
+          self.parts ++ that.parts,
       queryParams = self.queryParams ++ that.queryParams,
       cont = self.cont
     )
 
     def ++(that: String): Query[Row] = Query[Row](
-      parts = if(self.parts.length > self.queryParams.length)
+      parts =
+        if (self.parts.length > self.queryParams.length)
           self.parts.dropRight(1) :+ (self.parts.last + that)
         else
           self.parts :+ that,
diff --git a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/QueryParams.scala b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/QueryParams.scala
index 06dfd4f2..34ec0af6 100644
--- a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/QueryParams.scala
+++ b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/QueryParams.scala
@@ -5,17 +5,34 @@ import scala.collection.GenTraversable
 
 import com.twitter.finagle.postgres.Param
 import com.twitter.finagle.postgres.values.ValueEncoder
-import shapeless.ops.hlist.{Length, LiftAll, Mapper, ToList, ToTraversable, Tupler, Unifier, Zip}
+import shapeless.ops.hlist.{
+  Length,
+  LiftAll,
+  Mapper,
+  ToList,
+  ToTraversable,
+  Tupler,
+  Unifier,
+  Zip
+}
 import shapeless.ops.nat.ToInt
 import shapeless.ops.record.Keys
-import shapeless.{Generic, HList, HNil, LUBConstraint, LabelledGeneric, Nat, Poly1}
+import shapeless.{
+  Generic,
+  HList,
+  HNil,
+  LUBConstraint,
+  LabelledGeneric,
+  Nat,
+  Poly1
+}
 
-/**
-  * Typeclass allowing conversion of a type T into a sequence of postgres parameters
-  * Used for quoting lists, tuples, etc in a query (i.e. "WHERE foo IN ${("A", "B")})
+/** Typeclass allowing conversion of a type T into a sequence of postgres
+  * parameters Used for quoting lists, tuples, etc in a query (i.e. "WHERE foo
+  * IN ${("A", "B")})
   */
 @implicitNotFound(
-"""Could not represent the given value(s) of type ${T} as query parameters. The value must either be a scalar with a ValueEncoder instance, a Seq whose type parameter has a ValueEncoder instance, or a homogeneous tuple whose type has a ValueEncoder instance."""
+  """Could not represent the given value(s) of type ${T} as query parameters. The value must either be a scalar with a ValueEncoder instance, a Seq whose type parameter has a ValueEncoder instance, or a homogeneous tuple whose type has a ValueEncoder instance."""
 )
 trait QueryParams[T] {
   def apply(t: T): Seq[Param[_]]
@@ -23,35 +40,40 @@ trait QueryParams[T] {
 }
 
 object QueryParams extends QueryParams0 {
-  implicit def seq[F[A] <: Seq[A], T](implicit encoder: ValueEncoder[T]): QueryParams[F[T]] = new QueryParams[F[T]] {
+  implicit def seq[F[A] <: Seq[A], T](implicit
+      encoder: ValueEncoder[T]
+  ): QueryParams[F[T]] = new QueryParams[F[T]] {
     @inline final def apply(ts: F[T]): Seq[Param[_]] = ts.map(t => Param(t))
-    @inline final def placeholders(ts: F[T], start: Int) = (start until (start + ts.length)).map(i => s"$$$i")
+    @inline final def placeholders(ts: F[T], start: Int) =
+      (start until (start + ts.length)).map(i => s"$$$i")
   }
 }
 
 trait QueryParams0 extends QueryParams1 { self: QueryParams.type =>
 
   implicit def tuple[A <: Product, L <: HList, P <: HList, N <: Nat](implicit
-    gen: Generic.Aux[A, L],
-    length: Length.Aux[L, N],
-    tupler: Tupler.Aux[L, A],
-    toInt: ToInt[N],
-    mapper: Mapper.Aux[toParam.type, L, P],
-    toTraversable: ToTraversable.Aux[P, Seq, Param[_]]
+      gen: Generic.Aux[A, L],
+      length: Length.Aux[L, N],
+      tupler: Tupler.Aux[L, A],
+      toInt: ToInt[N],
+      mapper: Mapper.Aux[toParam.type, L, P],
+      toTraversable: ToTraversable.Aux[P, Seq, Param[_]]
   ): QueryParams[A] = new QueryParams[A] {
-    @inline final def apply(a: A): Seq[Param[_]] = toTraversable(mapper(gen.to(a)))
-    @inline final def placeholders(a: A, start: Int) = (start until (start + toInt())).map(i => s"$$$i")
+    @inline final def apply(a: A): Seq[Param[_]] = toTraversable(
+      mapper(gen.to(a))
+    )
+    @inline final def placeholders(a: A, start: Int) =
+      (start until (start + toInt())).map(i => s"$$$i")
   }
 
 }
 
 trait QueryParams1 { self: QueryParams.type =>
 
-  implicit def single[T](implicit encoder: ValueEncoder[T]): QueryParams[T] = new QueryParams[T] {
-    def apply(t: T): Seq[Param[T]] = Seq(Param(t))
-    def placeholders(t: T, start: Int) = Seq(s"$$$start")
-  }
+  implicit def single[T](implicit encoder: ValueEncoder[T]): QueryParams[T] =
+    new QueryParams[T] {
+      def apply(t: T): Seq[Param[T]] = Seq(Param(t))
+      def placeholders(t: T, start: Int) = Seq(s"$$$start")
+    }
 
 }
-
-
diff --git a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/RowDecoder.scala b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/RowDecoder.scala
index 10b5b061..fb0de93c 100644
--- a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/RowDecoder.scala
+++ b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/RowDecoder.scala
@@ -11,7 +11,7 @@ trait RowDecoder[T] {
 
 object RowDecoder extends RowDecoder0 {
 
-  def apply[T : RowDecoder] = implicitly[RowDecoder[T]]
+  def apply[T: RowDecoder] = implicitly[RowDecoder[T]]
 
   // Recursive base case for decoding rows
   implicit object hnil extends RowDecoder[HNil] {
@@ -20,68 +20,80 @@ object RowDecoder extends RowDecoder0 {
 
   // Optional (nullable) values
   class HConsOption[K <: Symbol, H, T <: HList](implicit
-    colName: Witness.Aux[K],
-    decodeHead: ValueDecoder[H],
-    decodeTail: RowDecoder[T]
+      colName: Witness.Aux[K],
+      decodeHead: ValueDecoder[H],
+      decodeTail: RowDecoder[T]
   ) extends RowDecoder[FieldType[K, Option[H]] :: T] {
-    @inline final def apply(row: Row)(implicit columnNamer: ColumnNamer): FieldType[K, Option[H]] :: T = {
-      field[K](row.getOption[H](columnNamer(colName.value.name))) :: decodeTail(row)(columnNamer)
+    @inline final def apply(
+        row: Row
+    )(implicit columnNamer: ColumnNamer): FieldType[K, Option[H]] :: T = {
+      field[K](row.getOption[H](columnNamer(colName.value.name))) :: decodeTail(
+        row
+      )(columnNamer)
     }
   }
 
   implicit def hconsOption[K <: Symbol, H, T <: HList](implicit
-    colName: Witness.Aux[K],
-    decodeHead: ValueDecoder[H],
-    decodeTail: RowDecoder[T]
+      colName: Witness.Aux[K],
+      decodeHead: ValueDecoder[H],
+      decodeTail: RowDecoder[T]
   ): RowDecoder[FieldType[K, Option[H]] :: T] = new HConsOption
 
   // Decoders for tuples of case classes - for JOINs.
   // This could be arity-abstracted, but would probably end up messier and cause implicit issues
   // So instead we'll just start with making a two-table join workable and go from there.
-  implicit def joined[A <: Product, B <: Product, AL <: HList, BL <: HList](implicit
-    prodA: GenericProduct[A, AL],
-    prodB: GenericProduct[B, BL]
+  implicit def joined[A <: Product, B <: Product, AL <: HList, BL <: HList](
+      implicit
+      prodA: GenericProduct[A, AL],
+      prodB: GenericProduct[B, BL]
   ): RowDecoder[(A, B)] = new RowDecoder[(A, B)] {
-    @inline final def apply(row: Row)(implicit columnNamer: ColumnNamer): (A, B) = {
-      (prodA.apply(row)(columnNamer andThen ((s: String) => s"""_1.$s""")),
-        prodB.apply(row)(columnNamer andThen ((s: String) => s"""_2.$s""")))
+    @inline final def apply(
+        row: Row
+    )(implicit columnNamer: ColumnNamer): (A, B) = {
+      (
+        prodA.apply(row)(columnNamer andThen ((s: String) => s"""_1.$s""")),
+        prodB.apply(row)(columnNamer andThen ((s: String) => s"""_2.$s"""))
+      )
     }
   }
 
-
 }
 
 trait RowDecoder0 {
 
   // Generic decoder for any case class which has a LabelledGeneric
   class GenericProduct[T <: Product, L <: HList](implicit
-    gen: LabelledGeneric.Aux[T, L],
-    decodeL: RowDecoder[L]
+      gen: LabelledGeneric.Aux[T, L],
+      decodeL: RowDecoder[L]
   ) extends RowDecoder[T] {
-    @inline final def apply(row: Row)(implicit columnNamer: ColumnNamer): T = gen.from(decodeL(row)(columnNamer))
+    @inline final def apply(row: Row)(implicit columnNamer: ColumnNamer): T =
+      gen.from(decodeL(row)(columnNamer))
   }
 
   implicit def genericProduct[T <: Product, L <: HList](implicit
-    gen: LabelledGeneric.Aux[T, L],
-    decodeL: RowDecoder[L]
+      gen: LabelledGeneric.Aux[T, L],
+      decodeL: RowDecoder[L]
   ): GenericProduct[T, L] = new GenericProduct[T, L]
 
   // Non-optional values (prioritized here underneath optional values)
   class HCons[K <: Symbol, H, T <: HList](implicit
-    colName: Witness.Aux[K],
-    decodeHead: ValueDecoder[H],
-    decodeTail: RowDecoder[T]
+      colName: Witness.Aux[K],
+      decodeHead: ValueDecoder[H],
+      decodeTail: RowDecoder[T]
   ) extends RowDecoder[FieldType[K, H] :: T] {
-    @inline final def apply(row: Row)(implicit columnNamer: ColumnNamer): FieldType[K, H] :: T = {
-      field[K](row.get[H](columnNamer(colName.value.name))) :: decodeTail(row)(columnNamer)
+    @inline final def apply(
+        row: Row
+    )(implicit columnNamer: ColumnNamer): FieldType[K, H] :: T = {
+      field[K](row.get[H](columnNamer(colName.value.name))) :: decodeTail(row)(
+        columnNamer
+      )
     }
   }
 
   implicit def hcons[K <: Symbol, H, T <: HList](implicit
-    colName: Witness.Aux[K],
-    decodeHead: ValueDecoder[H],
-    decodeTail: RowDecoder[T]
+      colName: Witness.Aux[K],
+      decodeHead: ValueDecoder[H],
+      decodeTail: RowDecoder[T]
   ): RowDecoder[FieldType[K, H] :: T] = new HCons
 
 }
-
diff --git a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Updates.scala b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Updates.scala
index f8a1b5d3..d3ecbf99 100644
--- a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Updates.scala
+++ b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Updates.scala
@@ -7,7 +7,7 @@ import shapeless.{HList, LabelledGeneric, Poly1, Witness}
 import shapeless.labelled._
 import shapeless.ops.hlist.{Mapper, _}
 
-case class Updates (updates: List[(String, Param[_])]) extends QueryParam {
+case class Updates(updates: List[(String, Param[_])]) extends QueryParam {
   def params: Seq[Param[_]] = updates.map(_._2)
   def placeholders(start: Int): Seq[String] = updates.zipWithIndex.map {
     case ((col, param), index) => s"$col = $$${index + start}"
@@ -21,32 +21,36 @@ case class Updates (updates: List[(String, Param[_])]) extends QueryParam {
 
 object Updates {
   def apply[O <: HList, MP <: HList](o: O)(implicit
-    mapper: Mapper.Aux[updateWithOptions.type, O, MP],
-    toList: ToList[MP, Option[(String, Param[_])]],
-    columnNamer: ColumnNamer
-  ): Updates = new Updates(toList(mapper(o)).flatten.map { case (k, v) => columnNamer(k) -> v})
+      mapper: Mapper.Aux[updateWithOptions.type, O, MP],
+      toList: ToList[MP, Option[(String, Param[_])]],
+      columnNamer: ColumnNamer
+  ): Updates = new Updates(toList(mapper(o)).flatten.map { case (k, v) =>
+    columnNamer(k) -> v
+  })
 
   def apply[P <: Product, L <: HList, MP <: HList](p: P)(implicit
-    gen: LabelledGeneric.Aux[P, L],
-    mapper: Mapper.Aux[toLabelledParam.type, L, MP],
-    toList: ToList[MP, (String, Param[_])],
-    columnNamer: ColumnNamer
-  ): Updates = new Updates(toList(mapper(gen.to(p))).map { case (k, v) => columnNamer(k) -> v})
+      gen: LabelledGeneric.Aux[P, L],
+      mapper: Mapper.Aux[toLabelledParam.type, L, MP],
+      toList: ToList[MP, (String, Param[_])],
+      columnNamer: ColumnNamer
+  ): Updates = new Updates(toList(mapper(gen.to(p))).map { case (k, v) =>
+    columnNamer(k) -> v
+  })
 
   def apply[T, U <: HList, MP <: HList](patch: Patch[T])(implicit
-    patchable: Patchable.Aux[T, U],
-    mapper: Mapper.Aux[updateWithOptions.type, U, MP],
-    toList: ToList[MP, Option[(String, Param[_])]],
-    columnNamer: ColumnNamer
+      patchable: Patchable.Aux[T, U],
+      mapper: Mapper.Aux[updateWithOptions.type, U, MP],
+      toList: ToList[MP, Option[(String, Param[_])]],
+      columnNamer: ColumnNamer
   ): Updates = apply[U, MP](patch.updates.asInstanceOf[U])
 
   object updateWithOptions extends Poly1 {
     implicit def cases[K <: Symbol, T](implicit
-      encoder: ValueEncoder[T],
-      name: Witness.Aux[K]
-    ) = at[FieldType[K, Option[T]]] {
-      opt => opt.map {
-        v => name.value.name -> Param(v)
+        encoder: ValueEncoder[T],
+        name: Witness.Aux[K]
+    ) = at[FieldType[K, Option[T]]] { opt =>
+      opt.map { v =>
+        name.value.name -> Param(v)
       }
     }
   }
diff --git a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Values.scala b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Values.scala
index e0560d2c..006894cf 100644
--- a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Values.scala
+++ b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/Values.scala
@@ -5,17 +5,20 @@ import shapeless.ops.hlist.{Length, Mapper, ToTraversable}
 import shapeless.ops.nat.ToInt
 import shapeless.{HList, LabelledGeneric, Nat}
 
-case class Values private (params: Seq[Param[_]], length: Int) extends QueryParam {
-  def placeholders(start: Int): Seq[String] = (start until (start + length)).map(i => s"$$$i")
+case class Values private (params: Seq[Param[_]], length: Int)
+    extends QueryParam {
+  def placeholders(start: Int): Seq[String] =
+    (start until (start + length)).map(i => s"$$$i")
 }
 
 object Values {
-  def apply[T <: Product, L <: HList, V <: HList, P <: HList, N <: Nat](obj: T)(implicit
-    gen: LabelledGeneric.Aux[T, L],
-    values: shapeless.ops.record.Values.Aux[L, V],
-    mapper: Mapper.Aux[toParam.type, V, P],
-    length: Length.Aux[L, N],
-    toInt: ToInt[N],
-    toTraversable: ToTraversable.Aux[P, Seq, Param[_]]
+  def apply[T <: Product, L <: HList, V <: HList, P <: HList, N <: Nat](obj: T)(
+      implicit
+      gen: LabelledGeneric.Aux[T, L],
+      values: shapeless.ops.record.Values.Aux[L, V],
+      mapper: Mapper.Aux[toParam.type, V, P],
+      length: Length.Aux[L, N],
+      toInt: ToInt[N],
+      toTraversable: ToTraversable.Aux[P, Seq, Param[_]]
   ): Values = Values(toTraversable(mapper(values(gen.to(obj)))), toInt())
-}
\ No newline at end of file
+}
diff --git a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/enumeration/Enums.scala b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/enumeration/Enums.scala
index 491d5024..593ca22c 100644
--- a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/enumeration/Enums.scala
+++ b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/enumeration/Enums.scala
@@ -8,56 +8,65 @@ import io.netty.buffer.{ByteBuf, Unpooled}
 import shapeless.labelled._
 import shapeless.{:+:, CNil, Coproduct, Inl, Inr, LabelledGeneric, Witness}
 
-case class InvalidValue(repr: String) extends IllegalArgumentException(
-  s"Reached CNil case, but CNil does not exist (value '$repr' is not a valid value for this enumeration)"
-)
-
+case class InvalidValue(repr: String)
+    extends IllegalArgumentException(
+      s"Reached CNil case, but CNil does not exist (value '$repr' is not a valid value for this enumeration)"
+    )
 
 class EnumCConsDecoder[K <: Symbol, H, T <: Coproduct](
-  name: Witness.Aux[K],
-  leaf: Witness.Aux[H],
-  decodeTail: ValueDecoder[T]
+    name: Witness.Aux[K],
+    leaf: Witness.Aux[H],
+    decodeTail: ValueDecoder[T]
 ) extends ValueDecoder[FieldType[K, H] :+: T] {
   private val str = name.value.name
 
-  @inline final def decodeText(recv: String, text: String): Try[FieldType[K, H] :+: T] =
-    if(text == str)
+  @inline final def decodeText(
+      recv: String,
+      text: String
+  ): Try[FieldType[K, H] :+: T] =
+    if (text == str)
       Return(Inl(field[K](leaf.value)))
     else
       decodeTail.decodeText(recv, text).map(Inr(_))
 
   @inline final def decodeBinary(
-    recv: String, bytes: ByteBuf,
-    charset: Charset
+      recv: String,
+      bytes: ByteBuf,
+      charset: Charset
   ): Try[FieldType[K, H] :+: T] = decodeText(recv, bytes.toString(charset))
 }
 
-
 class EnumCoproductDecoder[T, C <: Coproduct](
-  gen: LabelledGeneric.Aux[T, C],
-  decodeC: ValueDecoder[C]
+    gen: LabelledGeneric.Aux[T, C],
+    decodeC: ValueDecoder[C]
 ) extends ValueDecoder[T] {
-  @inline final def decodeText(recv: String, text: String): Try[T] = decodeC.decodeText(recv, text).map(gen.from)
-  @inline final def decodeBinary(recv: String, bytes: ByteBuf, charset: Charset): Try[T] =
+  @inline final def decodeText(recv: String, text: String): Try[T] =
+    decodeC.decodeText(recv, text).map(gen.from)
+  @inline final def decodeBinary(
+      recv: String,
+      bytes: ByteBuf,
+      charset: Charset
+  ): Try[T] =
     decodeC.decodeBinary(recv, bytes, charset).map(gen.from)
 }
 
 class EnumCConsEncoder[K <: Symbol, H, T <: Coproduct](
-  name: Witness.Aux[K],
-  leaf: Witness.Aux[H],
-  encodeTail: ValueEncoder[T]
+    name: Witness.Aux[K],
+    leaf: Witness.Aux[H],
+    encodeTail: ValueEncoder[T]
 ) extends ValueEncoder[FieldType[K, H] :+: T] {
   private val str = name.value.name
 
   @inline final def encodeText(
-    t: FieldType[K, H] :+: T
+      t: FieldType[K, H] :+: T
   ): Option[String] = t match {
     case Inl(_)    => Some(str)
     case Inr(tail) => encodeTail.encodeText(tail)
   }
 
   @inline final def encodeBinary(
-    t: FieldType[K, H] :+: T, charset: Charset
+      t: FieldType[K, H] :+: T,
+      charset: Charset
   ): Option[ByteBuf] = t match {
     case Inl(_)    => Some(Unpooled.copiedBuffer(str, charset))
     case Inr(tail) => encodeTail.encodeBinary(tail, charset)
@@ -68,11 +77,12 @@ class EnumCConsEncoder[K <: Symbol, H, T <: Coproduct](
 }
 
 class EnumCoproductEncoder[T, C <: Coproduct](
-  gen: LabelledGeneric.Aux[T, C],
-  encodeC: ValueEncoder[C]
+    gen: LabelledGeneric.Aux[T, C],
+    encodeC: ValueEncoder[C]
 ) extends ValueEncoder[T] {
   @inline final def encodeText(t: T) = encodeC.encodeText(gen.to(t))
-  @inline final def encodeBinary(t: T, charset: Charset) = encodeC.encodeBinary(gen.to(t), charset)
+  @inline final def encodeBinary(t: T, charset: Charset) =
+    encodeC.encodeBinary(gen.to(t), charset)
   val typeName = ""
   val elemTypeName = None
 }
@@ -80,24 +90,27 @@ class EnumCoproductEncoder[T, C <: Coproduct](
 trait Enums {
 
   implicit object EnumCNilDecoder extends ValueDecoder[CNil] {
-    @inline final def decodeText(recv: String, text: String): Try[CNil] = Throw(InvalidValue(text))
+    @inline final def decodeText(recv: String, text: String): Try[CNil] = Throw(
+      InvalidValue(text)
+    )
 
     @inline final def decodeBinary(
-      recv: String, bytes: ByteBuf,
-      charset: Charset
+        recv: String,
+        bytes: ByteBuf,
+        charset: Charset
     ): Try[CNil] = Throw(InvalidValue(bytes.toString(charset)))
   }
 
   implicit def enumCConsDecoder[K <: Symbol, H, T <: Coproduct](implicit
-    name: Witness.Aux[K],
-    leaf: Witness.Aux[H],
-    decodeTail: ValueDecoder[T]
-  ): ValueDecoder[FieldType[K, H] :+: T] = new EnumCConsDecoder[K, H, T](name, leaf, decodeTail)
-
+      name: Witness.Aux[K],
+      leaf: Witness.Aux[H],
+      decodeTail: ValueDecoder[T]
+  ): ValueDecoder[FieldType[K, H] :+: T] =
+    new EnumCConsDecoder[K, H, T](name, leaf, decodeTail)
 
   implicit def enumCoproductDecoder[T, C <: Coproduct](implicit
-    gen: LabelledGeneric.Aux[T, C],
-    decodeC: ValueDecoder[C]
+      gen: LabelledGeneric.Aux[T, C],
+      decodeC: ValueDecoder[C]
   ): ValueDecoder[T] = new EnumCoproductDecoder[T, C](gen, decodeC)
 
   implicit object EnumCNilEncoder extends ValueEncoder[CNil] {
@@ -108,13 +121,14 @@ trait Enums {
   }
 
   implicit def enumCConsEncoder[K <: Symbol, H, T <: Coproduct](implicit
-    name: Witness.Aux[K],
-    leaf: Witness.Aux[H],
-    encodeTail: ValueEncoder[T]
-  ): ValueEncoder[FieldType[K, H] :+: T] = new EnumCConsEncoder[K, H, T](name, leaf, encodeTail)
+      name: Witness.Aux[K],
+      leaf: Witness.Aux[H],
+      encodeTail: ValueEncoder[T]
+  ): ValueEncoder[FieldType[K, H] :+: T] =
+    new EnumCConsEncoder[K, H, T](name, leaf, encodeTail)
 
   implicit def enumCoproductEncoder[T, C <: Coproduct](implicit
-    gen: LabelledGeneric.Aux[T, C],
-    encodeC: ValueEncoder[C]
+      gen: LabelledGeneric.Aux[T, C],
+      encodeC: ValueEncoder[C]
   ): ValueEncoder[T] = new EnumCoproductEncoder[T, C](gen, encodeC)
-}
\ No newline at end of file
+}
diff --git a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/package.scala b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/package.scala
index f925cf05..1ea93dd3 100644
--- a/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/package.scala
+++ b/finagle-postgres-shapeless/src/main/scala/com/twitter/finagle/postgres/generic/package.scala
@@ -4,19 +4,29 @@ import scala.collection.immutable.Queue
 
 import com.twitter.finagle.postgres.generic.enumeration.Enums
 import com.twitter.finagle.postgres.values.ValueEncoder
-import shapeless.ops.hlist.{LeftFolder, LiftAll, Mapper, ToList, ToTraversable, Zip}
+import shapeless.ops.hlist.{
+  LeftFolder,
+  LiftAll,
+  Mapper,
+  ToList,
+  ToTraversable,
+  Zip
+}
 import shapeless._
 import shapeless.labelled.FieldType
 
 package object generic extends Enums {
 
-  implicit class ToShapelessClientOps(val client: PostgresClient) extends AnyVal {
+  implicit class ToShapelessClientOps(val client: PostgresClient)
+      extends AnyVal {
 
     def queryAs[T <: Product](query: String, params: Param[_]*)(implicit
-      rowDecoder: RowDecoder[T],
-      columnNamer: ColumnNamer
+        rowDecoder: RowDecoder[T],
+        columnNamer: ColumnNamer
     ) = {
-      client.prepareAndQuery(query, params: _*)(row => rowDecoder(row)(columnNamer))
+      client.prepareAndQuery(query, params: _*)(row =>
+        rowDecoder(row)(columnNamer)
+      )
     }
 
   }
@@ -26,30 +36,34 @@ package object generic extends Enums {
     def placeholders(start: Int): Seq[String]
   }
 
-  implicit class ToQueryParam[T](v: T)(implicit qp: QueryParams[T]) extends QueryParam {
+  implicit class ToQueryParam[T](v: T)(implicit qp: QueryParams[T])
+      extends QueryParam {
     @inline final def params: Seq[Param[_]] = qp(v)
-    @inline final def placeholders(start: Int): Seq[String] = qp.placeholders(v, start)
+    @inline final def placeholders(start: Int): Seq[String] =
+      qp.placeholders(v, start)
   }
 
   object toParam extends Poly1 {
-    implicit def cases[T](implicit encoder: ValueEncoder[T]) = at[T](t => Param(t))
+    implicit def cases[T](implicit encoder: ValueEncoder[T]) =
+      at[T](t => Param(t))
   }
 
   object toLabelledParam extends Poly1 {
-    implicit def cases[K <: Symbol, T](implicit name: Witness.Aux[K], encoder: ValueEncoder[T]) = at[FieldType[K, T]] {
-      t => name.value.name -> Param(t: T)
+    implicit def cases[K <: Symbol, T](implicit
+        name: Witness.Aux[K],
+        encoder: ValueEncoder[T]
+    ) = at[FieldType[K, T]] { t =>
+      name.value.name -> Param(t: T)
     }
   }
 
   implicit class QueryContext(val str: StringContext) extends AnyVal {
     def sql(queryParams: QueryParam*) = {
-      val parts = if(str.parts.last == "") str.parts.dropRight(1) else str.parts
+      val parts =
+        if (str.parts.last == "") str.parts.dropRight(1) else str.parts
       val diff = queryParams.length - parts.length
-      val pad = if(diff > 0) Seq.fill(diff)("") else Seq.empty
-      Query(
-        parts ++ pad,
-        queryParams,
-        identity)
+      val pad = if (diff > 0) Seq.fill(diff)("") else Seq.empty
+      Query(parts ++ pad, queryParams, identity)
     }
   }
 
diff --git a/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/DSLSpec.scala b/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/DSLSpec.scala
index ec4f8983..aa2a8f50 100644
--- a/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/DSLSpec.scala
+++ b/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/DSLSpec.scala
@@ -11,8 +11,16 @@ class DSLSpec extends AnyFreeSpec with Matchers {
   "Columns" - {
 
     "should snake case by default" in {
-      case class Camels(camelOne: String, camelTwoWords: Int, camelWith2NumbersAnd5Words: Boolean)
-      Columns[Camels].names shouldEqual List("camel_one", "camel_two_words", "camel_with_2_numbers_and_5_words")
+      case class Camels(
+          camelOne: String,
+          camelTwoWords: Int,
+          camelWith2NumbersAnd5Words: Boolean
+      )
+      Columns[Camels].names shouldEqual List(
+        "camel_one",
+        "camel_two_words",
+        "camel_with_2_numbers_and_5_words"
+      )
     }
 
   }
@@ -20,14 +28,17 @@ class DSLSpec extends AnyFreeSpec with Matchers {
   "Updates" - {
 
     "should recover updates from record of options" in {
-      val record = Record(foo = Some(22):Option[Int], bar = None:Option[String])
+      val record =
+        Record(foo = Some(22): Option[Int], bar = None: Option[String])
       Updates(record) shouldEqual Updates(List("foo" -> Param(22)))
     }
 
     "should recover updates from a case class" in {
       case class Foo(foo: String, bar: Int)
       val foo = Foo("hello", 22)
-      Updates(foo) shouldEqual Updates(List("foo" -> Param("hello"), "bar" -> Param(22)))
+      Updates(foo) shouldEqual Updates(
+        List("foo" -> Param("hello"), "bar" -> Param(22))
+      )
     }
 
     "should recover updates from a patchless Patch" in {
@@ -39,12 +50,17 @@ class DSLSpec extends AnyFreeSpec with Matchers {
     }
 
     "uses snake case namer by default" in {
-      val record = Record(fooCamel = Some(22):Option[Int], barCamel = None:Option[String])
+      val record = Record(
+        fooCamel = Some(22): Option[Int],
+        barCamel = None: Option[String]
+      )
       Updates(record) shouldEqual Updates(List("foo_camel" -> Param(22)))
 
       case class Foo(fooCamel: String, barCamel: Int)
       val foo = Foo("hello", 22)
-      Updates(foo) shouldEqual Updates(List("foo_camel" -> Param("hello"), "bar_camel" -> Param(22)))
+      Updates(foo) shouldEqual Updates(
+        List("foo_camel" -> Param("hello"), "bar_camel" -> Param(22))
+      )
     }
 
   }
diff --git a/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/EnumSpec.scala b/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/EnumSpec.scala
index 81e77c1a..0db1503a 100644
--- a/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/EnumSpec.scala
+++ b/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/EnumSpec.scala
@@ -20,8 +20,7 @@ class EnumSpec extends AnyFlatSpec with Matchers {
 
   val UTF8 = StandardCharsets.UTF_8
 
-
-  "Enum decoding" should "decode enumeration ADTs from strings" in  {
+  "Enum decoding" should "decode enumeration ADTs from strings" in {
 
     val decoder = ValueDecoder[TestEnum]
 
@@ -52,7 +51,9 @@ class EnumSpec extends AnyFlatSpec with Matchers {
   it should "fail for an invalid value" in {
     val decoder = ValueDecoder[TestEnum]
 
-    decoder.decodeText("enum_recv", "CasePurple") shouldEqual Throw(InvalidValue("CasePurple"))
+    decoder.decodeText("enum_recv", "CasePurple") shouldEqual Throw(
+      InvalidValue("CasePurple")
+    )
     decoder.decodeBinary(
       "enum_recv",
       Unpooled.copiedBuffer("CasePurple", UTF8),
@@ -68,7 +69,10 @@ class EnumSpec extends AnyFlatSpec with Matchers {
     encoder.encodeText(CaseThree) shouldEqual Some("CaseThree")
     encoder.encodeBinary(CaseOne, UTF8).get.toString(UTF8) shouldEqual "CaseOne"
     encoder.encodeBinary(CaseTwo, UTF8).get.toString(UTF8) shouldEqual "CaseTwo"
-    encoder.encodeBinary(CaseThree, UTF8).get.toString(UTF8) shouldEqual "CaseThree"
+    encoder
+      .encodeBinary(CaseThree, UTF8)
+      .get
+      .toString(UTF8) shouldEqual "CaseThree"
   }
 
 }
diff --git a/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/QuerySpec.scala b/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/QuerySpec.scala
index b48d1977..31b293cd 100644
--- a/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/QuerySpec.scala
+++ b/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/QuerySpec.scala
@@ -16,11 +16,14 @@ import shapeless.{HList, LabelledGeneric}
 
 class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
 
-
   val row = mock[Row]
 
   trait MockClient {
-    def prepareAndQuery[T](sql: String, params: List[Param[_]], f: Row => T): Seq[T]
+    def prepareAndQuery[T](
+        sql: String,
+        params: List[Param[_]],
+        f: Row => T
+    ): Seq[T]
     def prepareAndExecute(sql: String, params: List[Param[_]]): Int
   }
 
@@ -28,7 +31,9 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
 
   val client = new PostgresClient {
 
-    def prepareAndQueryToStream[T](sql: String, params: Param[_]*)(f: (Row) => T): AsyncStream[T] =
+    def prepareAndQueryToStream[T](sql: String, params: Param[_]*)(
+        f: (Row) => T
+    ): AsyncStream[T] =
       AsyncStream.fromSeq(mockClient.prepareAndQuery(sql, params.toList, f))
 
     def prepareAndExecute(sql: String, params: Param[_]*): Future[Int] =
@@ -56,9 +61,13 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
 
   }
 
-  def expectQuery[U](expectedQuery: String, expectedParams: Param[_]*)(query: Query[U]) = {
-    mockClient.prepareAndQuery[U] _ expects (expectedQuery, expectedParams.toList, *) onCall {
-      (q, p, fn) => Seq(fn(row))
+  def expectQuery[U](expectedQuery: String, expectedParams: Param[_]*)(
+      query: Query[U]
+  ) = {
+    mockClient.prepareAndQuery[
+      U
+    ] _ expects (expectedQuery, expectedParams.toList, *) onCall { (q, p, fn) =>
+      Seq(fn(row))
     }
     Await.result(query.run(client)).head
   }
@@ -86,28 +95,44 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
         val p1 = "foo"
         val p2 = 22
 
-        expectQuery("SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1", p1, p2) {
+        expectQuery(
+          "SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1",
+          p1,
+          p2
+        ) {
           sql"SELECT * FROM foo WHERE p1 = $p1 AND p2 = $p2 ORDER BY p1"
         } shouldEqual row
       }
 
       "tuple params for IN operator" in {
         val p1 = ("foo", "bar")
-        expectQuery("SELECT * FROM foo WHERE a IN ($1, $2)", Param("foo"), Param("bar")) {
+        expectQuery(
+          "SELECT * FROM foo WHERE a IN ($1, $2)",
+          Param("foo"),
+          Param("bar")
+        ) {
           sql"SELECT * FROM foo WHERE a IN ($p1)"
         }
       }
 
       "list params for IN operator" in {
         val p1 = List("foo", "bar")
-        expectQuery("SELECT * FROM foo WHERE a IN ($1, $2)", Param("foo"), Param("bar")) {
+        expectQuery(
+          "SELECT * FROM foo WHERE a IN ($1, $2)",
+          Param("foo"),
+          Param("bar")
+        ) {
           sql"SELECT * FROM foo WHERE a IN ($p1)"
         }
       }
 
       "Columns and Values" in {
         case class Foo(foo: String, bar: Int)
-        expectQuery("INSERT INTO foo (foo, bar) VALUES ($1, $2)", Param("fooValue"), Param(22)) {
+        expectQuery(
+          "INSERT INTO foo (foo, bar) VALUES ($1, $2)",
+          Param("fooValue"),
+          Param(22)
+        ) {
           sql"INSERT INTO foo (${Columns[Foo]}) VALUES (${Values(Foo("fooValue", 22))})"
         }
       }
@@ -115,24 +140,38 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
       "Columns and Values, Columns twice (for RETURNING)" in {
         case class Foo(foo: String, bar: Int)
         val foo = Foo("fooValue", 22)
-        expectQuery("INSERT INTO foo (foo, bar) VALUES ($1, $2) RETURNING foo, bar", Param("fooValue"), Param(22)) {
+        expectQuery(
+          "INSERT INTO foo (foo, bar) VALUES ($1, $2) RETURNING foo, bar",
+          Param("fooValue"),
+          Param(22)
+        ) {
           sql"INSERT INTO foo (${Columns[Foo]}) VALUES (${Values(foo)}) RETURNING ${Columns[Foo]}"
         }
       }
 
       "Updates" in {
-        val update = Record(foo = Some("newFoo"): Option[String], bar = None: Option[Int])
+        val update =
+          Record(foo = Some("newFoo"): Option[String], bar = None: Option[Int])
         val bar = 2
-        expectQuery("UPDATE foo SET foo = $1 WHERE bar = $2", Param("newFoo"), Param(2)) {
+        expectQuery(
+          "UPDATE foo SET foo = $1 WHERE bar = $2",
+          Param("newFoo"),
+          Param(2)
+        ) {
           sql"UPDATE foo SET ${Updates(update)} WHERE bar = $bar"
         }
       }
 
       "Updates with Columns (for RETURNING)" in {
         case class Foo(foo: String, bar: Int)
-        val update = Record(foo = Some("newFoo"): Option[String], bar = None: Option[Int])
+        val update =
+          Record(foo = Some("newFoo"): Option[String], bar = None: Option[Int])
         val bar = 2
-        expectQuery("UPDATE foo SET foo = $1 WHERE bar = $2 RETURNING foo, bar", Param("newFoo"), Param(2)) {
+        expectQuery(
+          "UPDATE foo SET foo = $1 WHERE bar = $2 RETURNING foo, bar",
+          Param("newFoo"),
+          Param(2)
+        ) {
           sql"UPDATE foo SET ${Updates(update)} WHERE bar = $bar RETURNING ${Columns[Foo]}"
         }
       }
@@ -142,9 +181,15 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
       val p1 = "foo"
       val p2 = 22
 
-      (row.getOption[Int](_:String)(_: ValueDecoder[Int])) expects ("bar", *) returning Some(2)
+      (row.getOption[Int](_: String)(
+        _: ValueDecoder[Int]
+      )) expects ("bar", *) returning Some(2)
 
-      expectQuery("SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1", p1, p2) {
+      expectQuery(
+        "SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1",
+        p1,
+        p2
+      ) {
         sql"SELECT * FROM foo WHERE p1 = $p1 AND p2 = $p2 ORDER BY p1".map {
           row => row.getOption[Int]("bar")
         }
@@ -159,10 +204,18 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
         val p1 = "foo"
         val p2 = 22
 
-        (row.get[Int](_: String)(_: ValueDecoder[Int])) expects("i", *) returning 2
-        (row.get[String](_: String)(_: ValueDecoder[String])) expects("s", *) returning "two"
-
-        expectQuery("SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1", p1, p2) {
+        (row.get[Int](_: String)(
+          _: ValueDecoder[Int]
+        )) expects ("i", *) returning 2
+        (row.get[String](_: String)(
+          _: ValueDecoder[String]
+        )) expects ("s", *) returning "two"
+
+        expectQuery(
+          "SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1",
+          p1,
+          p2
+        ) {
           sql"SELECT * FROM foo WHERE p1 = $p1 AND p2 = $p2 ORDER BY p1".as[Foo]
         } shouldEqual Foo(2, "two")
       }
@@ -172,17 +225,33 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
         val p1 = "foo"
         val p2 = 22
 
-        (row.get[Int](_: String)(_: ValueDecoder[Int])) expects("i", *) returning 2
-        (row.getOption[String](_: String)(_: ValueDecoder[String])) expects("s", *) returning Some("two")
-
-        expectQuery("SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1", p1, p2) {
+        (row.get[Int](_: String)(
+          _: ValueDecoder[Int]
+        )) expects ("i", *) returning 2
+        (row.getOption[String](_: String)(
+          _: ValueDecoder[String]
+        )) expects ("s", *) returning Some("two")
+
+        expectQuery(
+          "SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1",
+          p1,
+          p2
+        ) {
           sql"SELECT * FROM foo WHERE p1 = $p1 AND p2 = $p2 ORDER BY p1".as[Foo]
         } shouldEqual Foo(2, Some("two"))
 
-        (row.get[Int](_: String)(_: ValueDecoder[Int])) expects("i", *) returning 2
-        (row.getOption[String](_: String)(_: ValueDecoder[String])) expects("s", *) returning None
-
-        expectQuery("SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1", p1, p2) {
+        (row.get[Int](_: String)(
+          _: ValueDecoder[Int]
+        )) expects ("i", *) returning 2
+        (row.getOption[String](_: String)(
+          _: ValueDecoder[String]
+        )) expects ("s", *) returning None
+
+        expectQuery(
+          "SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1",
+          p1,
+          p2
+        ) {
           sql"SELECT * FROM foo WHERE p1 = $p1 AND p2 = $p2 ORDER BY p1".as[Foo]
         } shouldEqual Foo(2, None)
       }
@@ -195,8 +264,12 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
         val p2 = 22
         val first = sql"SELECT * FROM foo WHERE p1 = $p1"
         val second = sql" AND p2 = $p2"
-        (row.get[Int](_: String)(_: ValueDecoder[Int])) expects("i", *) returning 2
-        (row.get[String](_: String)(_: ValueDecoder[String])) expects("s", *) returning "two"
+        (row.get[Int](_: String)(
+          _: ValueDecoder[Int]
+        )) expects ("i", *) returning 2
+        (row.get[String](_: String)(
+          _: ValueDecoder[String]
+        )) expects ("s", *) returning "two"
         expectQuery("SELECT * FROM foo WHERE p1 = $1 AND p2 = $2", p1, p2) {
           (first ++ second).as[Foo]
         } shouldEqual Foo(2, "two")
@@ -207,8 +280,12 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
         val p1 = "foo"
         val first = sql"SELECT * FROM foo WHERE p1 = $p1"
         val second = " ORDER BY p1"
-        (row.get[Int](_: String)(_: ValueDecoder[Int])) expects("i", *) returning 2
-        (row.get[String](_: String)(_: ValueDecoder[String])) expects("s", *) returning "two"
+        (row.get[Int](_: String)(
+          _: ValueDecoder[Int]
+        )) expects ("i", *) returning 2
+        (row.get[String](_: String)(
+          _: ValueDecoder[String]
+        )) expects ("s", *) returning "two"
         expectQuery("SELECT * FROM foo WHERE p1 = $1 ORDER BY p1", p1) {
           (first ++ second).as[Foo]
         } shouldEqual Foo(2, "two")
@@ -220,9 +297,17 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
         val p2 = 22
         val first = sql"SELECT * FROM foo WHERE p1 = $p1"
         val second = sql" AND p2 = $p2"
-        (row.get[Int](_: String)(_: ValueDecoder[Int])) expects("i", *) returning 2
-        (row.get[String](_: String)(_: ValueDecoder[String])) expects("s", *) returning "two"
-        expectQuery("SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1", p1, p2) {
+        (row.get[Int](_: String)(
+          _: ValueDecoder[Int]
+        )) expects ("i", *) returning 2
+        (row.get[String](_: String)(
+          _: ValueDecoder[String]
+        )) expects ("s", *) returning "two"
+        expectQuery(
+          "SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1",
+          p1,
+          p2
+        ) {
           (first ++ second ++ " ORDER BY p1").as[Foo]
         } shouldEqual Foo(2, "two")
       }
@@ -233,9 +318,17 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
         val p2 = 22
         val first = sql"SELECT * FROM foo WHERE p1 = $p1"
         val second = sql"p2 = $p2"
-        (row.get[Int](_: String)(_: ValueDecoder[Int])) expects("i", *) returning 2
-        (row.get[String](_: String)(_: ValueDecoder[String])) expects("s", *) returning "two"
-        expectQuery("SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1", p1, p2) {
+        (row.get[Int](_: String)(
+          _: ValueDecoder[Int]
+        )) expects ("i", *) returning 2
+        (row.get[String](_: String)(
+          _: ValueDecoder[String]
+        )) expects ("s", *) returning "two"
+        expectQuery(
+          "SELECT * FROM foo WHERE p1 = $1 AND p2 = $2 ORDER BY p1",
+          p1,
+          p2
+        ) {
           (first ++ " AND " ++ second ++ " ORDER BY p1").as[Foo]
         } shouldEqual Foo(2, "two")
       }
@@ -246,9 +339,16 @@ class QuerySpec extends AnyFreeSpec with Matchers with MockFactory {
         val p2 = 22
         val first = sql"SELECT * FROM foo WHERE p1 = $p1"
         val second = sql"p2 = 'foo'"
-        (row.get[Int](_: String)(_: ValueDecoder[Int])) expects("i", *) returning 2
-        (row.get[String](_: String)(_: ValueDecoder[String])) expects("s", *) returning "two"
-        expectQuery("SELECT * FROM foo WHERE p1 = $1 AND p2 = 'foo' ORDER BY p1", p1) {
+        (row.get[Int](_: String)(
+          _: ValueDecoder[Int]
+        )) expects ("i", *) returning 2
+        (row.get[String](_: String)(
+          _: ValueDecoder[String]
+        )) expects ("s", *) returning "two"
+        expectQuery(
+          "SELECT * FROM foo WHERE p1 = $1 AND p2 = 'foo' ORDER BY p1",
+          p1
+        ) {
           (first ++ " AND " ++ second ++ " ORDER BY p1").as[Foo]
         } shouldEqual Foo(2, "two")
       }
diff --git a/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/RowDecoderSpec.scala b/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/RowDecoderSpec.scala
index 36304c8e..47afe12e 100644
--- a/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/RowDecoderSpec.scala
+++ b/finagle-postgres-shapeless/src/test/scala/com/twitter/finagle/postgres/generic/RowDecoderSpec.scala
@@ -14,20 +14,36 @@ class RowDecoderSpec extends AnyFlatSpec with Matchers with MockFactory {
     case class Foo(int: Int, string: String, numeric: BigDecimal)
     val decoder = RowDecoder[Foo]
 
-    (row.get(_: String)(_: ValueDecoder[Int])) expects ("int", ValueDecoder.int4) returning 10
-    (row.get(_: String)(_: ValueDecoder[String])) expects ("string", ValueDecoder.string) returning "ten"
-    (row.get(_: String)(_: ValueDecoder[BigDecimal])) expects ("numeric", ValueDecoder.bigDecimal) returning BigDecimal(10.0)
+    (row.get(_: String)(
+      _: ValueDecoder[Int]
+    )) expects ("int", ValueDecoder.int4) returning 10
+    (row.get(_: String)(
+      _: ValueDecoder[String]
+    )) expects ("string", ValueDecoder.string) returning "ten"
+    (row.get(_: String)(
+      _: ValueDecoder[BigDecimal]
+    )) expects ("numeric", ValueDecoder.bigDecimal) returning BigDecimal(10.0)
 
     decoder(row) shouldEqual Foo(10, "ten", 10.0)
   }
 
   it should "decode nullables" in {
-    case class FooWithNulls(int: Int, string: Option[String], numeric: BigDecimal)
+    case class FooWithNulls(
+        int: Int,
+        string: Option[String],
+        numeric: BigDecimal
+    )
     val decoder = RowDecoder[FooWithNulls]
 
-    (row.get(_: String)(_: ValueDecoder[Int])) expects ("int", ValueDecoder.int4) returning 10
-    (row.getOption(_: String)(_: ValueDecoder[String])) expects ("string", ValueDecoder.string) returning None
-    (row.get(_: String)(_: ValueDecoder[BigDecimal])) expects ("numeric", ValueDecoder.bigDecimal) returning BigDecimal(10.0)
+    (row.get(_: String)(
+      _: ValueDecoder[Int]
+    )) expects ("int", ValueDecoder.int4) returning 10
+    (row.getOption(_: String)(
+      _: ValueDecoder[String]
+    )) expects ("string", ValueDecoder.string) returning None
+    (row.get(_: String)(
+      _: ValueDecoder[BigDecimal]
+    )) expects ("numeric", ValueDecoder.bigDecimal) returning BigDecimal(10.0)
 
     decoder(row) shouldEqual FooWithNulls(10, None, 10.0)
   }
@@ -37,10 +53,18 @@ class RowDecoderSpec extends AnyFlatSpec with Matchers with MockFactory {
     case class B(int: Int, bool: Boolean)
     val decoder = RowDecoder[(A, B)]
 
-    (row.get(_: String)(_: ValueDecoder[Int])) expects ("_1.int", ValueDecoder.int4) returning 10
-    (row.get(_: String)(_: ValueDecoder[String])) expects ("_1.string", ValueDecoder.string) returning "ten"
-    (row.get(_: String)(_: ValueDecoder[Int])) expects ("_2.int", ValueDecoder.int4) returning 20
-    (row.get(_: String)(_: ValueDecoder[Boolean])) expects ("_2.bool", ValueDecoder.boolean) returning true
+    (row.get(_: String)(
+      _: ValueDecoder[Int]
+    )) expects ("_1.int", ValueDecoder.int4) returning 10
+    (row.get(_: String)(
+      _: ValueDecoder[String]
+    )) expects ("_1.string", ValueDecoder.string) returning "ten"
+    (row.get(_: String)(
+      _: ValueDecoder[Int]
+    )) expects ("_2.int", ValueDecoder.int4) returning 20
+    (row.get(_: String)(
+      _: ValueDecoder[Boolean]
+    )) expects ("_2.bool", ValueDecoder.boolean) returning true
 
     decoder(row) shouldEqual (A(10, "ten"), B(20, true))
   }
diff --git a/src/main/scala/com/twitter/finagle/Postgres.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/Postgres.scala
similarity index 63%
rename from src/main/scala/com/twitter/finagle/Postgres.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/Postgres.scala
index 072cf6c2..ed652dbc 100644
--- a/src/main/scala/com/twitter/finagle/Postgres.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/Postgres.scala
@@ -12,7 +12,10 @@ import com.twitter.finagle.postgres.messages._
 import com.twitter.finagle.postgres.values.ValueDecoder
 import com.twitter.finagle.service.FailFastFactory.FailFast
 import com.twitter.finagle.service._
-import com.twitter.finagle.ssl.client.{ SslClientEngineFactory, SslClientSessionVerifier }
+import com.twitter.finagle.ssl.client.{
+  SslClientEngineFactory,
+  SslClientSessionVerifier
+}
 import com.twitter.finagle.stats.StatsReceiver
 import com.twitter.finagle.transport.{Transport, TransportContext}
 import com.twitter.util.{Monitor => _, _}
@@ -21,7 +24,6 @@ import io.netty.buffer.UnpooledByteBufAllocator
 import io.netty.channel._
 import java.net.SocketAddress
 
-
 import scala.language.existentials
 
 object Postgres {
@@ -29,7 +31,8 @@ object Postgres {
   object PostgresDefaultMonitor extends com.twitter.util.Monitor {
     val log = Logger(getClass)
     def handle(exc: Throwable): Boolean = exc match {
-      case ServerError(_, _, _, Some(sqlState), _, _, _) if !(sqlState startsWith "XX") =>
+      case ServerError(_, _, _, Some(sqlState), _, _, _)
+          if !(sqlState startsWith "XX") =>
         // typically, a ServerError isn't critical and is often expected
         // it will be logged in the Debug level for visibility without too much noise in production
         log.debug(exc, "ServerError acknowledged by PostgresDefaultMonitor")
@@ -52,13 +55,21 @@ object Postgres {
   }
 
   case class Database(database: String) extends AnyVal
-  object Database { implicit object param extends RequiredParam[Database]("Database") }
+  object Database {
+    implicit object param extends RequiredParam[Database]("Database")
+  }
 
-  case class CustomTypes(types: Option[Map[Int, postgres.PostgresClient.TypeSpecifier]]) extends AnyVal
+  case class CustomTypes(
+      types: Option[Map[Int, postgres.PostgresClient.TypeSpecifier]]
+  ) extends AnyVal
   object CustomTypes { implicit val param = Param(CustomTypes(None)) }
 
-  case class CustomReceiveFunctions(functions: PartialFunction[String, ValueDecoder[T] forSome {type T}]) extends AnyVal
-  object CustomReceiveFunctions { implicit val param = Param(CustomReceiveFunctions(PartialFunction.empty)) }
+  case class CustomReceiveFunctions(
+      functions: PartialFunction[String, ValueDecoder[T] forSome { type T }]
+  ) extends AnyVal
+  object CustomReceiveFunctions {
+    implicit val param = Param(CustomReceiveFunctions(PartialFunction.empty))
+  }
 
   case class BinaryResults(binaryResults: Boolean) extends AnyVal
   object BinaryResults { implicit val param = Param(BinaryResults(false)) }
@@ -75,20 +86,34 @@ object Postgres {
     Monitor(PostgresDefaultMonitor) +
     Allocator(UnpooledByteBufAllocator.DEFAULT)
 
-  private def defaultStack = StackClient.newStack[PgRequest, PgResponse]
+  private def defaultStack = StackClient
+    .newStack[PgRequest, PgResponse]
     .replace(StackClient.Role.prepConn, PrepConnection)
     .replace(Retries.Role, Retries.moduleWithRetryPolicy[PgRequest, PgResponse])
 
   private def channelInitializer(params: Stack.Params) = {
-    val SslClientEngineFactory.Param(sslFactory) = params[SslClientEngineFactory.Param]
-    val SslClientSessionVerifier.Param(sessionVerifier) = params[SslClientSessionVerifier.Param]
+    val SslClientEngineFactory.Param(sslFactory) =
+      params[SslClientEngineFactory.Param]
+    val SslClientSessionVerifier.Param(sessionVerifier) =
+      params[SslClientSessionVerifier.Param]
     val Transport.ClientSsl(ssl) = params[Transport.ClientSsl]
 
     (pipeline: ChannelPipeline) => {
       pipeline
         .addLast("binary_to_packet", new PacketDecoder(ssl.nonEmpty))
-        .addLast("packet_to_backend_messages", new BackendMessageDecoder(new BackendMessageParser))
-        .addLast("backend_messages_to_postgres_response", new PgClientChannelHandler(sslFactory, sessionVerifier, ssl, ssl.nonEmpty))
+        .addLast(
+          "packet_to_backend_messages",
+          new BackendMessageDecoder(new BackendMessageParser)
+        )
+        .addLast(
+          "backend_messages_to_postgres_response",
+          new PgClientChannelHandler(
+            sslFactory,
+            sessionVerifier,
+            ssl,
+            ssl.nonEmpty
+          )
+        )
       ()
     }
   }
@@ -97,15 +122,18 @@ object Postgres {
     Netty4Transporter.raw[PgRequest, PgResponse](
       channelInitializer(params),
       addr,
-      params + Transport.ClientSsl(None)  // we want to give this param to Postgres but not directly to transport
-                                          // because postgres doesn't start out in TLS
+      params + Transport.ClientSsl(
+        None
+      ) // we want to give this param to Postgres but not directly to transport
+      // because postgres doesn't start out in TLS
     )
 
   case class Client(
-    stack: Stack[ServiceFactory[PgRequest, PgResponse]] = defaultStack,
-    params: Stack.Params = defaultParams
+      stack: Stack[ServiceFactory[PgRequest, PgResponse]] = defaultStack,
+      params: Stack.Params = defaultParams
   ) extends StdStackClient[PgRequest, PgResponse, Client]
-    with WithSessionPool[Client] with WithDefaultLoadBalancer[Client] {
+      with WithSessionPool[Client]
+      with WithDefaultLoadBalancer[Client] {
     type In = PgRequest
     type Out = PgResponse
     type Context = TransportContext
@@ -114,21 +142,31 @@ object Postgres {
 
       val Dest(name) = params[Dest]
       val CustomTypes(customTypes) = params[CustomTypes]
-      val CustomReceiveFunctions(customReceiveFunctions) = params[CustomReceiveFunctions]
+      val CustomReceiveFunctions(customReceiveFunctions) =
+        params[CustomReceiveFunctions]
       val Label(id) = params[Label]
       val BinaryResults(binaryResults) = params[BinaryResults]
       val BinaryParams(binaryParams) = params[BinaryParams]
 
       val client = newClient(name, id)
 
-      new postgres.PostgresClientImpl(client, id, customTypes, customReceiveFunctions, binaryResults, binaryParams)
+      new postgres.PostgresClientImpl(
+        client,
+        id,
+        customTypes,
+        customReceiveFunctions,
+        binaryResults,
+        binaryParams
+      )
     }
 
-    def newRichClient(addr: String): postgres.PostgresClientImpl = dest(addr).newRichClient()
-    def newRichClient(addr: Name): postgres.PostgresClientImpl = dest(addr).newRichClient()
+    def newRichClient(addr: String): postgres.PostgresClientImpl =
+      dest(addr).newRichClient()
+    def newRichClient(addr: Name): postgres.PostgresClientImpl =
+      dest(addr).newRichClient()
 
     def dest(
-      addr: String
+        addr: String
     ): Client = {
       Resolver.evalLabeled(addr) match {
         case (n, "") => dest(n)
@@ -141,13 +179,25 @@ object Postgres {
 
     def dest(name: Name): Client = configured(Dest(name))
 
-    def withBinaryParams(enable: Boolean = true) = configured(BinaryParams(enable))
-    def withBinaryResults(enable: Boolean = true) = configured(BinaryResults(enable))
+    def withBinaryParams(enable: Boolean = true) = configured(
+      BinaryParams(enable)
+    )
+    def withBinaryResults(enable: Boolean = true) = configured(
+      BinaryResults(enable)
+    )
     def database(database: String) = configured(Database(database))
-    def withCustomTypes(customTypes: Map[Int, postgres.PostgresClient.TypeSpecifier]) =
+    def withCustomTypes(
+        customTypes: Map[Int, postgres.PostgresClient.TypeSpecifier]
+    ) =
       configured(CustomTypes(Some(customTypes)))
-    def withDefaultTypes() = configured(CustomTypes(Some(postgres.PostgresClient.defaultTypes)))
-    def withCustomReceiveFunctions(receiveFunctions: PartialFunction[String, ValueDecoder[T] forSome { type T }]) =
+    def withDefaultTypes() = configured(
+      CustomTypes(Some(postgres.PostgresClient.defaultTypes))
+    )
+    def withCustomReceiveFunctions(
+        receiveFunctions: PartialFunction[String, ValueDecoder[
+          T
+        ] forSome { type T }]
+    ) =
       configured(CustomReceiveFunctions(receiveFunctions))
 
     def withCredentials(user: String, password: Option[String]): Client =
@@ -156,13 +206,20 @@ object Postgres {
       withCredentials(user, Some(password))
     def withCredentials(user: String): Client = withCredentials(user, None)
 
-    def withRetryPolicy(policy: RetryPolicy[Try[Nothing]]) = configured(Retries.Policy(policy))
+    def withRetryPolicy(policy: RetryPolicy[Try[Nothing]]) = configured(
+      Retries.Policy(policy)
+    )
 
-    def conditionally(bool: Boolean, conf: Client => Client) = if(bool) conf(this) else this
+    def conditionally(bool: Boolean, conf: Client => Client) =
+      if (bool) conf(this) else this
 
-    protected def newTransporter(addr: SocketAddress): Transporter[In, Out, Context] = mkTransport(params, addr)
+    protected def newTransporter(
+        addr: SocketAddress
+    ): Transporter[In, Out, Context] = mkTransport(params, addr)
 
-    protected def newDispatcher(transport: Transport[In, Out] { type Context <: Client.this.Context }): Service[PgRequest, PgResponse] = {
+    protected def newDispatcher(transport: Transport[In, Out] {
+      type Context <: Client.this.Context
+    }): Service[PgRequest, PgResponse] = {
       new Dispatcher(
         transport,
         params[Stats].statsReceiver
@@ -170,15 +227,24 @@ object Postgres {
     }
 
     protected def copy1(
-      stack: Stack[ServiceFactory[PgRequest, PgResponse]],
-      params: Params
-    ): Client {type In = Client.this.In; type Out = Client.this.Out} = copy(stack, params)
+        stack: Stack[ServiceFactory[PgRequest, PgResponse]],
+        params: Params
+    ): Client { type In = Client.this.In; type Out = Client.this.Out } =
+      copy(stack, params)
   }
 
-  private class Dispatcher(transport: Transport[PgRequest, PgResponse], statsReceiver: StatsReceiver)
-    extends SerialClientDispatcher[PgRequest, PgResponse](transport, statsReceiver) {
+  private class Dispatcher(
+      transport: Transport[PgRequest, PgResponse],
+      statsReceiver: StatsReceiver
+  ) extends SerialClientDispatcher[PgRequest, PgResponse](
+        transport,
+        statsReceiver
+      ) {
 
-    override def dispatch(req: PgRequest, p: Promise[PgResponse]): Future[Unit] =
+    override def dispatch(
+        req: PgRequest,
+        p: Promise[PgResponse]
+    ): Future[Unit] =
       super.dispatch(req, p) before p.flatMap {
         case s: AsyncPgResponse =>
           // Only release the connection when the state machine has finished processing the events for this request
@@ -187,31 +253,45 @@ object Postgres {
       }
 
     override def apply(
-      req: PgRequest
+        req: PgRequest
     ): Future[PgResponse] = req match {
       // allow Terminate requests to go through no matter what
-      case PgRequest(Terminate, true) => transport.write(req).flatMap(_ => transport.close().map(_ => Terminated))
+      case PgRequest(Terminate, true) =>
+        transport
+          .write(req)
+          .flatMap(_ => transport.close().map(_ => Terminated))
       case _ => super.apply(req)
     }
   }
 
-  private object PrepConnection extends Stack.ModuleParams[ServiceFactory[PgRequest, PgResponse]] {
+  private object PrepConnection
+      extends Stack.ModuleParams[ServiceFactory[PgRequest, PgResponse]] {
     def parameters: Seq[Param[_]] = Nil
     def role: Role = StackClient.Role.prepConn
-    val description = "Prepare the PostgreSQL connection by authenticating and managing connection failures"
-    def make(params: Params, next: ServiceFactory[PgRequest, PgResponse]): ServiceFactory[PgRequest, PgResponse] = {
+    val description =
+      "Prepare the PostgreSQL connection by authenticating and managing connection failures"
+    def make(
+        params: Params,
+        next: ServiceFactory[PgRequest, PgResponse]
+    ): ServiceFactory[PgRequest, PgResponse] = {
       val User(user) = params[User]
       val Password(password) = params[Password]
       val Database(db) = params[Database]
       val Transport.ClientSsl(ssl) = params[Transport.ClientSsl]
-      new AuthenticationProxy(new HandleErrorsProxy(next), user, password, db, ssl.nonEmpty)
+      new AuthenticationProxy(
+        new HandleErrorsProxy(next),
+        user,
+        password,
+        db,
+        ssl.nonEmpty
+      )
     }
   }
 
   private object SqlState {
     def unapply(err: Throwable): Option[String] = err match {
       case ServerError(_, _, _, sqlState, _, _, _) => sqlState
-      case _ => None
+      case _                                       => None
     }
   }
 
@@ -221,7 +301,7 @@ object Postgres {
       case SqlState(sqlState) if sqlState startsWith "53" => Some(err)
       // Class 08 - Connection exception (can be retried)
       case SqlState(sqlState) if sqlState startsWith "08" => Some(err)
-      case _ => None
+      case _                                              => None
     }
   }
 
@@ -239,15 +319,22 @@ object Postgres {
     // TODO: track this in the prepared statement
     case ReqRep(a, Throw(Retryable(_))) => ResponseClass.NonRetryableFailure
     // Critical errors in the server
-    case ReqRep(a, Throw(SqlState(sqlState))) if sqlState startsWith "XX" => ResponseClass.NonRetryableFailure
-    case ReqRep(a, Throw(SqlState(sqlState))) if sqlState startsWith "58" => ResponseClass.NonRetryableFailure
+    case ReqRep(a, Throw(SqlState(sqlState))) if sqlState startsWith "XX" =>
+      ResponseClass.NonRetryableFailure
+    case ReqRep(a, Throw(SqlState(sqlState))) if sqlState startsWith "58" =>
+      ResponseClass.NonRetryableFailure
     // Operator intervention - these should be failures as well
-    case ReqRep(a, Throw(SqlState(sqlState))) if sqlState startsWith "57" => ResponseClass.NonRetryableFailure
+    case ReqRep(a, Throw(SqlState(sqlState))) if sqlState startsWith "57" =>
+      ResponseClass.NonRetryableFailure
     case ReqRep(a, Throw(SqlState(_)))    => ResponseClass.Success
     case ReqRep(a, Throw(ClientError(_))) => ResponseClass.Success
   }
 
-  private val defaultBackoff = Backoff.exponential(Duration.fromMilliseconds(50), 2, Duration.fromSeconds(5))
+  private val defaultBackoff = Backoff.exponential(
+    Duration.fromMilliseconds(50),
+    2,
+    Duration.fromSeconds(5)
+  )
 
   private val defaultRetryPolicy = RetryPolicy.backoff(defaultBackoff) {
     RetryPolicy.TimeoutAndWriteExceptionsOnly orElse RetryPolicy.ChannelClosedExceptionsOnly
diff --git a/src/main/scala/com/twitter/finagle/postgres/PostgresClient.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/PostgresClient.scala
similarity index 87%
rename from src/main/scala/com/twitter/finagle/postgres/PostgresClient.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/PostgresClient.scala
index 4d8de198..15beeae2 100644
--- a/src/main/scala/com/twitter/finagle/postgres/PostgresClient.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/PostgresClient.scala
@@ -20,21 +20,21 @@ trait PostgresClient {
    * Issue an arbitrary SQL query and get the response.
    */
   def query(
-    sql: String
+      sql: String
   ): Future[QueryResponse]
 
   /*
    * Issue a single SELECT query and get the response.
    */
   def fetch(
-    sql: String
+      sql: String
   ): Future[SelectResult]
 
   /*
    * Execute an update command (e.g., INSERT, DELETE) and get the response.
    */
   def executeUpdate(
-    sql: String
+      sql: String
   ): Future[OK]
 
   def execute(sql: String): Future[OK]
@@ -49,40 +49,45 @@ trait PostgresClient {
   /*
    * Issue a single, prepared SELECT query and wrap the response rows with the provided function.
    */
-  def prepareAndQuery[T](sql: String, params: Param[_]*)(f: Row => T): Future[Seq[T]] =
+  def prepareAndQuery[T](sql: String, params: Param[_]*)(
+      f: Row => T
+  ): Future[Seq[T]] =
     prepareAndQueryToStream(sql, params: _*)(f).toSeq
-  def prepareAndQueryToStream[T](sql: String, params: Param[_]*)(f: Row => T): AsyncStream[T]
+  def prepareAndQueryToStream[T](sql: String, params: Param[_]*)(
+      f: Row => T
+  ): AsyncStream[T]
 
   /*
    * Issue a single, prepared arbitrary query without an expected result set, and provide the affected row count
    */
   def prepareAndExecute(
-    sql: String, params: Param[_]*
+      sql: String,
+      params: Param[_]*
   ): Future[Int]
 
-  /**
-    * Close the underlying connection pool and make this Client eternally down
+  /** Close the underlying connection pool and make this Client eternally down
     *
     * @return
     */
   def close(): Future[Unit]
 
-  /**
-   * The current availability [[Status]] of this client.
-   */
+  /** The current availability [[Status]] of this client.
+    */
   def status: Status
 
-  /**
-   * Determines whether this client is available (can accept requests
-   * with a reasonable likelihood of success).
-   */
+  /** Determines whether this client is available (can accept requests with a
+    * reasonable likelihood of success).
+    */
   def isAvailable: Boolean
 }
 
-
 object PostgresClient {
 
-  case class TypeSpecifier(receiveFunction: String, typeName: String, elemOid: Long = 0)
+  case class TypeSpecifier(
+      receiveFunction: String,
+      typeName: String,
+      elemOid: Long = 0
+  )
 
   val defaultTypes = Map(
     Types.BOOL -> TypeSpecifier("boolrecv", "bool"),
diff --git a/src/main/scala/com/twitter/finagle/postgres/PostgresClientImpl.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/PostgresClientImpl.scala
similarity index 53%
rename from src/main/scala/com/twitter/finagle/postgres/PostgresClientImpl.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/PostgresClientImpl.scala
index 3ab5e3e1..ce933998 100644
--- a/src/main/scala/com/twitter/finagle/postgres/PostgresClientImpl.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/PostgresClientImpl.scala
@@ -20,27 +20,28 @@ import scala.util.Random
  * A Finagle client for communicating with Postgres.
  */
 
-
 class PostgresClientImpl(
-  factory: ServiceFactory[PgRequest, PgResponse],
-  id:String,
-  types: Option[Map[Int, PostgresClient.TypeSpecifier]] = None,
-  receiveFunctions: PartialFunction[String, ValueDecoder[T] forSome {type T}],
-  binaryResults: Boolean = false,
-  binaryParams: Boolean = false
+    factory: ServiceFactory[PgRequest, PgResponse],
+    id: String,
+    types: Option[Map[Int, PostgresClient.TypeSpecifier]] = None,
+    receiveFunctions: PartialFunction[String, ValueDecoder[
+      T
+    ] forSome { type T }],
+    binaryResults: Boolean = false,
+    binaryParams: Boolean = false
 ) extends PostgresClient {
   private[this] val counter = new AtomicInteger(0)
   private[this] val logger = Logger(getClass.getName)
-  private val resultFormats = if(binaryResults) Seq(1) else Seq(0)
-  private val paramFormats = if(binaryParams) Seq(1) else Seq(0)
+  private val resultFormats = if (binaryResults) Seq(1) else Seq(0)
+  private val paramFormats = if (binaryParams) Seq(1) else Seq(0)
 
   val charset = StandardCharsets.UTF_8
 
   private def retrieveTypeMap() = {
-    //get a mapping of OIDs to the name of the receive function for all types in the remote DB.
-    //typreceive is the most reliable way to determine how a type should be decoded
+    // get a mapping of OIDs to the name of the receive function for all types in the remote DB.
+    // typreceive is the most reliable way to determine how a type should be decoded
     val customTypesQuery =
-    """
+      """
       |SELECT DISTINCT
       |  CAST(t.typname AS text) AS type,
       |  CAST(t.oid AS integer) AS oid,
@@ -52,17 +53,28 @@ class PostgresClientImpl(
 
     val serviceF = factory.apply
 
-    def extractTypes(response: PgResponse): Future[Map[Int, PostgresClient.TypeSpecifier]] =
+    def extractTypes(
+        response: PgResponse
+    ): Future[Map[Int, PostgresClient.TypeSpecifier]] =
       response match {
         case SelectResult(fields, rows) =>
-          val rowValues = ResultSet(fields, charset, rows, PostgresClient.defaultTypes, receiveFunctions).rows
-          rowValues.map {
-            row =>
+          val rowValues = ResultSet(
+            fields,
+            charset,
+            rows,
+            PostgresClient.defaultTypes,
+            receiveFunctions
+          ).rows
+          rowValues
+            .map { row =>
               row.get[Int]("oid") -> PostgresClient.TypeSpecifier(
                 row.get[String]("typreceive"),
                 row.get[String]("type"),
-                row.get[Int]("typelem"))
-          }.toSeq().map(_.toMap)
+                row.get[Int]("typelem")
+              )
+            }
+            .toSeq()
+            .map(_.toMap)
       }
 
     val customTypesResult = for {
@@ -78,48 +90,62 @@ class PostgresClientImpl(
     customTypesResult
   }
 
-
   private[postgres] val typeMap = Refresh.every(1.hour) {
     types.map(Future(_)).getOrElse(retrieveTypeMap())
   }
 
   // The OIDs to be used when sending parameters
   private[postgres] val encodeOids =
-    typeMap().map {
-      tm =>
-        tm.toIndexedSeq.map {
-          case (oid, PostgresClient.TypeSpecifier(_, typeName, _)) => typeName -> oid
-        }.groupBy(_._1).mapValues(_.map(_._2).min)
+    typeMap().map { tm =>
+      tm.toIndexedSeq
+        .map { case (oid, PostgresClient.TypeSpecifier(_, typeName, _)) =>
+          typeName -> oid
+        }
+        .groupBy(_._1)
+        .mapValues(_.map(_._2).min)
     }
 
   /*
    * Execute some actions inside of a transaction using a single connection
    */
-  override def inTransaction[T](fn: PostgresClient => Future[T]): Future[T] = for {
-    types                    <- typeMap()
-    service                  <- factory()
-    constFactory             =  ServiceFactory.const(service)
-    id                       =  Random.alphanumeric.take(28).mkString
-    transactionalClient      =  new PostgresClientImpl(constFactory, id, Some(types), receiveFunctions, binaryResults, binaryParams)
-    closeTransaction         =  () => transactionalClient.close().ensure(constFactory.close().ensure(service.close()))
-    completeTransactionQuery =  (sql: String) => transactionalClient.query(sql).ensure(closeTransaction())
-    _                        <- transactionalClient.query("BEGIN").onFailure(_ => closeTransaction())
-    result                   <- fn(transactionalClient).rescue {
-      case err => for {
-        _ <- completeTransactionQuery("ROLLBACK")
-        _ <- Future.exception(err)
-      } yield null.asInstanceOf[T]
-    }
-    _                        <- completeTransactionQuery("COMMIT")
-  } yield result
+  override def inTransaction[T](fn: PostgresClient => Future[T]): Future[T] =
+    for {
+      types <- typeMap()
+      service <- factory()
+      constFactory = ServiceFactory.const(service)
+      id = Random.alphanumeric.take(28).mkString
+      transactionalClient = new PostgresClientImpl(
+        constFactory,
+        id,
+        Some(types),
+        receiveFunctions,
+        binaryResults,
+        binaryParams
+      )
+      closeTransaction = () =>
+        transactionalClient
+          .close()
+          .ensure(constFactory.close().ensure(service.close()))
+      completeTransactionQuery = (sql: String) =>
+        transactionalClient.query(sql).ensure(closeTransaction())
+      _ <- transactionalClient.query("BEGIN").onFailure(_ => closeTransaction())
+      result <- fn(transactionalClient).rescue { case err =>
+        for {
+          _ <- completeTransactionQuery("ROLLBACK")
+          _ <- Future.exception(err)
+        } yield null.asInstanceOf[T]
+      }
+      _ <- completeTransactionQuery("COMMIT")
+    } yield result
 
   /*
    * Issue an arbitrary SQL query and get the response.
    */
   override def query(sql: String): Future[QueryResponse] = sendQuery(sql) {
-    case SelectResult(fields, rows) => typeMap().map {
-      types => ResultSet(fields, charset, rows, types, receiveFunctions)
-    }
+    case SelectResult(fields, rows) =>
+      typeMap().map { types =>
+        ResultSet(fields, charset, rows, types, receiveFunctions)
+      }
     case CommandCompleteResponse(affected) => Future(OK(affected))
   }
 
@@ -147,19 +173,22 @@ class PostgresClientImpl(
       for {
         types <- typeMap()
         SelectResult(fields, rows) <- fetch(sql)
-      } yield ResultSet(fields, charset, rows, types, receiveFunctions).rows.map(f)
+      } yield ResultSet(fields, charset, rows, types, receiveFunctions).rows
+        .map(f)
     }.flatten
 
   /*
    * Issue a single, prepared SELECT query and wrap the response rows with the provided function.
    */
-  override def prepareAndQueryToStream[T](sql: String, params: Param[_]*)(f: Row => T): AsyncStream[T] =
+  override def prepareAndQueryToStream[T](sql: String, params: Param[_]*)(
+      f: Row => T
+  ): AsyncStream[T] =
     AsyncStream.fromFuture {
       typeMap().flatMap { _ =>
         for {
-          service   <- factory()
-          statement = new PreparedStatementImpl("", sql, service)
-          result    <- statement.selectToStream(params: _*)(f)
+          service <- factory()
+          statement = new PreparedStatementImpl(sql, service)
+          result <- statement.selectToStream(params: _*)(f)
         } yield result
       }
     }.flatten
@@ -167,78 +196,80 @@ class PostgresClientImpl(
   /*
    * Issue a single, prepared arbitrary query without an expected result set, and provide the affected row count
    */
-  override def prepareAndExecute(sql: String, params: Param[_]*): Future[Int] = {
+  override def prepareAndExecute(
+      sql: String,
+      params: Param[_]*
+  ): Future[Int] = {
     typeMap().flatMap { _ =>
       for {
-        service   <- factory()
-        statement = new PreparedStatementImpl("", sql, service)
+        service <- factory()
+        statement = new PreparedStatementImpl(sql, service)
         OK(count) <- statement.exec(params: _*)
       } yield count
     }
   }
 
-
-  /**
-    * Close the underlying connection pool and make this Client eternally down
+  /** Close the underlying connection pool and make this Client eternally down
     * @return
     */
   override def close(): Future[Unit] = {
     factory.close()
   }
 
-  /**
-   * The current availability [[Status]] of this client.
-   */
+  /** The current availability [[Status]] of this client.
+    */
   override def status: Status = factory.status
 
-  /**
-   * Determines whether this client is available (can accept requests
-   * with a reasonable likelihood of success).
-   */
+  /** Determines whether this client is available (can accept requests with a
+    * reasonable likelihood of success).
+    */
   override def isAvailable: Boolean = status == Status.Open
 
-  private[this] def sendQuery[T](sql: String)(handler: PartialFunction[PgResponse, Future[T]]) = {
+  private[this] def sendQuery[T](
+      sql: String
+  )(handler: PartialFunction[PgResponse, Future[T]]) = {
     send(PgRequest(Query(sql)))(handler)
   }
 
-
   private[this] def send[T](
-    r: PgRequest,
-    optionalService: Option[Service[PgRequest, PgResponse]] = None)(
-    handler: PartialFunction[PgResponse, Future[T]]
+      r: PgRequest,
+      optionalService: Option[Service[PgRequest, PgResponse]] = None
+  )(
+      handler: PartialFunction[PgResponse, Future[T]]
   ) = {
     val service = optionalService.getOrElse(factory.toService)
-    service(r).flatMap (handler orElse {
-      case unexpected => Future.exception(new IllegalStateException(s"Unexpected response $unexpected"))
+    service(r).flatMap(handler orElse { case unexpected =>
+      Future.exception(
+        new IllegalStateException(s"Unexpected response $unexpected")
+      )
     })
   }
 
-
   private[this] class PreparedStatementImpl(
-    name: String,
-    sql: String,
-    service: Service[PgRequest, PgResponse]
+      sql: String,
+      service: Service[PgRequest, PgResponse]
   ) extends PreparedStatement {
 
+    private[this] val name = s"fin-pg-$id-" + counter.incrementAndGet
+
     def closeService = service.close()
 
     private[this] def parse(params: Param[_]*): Future[Unit] = {
-      val paramTypes = encodeOids.map {
-        oidMap => params.map {
-          param => oidMap.getOrElse(param.encoder.typeName, 0)
+      val paramTypes = encodeOids.map { oidMap =>
+        params.map { param =>
+          oidMap.getOrElse(param.encoder.typeName, 0)
         }
       }
-      paramTypes.flatMap {
-        types =>
-          val req = Parse(name, sql, types)
-          send(PgRequest(req, flush = true), Some(service)) {
-            case ParseCompletedResponse => Future.value(())
-          }
+      paramTypes.flatMap { types =>
+        val req = Parse(name, sql, types)
+        send(PgRequest(req, flush = true), Some(service)) {
+          case ParseCompletedResponse => Future.value(())
+        }
       }
     }
 
     private[this] def bind(params: Seq[ByteBuf]): Future[Unit] = {
-      val req =  Bind(
+      val req = Bind(
         portal = name,
         name = name,
         formats = paramFormats,
@@ -253,71 +284,65 @@ class PostgresClientImpl(
 
     private[this] def describe(): Future[Array[Field]] = {
       val req = PgRequest(Describe(portal = true, name = name), flush = true)
-      send(req, Some(service)) {
-        case RowDescriptions(fields) => Future.value(fields)
+      send(req, Some(service)) { case RowDescriptions(fields) =>
+        Future.value(fields)
       }
     }
 
-
     private[this] def execute(
-      maxRows: Int = 0
+        maxRows: Int = 0
     ) = {
       val req = PgRequest(Execute(name, maxRows), flush = true)
-      send(req, Some(service)) {
-        case rep => Future.value(rep)
+      send(req, Some(service)) { case rep =>
+        Future.value(rep)
       }
     }
 
-
     private[this] def sync(
-      optionalService: Option[Service[PgRequest, PgResponse]] = None
+        optionalService: Option[Service[PgRequest, PgResponse]] = None
     ): Future[Unit] = send(PgRequest(Sync), optionalService) {
       case ReadyForQueryResponse => Future.value(())
     }
 
-
     override def fire(params: Param[_]*): Future[QueryResponse] = {
-      val paramBuffers = if(binaryParams) {
-        params.map {
-          p => p.encodeBinary(StandardCharsets.UTF_8)
+      val paramBuffers = if (binaryParams) {
+        params.map { p =>
+          p.encodeBinary(StandardCharsets.UTF_8)
         }
       } else {
-        params.map {
-          p => p.encodeText(StandardCharsets.UTF_8)
+        params.map { p =>
+          p.encodeText(StandardCharsets.UTF_8)
         }
       }
 
       val f = for {
-        types  <- typeMap()
-        pname  <- parse(params: _*)
-        _      <- bind(paramBuffers)
+        types <- typeMap()
+        pname <- parse(params: _*)
+        _ <- bind(paramBuffers)
         fields <- describe()
-        exec   <- execute()
+        exec <- execute()
       } yield exec match {
         case CommandCompleteResponse(rows) => OK(rows)
         case Rows(rows) =>
           ResultSet(fields, charset, rows, types, receiveFunctions)
       }
-      f.transform {
-        result =>
-          sync(Some(service)).flatMap {
-            _ => Future.const(result)
-          }
+      f.transform { result =>
+        sync(Some(service)).flatMap { _ =>
+          Future.const(result)
+        }
       }.ensure(service.close())
     }
   }
-
-  private[this] def genName() = s"fin-pg-$id-" + counter.incrementAndGet
 }
 
-
-
-
 case class Param[T](value: T)(implicit val encoder: ValueEncoder[T]) {
-  def encodeText(charset: Charset = StandardCharsets.UTF_8) = ValueEncoder.encodeText(value, encoder, charset)
-  def encodeBinary(charset: Charset = StandardCharsets.UTF_8) = ValueEncoder.encodeBinary(value, encoder, charset)
+  def encodeText(charset: Charset = StandardCharsets.UTF_8) =
+    ValueEncoder.encodeText(value, encoder, charset)
+  def encodeBinary(charset: Charset = StandardCharsets.UTF_8) =
+    ValueEncoder.encodeBinary(value, encoder, charset)
 }
 
 object Param {
-  implicit def convert[T : ValueEncoder](t: T): Param[T] = Param(t)
+  implicit def convert[T](t: T)(implicit encoder: ValueEncoder[T]): Param[T] =
+    Param(t)
 }
diff --git a/src/main/scala/com/twitter/finagle/postgres/PreparedStatement.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/PreparedStatement.scala
similarity index 63%
rename from src/main/scala/com/twitter/finagle/postgres/PreparedStatement.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/PreparedStatement.scala
index 1f279292..78df22b0 100644
--- a/src/main/scala/com/twitter/finagle/postgres/PreparedStatement.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/PreparedStatement.scala
@@ -11,17 +11,20 @@ trait PreparedStatement {
   def fire(params: Param[_]*): Future[QueryResponse]
 
   def exec(params: Param[_]*): Future[OK] = fire(params: _*) flatMap {
-    case ok @ OK(_)   => Future.value(ok)
-    case ResultSet(_) => Future.exception(Errors.client("Update query expected"))
+    case ok @ OK(_) => Future.value(ok)
+    case ResultSet(_) =>
+      Future.exception(Errors.client("Update query expected"))
   }
 
-  def selectToStream[T](params: Param[_]*)(f: Row => T): Future[AsyncStream[T]] = fire(params: _*) map {
+  def selectToStream[T](
+      params: Param[_]*
+  )(f: Row => T): Future[AsyncStream[T]] = fire(params: _*) map {
     case ResultSet(rows) => rows.map(f)
-    case OK(_) => AsyncStream.empty
+    case OK(_)           => AsyncStream.empty
   }
   def select[T](params: Param[_]*)(f: Row => T): Future[Seq[T]] =
     selectToStream(params: _*)(f).flatMap(_.toSeq)
 
   def selectFirst[T](params: Param[_]*)(f: Row => T): Future[Option[T]] =
-    select[T](params:_*)(f) flatMap { rows => Future.value(rows.headOption) }
+    select[T](params: _*)(f) flatMap { rows => Future.value(rows.headOption) }
 }
diff --git a/src/main/scala/com/twitter/finagle/postgres/Responses.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/Responses.scala
similarity index 54%
rename from src/main/scala/com/twitter/finagle/postgres/Responses.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/Responses.scala
index a4b81862..5c689c7e 100644
--- a/src/main/scala/com/twitter/finagle/postgres/Responses.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/Responses.scala
@@ -15,15 +15,16 @@ import scala.language.existentials
 
 // capture all common format data for a set of rows to reduce repeated references
 case class RowFormat(
-  indexMap: Map[String, Int],
-  formats: Array[Short],
-  oids: Array[Int],
-  dataTypes: Map[Int, TypeSpecifier],
-  receives: PartialFunction[String, ValueDecoder[T] forSome {type T}],
-  charset: Charset
+    indexMap: Map[String, Int],
+    formats: Array[Short],
+    oids: Array[Int],
+    dataTypes: Map[Int, TypeSpecifier],
+    receives: PartialFunction[String, ValueDecoder[T] forSome { type T }],
+    charset: Charset
 ) {
   @inline final def recv(index: Int) = dataTypes(oids(index)).receiveFunction
-  @inline final def defaultDecoder(index: Int) = receives.applyOrElse(recv(index), (_: String) => ValueDecoder.never)
+  @inline final def defaultDecoder(index: Int) =
+    receives.applyOrElse(recv(index), (_: String) => ValueDecoder.never)
 }
 
 trait Row {
@@ -33,82 +34,116 @@ trait Row {
   def get[T](index: Int)(implicit decoder: ValueDecoder[T]): T
   def getTry[T](name: String)(implicit decoder: ValueDecoder[T]): Try[T]
   def getTry[T](index: Int)(implicit decoder: ValueDecoder[T]): Try[T]
-  def getOrElse[T](name: String, default: => T)(implicit decoder: ValueDecoder[T]): T
-  def getOrElse[T](index: Int, default: => T)(implicit decoder: ValueDecoder[T]): T
+  def getOrElse[T](name: String, default: => T)(implicit
+      decoder: ValueDecoder[T]
+  ): T
+  def getOrElse[T](index: Int, default: => T)(implicit
+      decoder: ValueDecoder[T]
+  ): T
   def getAnyOption(name: String): Option[Any]
   def getAnyOption(index: Int): Option[Any]
 }
 
 object Row {
-  def apply(values: Array[Option[ByteBuf]], rowFormat: RowFormat): Row = RowImpl(values, rowFormat)
+  def apply(values: Array[Option[ByteBuf]], rowFormat: RowFormat): Row =
+    RowImpl(values, rowFormat)
 }
 
 /*
  * Convenience wrapper around a set of row values. Supports lookup by name.
  */
 case class RowImpl(
-  values: Array[Option[ByteBuf]],
-  rowFormat: RowFormat
+    values: Array[Option[ByteBuf]],
+    rowFormat: RowFormat
 ) extends Row {
 
-  final def getOption[T](name: String)(implicit decoder: ValueDecoder[T]): Option[T] =
+  final def getOption[T](name: String)(implicit
+      decoder: ValueDecoder[T]
+  ): Option[T] =
     rowFormat.indexMap.get(name).flatMap(i => getOption[T](i))
 
-
-  final def getOption[T](index: Int)(implicit decoder: ValueDecoder[T]): Option[T] = for {
+  final def getOption[T](
+      index: Int
+  )(implicit decoder: ValueDecoder[T]): Option[T] = for {
     buffer <- values(index)
-    format =  rowFormat.formats(index)
-    value  <- if(format == 0)
-                decoder.decodeText(rowFormat.recv(index), buffer.toString(rowFormat.charset)).toOption
-              else
-                decoder.decodeBinary(rowFormat.recv(index), buffer.duplicate(), rowFormat.charset).toOption
+    format = rowFormat.formats(index)
+    value <-
+      if (format == 0)
+        decoder
+          .decodeText(rowFormat.recv(index), buffer.toString(rowFormat.charset))
+          .toOption
+      else
+        decoder
+          .decodeBinary(
+            rowFormat.recv(index),
+            buffer.duplicate(),
+            rowFormat.charset
+          )
+          .toOption
   } yield value
 
-  /**
-    * Danger zone! See get[T](Int) below
+  /** Danger zone! See get[T](Int) below
     */
   final def get[T](name: String)(implicit decoder: ValueDecoder[T]): T =
     get(rowFormat.indexMap(name))
 
-  /**
-    * Danger zone! If [[T]] is primitive, and the column is NULL, we explicitly cast null to [[T]] which will result
-    * in unexpected results:
+  /** Danger zone! If [[T]] is primitive, and the column is NULL, we explicitly
+    * cast null to [[T]] which will result in unexpected results:
     *
-    * null.asInstanceOf[Int]     // 0
-    * null.asInstanceOf[Boolean] // false
+    * null.asInstanceOf[Int] // 0 null.asInstanceOf[Boolean] // false
     *
-    * And so forth. Therefore, use of `get` is discouraged, with `getOption` or `getTry` preferred.
+    * And so forth. Therefore, use of `get` is discouraged, with `getOption` or
+    * `getTry` preferred.
     */
-  final def get[T](index: Int)(implicit decoder: ValueDecoder[T]): T = getOption[T](index).getOrElse(null.asInstanceOf[T])
+  final def get[T](index: Int)(implicit decoder: ValueDecoder[T]): T =
+    getOption[T](index).getOrElse(null.asInstanceOf[T])
 
   final def getTry[T](name: String)(implicit decoder: ValueDecoder[T]): Try[T] =
-    rowFormat.indexMap.get(name).orThrow(new NoSuchElementException(name)).flatMap(getTry[T])
-
-  final def getTry[T](index: Int)(implicit decoder: ValueDecoder[T]): Try[T] = for {
-    bufferOpt  <- Try(values(index))
-    buffer     <- bufferOpt orThrow NullValue
-    format     <- Try(rowFormat.formats(index))
-    recv       <- Try(rowFormat.recv(index))
-    value      <- if(format == 0)
-                    decoder.decodeText(recv, buffer.toString(rowFormat.charset))
-                  else
-                    decoder.decodeBinary(recv, buffer.duplicate(), rowFormat.charset)
-  } yield value
-
-  final def getOrElse[T](index: Int, default: => T)(implicit decoder: ValueDecoder[T]): T =
+    rowFormat.indexMap
+      .get(name)
+      .orThrow(new NoSuchElementException(name))
+      .flatMap(getTry[T])
+
+  final def getTry[T](index: Int)(implicit decoder: ValueDecoder[T]): Try[T] =
+    for {
+      bufferOpt <- Try(values(index))
+      buffer <- bufferOpt orThrow NullValue
+      format <- Try(rowFormat.formats(index))
+      recv <- Try(rowFormat.recv(index))
+      value <-
+        if (format == 0)
+          decoder.decodeText(recv, buffer.toString(rowFormat.charset))
+        else
+          decoder.decodeBinary(recv, buffer.duplicate(), rowFormat.charset)
+    } yield value
+
+  final def getOrElse[T](index: Int, default: => T)(implicit
+      decoder: ValueDecoder[T]
+  ): T =
     getTry[T](index).getOrElse(default)
 
-  final def getOrElse[T](name: String, default: => T)(implicit decoder: ValueDecoder[T]): T =
+  final def getOrElse[T](name: String, default: => T)(implicit
+      decoder: ValueDecoder[T]
+  ): T =
     getTry[T](name).getOrElse(default)
 
   final def getAnyOption(index: Int): Option[Any] = for {
-    buffer  <- values(index)
-    format  =  rowFormat.formats(index)
-    decoder =  rowFormat.defaultDecoder(index)
-    value  <- if(format == 0)
-      decoder.decodeText(rowFormat.recv(index), buffer.toString(rowFormat.charset)).toOption
-    else
-      decoder.decodeBinary(rowFormat.recv(index), buffer.duplicate(), rowFormat.charset).toOption
+    buffer <- values(index)
+    format = rowFormat.formats(index)
+    decoder = rowFormat.defaultDecoder(index)
+    value <-
+      if (format == 0)
+        decoder
+          .decodeText(rowFormat.recv(index), buffer.toString(rowFormat.charset))
+          .toOption
+      else
+        decoder
+          .decodeBinary(
+            rowFormat.recv(index),
+            buffer.duplicate(),
+            rowFormat.charset
+          )
+          .toOption
   } yield value
 
   final def getAnyOption(name: String): Option[Any] =
@@ -137,16 +172,15 @@ trait RowReader[A] { self =>
  * A reader that reads a name-specified field from a row.
  */
 object RequiredField {
-  def apply[A : ValueDecoder](name: String) = new RowReader[A] {
+  def apply[A: ValueDecoder](name: String) = new RowReader[A] {
     def apply(row: Row): A = row.get[A](name)
   }
 }
 
-/**
- * A reader that reads an optional, name-specified field from a row.
- */
+/** A reader that reads an optional, name-specified field from a row.
+  */
 object OptionalField {
-  def apply[A : ValueDecoder](name: String) = new RowReader[Option[A]] {
+  def apply[A: ValueDecoder](name: String) = new RowReader[Option[A]] {
     def apply(row: Row): Option[A] = row.getOption[A](name)
   }
 }
@@ -162,11 +196,11 @@ case class ResultSet(rows: AsyncStream[Row]) extends QueryResponse
  */
 object ResultSet {
   def apply(
-    fields: Array[Field],
-    charset: Charset,
-    dataRows: AsyncStream[DataRow],
-    types: Map[Int, TypeSpecifier],
-    receives: PartialFunction[String, ValueDecoder[T] forSome { type T }]
+      fields: Array[Field],
+      charset: Charset,
+      dataRows: AsyncStream[DataRow],
+      types: Map[Int, TypeSpecifier],
+      receives: PartialFunction[String, ValueDecoder[T] forSome { type T }]
   ): ResultSet = {
     val (indexMap, formats, oids) = {
       val l = fields.length
@@ -174,7 +208,7 @@ object ResultSet {
       val formats = new Array[Short](l)
       val oids = new Array[Int](l)
       var i = 0
-      while(i < l) {
+      while (i < l) {
         val Field(name, format, dataType) = fields(i)
         stringIndex(i) = (name, i)
         formats(i) = format
@@ -186,8 +220,8 @@ object ResultSet {
 
     val rowFormat = RowFormat(indexMap, formats, oids, types, receives, charset)
 
-    val rows = dataRows.map {
-      dataRow => Row(
+    val rows = dataRows.map { dataRow =>
+      Row(
         values = dataRow.data,
         rowFormat = rowFormat
       )
diff --git a/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/codec/Errors.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/codec/Errors.scala
new file mode 100644
index 00000000..484bf388
--- /dev/null
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/codec/Errors.scala
@@ -0,0 +1,60 @@
+package com.twitter.finagle.postgres.codec
+
+import com.twitter.finagle.postgres.messages.PgRequest
+import com.twitter.finagle.postgres.messages.Error
+
+/*
+ * An error generated by Postgres.
+ */
+case class ServerError(
+    message: String,
+    request: Option[PgRequest],
+    severity: Option[String],
+    sqlState: Option[String] = None,
+    detail: Option[String] = None,
+    hint: Option[String] = None,
+    position: Option[String] = None
+) extends Exception(message) {
+  override def toString: String = sqlState match {
+    case Some(state) =>
+      s"com.twitter.finagle.postgres.codec.ServerError: SQLSTATE $state: $message"
+    case None => super.toString
+  }
+}
+
+/*
+ * An error caused on the client side (e.g., a badly-formed query).
+ */
+case class ClientError(message: String) extends Exception(message)
+
+/*
+ * An error arising from attempting to access a NULL field
+ */
+case object NullValue extends Exception("Value is NULL")
+
+object Errors {
+  def client(message: String) = ClientError(message)
+  def server(
+      message: String,
+      request: Option[PgRequest] = None,
+      severity: Option[String] = None,
+      sqlState: Option[String] = None,
+      detail: Option[String] = None,
+      hint: Option[String] = None,
+      position: Option[String] = None
+  ) =
+    ServerError(message, request, severity, sqlState, detail, hint, position)
+
+  def server(error: Error, request: Option[PgRequest]): ServerError = {
+    import error._
+    server(
+      msg.getOrElse("unknown failure"),
+      request,
+      severity,
+      sqlState,
+      detail,
+      hint,
+      position
+    )
+  }
+}
diff --git a/src/main/scala/com/twitter/finagle/postgres/codec/PgCodec.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/codec/PgCodec.scala
similarity index 56%
rename from src/main/scala/com/twitter/finagle/postgres/codec/PgCodec.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/codec/PgCodec.scala
index 4c7331a5..d314a500 100644
--- a/src/main/scala/com/twitter/finagle/postgres/codec/PgCodec.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/codec/PgCodec.scala
@@ -1,10 +1,19 @@
 package com.twitter.finagle.postgres.codec
 
 import com.twitter.finagle._
-import com.twitter.finagle.postgres.connection.{AuthenticationRequired, Connection, RequestingSsl, WrongStateForEvent}
+import com.twitter.finagle.postgres.connection.{
+  AuthenticationRequired,
+  Connection,
+  RequestingSsl,
+  WrongStateForEvent
+}
 import com.twitter.finagle.postgres.messages._
 import com.twitter.finagle.postgres.values.Md5Encryptor
-import com.twitter.finagle.ssl.client.{SslClientConfiguration, SslClientEngineFactory, SslClientSessionVerifier}
+import com.twitter.finagle.ssl.client.{
+  SslClientConfiguration,
+  SslClientEngineFactory,
+  SslClientSessionVerifier
+}
 import com.twitter.logging.Logger
 import com.twitter.util.{Future, Try}
 import io.netty.buffer.{ByteBuf, Unpooled}
@@ -18,10 +27,12 @@ import javax.net.ssl.SSLSession
 /*
  * Filter that converts exceptions into ServerErrors.
  */
-class HandleErrorsProxy(
-    delegate: ServiceFactory[PgRequest, PgResponse]) extends ServiceFactoryProxy(delegate) {
+class HandleErrorsProxy(delegate: ServiceFactory[PgRequest, PgResponse])
+    extends ServiceFactoryProxy(delegate) {
 
-  override def apply(conn: ClientConnection): Future[Service[PgRequest, PgResponse]] = {
+  override def apply(
+      conn: ClientConnection
+  ): Future[Service[PgRequest, PgResponse]] = {
     for {
       service <- delegate.apply(conn)
     } yield HandleErrors.andThen(service)
@@ -46,12 +57,16 @@ class HandleErrorsProxy(
  */
 class AuthenticationProxy(
     delegate: ServiceFactory[PgRequest, PgResponse],
-    user: String, password: Option[String],
+    user: String,
+    password: Option[String],
     database: String,
-    useSsl: Boolean) extends ServiceFactoryProxy(delegate) {
+    useSsl: Boolean
+) extends ServiceFactoryProxy(delegate) {
   private val logger = Logger(getClass.getName)
 
-  override def apply(conn: ClientConnection): Future[Service[PgRequest, PgResponse]] = {
+  override def apply(
+      conn: ClientConnection
+  ): Future[Service[PgRequest, PgResponse]] = {
     for {
       service <- delegate.apply(conn)
       optionalSslResponse <- sendSslRequest(service)
@@ -62,15 +77,21 @@ class AuthenticationProxy(
     } yield service
   }
 
-  private[this] def sendSslRequest(service: Service[PgRequest, PgResponse]): Future[Option[PgResponse]] = {
+  private[this] def sendSslRequest(
+      service: Service[PgRequest, PgResponse]
+  ): Future[Option[PgResponse]] = {
     if (useSsl) {
-      service(PgRequest(new SslRequestMessage)).map { response => Some(response) }
+      service(PgRequest(new SslRequestMessage)).map { response =>
+        Some(response)
+      }
     } else {
       Future.value(None)
     }
   }
 
-  private[this] def handleSslResponse(optionalSslResponse: Option[PgResponse]): Future[Unit] = {
+  private[this] def handleSslResponse(
+      optionalSslResponse: Option[PgResponse]
+  ): Future[Unit] = {
     logger.ifDebug("SSL response: %s".format(optionalSslResponse))
 
     if (useSsl && (optionalSslResponse contains SslNotSupportedResponse)) {
@@ -81,18 +102,31 @@ class AuthenticationProxy(
   }
 
   private[this] def sendPassword(
-      startupResponse: PgResponse, service: Service[PgRequest, PgResponse]): Future[PgResponse] = {
+      startupResponse: PgResponse,
+      service: Service[PgRequest, PgResponse]
+  ): Future[PgResponse] = {
     startupResponse match {
-      case PasswordRequired(encoding) => password match {
-        case Some(pass) =>
-          val msg = encoding match {
-            case ClearText => PasswordMessage(pass)
-            case Md5(salt) => PasswordMessage(new String(Md5Encryptor.encrypt(user.getBytes, pass.getBytes, salt)))
-          }
-          service(PgRequest(msg))
+      case PasswordRequired(encoding) =>
+        password match {
+          case Some(pass) =>
+            val msg = encoding match {
+              case ClearText => PasswordMessage(pass)
+              case Md5(salt) =>
+                PasswordMessage(
+                  new String(
+                    Md5Encryptor.encrypt(user.getBytes, pass.getBytes, salt)
+                  )
+                )
+            }
+            service(PgRequest(msg))
 
-        case None => Future.exception(Errors.client("Password has to be specified for authenticated connection"))
-      }
+          case None =>
+            Future.exception(
+              Errors.client(
+                "Password has to be specified for authenticated connection"
+              )
+            )
+        }
 
       case r => Future.value(r)
     }
@@ -101,20 +135,25 @@ class AuthenticationProxy(
   private[this] def verifyResponse(response: PgResponse): Future[Unit] = {
     response match {
       case AuthenticatedResponse(statuses, processId, secretKey) =>
-        logger.ifDebug("Authenticated: %d %d\n%s".format(processId, secretKey, statuses))
+        logger.ifDebug(
+          "Authenticated: %d %d\n%s".format(processId, secretKey, statuses)
+        )
         Future({})
     }
   }
 }
 
-
 /*
  * Decodes a Packet into a BackendMessage.
  */
-class BackendMessageDecoder(val parser: BackendMessageParser) extends ChannelInboundHandlerAdapter {
+class BackendMessageDecoder(val parser: BackendMessageParser)
+    extends ChannelInboundHandlerAdapter {
   private val logger = Logger(getClass.getName)
 
-  override def channelRead(ctx: ChannelHandlerContext, message: AnyRef): Unit = {
+  override def channelRead(
+      ctx: ChannelHandlerContext,
+      message: AnyRef
+  ): Unit = {
     message match {
       case packet: Packet =>
         parser.parse(packet) match {
@@ -134,10 +173,15 @@ class BackendMessageDecoder(val parser: BackendMessageParser) extends ChannelInb
 /*
  * Decodes a byte stream into a Packet.
  */
-class PacketDecoder(@volatile var inSslNegotation: Boolean) extends ByteToMessageDecoder {
+class PacketDecoder(@volatile var inSslNegotation: Boolean)
+    extends ByteToMessageDecoder {
   private val logger = Logger(getClass.getName)
 
-  def decode(ctx: ChannelHandlerContext, buffer: ByteBuf, out: java.util.List[AnyRef]): Unit = {
+  def decode(
+      ctx: ChannelHandlerContext,
+      buffer: ByteBuf,
+      out: java.util.List[AnyRef]
+  ): Unit = {
     if (inSslNegotation && buffer.readableBytes() >= 1) {
       val SslCode: Char = buffer.readByte().asInstanceOf[Char]
 
@@ -147,8 +191,7 @@ class PacketDecoder(@volatile var inSslNegotation: Boolean) extends ByteToMessag
 
       buffer.retain()
       out.add(new Packet(Some(SslCode), 1, null, true))
-    } else if (buffer.readableBytes() < 5) {
-    } else {
+    } else if (buffer.readableBytes() < 5) {} else {
       buffer.markReaderIndex()
       val code: Char = buffer.readByte().asInstanceOf[Char]
 
@@ -158,7 +201,8 @@ class PacketDecoder(@volatile var inSslNegotation: Boolean) extends ByteToMessag
       if (buffer.readableBytes() < length) {
         buffer.resetReaderIndex()
       } else {
-        val packet = new Packet(Some(code), totalLength, buffer.readSlice(length))
+        val packet =
+          new Packet(Some(code), totalLength, buffer.readSlice(length))
         buffer.retain()
         out.add(packet)
       }
@@ -170,17 +214,17 @@ class PacketDecoder(@volatile var inSslNegotation: Boolean) extends ByteToMessag
  * Map PgRequest to PgResponse.
  */
 class PgClientChannelHandler(
-  sslEngineFactory: SslClientEngineFactory,
-  sessionVerifier: SslClientSessionVerifier,
-  sslConfig: Option[SslClientConfiguration],
-  val useSsl: Boolean
+    sslEngineFactory: SslClientEngineFactory,
+    sessionVerifier: SslClientSessionVerifier,
+    sslConfig: Option[SslClientConfiguration],
+    val useSsl: Boolean
 ) extends ChannelDuplexHandler {
   private[this] val logger = Logger(getClass.getName)
   private[this] val connection = {
     if (useSsl) {
       new Connection(startState = RequestingSsl)
     } else {
-      new Connection(startState = AuthenticationRequired) 
+      new Connection(startState = AuthenticationRequired)
     }
   }
 
@@ -189,18 +233,26 @@ class PgClientChannelHandler(
     super.channelInactive(ctx)
   }
 
-  override def channelRead(ctx: ChannelHandlerContext, message: AnyRef): Unit = {
+  override def channelRead(
+      ctx: ChannelHandlerContext,
+      message: AnyRef
+  ): Unit = {
     message match {
       case SwitchToSsl =>
-        logger.ifDebug("Got switchToSSL message; adding ssl handler into pipeline")
+        logger.ifDebug(
+          "Got switchToSSL message; adding ssl handler into pipeline"
+        )
 
         val pipeline = ctx.pipeline()
 
         ctx.channel().remoteAddress() match {
           case i: InetSocketAddress =>
             val address = Address(i)
-            val config = sslConfig.getOrElse(SslClientConfiguration(hostname = Some(i.getHostString)))
-            val verifier = (s: SSLSession) => sessionVerifier(address, config, s)
+            val config = sslConfig.getOrElse(
+              SslClientConfiguration(hostname = Some(i.getHostString))
+            )
+            val verifier = (s: SSLSession) =>
+              sessionVerifier(address, config, s)
 
             val engine = sslEngineFactory(address, config).self
             engine.setUseClientMode(true)
@@ -208,23 +260,36 @@ class PgClientChannelHandler(
             val sslHandler = new SslHandler(engine)
             pipeline.addFirst("ssl", sslHandler)
 
-            sslHandler.handshakeFuture().addListener(new FutureListener[Channel] {
-              override def operationComplete(f: io.netty.util.concurrent.Future[Channel]): Unit = {
-                if (!Try(verifier(engine.getSession)).onFailure { err =>
-                  logger.error(err, "Exception thrown during SSL session verification")
-                }.getOrElse(false)) {
-                  logger.error("SSL session verification failed")
-                  ctx.channel().close()
+            sslHandler
+              .handshakeFuture()
+              .addListener(new FutureListener[Channel] {
+                override def operationComplete(
+                    f: io.netty.util.concurrent.Future[Channel]
+                ): Unit = {
+                  if (
+                    !Try(verifier(engine.getSession))
+                      .onFailure { err =>
+                        logger.error(
+                          err,
+                          "Exception thrown during SSL session verification"
+                        )
+                      }
+                      .getOrElse(false)
+                  ) {
+                    logger.error("SSL session verification failed")
+                    ctx.channel().close()
+                  }
                 }
-              }
-            })
+              })
 
             connection.receive(SwitchToSsl).foreach {
               ctx.fireChannelRead(_)
             }
 
           case _ =>
-            ctx.fireExceptionCaught(new Exception("Unsupported socket address for SSL"))
+            ctx.fireExceptionCaught(
+              new Exception("Unsupported socket address for SSL")
+            )
         }
       case msg: BackendMessage =>
         try {
@@ -233,7 +298,10 @@ class PgClientChannelHandler(
           }
         } catch {
           case err @ WrongStateForEvent(evt, state) =>
-            logger.error(s"Could not handle event $evt while in state $state; connection will be terminated", err)
+            logger.error(
+              s"Could not handle event $evt while in state $state; connection will be terminated",
+              err
+            )
             ctx.channel.write(Terminate.asPacket().encode())
             ctx.fireExceptionCaught(err)
         }
@@ -243,7 +311,11 @@ class PgClientChannelHandler(
     }
   }
 
-  override def write(ctx: ChannelHandlerContext, message: AnyRef, promise: ChannelPromise) = {
+  override def write(
+      ctx: ChannelHandlerContext,
+      message: AnyRef,
+      promise: ChannelPromise
+  ) = {
     val (buf, out) = message match {
       case PgRequest(msg, flush) =>
         val packet = msg.asPacket()
@@ -259,7 +331,10 @@ class PgClientChannelHandler(
           (Some(c), connection.send(msg))
         } catch {
           case err @ WrongStateForEvent(evt, state) =>
-            logger.error(s"Could not handle event $evt while in state $state; connection will be terminated", err)
+            logger.error(
+              s"Could not handle event $evt while in state $state; connection will be terminated",
+              err
+            )
             ctx.fireExceptionCaught(err)
             (None, Some(com.twitter.finagle.postgres.messages.Terminated))
         }
@@ -268,12 +343,14 @@ class PgClientChannelHandler(
         (Some(buffer), None)
 
       case other =>
-        logger.warning(s"Cannot convert message of type ${other.getClass.getName}... Skipping")
+        logger.warning(
+          s"Cannot convert message of type ${other.getClass.getName}... Skipping"
+        )
         (Some(message), None)
     }
 
-    buf.filter(_ => ctx.channel.isOpen) foreach {
-      bytes => ctx.write(bytes, promise)
+    buf.filter(_ => ctx.channel.isOpen) foreach { bytes =>
+      ctx.write(bytes, promise)
     }
     out collect {
       case term @ com.twitter.finagle.postgres.messages.Terminated =>
@@ -282,9 +359,3 @@ class PgClientChannelHandler(
     }
   }
 }
-
-
-
-
-
-
diff --git a/src/main/scala/com/twitter/finagle/postgres/connection/Connection.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/Connection.scala
similarity index 77%
rename from src/main/scala/com/twitter/finagle/postgres/connection/Connection.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/Connection.scala
index 6ead9356..d8d8ff58 100644
--- a/src/main/scala/com/twitter/finagle/postgres/connection/Connection.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/Connection.scala
@@ -14,9 +14,10 @@ class Connection(startState: State = AuthenticationRequired) {
   private[this] val logger = Logger(s"${getClass.getName}.connection-$id")
   private[this] val stateMachine = new ConnectionStateMachine(startState, id)
 
-
   def send(msg: FrontendMessage) = {
-    logger.ifDebug("Sent frontend message of type: %s".format(msg.getClass.getName))
+    logger.ifDebug(
+      "Sent frontend message of type: %s".format(msg.getClass.getName)
+    )
 
     msg match {
       case q: Query =>
@@ -28,11 +29,13 @@ class Connection(startState: State = AuthenticationRequired) {
   }
 
   def receive(msg: BackendMessage): Option[PgResponse] = {
-    logger.ifDebug("Received backend message of type: %s".format(msg.getClass.getName))
+    logger.ifDebug(
+      "Received backend message of type: %s".format(msg.getClass.getName)
+    )
 
     val result = stateMachine.onEvent(msg)
-    result foreach {
-      r => logger.ifDebug(s"Emitting result ${r.getClass.getName}")
+    result foreach { r =>
+      logger.ifDebug(s"Emitting result ${r.getClass.getName}")
     }
     result
   }
@@ -41,4 +44,4 @@ class Connection(startState: State = AuthenticationRequired) {
 object Connection {
   private[this] val currentId = new AtomicInteger(0)
   private def nextId() = currentId.getAndIncrement()
-}
\ No newline at end of file
+}
diff --git a/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/ConnectionStateMachine.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/ConnectionStateMachine.scala
new file mode 100644
index 00000000..ce5e0339
--- /dev/null
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/ConnectionStateMachine.scala
@@ -0,0 +1,298 @@
+package com.twitter.finagle.postgres.connection
+
+import com.twitter.concurrent.AsyncStream
+import com.twitter.finagle.postgres.codec.Errors
+import com.twitter.finagle.postgres.messages.{Terminated => _, _}
+import com.twitter.logging.Logger
+import com.twitter.util.{Promise, Return, Throw}
+
+/*
+ * State machine that captures transitions between states.
+ *
+ * See associated Postgres documentation: http://www.postgresql.org/docs/9.0/static/protocol-flow.html
+ */
+class ConnectionStateMachine(state: State = AuthenticationRequired, val id: Int)
+    extends StateMachine[Message, PgResponse, State] {
+  private[this] val logger = Logger(
+    s"${getClass.getName}.psql state machine:$id"
+  )
+
+  startState(state)
+
+  transition {
+    case (SslRequestMessage(), RequestingSsl) => (None, AwaitingSslResponse)
+    case (SwitchToSsl, AwaitingSslResponse) =>
+      (Some(SslSupportedResponse), AuthenticationRequired)
+    case (SslNotSupported, AwaitingSslResponse) =>
+      (Some(SslNotSupportedResponse), AuthenticationRequired)
+  }
+
+  transition {
+    case (StartupMessage(_, _), AuthenticationRequired) =>
+      (None, AuthenticationInProgress)
+    case (AuthenticationOk(), AuthenticationInProgress) =>
+      (None, AggregatingAuthData(Map(), -1, -1))
+    case (AuthenticationCleartextPassword(), AuthenticationInProgress) =>
+      (Some(PasswordRequired(ClearText)), AwaitingPassword)
+    case (AuthenticationMD5Password(salt), AuthenticationInProgress) =>
+      (Some(PasswordRequired(Md5(salt))), AwaitingPassword)
+    case (PasswordMessage(_), AwaitingPassword) =>
+      (None, AuthenticationInProgress)
+
+    case (
+          ErrorResponse(details),
+          AuthenticationRequired | AuthenticationInProgress | AwaitingPassword
+        ) =>
+      (Some(Error(details)), AuthenticationRequired)
+  }
+
+  transition {
+    case (
+          ParameterStatus(name, value),
+          AggregatingAuthData(statuses, processId, secretKey)
+        ) =>
+      (
+        None,
+        AggregatingAuthData(
+          statuses = statuses + (name -> value),
+          processId,
+          secretKey
+        )
+      )
+    case (
+          BackendKeyData(processId, secretKey),
+          AggregatingAuthData(statuses, _, _)
+        ) =>
+      (None, AggregatingAuthData(statuses, processId, secretKey))
+    case (
+          ReadyForQuery(_),
+          AggregatingAuthData(statuses, processId, secretKey)
+        ) =>
+      (Some(AuthenticatedResponse(statuses, processId, secretKey)), Connected)
+
+    case (ErrorResponse(details), AggregatingAuthData(_, _, _)) =>
+      (Some(Error(details)), AuthenticationRequired)
+  }
+
+  transition {
+    case (Query(_), Connected)             => (None, SimpleQuery)
+    case (Parse(_, _, _), Connected)       => (None, Parsing)
+    case (Bind(_, _, _, _, _), Connected)  => (None, Binding)
+    case (Describe(_, _), Connected)       => (None, AwaitParamsDescription)
+    case (Execute(_, _), Connected)        => (None, ExecutePreparedStatement)
+    case (Sync, Connected)                 => (None, Syncing)
+    case (Sync, state: ExtendedQueryState) => (None, Syncing)
+    case (ErrorResponse(details), Connected) =>
+      (Some(Error(details)), Connected)
+  }
+
+  transition {
+    case (ParameterDescription(types), AwaitParamsDescription) =>
+      (None, AwaitRowDescription(types))
+    case (RowDescription(fields), AwaitParamsDescription) =>
+      (
+        Some(
+          RowDescriptions(
+            fields.map(f => Field(f.name, f.fieldFormat, f.dataType))
+          )
+        ),
+        Connected
+      )
+    case (NoData, AwaitParamsDescription) =>
+      (Some(RowDescriptions(Array.empty)), Connected)
+    case (ErrorResponse(details), AwaitParamsDescription) =>
+      (Some(Error(details)), Connected)
+  }
+
+  transition {
+    case (RowDescription(fields), AwaitRowDescription(types)) =>
+      (
+        Some(
+          RowDescriptions(
+            fields.map(f => Field(f.name, f.fieldFormat, f.dataType))
+          )
+        ),
+        Connected
+      )
+    case (NoData, AwaitRowDescription(types)) =>
+      (Some(RowDescriptions(Array.empty)), Connected)
+    case (ErrorResponse(details), AwaitRowDescription(_)) =>
+      (Some(Error(details)), Connected)
+  }
+
+  transition {
+    case (BindComplete, Binding) => (Some(BindCompletedResponse), Connected)
+    case (ErrorResponse(details), Binding) => (Some(Error(details)), Connected)
+  }
+
+  transition {
+    case (ParseComplete, Parsing) => (Some(ParseCompletedResponse), Connected)
+    case (ErrorResponse(details), Parsing) => (Some(Error(details)), Connected)
+  }
+
+  transition {
+    case (ReadyForQuery(_), Syncing) => (Some(ReadyForQueryResponse), Connected)
+    case (ErrorResponse(details), Syncing) =>
+      throw new IllegalStateException("Received an error in response to Sync")
+  }
+
+  transition {
+    case (EmptyQueryResponse, SimpleQuery) =>
+      (None, EmitOnReadyForQuery(SelectResult.Empty))
+    case (
+          CommandComplete(
+            CreateExtension | CreateFunction | CreateIndex | CreateTable |
+            CreateTrigger | CreateType
+          ),
+          SimpleQuery
+        ) =>
+      (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
+    case (CommandComplete(DropTable), SimpleQuery) =>
+      (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
+    case (CommandComplete(Insert(count)), SimpleQuery) =>
+      (None, EmitOnReadyForQuery(CommandCompleteResponse(count)))
+    case (CommandComplete(Update(count)), SimpleQuery) =>
+      (None, EmitOnReadyForQuery(CommandCompleteResponse(count)))
+    case (CommandComplete(Delete(count)), SimpleQuery) =>
+      (None, EmitOnReadyForQuery(CommandCompleteResponse(count)))
+    case (CommandComplete(DiscardAll), SimpleQuery) =>
+      (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
+    case (
+          CommandComplete(Begin | Savepoint | Release | RollBack | Commit),
+          SimpleQuery
+        ) =>
+      (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
+    case (CommandComplete(Set), SimpleQuery) =>
+      (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
+    case (CommandComplete(Do), SimpleQuery) =>
+      (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
+
+    case (RowDescription(fields), SimpleQuery) =>
+      val complete = new Promise[Unit]()
+      val nextRow = StreamRows(complete, extended = false)
+      (
+        Some(
+          SelectResult(
+            fields.map(f => Field(f.name, f.fieldFormat, f.dataType)),
+            nextRow.asyncStream
+          )(complete)
+        ),
+        nextRow
+      )
+    case (ErrorResponse(details), SimpleQuery) =>
+      (None, EmitOnReadyForQuery(Error(details)))
+  }
+
+  transition {
+    // for multiple commands in one query, we recieve multiple CommandComplete tags before becoming ready
+    case (CommandComplete(_), EmitOnReadyForQuery(old)) =>
+      (None, EmitOnReadyForQuery(old))
+  }
+
+  transition {
+    case (EmptyQueryResponse, ExecutePreparedStatement) =>
+      (Some(SelectResult.Empty), Connected)
+    case (
+          CommandComplete(
+            CreateExtension | CreateFunction | CreateIndex | CreateTable |
+            CreateType | CreateTrigger
+          ),
+          ExecutePreparedStatement
+        ) =>
+      (Some(CommandCompleteResponse(1)), Connected)
+    case (CommandComplete(DropTable), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(1)), Connected)
+    case (CommandComplete(Insert(count)), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(count)), Connected)
+    case (CommandComplete(Update(count)), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(count)), Connected)
+    case (CommandComplete(Delete(count)), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(count)), Connected)
+    case (CommandComplete(Begin), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(1)), Connected)
+    case (CommandComplete(Set), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(1)), Connected)
+    case (CommandComplete(Savepoint), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(1)), Connected)
+    case (CommandComplete(RollBack), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(1)), Connected)
+    case (CommandComplete(Commit), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(1)), Connected)
+    case (CommandComplete(Do), ExecutePreparedStatement) =>
+      (Some(CommandCompleteResponse(1)), Connected)
+    case (row: DataRow, ExecutePreparedStatement) =>
+      val complete = new Promise[Unit]
+      val nextRow = StreamRows(complete, extended = true)
+      val thisRow = AsyncStream.mk(row, nextRow.asyncStream)
+      val response = Rows(thisRow)(complete)
+      (Some(response), nextRow)
+    case (CommandComplete(Select(0)), ExecutePreparedStatement) =>
+      (Some(Rows.Empty), Connected)
+    case (ErrorResponse(details), ExecutePreparedStatement) =>
+      (Some(Error(details)), Connected)
+  }
+
+  fullTransition {
+    case (row: DataRow, StreamRows(complete, extended, thisRow)) =>
+      val nextRow = StreamRows(complete, extended)
+      thisRow.setValue(AsyncStream.mk(row, nextRow.asyncStream))
+      (None, nextRow)
+    case (PortalSuspended, StreamRows(complete, _, thisRow)) =>
+      thisRow.setValue(AsyncStream.empty)
+      (Some(StateMachine.Complete(complete, Return.Unit)), Connected)
+    case (CommandComplete(_), StreamRows(complete, extended, thisRow)) =>
+      thisRow.setValue(AsyncStream.empty)
+      val response = StateMachine.Complete(complete, Return.Unit)
+      if (extended) {
+        // in extended mode, we don't expect a ReadyForQuery, so we respond now
+        (Some(response), Connected)
+      } else {
+        (None, EmitOnReadyForQuery(response))
+      }
+    case (ErrorResponse(details), StreamRows(complete, extended, thisRow)) =>
+      val exn = Errors.server(Error(details), None)
+      thisRow.setValue(AsyncStream.exception(exn))
+      val response = StateMachine.Complete(complete, Throw(exn))
+      if (extended) {
+        // in extended mode, we don't expect a ReadyForQuery, so we respond now
+        (Some(response), Connected)
+      } else {
+        (None, EmitOnReadyForQuery(response))
+      }
+  }
+
+  fullTransition {
+    case (ReadyForQuery(_), EmitOnReadyForQuery(response)) =>
+      (Some(response), Connected)
+    case (
+          ErrorResponse(details),
+          EmitOnReadyForQuery(StateMachine.Response(_))
+        ) =>
+      (Some(StateMachine.Response(Error(details))), Connected)
+    case (
+          ErrorResponse(details),
+          EmitOnReadyForQuery(StateMachine.Complete(promise, _))
+        ) =>
+      val exn = Errors.server(Error(details), None)
+      (Some(StateMachine.Complete(promise, Throw(exn))), Connected)
+  }
+
+  transition {
+    case (Terminate, _) =>
+      (Some(com.twitter.finagle.postgres.messages.Terminated), Terminated)
+    case (_, Terminated) =>
+      (Some(com.twitter.finagle.postgres.messages.Terminated), Terminated)
+  }
+
+  transition {
+    case (NoticeResponse(details), s) =>
+      logger.ifDebug("Notice from server: %s".format(details))
+      (None, s)
+    case (notification: NotificationResponse, s) =>
+      logger.ifDebug("Notification from server: %s".format(notification))
+      (None, s)
+    case (ParameterStatus(name, value), s) =>
+      logger.ifDebug("Params changed: %s %s".format(name, value))
+      (None, s)
+  }
+}
diff --git a/src/main/scala/com/twitter/finagle/postgres/connection/StateMachine.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/StateMachine.scala
similarity index 72%
rename from src/main/scala/com/twitter/finagle/postgres/connection/StateMachine.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/StateMachine.scala
index 5b903c6f..9bbce094 100644
--- a/src/main/scala/com/twitter/finagle/postgres/connection/StateMachine.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/StateMachine.scala
@@ -10,7 +10,9 @@ object Undefined extends PartialFunction[Any, Nothing] {
 }
 
 case class WrongStateForEvent[E, S](event: E, state: S)
-  extends IllegalStateException("Unknown event " + event + " for state " + state)
+    extends IllegalStateException(
+      "Unknown event " + event + " for state " + state
+    )
 
 /*
  * Generic definition of a state machine. Used to define connection state machine
@@ -28,14 +30,14 @@ trait StateMachine[E, R, S] {
 
   @volatile private[this] var currentState: S = _
 
-  def startState(s : S): Unit = {
+  def startState(s: S): Unit = {
     currentState = s
   }
 
   def transition(t: SimpleTransition): Unit = {
     fullTransition(
-      t.andThen {
-        case (r, s) => (r.map(Response(_)), s)
+      t.andThen { case (r, s) =>
+        (r.map(Response(_)), s)
       }
     )
   }
@@ -44,16 +46,26 @@ trait StateMachine[E, R, S] {
     transitionFunction = transitionFunction orElse t
   }
 
-  private[this] def handleMisc: PartialFunction[(E, S), (Option[TransitionResult[R]], S)] = {
+  private[this] def handleMisc
+      : PartialFunction[(E, S), (Option[TransitionResult[R]], S)] = {
     case (e, s) => throw WrongStateForEvent(e, s)
   }
 
   def onEvent(e: E): Option[R] = {
     val f = transitionFunction.orElse(handleMisc)
-    logger.ifDebug("Received event %s in state %s".format(e.getClass.getName, currentState.getClass.getName))
+    logger.ifDebug(
+      "Received event %s in state %s".format(
+        e.getClass.getName,
+        currentState.getClass.getName
+      )
+    )
 
     val (result, newState) = f((e, currentState))
-    logger.ifDebug("Transitioning to state %s and emiting result".format(newState.getClass.getName))
+    logger.ifDebug(
+      "Transitioning to state %s and emiting result".format(
+        newState.getClass.getName
+      )
+    )
 
     currentState = newState
 
@@ -72,5 +84,6 @@ object StateMachine {
   //   In both cases, state machine's current state is updated before this result is returned / applied.
   sealed trait TransitionResult[+R]
   case class Response[R](value: R) extends TransitionResult[R]
-  case class Complete(signal: Promise[Unit], value: Try[Unit]) extends TransitionResult[Nothing]
+  case class Complete(signal: Promise[Unit], value: Try[Unit])
+      extends TransitionResult[Nothing]
 }
diff --git a/src/main/scala/com/twitter/finagle/postgres/connection/States.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/States.scala
similarity index 71%
rename from src/main/scala/com/twitter/finagle/postgres/connection/States.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/States.scala
index c976fd06..d4418095 100644
--- a/src/main/scala/com/twitter/finagle/postgres/connection/States.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/connection/States.scala
@@ -11,8 +11,6 @@ import scala.collection.mutable.ListBuffer
  */
 sealed trait State
 
-
-
 case object SimpleQuery extends State
 
 case object RequestingSsl extends State
@@ -25,7 +23,11 @@ case object AuthenticationInProgress extends State
 
 case object AwaitingPassword extends State
 
-case class AggregatingAuthData(statuses: Map[String, String], processId: Int, secretKey: Int) extends State
+case class AggregatingAuthData(
+    statuses: Map[String, String],
+    processId: Int,
+    secretKey: Int
+) extends State
 
 case object Connected extends State
 
@@ -44,13 +46,20 @@ case object ExecutePreparedStatement extends ExtendedQueryState
 
 case object AwaitParamsDescription extends ExtendedQueryState
 
-case class StreamRows(complete: Promise[Unit], extended: Boolean, nextRow: Promise[AsyncStream[DataRow]] = new Promise) extends ExtendedQueryState {
-  val asyncStream: AsyncStream[DataRow] = AsyncStream.fromFuture(nextRow).flatten
+case class StreamRows(
+    complete: Promise[Unit],
+    extended: Boolean,
+    nextRow: Promise[AsyncStream[DataRow]] = new Promise
+) extends ExtendedQueryState {
+  val asyncStream: AsyncStream[DataRow] =
+    AsyncStream.fromFuture(nextRow).flatten
 }
 
 case class AwaitRowDescription(types: Array[Int]) extends ExtendedQueryState
 
-case class EmitOnReadyForQuery[R <: PgResponse](emit: StateMachine.TransitionResult[R]) extends ExtendedQueryState
+case class EmitOnReadyForQuery[R <: PgResponse](
+    emit: StateMachine.TransitionResult[R]
+) extends ExtendedQueryState
 object EmitOnReadyForQuery {
   def apply[R <: PgResponse](response: R): EmitOnReadyForQuery[R] =
     EmitOnReadyForQuery(StateMachine.Response(response))
diff --git a/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessageParser.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessageParser.scala
similarity index 77%
rename from src/main/scala/com/twitter/finagle/postgres/messages/BackendMessageParser.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessageParser.scala
index 2625ec55..64d56ead 100644
--- a/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessageParser.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessageParser.scala
@@ -105,15 +105,18 @@ class BackendMessageParser {
   def parseE(packet: Packet): Option[BackendMessage] = {
     val Packet(_, _, content, _) = packet
 
-    def fieldStream(buf: ByteBuf):Stream[(Char,String)] =
-      if(buf.isReadable)
+    def fieldStream(buf: ByteBuf): Stream[(Char, String)] =
+      if (buf.isReadable)
         Buffers.readCString(buf) match {
           case "" => Stream.empty
-          case nonempty => (nonempty.splitAt(1) match { case (fieldId, value) => (fieldId.charAt(0), value) }) #:: fieldStream(buf)
+          case nonempty =>
+            (nonempty.splitAt(1) match {
+              case (fieldId, value) => (fieldId.charAt(0), value)
+            }) #:: fieldStream(buf)
         }
-      else Stream.empty[(Char,String)]
+      else Stream.empty[(Char, String)]
 
-    val fields = fieldStream(content).foldLeft(Map.empty[Char,String])(_ + _)
+    val fields = fieldStream(content).foldLeft(Map.empty[Char, String])(_ + _)
 
     Some(ErrorResponse(fields))
   }
@@ -192,19 +195,18 @@ class BackendMessageParser {
     val fieldNumber = content.readShort
 
     val fields = new Array[FieldDescription](fieldNumber)
-    0.until(fieldNumber).foreach {
-      index =>
-
-        val field = FieldDescription(
-          Buffers.readCString(content),
-          content.readInt,
-          content.readShort,
-          content.readInt,
-          content.readShort,
-          content.readInt,
-          content.readShort)
-
-        fields(index) = field
+    0.until(fieldNumber).foreach { index =>
+      val field = FieldDescription(
+        Buffers.readCString(content),
+        content.readInt,
+        content.readShort,
+        content.readInt,
+        content.readShort,
+        content.readInt,
+        content.readShort
+      )
+
+      fields(index) = field
     }
 
     Some(RowDescription(fields))
@@ -218,31 +220,35 @@ class BackendMessageParser {
     Some(CommandComplete(parseTag(tag)))
   }
 
-  def parseTag(tag: String) : CommandCompleteStatus = {
+  def parseTag(tag: String): CommandCompleteStatus = {
     tag match {
-      case "CREATE TABLE" => CreateTable
-      case "CREATE EXTENSION"=> CreateExtension
-      case "CREATE TYPE" => CreateType
-      case "CREATE FUNCTION" => CreateFunction
-      case "CREATE INDEX" => CreateIndex
-      case "CREATE TRIGGER" => CreateTrigger
-      case "DO" => Do
-      case "DISCARD ALL" => DiscardAll
-      case "DROP TABLE" => DropTable
+      case "CREATE TABLE"     => CreateTable
+      case "CREATE EXTENSION" => CreateExtension
+      case "CREATE TYPE"      => CreateType
+      case "CREATE FUNCTION"  => CreateFunction
+      case "CREATE INDEX"     => CreateIndex
+      case "CREATE TRIGGER"   => CreateTrigger
+      case "DO"               => Do
+      case "DISCARD ALL"      => DiscardAll
+      case "DROP TABLE"       => DropTable
       case _ =>
         val parts = tag.split(" ")
 
         parts(0) match {
-          case "SELECT" => Select(parts(1).toInt)
-          case "INSERT" => Insert(parts(2).toInt)
-          case "DELETE" => Delete(parts(1).toInt)
-          case "UPDATE" => Update(parts(1).toInt)
-          case "BEGIN"  => Begin
+          case "SELECT"    => Select(parts(1).toInt)
+          case "INSERT"    => Insert(parts(2).toInt)
+          case "DELETE"    => Delete(parts(1).toInt)
+          case "UPDATE"    => Update(parts(1).toInt)
+          case "BEGIN"     => Begin
+          case "SET"       => Set
           case "SAVEPOINT" => Savepoint
-          case "RELEASE" => Release
+          case "RELEASE"   => Release
           case "ROLLBACK"  => RollBack
-          case "COMMIT" => Commit
-          case _ => throw new IllegalStateException("Unknown command complete response tag " + tag)
+          case "COMMIT"    => Commit
+          case _ =>
+            throw new IllegalStateException(
+              "Unknown command complete response tag " + tag
+            )
         }
     }
   }
@@ -253,7 +259,10 @@ class BackendMessageParser {
     if (inSslNegotation) {
       Some(SwitchToSsl)
     } else {
-      val parameterStatus = ParameterStatus(Buffers.readCString(content), Buffers.readCString(content))
+      val parameterStatus = ParameterStatus(
+        Buffers.readCString(content),
+        Buffers.readCString(content)
+      )
       Some(parameterStatus)
     }
   }
@@ -272,10 +281,9 @@ class BackendMessageParser {
     val paramNumber = content.readShort
 
     val params = new Array[Int](paramNumber)
-    0.until(paramNumber).foreach {
-      index =>
-        val param = content.readInt
-        params(index) = param
+    0.until(paramNumber).foreach { index =>
+      val param = content.readInt
+      params(index) = param
     }
 
     Some(ParameterDescription(params))
diff --git a/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessages.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessages.scala
similarity index 78%
rename from src/main/scala/com/twitter/finagle/postgres/messages/BackendMessages.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessages.scala
index 06d67fe2..5121f161 100644
--- a/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessages.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/BackendMessages.scala
@@ -2,20 +2,24 @@ package com.twitter.finagle.postgres.messages
 
 import io.netty.buffer.ByteBuf
 
-/**
- * Responses sent from Postgres back to the client.
- */
+/** Responses sent from Postgres back to the client.
+  */
 trait BackendMessage extends Message
 
 case object SwitchToSsl extends BackendMessage
 
 case object SslNotSupported extends BackendMessage
 
-case class ErrorResponse(params: Map[Char,String] = Map.empty) extends BackendMessage
+case class ErrorResponse(params: Map[Char, String] = Map.empty)
+    extends BackendMessage
 
 case class NoticeResponse(msg: Option[String]) extends BackendMessage
 
-case class NotificationResponse(processId: Int, channel: String, payload: String) extends BackendMessage
+case class NotificationResponse(
+    processId: Int,
+    channel: String,
+    payload: String
+) extends BackendMessage
 
 case class AuthenticationOk() extends BackendMessage
 
@@ -29,7 +33,8 @@ case class BackendKeyData(processId: Int, secretKey: Int) extends BackendMessage
 
 case class ParameterDescription(types: Array[Int]) extends BackendMessage
 
-case class RowDescription(fields: Array[FieldDescription]) extends BackendMessage
+case class RowDescription(fields: Array[FieldDescription])
+    extends BackendMessage
 
 case class FieldDescription(
     name: String,
@@ -38,7 +43,8 @@ case class FieldDescription(
     dataType: Int,
     dataTypeSize: Short,
     dataTypeModifier: Int,
-    fieldFormat: Short)
+    fieldFormat: Short
+)
 
 case class DataRow(data: Array[Option[ByteBuf]]) extends BackendMessage
 
@@ -65,16 +71,18 @@ case object DiscardAll extends CommandCompleteStatus
 
 case object Do extends CommandCompleteStatus
 
-case class Insert(count : Int) extends CommandCompleteStatus
+case class Insert(count: Int) extends CommandCompleteStatus
 
-case class Update(count : Int) extends CommandCompleteStatus
+case class Update(count: Int) extends CommandCompleteStatus
 
-case class Delete(count : Int) extends CommandCompleteStatus
+case class Delete(count: Int) extends CommandCompleteStatus
 
 case class Select(count: Int) extends CommandCompleteStatus
 
 case object Begin extends CommandCompleteStatus
 
+case object Set extends CommandCompleteStatus
+
 case object Savepoint extends CommandCompleteStatus
 
 case object Release extends CommandCompleteStatus
diff --git a/src/main/scala/com/twitter/finagle/postgres/messages/FrontendMessages.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/FrontendMessages.scala
similarity index 80%
rename from src/main/scala/com/twitter/finagle/postgres/messages/FrontendMessages.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/FrontendMessages.scala
index effa8410..3a5e012c 100644
--- a/src/main/scala/com/twitter/finagle/postgres/messages/FrontendMessages.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/FrontendMessages.scala
@@ -4,14 +4,14 @@ import com.twitter.finagle.postgres.values.{Strings, Convert}
 
 import io.netty.buffer.ByteBuf
 
-/**
- * Messages sent to Postgres from the client.
- */
+/** Messages sent to Postgres from the client.
+  */
 trait FrontendMessage extends Message {
   def asPacket(): Packet
 }
 
-case class StartupMessage(user: String, database: String) extends FrontendMessage {
+case class StartupMessage(user: String, database: String)
+    extends FrontendMessage {
   def asPacket() = PacketBuilder()
     .writeShort(3)
     .writeShort(0)
@@ -43,7 +43,10 @@ case class Query(str: String) extends FrontendMessage {
 }
 
 case class Parse(
-      name: String = Strings.empty, query: String = "", paramTypes: Seq[Int] = Seq()) extends FrontendMessage {
+    name: String = Strings.empty,
+    query: String = "",
+    paramTypes: Seq[Int] = Seq()
+) extends FrontendMessage {
   def asPacket() = {
     val builder = PacketBuilder('P')
       .writeCString(name)
@@ -57,8 +60,13 @@ case class Parse(
   }
 }
 
-case class Bind(portal: String = Strings.empty, name: String = Strings.empty, formats: Seq[Int] = Seq(),
-                params: Seq[ByteBuf] = Seq(), resultFormats: Seq[Int] = Seq()) extends FrontendMessage {
+case class Bind(
+    portal: String = Strings.empty,
+    name: String = Strings.empty,
+    formats: Seq[Int] = Seq(),
+    params: Seq[ByteBuf] = Seq(),
+    resultFormats: Seq[Int] = Seq()
+) extends FrontendMessage {
   def asPacket() = {
     val builder = PacketBuilder('B')
       .writeCString(portal)
@@ -93,7 +101,8 @@ case class Bind(portal: String = Strings.empty, name: String = Strings.empty, fo
   }
 }
 
-case class Execute(name: String = Strings.empty, maxRows: Int = 0) extends FrontendMessage {
+case class Execute(name: String = Strings.empty, maxRows: Int = 0)
+    extends FrontendMessage {
   def asPacket() = {
     PacketBuilder('E')
       .writeCString(name)
@@ -102,7 +111,8 @@ case class Execute(name: String = Strings.empty, maxRows: Int = 0) extends Front
   }
 }
 
-case class Describe(portal: Boolean = true, name: String = new String) extends FrontendMessage {
+case class Describe(portal: Boolean = true, name: String = new String)
+    extends FrontendMessage {
   def asPacket() = {
     PacketBuilder('D')
       .writeChar(if (portal) 'P' else 'S')
@@ -113,15 +123,13 @@ case class Describe(portal: Boolean = true, name: String = new String) extends F
 
 object Flush extends FrontendMessage {
   def asPacket() = {
-    PacketBuilder('H')
-      .toPacket
+    PacketBuilder('H').toPacket
   }
 }
 
 object Sync extends FrontendMessage {
   def asPacket() = {
-    PacketBuilder('S')
-      .toPacket
+    PacketBuilder('S').toPacket
   }
 }
 
diff --git a/src/main/scala/com/twitter/finagle/postgres/messages/Message.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/Message.scala
similarity index 77%
rename from src/main/scala/com/twitter/finagle/postgres/messages/Message.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/Message.scala
index f0490b9b..e9ec525c 100644
--- a/src/main/scala/com/twitter/finagle/postgres/messages/Message.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/Message.scala
@@ -1,3 +1,3 @@
 package com.twitter.finagle.postgres.messages
 
-trait Message
\ No newline at end of file
+trait Message
diff --git a/src/main/scala/com/twitter/finagle/postgres/messages/Packet.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/Packet.scala
similarity index 87%
rename from src/main/scala/com/twitter/finagle/postgres/messages/Packet.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/Packet.scala
index 55be8735..424b5d2d 100644
--- a/src/main/scala/com/twitter/finagle/postgres/messages/Packet.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/Packet.scala
@@ -13,7 +13,12 @@ object Packet {
  *
  * Converts content into byte format expected by Postgres.
  */
-case class Packet(code: Option[Char], length: Int, content: ByteBuf, inSslNegotation: Boolean = false) {
+case class Packet(
+    code: Option[Char],
+    length: Int,
+    content: ByteBuf,
+    inSslNegotation: Boolean = false
+) {
   def encode(): ByteBuf = {
     val result = Unpooled.buffer()
     code.map { c =>
@@ -39,13 +44,13 @@ class PacketBuilder(val code: Option[Char]) {
   }
 
   def writeBytes(bytes: Array[Byte]) = {
-	  underlying.writeBytes(bytes)
-	  this
+    underlying.writeBytes(bytes)
+    this
   }
 
   def writeBuf(bytes: ByteBuf) = {
-	  underlying.writeBytes(bytes)
-	  this
+    underlying.writeBytes(bytes)
+    this
   }
 
   def writeChar(char: Char) = {
@@ -75,4 +80,4 @@ object PacketBuilder {
   def apply(): PacketBuilder = new PacketBuilder(None)
 
   def apply(code: Char): PacketBuilder = new PacketBuilder(Some(code))
-}
\ No newline at end of file
+}
diff --git a/src/main/scala/com/twitter/finagle/postgres/messages/PgRequest.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/PgRequest.scala
similarity index 100%
rename from src/main/scala/com/twitter/finagle/postgres/messages/PgRequest.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/PgRequest.scala
diff --git a/src/main/scala/com/twitter/finagle/postgres/messages/PgResponses.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/PgResponses.scala
similarity index 67%
rename from src/main/scala/com/twitter/finagle/postgres/messages/PgResponses.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/PgResponses.scala
index dcf05cc4..fe69ec4c 100644
--- a/src/main/scala/com/twitter/finagle/postgres/messages/PgResponses.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/messages/PgResponses.scala
@@ -15,11 +15,25 @@ trait AsyncPgResponse extends PgResponse {
 
 case class SingleMessageResponse(msg: BackendMessage) extends PgResponse
 
-case class Error(msg: Option[String], severity: Option[String] = None, sqlState: Option[String] = None, detail: Option[String] = None, hint: Option[String] = None, position: Option[String] = None) extends PgResponse
+case class Error(
+    msg: Option[String],
+    severity: Option[String] = None,
+    sqlState: Option[String] = None,
+    detail: Option[String] = None,
+    hint: Option[String] = None,
+    position: Option[String] = None
+) extends PgResponse
 
 object Error {
-  def apply(params: Map[Char,String]): Error =
-    Error(params.get('M'), params.get('S'), params.get('C'), params.get('D'), params.get('H'), params.get('P'))
+  def apply(params: Map[Char, String]): Error =
+    Error(
+      params.get('M'),
+      params.get('S'),
+      params.get('C'),
+      params.get('D'),
+      params.get('H'),
+      params.get('P')
+    )
 }
 
 case object SslSupportedResponse extends PgResponse
@@ -40,9 +54,15 @@ case class Md5(salt: Array[Byte]) extends PasswordEncoding
 
 case class PasswordRequired(encoding: PasswordEncoding) extends PgResponse
 
-case class AuthenticatedResponse(params: Map[String, String], processId: Int, secretKey: Int) extends PgResponse
+case class AuthenticatedResponse(
+    params: Map[String, String],
+    processId: Int,
+    secretKey: Int
+) extends PgResponse
 
-case class Rows(rows: AsyncStream[DataRow])(private[finagle] val complete: Future[Unit]) extends AsyncPgResponse
+case class Rows(rows: AsyncStream[DataRow])(
+    private[finagle] val complete: Future[Unit]
+) extends AsyncPgResponse
 object Rows {
   val Empty = Rows(AsyncStream.empty)(Future.Done)
 }
@@ -51,11 +71,14 @@ case class Field(name: String, format: Short, dataType: Int)
 
 case class RowDescriptions(fields: Array[Field]) extends PgResponse
 
-case class Descriptions(params: Array[Int], fields: Array[Field]) extends PgResponse
+case class Descriptions(params: Array[Int], fields: Array[Field])
+    extends PgResponse
 
 case class ParamsResponse(types: Array[Int]) extends PgResponse
 
-case class SelectResult(fields: Array[Field], rows: AsyncStream[DataRow])(private[finagle] val complete: Future[Unit]) extends AsyncPgResponse
+case class SelectResult(fields: Array[Field], rows: AsyncStream[DataRow])(
+    private[finagle] val complete: Future[Unit]
+) extends AsyncPgResponse
 object SelectResult {
   val Empty = SelectResult(Array.empty, AsyncStream.empty)(Future.Done)
 }
diff --git a/src/main/scala/com/twitter/finagle/postgres/values/Arrays.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Arrays.scala
similarity index 68%
rename from src/main/scala/com/twitter/finagle/postgres/values/Arrays.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Arrays.scala
index 24128ab9..a98e1de0 100644
--- a/src/main/scala/com/twitter/finagle/postgres/values/Arrays.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Arrays.scala
@@ -11,32 +11,39 @@ object Arrays {
 
     val value = """([^",}]|\")*""".r | """"([^"]|\")*"""".r
     val valueComma = "," ~ value ^^ { case "," ~ v => v }
-    val values = (value ~ valueComma.*) ^^ { case first ~ rest => first :: rest } | value.? ^^ (_.toList)
+    val values = (value ~ valueComma.*) ^^ { case first ~ rest =>
+      first :: rest
+    } | value.? ^^ (_.toList)
     val array = "{" ~ values ~ "}" ^^ { case _ ~ vs ~ _ => vs }
     val maybeArrayValue = array | value ^^ (List(_))
-    val maybeArrayValueComma = ("," ~ maybeArrayValue) ^^ { case _ ~ v => v}
+    val maybeArrayValueComma = ("," ~ maybeArrayValue) ^^ { case _ ~ v => v }
     val maybeArrayValues =
-      (maybeArrayValue ~ maybeArrayValueComma.*) ^^ { case first ~ rest => first ::: rest.flatten } |
+      (maybeArrayValue ~ maybeArrayValueComma.*) ^^ { case first ~ rest =>
+        first ::: rest.flatten
+      } |
         maybeArrayValue.* ^^ (_.flatten)
-    val root = "{" ~ maybeArrayValues ~ "}" ^^ {
-      case _ ~ vs ~ _ => vs
+    val root = "{" ~ maybeArrayValues ~ "}" ^^ { case _ ~ vs ~ _ =>
+      vs
     }
 
     def apply(str: String) = parseAll(root, str) match {
       case Success(strings, _) => Return(strings)
-      case Failure(_, _) | Error(_, _) => Throw(new Exception("Failed to parse array string"))
+      case Failure(_, _) | Error(_, _) =>
+        Throw(new Exception("Failed to parse array string"))
     }
 
   }
 
   // TODO: this isn't used anywhere, but it would need access to the type map and it would need to receive the elemoid
   def decodeArrayText[T](str: String, elemDecoder: ValueDecoder[T]) = {
-    ArrayStringParser(str).flatMap {
-      strings => strings.map(str => elemDecoder.decodeText("", str)).foldLeft[Try[Queue[T]]](Return(Queue.empty[T])) {
-        (accum, next) => accum.flatMap {
-          current => next.map(v => current enqueue v)
+    ArrayStringParser(str).flatMap { strings =>
+      strings
+        .map(str => elemDecoder.decodeText("", str))
+        .foldLeft[Try[Queue[T]]](Return(Queue.empty[T])) { (accum, next) =>
+          accum.flatMap { current =>
+            next.map(v => current enqueue v)
+          }
         }
-      }
     }
   }
 
diff --git a/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/HStores.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/HStores.scala
new file mode 100644
index 00000000..553507c0
--- /dev/null
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/HStores.scala
@@ -0,0 +1,82 @@
+package com.twitter.finagle.postgres.values
+
+import java.nio.charset.Charset
+
+import scala.util.parsing.combinator.RegexParsers
+
+import io.netty.buffer.{ByteBuf, Unpooled}
+
+object HStores {
+  object HStoreStringParser extends RegexParsers {
+    def key: Parser[String] = "\"" ~ """([^"\\]*(\\.[^"\\]*)*)""".r ~ "\"" ^^ {
+      case o ~ value ~ c => value.replace("\\\"", "\"").replace("\\\\", "\\")
+    }
+
+    def value = key | "NULL"
+
+    def item: Parser[(String, Option[String])] = key ~ "=>" ~ value ^^ {
+      case key ~ arrow ~ "NULL" => (key, None)
+      case key ~ arrow ~ value  => (key, Some(value))
+    }
+
+    def items: Parser[Map[String, Option[String]]] = repsep(item, ", ") ^^ {
+      l => l.toMap
+    }
+
+    def apply(input: String): Option[Map[String, Option[String]]] =
+      parseAll(items, input) match {
+        case Success(result, _) => Some(result)
+        case failure: NoSuccess => None
+      }
+  }
+
+  def parseHStoreString(str: String) = HStoreStringParser(str)
+
+  def formatHStoreString(hstore: Map[String, Option[String]]) = hstore
+    .map { case (k, v) =>
+      val key = s""""${k.replace("\"", "\\\"")}""""
+      val value =
+        v.map(str => s""""${str.replace("\"", "\\\"")}"""").getOrElse("NULL")
+      s"""$key => $value"""
+    }
+    .mkString(",")
+
+  def decodeHStoreBinary(buf: ByteBuf, charset: Charset) = {
+    val count = buf.readInt()
+    val pairs = Array.fill(count) {
+      val keyLength = buf.readInt()
+      val key = Array.fill(keyLength)(buf.readByte())
+      val valueLength = buf.readInt()
+      val value = valueLength match {
+        case -1 => None
+        case l =>
+          val valueBytes = Array.fill(l)(buf.readByte())
+          Some(valueBytes)
+      }
+      new String(key, charset) -> value.map(new String(_, charset))
+    }
+    pairs.toMap
+  }
+
+  def encodeHStoreBinary(
+      hstore: Map[String, Option[String]],
+      charset: Charset
+  ) = {
+    val buf = Unpooled.buffer()
+    buf.writeInt(hstore.size)
+    hstore foreach { case (key, value) =>
+      val keyBytes = key.getBytes(charset)
+      buf.writeInt(keyBytes.length)
+      buf.writeBytes(keyBytes)
+      value match {
+        case None => buf.writeInt(-1)
+        case Some(v) =>
+          val valueBytes = v.getBytes(charset)
+          buf.writeInt(valueBytes.length)
+          buf.writeBytes(valueBytes)
+      }
+    }
+    buf
+  }
+
+}
diff --git a/src/main/scala/com/twitter/finagle/postgres/values/JSONB.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/JSONB.scala
similarity index 53%
rename from src/main/scala/com/twitter/finagle/postgres/values/JSONB.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/JSONB.scala
index 15dd6276..8284d1f0 100644
--- a/src/main/scala/com/twitter/finagle/postgres/values/JSONB.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/JSONB.scala
@@ -3,10 +3,13 @@ package com.twitter.finagle.postgres.values
 import java.nio.charset.Charset
 
 object JSONB {
-  def apply(string: String, charset: Charset = Charset.defaultCharset): JSONB = new JSONB(string.getBytes(charset))
+  def apply(string: String, charset: Charset = Charset.defaultCharset): JSONB =
+    new JSONB(string.getBytes(charset))
 
-  def stringify(jsonb: JSONB, charset: Charset = Charset.defaultCharset): String = new String(jsonb.bytes, charset)
+  def stringify(
+      jsonb: JSONB,
+      charset: Charset = Charset.defaultCharset
+  ): String = new String(jsonb.bytes, charset)
 }
 
 case class JSONB(bytes: Array[Byte]) extends AnyVal
-
diff --git a/src/main/scala/com/twitter/finagle/postgres/values/Numerics.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Numerics.scala
similarity index 64%
rename from src/main/scala/com/twitter/finagle/postgres/values/Numerics.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Numerics.scala
index 02d50573..01277005 100644
--- a/src/main/scala/com/twitter/finagle/postgres/values/Numerics.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Numerics.scala
@@ -7,8 +7,8 @@ import io.netty.buffer.{ByteBuf, Unpooled}
 private object Numerics {
   private val NUMERIC_POS = 0x0000
   private val NUMERIC_NEG = 0x4000
-  private val NUMERIC_NAN = 0xC000
-  private val NUMERIC_NULL = 0xF000
+  private val NUMERIC_NAN = 0xc000
+  private val NUMERIC_NULL = 0xf000
   private val NumericDigitBaseExponent = 4
   val biBase = BigInteger.valueOf(10000)
 
@@ -19,7 +19,7 @@ private object Numerics {
   }
 
   private def base10exponent(in: java.math.BigDecimal) = {
-     in.round(new java.math.MathContext(1)).scale() * -1
+    in.round(new java.math.MathContext(1)).scale() * -1
   }
 
   def readNumeric(buf: ByteBuf) = {
@@ -28,23 +28,25 @@ private object Numerics {
     val sign = getUnsignedShort(buf)
     val displayScale = getUnsignedShort(buf)
 
-    //digits are actually unsigned base-10000 numbers (not straight up bytes)
+    // digits are actually unsigned base-10000 numbers (not straight up bytes)
     val digits = Array.fill(len)(buf.readShort())
     val bdDigits = digits.map(BigDecimal(_))
 
-    if(bdDigits.length > 0) {
-      val unscaled = bdDigits.foldLeft(BigDecimal(0)) {
-        case (acc, n) => acc * 10000 + n
+    if (bdDigits.length > 0) {
+      val unscaled = bdDigits.foldLeft(BigDecimal(0)) { case (acc, n) =>
+        acc * 10000 + n
       }
 
-      val scaleFactor = (weight  + 1 - len) * NumericDigitBaseExponent
-      val unsigned = unscaled.bigDecimal.movePointRight(scaleFactor).setScale(displayScale)
+      val scaleFactor = (weight + 1 - len) * NumericDigitBaseExponent
+      val unsigned =
+        unscaled.bigDecimal.movePointRight(scaleFactor).setScale(displayScale)
 
       sign match {
         case NUMERIC_POS => BigDecimal(unsigned)
         case NUMERIC_NEG => BigDecimal(unsigned.negate())
         case NUMERIC_NAN => throw new NumberFormatException("Decimal is NaN")
-        case NUMERIC_NULL => throw new NumberFormatException("Decimal is NUMERIC_NULL")
+        case NUMERIC_NULL =>
+          throw new NumberFormatException("Decimal is NUMERIC_NULL")
       }
     } else {
       BigDecimal(0)
@@ -56,12 +58,13 @@ private object Numerics {
     val unscaled = minimized.bigDecimal.unscaledValue().abs()
     val sign = minimized.signum
 
-    def findDigits(i: BigInteger, current: List[Short] = Nil): List[Short] = if(i.signum() != 0) {
-      val Array(q, r) = i.divideAndRemainder(biBase)
-      findDigits(q, r.shortValue() :: current)
-    } else current
+    def findDigits(i: BigInteger, current: List[Short] = Nil): List[Short] =
+      if (i.signum() != 0) {
+        val Array(q, r) = i.divideAndRemainder(biBase)
+        findDigits(q, r.shortValue() :: current)
+      } else current
 
-    //the decimal point must align on a base-10000 digit
+    // the decimal point must align on a base-10000 digit
     val padZeroes = 4 - (minimized.scale % 4)
     val paddedUnscaled = Option(padZeroes)
       .filterNot(_ == 0)
@@ -72,24 +75,26 @@ private object Numerics {
     val digits = findDigits(paddedUnscaled, Nil)
 
     val weight = {
-      val powers10 = base10exponent(in.bigDecimal) - base10exponent(new java.math.BigDecimal(paddedUnscaled))
+      val powers10 = base10exponent(in.bigDecimal) - base10exponent(
+        new java.math.BigDecimal(paddedUnscaled)
+      )
       val mod4 = if (powers10 % 4 >= 0) powers10 % 4 else 4 + powers10 % 4
 
       digits.length + (powers10 - mod4) / 4 - 1
     }
     val bufSize =
-      2 + //digit length
-      2 + //weight
-      2 + //sign
-      2 + //scale
-      digits.length * 2 //a short for each digit
+      2 + // digit length
+        2 + // weight
+        2 + // sign
+        2 + // scale
+        digits.length * 2 // a short for each digit
 
     val buf = Unpooled.wrappedBuffer(new Array[Byte](bufSize))
-    val scale = if(in.scale < 0) 0 else in.scale
+    val scale = if (in.scale < 0) 0 else in.scale
     buf.resetWriterIndex()
     buf.writeShort(digits.length)
     buf.writeShort(weight)
-    buf.writeShort(if(sign < 0) NUMERIC_NEG else NUMERIC_POS)
+    buf.writeShort(if (sign < 0) NUMERIC_NEG else NUMERIC_POS)
     buf.writeShort(scale)
     digits foreach (d => buf.writeShort(d))
     buf
diff --git a/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Time.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Time.scala
new file mode 100644
index 00000000..f6046ae0
--- /dev/null
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Time.scala
@@ -0,0 +1,221 @@
+package com.twitter.finagle.postgres.values
+
+import java.text.NumberFormat
+import java.time._
+import java.time.format.{
+  DateTimeFormatter,
+  DateTimeFormatterBuilder,
+  ResolverStyle
+}
+import java.time.temporal.{ChronoField, TemporalAccessor, TemporalQuery}
+
+import io.netty.buffer.{ByteBuf, Unpooled}
+
+private object DateTimeUtils {
+  val POSTGRES_EPOCH_MICROS = 946684800000000L
+  val ZONE_REGEX = "(.*)(-|\\+)([0-9]{2})".r
+
+  private val timeTzParser = new DateTimeFormatterBuilder()
+    .parseCaseInsensitive()
+    .append(DateTimeFormatter.ISO_LOCAL_TIME)
+    .optionalStart()
+    .appendOffset("+HH:MM:ss", "Z")
+    .optionalEnd()
+    .optionalStart()
+    .appendOffset("+HH:mm", "Z")
+    .optionalEnd()
+    .optionalStart()
+    .appendOffset("+HH", "Z")
+    .optionalEnd()
+    .toFormatter
+
+  /** https://www.postgresql.org/docs/current/datatype-datetime.html
+    *
+    * ISO 8601 specifies the use of uppercase letter T to separate the date and
+    * time. PostgreSQL accepts that format on input, but on output it uses a
+    * space rather than T, as shown above. This is for readability and for
+    * consistency with RFC 3339 as well as some other database systems.
+    */
+  private val PostgresDateTimeFormat = new DateTimeFormatterBuilder()
+    .parseCaseInsensitive()
+    .append(DateTimeFormatter.ISO_LOCAL_DATE)
+    .appendLiteral(' ')
+    .append(DateTimeFormatter.ISO_LOCAL_TIME)
+    .optionalStart()
+    .appendOffsetId()
+    .toFormatter()
+
+  def format(i: Instant) =
+    PostgresDateTimeFormat.withZone(ZoneOffset.UTC).format(i)
+  def format(zdt: ZonedDateTime) = PostgresDateTimeFormat.format(zdt)
+  def format(ldt: LocalDateTime) = PostgresDateTimeFormat.format(ldt)
+
+  private val PostgresDateTimeParser = new DateTimeFormatterBuilder()
+    .parseCaseInsensitive()
+    .append(DateTimeFormatter.ISO_LOCAL_DATE)
+    .appendLiteral(' ')
+    .append(timeTzParser)
+    .toFormatter()
+
+  // NOTE: this is Scala 2.11 interrop. Scala 2.12 automatically does this for us.
+  private def query[T](f: TemporalAccessor => T): TemporalQuery[T] =
+    new TemporalQuery[T] {
+      override def queryFrom(temporal: TemporalAccessor): T = f(temporal)
+    }
+
+  def parseLocalDateTime(s: String) =
+    PostgresDateTimeParser.parse(s, query(LocalDateTime.from))
+  def parseInstant(s: String) = PostgresDateTimeParser
+    .withZone(ZoneOffset.UTC)
+    .parse(s, query(Instant.from))
+  def parseZonedDateTime(s: String) =
+    PostgresDateTimeParser.parse(s, query(ZonedDateTime.from))
+
+  def readTimestamp(buf: ByteBuf) = {
+    val micros = buf.readLong() + POSTGRES_EPOCH_MICROS
+    val seconds = micros / 1000000L
+    val nanos = (micros - seconds * 1000000L) * 1000
+    Instant.ofEpochSecond(seconds, nanos)
+  }
+
+  def readTimeTz(buf: ByteBuf) = {
+    val time = LocalTime.ofNanoOfDay(buf.readLong() * 1000)
+    val zone = ZoneOffset.ofTotalSeconds(-buf.readInt())
+    time.atOffset(zone)
+  }
+
+  def readInterval(buf: ByteBuf) = {
+    val micros = buf.readLong()
+    val days = buf.readInt()
+    val months = buf.readInt()
+    Interval(
+      Duration.ofNanos(micros * 1000),
+      Period.ofMonths(months).plusDays(days)
+    )
+  }
+
+  def parseTimeTz(str: String) = OffsetTime.parse(str, timeTzParser)
+
+  def writeInstant(instant: Instant) = {
+    val seconds = instant.getEpochSecond
+    val micros =
+      instant.getLong(ChronoField.MICRO_OF_SECOND) + seconds * 1000000
+    val buf = Unpooled.buffer(8)
+    buf.writeLong(micros - POSTGRES_EPOCH_MICROS)
+    buf
+  }
+
+  def writeTimestamp(timestamp: LocalDateTime) = writeInstant(
+    timestamp.atOffset(ZoneOffset.UTC).toInstant
+  )
+
+  def writeTimestampTz(timestamp: ZonedDateTime) = writeInstant(
+    timestamp.toInstant
+  )
+
+  def writeTimeTz(time: OffsetTime) = {
+    val buf = Unpooled.buffer(12)
+    buf.writeLong(time.toLocalTime.toNanoOfDay / 1000)
+    buf.writeInt(-time.getOffset.getTotalSeconds)
+    buf
+  }
+
+  def writeInterval(interval: Interval) = {
+    val buf = Unpooled.buffer(16)
+    buf.writeLong(
+      interval.timeDifference.getSeconds * 1000000 + interval.timeDifference.getNano / 1000
+    )
+    buf.writeInt(interval.dateDifference.getDays)
+    buf.writeInt(
+      interval.dateDifference.getYears * 12 + interval.dateDifference.getMonths
+    )
+    buf
+  }
+}
+
+// Java time doesn't have the same notion of Interval that Postgres has
+// The simplest way to model it is by capturing the time portion and date portion separately (as postgres does)
+// TODO: this could probably implement Temporal to unify with java.time API
+case class Interval(timeDifference: Duration, dateDifference: Period) {
+  override def toString: String = {
+    val timePart = Option(timeDifference).filter(_.getSeconds != 0).map { t =>
+      val sign = if (t.getSeconds < 0) "-" else "+"
+      val totalSeconds = Math.abs(t.getSeconds)
+      val totalMinutes = totalSeconds / 60
+      val totalHours = totalMinutes / 60
+      val seconds = (totalSeconds % 60).toString.reverse.padTo(2, '0').reverse
+      val minutes =
+        (totalMinutes - totalHours * 60).toString.reverse.padTo(2, '0').reverse
+      val hours = totalHours.toString.reverse.padTo(2, '0').reverse
+      val micros = (t.getNano / 1000).toString.reverse.padTo(6, '0').reverse
+      s"$sign$hours:$minutes:$seconds.$micros"
+    }
+
+    val datePart = Option(dateDifference)
+      .filterNot(dd => dd.getDays == 0 && dd.getMonths == 0 && dd.getYears == 0)
+      .map { d =>
+        def sign(i: Int) = if (i > 0) s"+$i" else i.toString
+        val years =
+          Option(d.getYears).filter(_ != 0).map(y => s"${sign(y)} years")
+        val months =
+          Option(d.getMonths).filter(_ != 0).map(m => s"${sign(m)} mons")
+        val days = Option(d.getDays).filter(_ != 0).map(d => s"${sign(d)} days")
+        List(years, months, days).flatten.mkString(" ")
+      }
+
+    List(datePart, timePart).flatten.mkString(" ")
+  }
+
+  override def equals(obj: scala.Any): Boolean = obj match {
+    case Interval(td, dd) =>
+      val e =
+        td.getSeconds == timeDifference.getSeconds && td.getNano == timeDifference.getNano &&
+          dd.getYears * 12 + dd.getMonths == dateDifference.getYears * 12 + dateDifference.getMonths &&
+          dd.getDays == dateDifference.getDays
+      if (!e) {
+        println("debug")
+      }
+      e
+    case _ => false
+  }
+}
+
+object Interval {
+  val regex =
+    """(?:([\-+]?\d+) years? )?(?:([\-+]?\d+) mons? )?(?:([\-+]?\d+) days? )?(?:(-|\+)?(\d{2}):(\d{2}):(\d{2})(\.\d+)?)?""".r
+  def parse(s: String) = {
+    val t = regex.findFirstMatchIn(s).map { m =>
+      val period = Period
+        .ofYears(Option(m.group(1)).map(_.toInt).getOrElse(0))
+        .plusMonths(Option(m.group(2)).map(_.toLong).getOrElse(0))
+        .plusDays(Option(m.group(3)).map(_.toLong).getOrElse(0))
+      val duration = if (m.group(4) == "-") {
+        Duration
+          .ofHours(Option(m.group(5)).map(h => -1 * h.toLong).getOrElse(0))
+          .minusMinutes(Option(m.group(6)).map(_.toLong).getOrElse(0))
+          .minusSeconds(Option(m.group(7)).map(_.toLong).getOrElse(0))
+          .minusNanos(
+            Option(m.group(8))
+              .map(BigDecimal.apply)
+              .map(_ * 1000000000L)
+              .map(_.toLong)
+              .getOrElse(0)
+          )
+      } else {
+        Duration
+          .ofHours(Option(m.group(5)).map(_.toLong).getOrElse(0))
+          .plusMinutes(Option(m.group(6)).map(_.toLong).getOrElse(0))
+          .plusSeconds(Option(m.group(7)).map(_.toLong).getOrElse(0))
+          .plusNanos(
+            Option(m.group(8))
+              .map(BigDecimal.apply)
+              .map(_ * 1000000000L)
+              .map(_.toLong)
+              .getOrElse(0)
+          )
+      }
+      Interval(duration, period)
+    }
+    t.getOrElse(throw new DateTimeException("Interval could not be parsed"))
+  }
+}
diff --git a/src/main/scala/com/twitter/finagle/postgres/values/Types.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Types.scala
similarity index 100%
rename from src/main/scala/com/twitter/finagle/postgres/values/Types.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Types.scala
diff --git a/src/main/scala/com/twitter/finagle/postgres/values/Utils.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Utils.scala
similarity index 80%
rename from src/main/scala/com/twitter/finagle/postgres/values/Utils.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Utils.scala
index b0786a85..39a9816c 100644
--- a/src/main/scala/com/twitter/finagle/postgres/values/Utils.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/Utils.scala
@@ -20,7 +20,9 @@ object Buffers {
     @tailrec
     def countChars(buf: ByteBuf, count: Int): Int = {
       if (!buffer.isReadable) {
-        throw new IndexOutOfBoundsException("buffer ended, but '\\0' was not found")
+        throw new IndexOutOfBoundsException(
+          "buffer ended, but '\\0' was not found"
+        )
       } else if (buffer.readByte() == 0) {
         count
       } else {
@@ -57,10 +59,17 @@ object Md5Encryptor {
    * Encrypt a user/password combination using the MD5 algorithm.
    */
   @throws(classOf[IllegalArgumentException])
-  def encrypt(user: Array[Byte], password: Array[Byte], salt: Array[Byte]): Array[Byte] = {
+  def encrypt(
+      user: Array[Byte],
+      password: Array[Byte],
+      salt: Array[Byte]
+  ): Array[Byte] = {
 
     require(user != null && user.length > 0, "user should not be empty")
-    require(password != null && password.length > 0, "password should not be empty")
+    require(
+      password != null && password.length > 0,
+      "password should not be empty"
+    )
     require(salt != null && salt.length > 0, "salt should not be empty")
 
     val inner = MessageDigest.getInstance("MD5")
@@ -76,13 +85,14 @@ object Md5Encryptor {
 }
 
 object Hex {
-  def valueOf(buf: Array[Byte]): String = buf.map("%02X" format _).mkString.toLowerCase
+  def valueOf(buf: Array[Byte]): String =
+    buf.map("%02X" format _).mkString.toLowerCase
 }
 
 object Convert {
-  def asShort(i : Int) = i.asInstanceOf[Short]
+  def asShort(i: Int) = i.asInstanceOf[Short]
 }
 
 object Strings {
   val empty = new String
-}
\ No newline at end of file
+}
diff --git a/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/ValueDecoder.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/ValueDecoder.scala
new file mode 100644
index 00000000..a6726c6c
--- /dev/null
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/ValueDecoder.scala
@@ -0,0 +1,260 @@
+package com.twitter.finagle.postgres.values
+
+import java.net.InetAddress
+import java.nio.charset.Charset
+import java.time._
+import java.time.temporal.JulianFields
+import java.util.UUID
+
+import com.twitter.util.{Return, Throw, Try}
+import io.netty.buffer.ByteBuf
+
+/** Typeclass supporting type-safe decoding of values from PostgreSQL in text
+  * and binary formats
+  */
+trait ValueDecoder[T] {
+
+  /** Attempt to decode the given text with the Postgres data type represented
+    * by `recv` into [[T]]
+    * @param recv
+    *   The name of PostgreSQL's receive function for the text's data type
+    * @param text
+    *   The text to be decoded
+    * @return
+    *   A [[Try]] encapsulating the decoding attempt
+    */
+  def decodeText(recv: String, text: String): Try[T]
+
+  /** Attempt to decode the given bytes with the Postgres data type represented
+    * by `recv` into [[T]]
+    * @param recv
+    *   The name of PostgreSQL's receive function for the text's data type
+    * @param bytes
+    *   The bytes to be decoded; must be at the correct position (beginning of
+    *   bytes for this value)
+    * @param charset
+    *   The character set that is being used to communicate with Postgres
+    * @return
+    *   A [[Try]] encapsulating the decoding attempt
+    */
+  def decodeBinary(recv: String, bytes: ByteBuf, charset: Charset): Try[T]
+
+  /** Create a new [[ValueDecoder]] which is the composition of this decoder
+    * with the given function
+    * @param fn
+    *   The function which will transform [[T]]
+    * @tparam U
+    *   The type parameter of the new decoder
+    * @return
+    *   A new [[ValueDecoder]] decoding [[U]]
+    */
+  def map[U](fn: T => U): ValueDecoder[U] = new ValueDecoder[U] {
+    def decodeText(recv: String, text: String) =
+      ValueDecoder.this.decodeText(recv, text).map(fn)
+    def decodeBinary(recv: String, bytes: ByteBuf, charset: Charset) =
+      ValueDecoder.this.decodeBinary(recv, bytes, charset).map(fn)
+  }
+}
+
+object ValueDecoder {
+
+  def apply[T: ValueDecoder] = implicitly[ValueDecoder[T]]
+
+  def instance[T](
+      text: String => Try[T],
+      binary: (ByteBuf, Charset) => Try[T]
+  ): ValueDecoder[T] =
+    new ValueDecoder[T] {
+      def decodeText(recv: String, s: String) = text(s)
+      def decodeBinary(recv: String, b: ByteBuf, charset: Charset) =
+        binary(b, charset)
+    }
+
+  def instance[T](
+      text: (String, String) => Try[T],
+      binary: (String, ByteBuf, Charset) => Try[T]
+  ): ValueDecoder[T] =
+    new ValueDecoder[T] {
+      def decodeText(recv: String, s: String) = text(recv, s)
+      def decodeBinary(recv: String, b: ByteBuf, charset: Charset) =
+        binary(recv, b, charset)
+    }
+
+  private def readInetAddress(buf: ByteBuf) = {
+    val family = buf.readByte()
+    val bits = buf.readByte()
+    val i = buf.readByte()
+    val nb = buf.readByte()
+    val arr = Array.fill(nb)(buf.readByte())
+    InetAddress.getByAddress(arr)
+  }
+
+  implicit val boolean: ValueDecoder[Boolean] = instance(
+    s => Return(s == "t" || s == "true"),
+    (b, c) => Try(b.readByte() != 0)
+  )
+  implicit val bytea: ValueDecoder[Array[Byte]] = instance(
+    s =>
+      Try(
+        s.stripPrefix("\\x")
+          .sliding(2, 2)
+          .toArray
+          .map(Integer.parseInt(_, 16).toByte)
+      ),
+    (b, c) => Try(Buffers.readBytes(b))
+  )
+
+  // for String, we have a special case of `jsonb` - the user might want it as a String, but if it's jsonb we need
+  // to strip off the version byte in the binary case
+  implicit val string: ValueDecoder[String] =
+    instance(
+      (recv, s) => Return(s),
+      (recv, b, c) =>
+        recv match {
+          case "jsonb_recv" => b.readByte; Try(Buffers.readString(b, c))
+          case _            => Try(Buffers.readString(b, c))
+        }
+    )
+
+  implicit val int2: ValueDecoder[Short] =
+    instance(s => Try(s.toShort), (b, c) => Try(b.readShort()))
+  implicit val int4: ValueDecoder[Int] =
+    instance(s => Try(s.toInt), (b, c) => Try(b.readInt()))
+  implicit val int8: ValueDecoder[Long] =
+    instance(s => Try(s.toLong), (b, c) => Try(b.readLong()))
+  implicit val float4: ValueDecoder[Float] =
+    instance(s => Try(s.toFloat), (b, c) => Try(b.readFloat()))
+  implicit val float8: ValueDecoder[Double] =
+    instance(s => Try(s.toDouble), (b, c) => Try(b.readDouble()))
+  val Oid = instance(
+    s => Try(s.toLong),
+    (b, c) => Try(Integer.toUnsignedLong(b.readInt()))
+  )
+  implicit val inet: ValueDecoder[InetAddress] = instance(
+    s => Try(InetAddress.getByName(s)),
+    (b, c) => Try(readInetAddress(b))
+  )
+  implicit val localDate: ValueDecoder[LocalDate] = instance(
+    s => Try(LocalDate.parse(s)),
+    (b, c) =>
+      Try(
+        LocalDate.now().`with`(JulianFields.JULIAN_DAY, b.readInt() + 2451545)
+      )
+  )
+  implicit val localTime: ValueDecoder[LocalTime] = instance(
+    s => Try(LocalTime.parse(s)),
+    (b, c) => Try(LocalTime.ofNanoOfDay(b.readLong() * 1000))
+  )
+  implicit val offsetTime: ValueDecoder[OffsetTime] = instance(
+    s => Try(DateTimeUtils.parseTimeTz(s)),
+    (b, c) => Try(DateTimeUtils.readTimeTz(b))
+  )
+  implicit val localDateTime: ValueDecoder[LocalDateTime] = instance(
+    s => Try(DateTimeUtils.parseLocalDateTime(s)),
+    (b, c) =>
+      Try(
+        LocalDateTime.ofInstant(DateTimeUtils.readTimestamp(b), ZoneOffset.UTC)
+      )
+  )
+
+  implicit val instant: ValueDecoder[Instant] = instance(
+    s => Try(DateTimeUtils.parseInstant(s)),
+    (b, c) => Try(DateTimeUtils.readTimestamp(b))
+  )
+  implicit val zonedDateTime: ValueDecoder[ZonedDateTime] = instance(
+    s => Try(DateTimeUtils.parseZonedDateTime(s)),
+    (
+        b,
+        c
+    ) =>
+      Try(
+        DateTimeUtils.readTimestamp(b).atZone(ZoneOffset.UTC)
+      ) // binary mode does not provide the zone
+  )
+  implicit val offsetDateTime: ValueDecoder[OffsetDateTime] =
+    zonedDateTime.map(_.toOffsetDateTime)
+
+  implicit val interval: ValueDecoder[Interval] = instance(
+    s => Try(com.twitter.finagle.postgres.values.Interval.parse(s)),
+    (b, c) => Try(DateTimeUtils.readInterval(b))
+  )
+
+  implicit val uuid: ValueDecoder[UUID] = instance(
+    s => Try(UUID.fromString(s)),
+    (b, c) => Try(new UUID(b.readLong(), b.readLong()))
+  )
+  implicit val bigDecimal: ValueDecoder[BigDecimal] = instance(
+    s => Try(BigDecimal(s)),
+    (b, c) => Try(Numerics.readNumeric(b))
+  )
+
+  implicit val javaBigDecimal: ValueDecoder[java.math.BigDecimal] =
+    bigDecimal.map(_.bigDecimal)
+
+  implicit val jsonb: ValueDecoder[JSONB] = instance(
+    s => Return(JSONB(s)),
+    (b, c) =>
+      Try {
+        b.readByte() // discard version number
+        JSONB(new String(Array.fill(b.readableBytes())(b.readByte()), c))
+      }
+  )
+
+  implicit val hstoreMap: ValueDecoder[Map[String, Option[String]]] = instance(
+    s =>
+      Try {
+        HStores
+          .parseHStoreString(s)
+          .getOrElse(
+            throw new IllegalArgumentException("Invalid format for hstore")
+          )
+      },
+    (buf, charset) => Try(HStores.decodeHStoreBinary(buf, charset))
+  )
+
+  val unknown: ValueDecoder[Either[String, Array[Byte]]] = instance(
+    s => Return(Left(s)),
+    (b, c) => Return(Right(Buffers.readBytes(b)))
+  )
+
+  val never: ValueDecoder[Nothing] = instance(
+    (recv, _) =>
+      Throw(new NoSuchElementException(s"No decoder available for $recv")),
+    (recv, _, _) =>
+      Throw(new NoSuchElementException(s"No decoder available for $recv"))
+  )
+
+  def unknownBinary(t: (ByteBuf, Charset)): Try[Any] = Return(
+    Buffers.readBytes(t._1)
+  )
+
+  val decoders: PartialFunction[String, ValueDecoder[T] forSome { type T }] = {
+    case "boolrecv"  => boolean
+    case "bytearecv" => bytea
+    case "charrecv" | "namerecv" | "varcharrecv" | "xml_recv" | "json_recv" |
+        "textrecv" | "bpcharrecv" | "cstring_recv" | "citextrecv" |
+        "enum_recv" =>
+      string
+    case "int8recv" => int8
+    case "int4recv" => int4
+    case "int2recv" => int2
+    // TODO: cidr
+    case "float4recv"     => float4
+    case "float8recv"     => float8
+    case "inet_recv"      => inet
+    case "date_recv"      => localDate
+    case "time_recv"      => localTime
+    case "timetz_recv"    => offsetTime
+    case "timestamp_recv" => localDateTime
+    case "timestamptz_recv" =>
+      instant // TODO: this should be zonedDateTime since in text mode, using instant will lose the timezone
+    case "interval_recv" => interval
+    // TODO: bit
+    // TODO: varbit
+    case "numeric_recv" => bigDecimal
+    case "uuid_recv"    => uuid
+    case "jsonb_recv"   => jsonb
+    case "hstore_recv"  => hstoreMap
+  }
+
+}
diff --git a/src/main/scala/com/twitter/finagle/postgres/values/ValueEncoder.scala b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/ValueEncoder.scala
similarity index 64%
rename from src/main/scala/com/twitter/finagle/postgres/values/ValueEncoder.scala
rename to finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/ValueEncoder.scala
index f260c9e4..52a84b10 100644
--- a/src/main/scala/com/twitter/finagle/postgres/values/ValueEncoder.scala
+++ b/finagle-postgres/src/main/scala/com/twitter/finagle/postgres/values/ValueEncoder.scala
@@ -1,24 +1,21 @@
 package com.twitter.finagle.postgres.values
 
+import com.twitter.finagle.postgres.Param
+
 import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
 import java.time._
 import java.time.temporal.JulianFields
 import java.util.UUID
-
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
 
-import scala.language.existentials
-
-
-
-
+import scala.language.{existentials, implicitConversions}
 
-
-/**
-  * Typeclass responsible for encoding a parameter of type T for sending to postgres
-  * @tparam T The type which it encodes
+/** Typeclass responsible for encoding a parameter of type T for sending to
+  * postgres
+  * @tparam T
+  *   The type which it encodes
   */
 trait ValueEncoder[T] {
   def encodeText(t: T): Option[String]
@@ -26,11 +23,16 @@ trait ValueEncoder[T] {
   def typeName: String
   def elemTypeName: Option[String]
 
-  def contraMap[U](fn: U => T, newTypeName: String = this.typeName, newElemTypeName: Option[String] = elemTypeName): ValueEncoder[U] = {
+  def contraMap[U](
+      fn: U => T,
+      newTypeName: String = this.typeName,
+      newElemTypeName: Option[String] = elemTypeName
+  ): ValueEncoder[U] = {
     val prev = this
     new ValueEncoder[U] {
       def encodeText(u: U) = prev.encodeText(fn(u))
-      def encodeBinary(u: U, charset: Charset) = prev.encodeBinary(fn(u), charset)
+      def encodeBinary(u: U, charset: Charset) =
+        prev.encodeBinary(fn(u), charset)
       val typeName = newTypeName
       val elemTypeName = newElemTypeName
     }
@@ -39,6 +41,9 @@ trait ValueEncoder[T] {
 
 object ValueEncoder extends LowPriorityEncoder {
 
+  implicit def convert[T](t: T)(implicit encoder: ValueEncoder[T]): Param[T] =
+    Param(t)
+
   def apply[T](implicit encoder: ValueEncoder[T]) = encoder
 
   case class Exported[T](encoder: ValueEncoder[T])
@@ -50,9 +55,9 @@ object ValueEncoder extends LowPriorityEncoder {
   }
 
   def instance[T](
-    instanceTypeName: String,
-    text: T => String,
-    binary: (T, Charset) => Option[ByteBuf]
+      instanceTypeName: String,
+      text: T => String,
+      binary: (T, Charset) => Option[ByteBuf]
   ): ValueEncoder[T] = new ValueEncoder[T] {
     def encodeText(t: T) = Option(t).map(text)
     def encodeBinary(t: T, c: Charset) = binary(t, c)
@@ -60,7 +65,11 @@ object ValueEncoder extends LowPriorityEncoder {
     val elemTypeName = None
   }
 
-  def encodeText[T](t: T, encoder: ValueEncoder[T], charset: Charset = StandardCharsets.UTF_8) =
+  def encodeText[T](
+      t: T,
+      encoder: ValueEncoder[T],
+      charset: Charset = StandardCharsets.UTF_8
+  ) =
     Option(t).flatMap(encoder.encodeText) match {
       case None => nullParam.duplicate()
       case Some(str) =>
@@ -71,7 +80,11 @@ object ValueEncoder extends LowPriorityEncoder {
         buf
     }
 
-  def encodeBinary[T](t: T, encoder: ValueEncoder[T], charset: Charset = StandardCharsets.UTF_8) =
+  def encodeBinary[T](
+      t: T,
+      encoder: ValueEncoder[T],
+      charset: Charset = StandardCharsets.UTF_8
+  ) =
     Option(t).flatMap(encoder.encodeBinary(_, charset)) match {
       case None => nullParam.duplicate()
       case Some(inBuf) =>
@@ -96,12 +109,13 @@ object ValueEncoder extends LowPriorityEncoder {
 
   implicit val boolean: ValueEncoder[Boolean] = instance(
     "bool",
-    b => if(b) "t" else "f",
-    (b, c) => Some {
-      val buf = Unpooled.buffer(1)
-      buf.writeByte(if(b) 1.toByte else 0.toByte)
-      buf
-    }
+    b => if (b) "t" else "f",
+    (b, c) =>
+      Some {
+        val buf = Unpooled.buffer(1)
+        buf.writeByte(if (b) 1.toByte else 0.toByte)
+        buf
+      }
   )
 
   implicit val bytea: ValueEncoder[Array[Byte]] = instance(
@@ -109,13 +123,25 @@ object ValueEncoder extends LowPriorityEncoder {
     bytes => "\\x" + bytes.map("%02x".format(_)).mkString,
     (b, c) => Some(Unpooled.copiedBuffer(b))
   )
-  implicit val int2: ValueEncoder[Short] = instance("int2", _.toString, (i, c) => Some(buffer(2)(_.writeShort(i))))
-  implicit val int4: ValueEncoder[Int] = instance("int4", _.toString, (i, c) => Some(buffer(4)(_.writeInt(i))))
-  implicit val int8: ValueEncoder[Long] = instance("int8", _.toString, (i, c) => Some(buffer(8)(_.writeLong(i))))
-  implicit val float4: ValueEncoder[Float] = instance("float4", _.toString, (i, c) => Some(buffer(4)(_.writeFloat(i))))
-  implicit val float8: ValueEncoder[Double] = instance("float8", _.toString, (i, c) => Some(buffer(8)(_.writeDouble(i))))
-  implicit val date: ValueEncoder[LocalDate] = instance("date", _.toString, (i, c) =>
-    Option(i).map(i => buffer(4)(_.writeInt((i.getLong(JulianFields.JULIAN_DAY) - 2451545).toInt)))
+  implicit val int2: ValueEncoder[Short] =
+    instance("int2", _.toString, (i, c) => Some(buffer(2)(_.writeShort(i))))
+  implicit val int4: ValueEncoder[Int] =
+    instance("int4", _.toString, (i, c) => Some(buffer(4)(_.writeInt(i))))
+  implicit val int8: ValueEncoder[Long] =
+    instance("int8", _.toString, (i, c) => Some(buffer(8)(_.writeLong(i))))
+  implicit val float4: ValueEncoder[Float] =
+    instance("float4", _.toString, (i, c) => Some(buffer(4)(_.writeFloat(i))))
+  implicit val float8: ValueEncoder[Double] =
+    instance("float8", _.toString, (i, c) => Some(buffer(8)(_.writeDouble(i))))
+  implicit val date: ValueEncoder[LocalDate] = instance(
+    "date",
+    _.toString,
+    (i, c) =>
+      Option(i).map(i =>
+        buffer(4)(
+          _.writeInt((i.getLong(JulianFields.JULIAN_DAY) - 2451545).toInt)
+        )
+      )
   )
   implicit val timestamp: ValueEncoder[LocalDateTime] = instance(
     "timestamp",
@@ -170,22 +196,26 @@ object ValueEncoder extends LowPriorityEncoder {
   implicit val uuid: ValueEncoder[UUID] = instance(
     "uuid",
     u => u.toString,
-    (u, c) => Option(u).map(u => buffer(16) {
-      b =>
-        b.writeLong(u.getMostSignificantBits)
-        b.writeLong(u.getLeastSignificantBits)
-    })
-  )
-  implicit val hstore: ValueEncoder[Map[String, Option[String]]] = instance[Map[String, Option[String]]](
-    "hstore",
-    m => HStores.formatHStoreString(m),
-    (m, c) => Option(m).map(HStores.encodeHStoreBinary(_, c))
-  )
-  implicit val hstoreNoNulls: ValueEncoder[Map[String, String]] = hstore.contraMap {
-    m: Map[String, String] => m.map {
-      case (k, v) => (k, Option(v))
+    (u, c) =>
+      Option(u).map(u =>
+        buffer(16) { b =>
+          b.writeLong(u.getMostSignificantBits)
+          b.writeLong(u.getLeastSignificantBits)
+        }
+      )
+  )
+  implicit val hstore: ValueEncoder[Map[String, Option[String]]] =
+    instance[Map[String, Option[String]]](
+      "hstore",
+      m => HStores.formatHStoreString(m),
+      (m, c) => Option(m).map(HStores.encodeHStoreBinary(_, c))
+    )
+  implicit val hstoreNoNulls: ValueEncoder[Map[String, String]] =
+    hstore.contraMap { m: Map[String, String] =>
+      m.map { case (k, v) =>
+        (k, Option(v))
+      }
     }
-  }
 
   implicit val jsonb: ValueEncoder[JSONB] = instance[JSONB](
     "jsonb",
@@ -198,15 +228,20 @@ object ValueEncoder extends LowPriorityEncoder {
     }
   )
 
-  @inline final implicit def option[T](implicit encodeT: ValueEncoder[T]): ValueEncoder[Option[T]] =
+  @inline final implicit def option[T](implicit
+      encodeT: ValueEncoder[T]
+  ): ValueEncoder[Option[T]] =
     new ValueEncoder[Option[T]] {
       val typeName = encodeT.typeName
       val elemTypeName = encodeT.elemTypeName
       def encodeText(optT: Option[T]) = optT.flatMap(encodeT.encodeText)
-      def encodeBinary(tOpt: Option[T], c: Charset) = tOpt.flatMap(t => encodeT.encodeBinary(t, c))
+      def encodeBinary(tOpt: Option[T], c: Charset) =
+        tOpt.flatMap(t => encodeT.encodeBinary(t, c))
     }
 
-  @inline final implicit def some[T](implicit encodeT: ValueEncoder[T]): ValueEncoder[Some[T]] =
+  @inline final implicit def some[T](implicit
+      encodeT: ValueEncoder[T]
+  ): ValueEncoder[Some[T]] =
     encodeT.contraMap((s: Some[T]) => s.get)
 
   implicit object none extends ValueEncoder[None.type] {
@@ -218,5 +253,7 @@ object ValueEncoder extends LowPriorityEncoder {
 }
 
 trait LowPriorityEncoder {
-  implicit def fromExport[T](implicit export: ValueEncoder.Exported[T]): ValueEncoder[T] = export.encoder
+  implicit def fromExport[T](implicit
+      export: ValueEncoder.Exported[T]
+  ): ValueEncoder[T] = export.encoder
 }
diff --git a/src/test/resources/extensions.sql b/finagle-postgres/src/test/resources/extensions.sql
similarity index 100%
rename from src/test/resources/extensions.sql
rename to finagle-postgres/src/test/resources/extensions.sql
diff --git a/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/Generators.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/Generators.scala
new file mode 100644
index 00000000..482f9850
--- /dev/null
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/Generators.scala
@@ -0,0 +1,119 @@
+package com.twitter.finagle.postgres
+
+import java.nio.charset.StandardCharsets
+import java.time.{ZonedDateTime, _}
+import java.time.temporal.JulianFields
+import java.util.UUID
+
+import org.scalacheck.{Arbitrary, Gen}
+import Arbitrary.arbitrary
+import com.twitter.finagle.postgres.values.Interval
+
+object Generators {
+  // need a more sensible BigDecimal generator, because ScalaCheck goes crazy with it and we can't even stringify them
+  // this will be sufficient to test the decoder
+  implicit val arbBD: Arbitrary[BigDecimal] = Arbitrary(
+    for {
+      precision <- Gen.choose(1, 32)
+      scale <- Gen.choose(-precision, precision)
+      digits <- Gen.listOfN[Char](precision, Gen.numChar)
+    } yield BigDecimal(
+      BigDecimal(digits.mkString).bigDecimal.movePointLeft(scale)
+    )
+  )
+
+  implicit val arbDate = Arbitrary[LocalDate](for {
+    julian <- Gen.choose(
+      1721060,
+      5373484
+    ) // Postgres date parser doesn't like dates outside year range 0000-9999
+  } yield LocalDate.now().`with`(JulianFields.JULIAN_DAY, julian))
+
+  implicit val arbTime: Arbitrary[LocalTime] = Arbitrary[LocalTime](for {
+    usec <- Gen.choose(0L, 24L * 60 * 60 * 1000000 - 1)
+  } yield LocalTime.ofNanoOfDay(usec * 1000))
+
+  implicit val arbInstant = Arbitrary[Instant](for {
+    milli <- Gen.posNum[Long]
+  } yield Instant.ofEpochMilli(milli))
+
+  implicit val arbTimestamp = Arbitrary[LocalDateTime](
+    for {
+      milli <- Gen.posNum[Long]
+    } yield LocalDateTime.ofInstant(
+      Instant.ofEpochMilli(milli),
+      ZoneId.systemDefault()
+    )
+  )
+
+  implicit val arbTimestampTz = Arbitrary[ZonedDateTime](
+    for {
+      milli <- Gen.posNum[Long]
+    } yield ZonedDateTime.ofInstant(
+      Instant.ofEpochMilli(milli),
+      ZoneId.systemDefault()
+    )
+  )
+
+  implicit val arbZoneOffset = Arbitrary(
+    Gen.choose(-12, 12).map(ZoneOffset.ofHours)
+  )
+
+  implicit val arbInterval = Arbitrary(
+    for {
+      months <- Gen.choose(-120, 120)
+      years <- Gen.choose(-10, 10)
+      days <- Gen.choose(-50, 50)
+      hours <- Gen.choose(-50, 50)
+      minutes <- Gen.choose(0, 59)
+      seconds <- Gen.choose(0, 59)
+    } yield Interval(
+      Duration.ofSeconds(seconds).plusMinutes(minutes).plusHours(hours),
+      Period.ofMonths(months).plusYears(years).plusDays(days)
+    )
+  )
+
+  implicit val arbTimeTz = Arbitrary[OffsetTime](for {
+    time <- arbitrary[LocalTime]
+    offs <- arbitrary[ZoneOffset]
+  } yield time.atOffset(offs))
+
+  implicit val arbUUID = Arbitrary[UUID](Gen.uuid)
+
+  // arbitrary string that only contains valid UTF-8 characters
+  val utf8 = StandardCharsets.UTF_8.newEncoder()
+  implicit val arbUTF8String = Arbitrary(arbitrary[String].filter { str =>
+    utf8.canEncode(str) && !str.contains('\u0000')
+  })
+
+  // TODO: can empty maps be supported?
+  implicit val arbHStore: Arbitrary[Map[String, Option[String]]] = Arbitrary(
+    Gen
+      .mapOf(for {
+        k <- Gen.identifier
+        v <- Gen.oneOf(Gen.alphaStr.map(Some(_)), Gen.const(None))
+      } yield (k, v))
+      .suchThat(_.nonEmpty)
+  )
+
+  // postgres has slightly different precision rules, but that doesn't mean the decoder isn't working
+  implicit val arbFloat = Arbitrary[Float](
+    for {
+      precision <- Gen.choose(1, 6)
+      scale <- Gen.choose(-10, 10)
+      digits <- Gen.listOfN[Char](precision, Gen.numChar)
+    } yield BigDecimal(
+      BigDecimal(digits.mkString).bigDecimal.movePointLeft(scale)
+    ).toFloat
+  )
+
+  implicit val arbDouble = Arbitrary[Double](
+    for {
+      precision <- Gen.choose(1, 15)
+      scale <- Gen.choose(-20, 20)
+      digits <- Gen.listOfN[Char](precision, Gen.numChar)
+    } yield BigDecimal(
+      BigDecimal(digits.mkString).bigDecimal.movePointLeft(scale)
+    ).toDouble
+  )
+}
diff --git a/src/test/scala/com/twitter/finagle/postgres/Spec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/Spec.scala
similarity index 73%
rename from src/test/scala/com/twitter/finagle/postgres/Spec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/Spec.scala
index e62490a3..d3b2a8f5 100644
--- a/src/test/scala/com/twitter/finagle/postgres/Spec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/Spec.scala
@@ -7,8 +7,4 @@ import org.scalatest.wordspec.AnyWordSpec
 /*
  * Base class for finagle postgres tests.
  */
-class Spec
-  extends AnyWordSpec
-  with Matchers
-  with BeforeAndAfter {
-}
+class Spec extends AnyWordSpec with Matchers with BeforeAndAfter {}
diff --git a/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAsyncSpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAsyncSpec.scala
similarity index 92%
rename from src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAsyncSpec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAsyncSpec.scala
index 3764f230..4a1b6ebd 100644
--- a/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAsyncSpec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAsyncSpec.scala
@@ -1,7 +1,12 @@
 package com.twitter.finagle.postgres.connection
 
 import com.twitter.finagle.postgres.Spec
-import com.twitter.finagle.postgres.messages.{Query, ParameterStatus, NotificationResponse, NoticeResponse}
+import com.twitter.finagle.postgres.messages.{
+  Query,
+  ParameterStatus,
+  NotificationResponse,
+  NoticeResponse
+}
 
 class ConnectionAsyncSpec extends Spec {
   "A postgres connection" should {
diff --git a/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAuthSpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAuthSpec.scala
similarity index 99%
rename from src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAuthSpec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAuthSpec.scala
index c6feed58..854319a8 100644
--- a/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAuthSpec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionAuthSpec.scala
@@ -73,4 +73,4 @@ class ConnectionAuthSpec extends Spec {
       response3 must equal(Some(AuthenticatedResponse(Map(), -1, -1)))
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionQuerySpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionQuerySpec.scala
similarity index 73%
rename from src/test/scala/com/twitter/finagle/postgres/connection/ConnectionQuerySpec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionQuerySpec.scala
index e93a655e..e014105c 100644
--- a/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionQuerySpec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/connection/ConnectionQuerySpec.scala
@@ -9,13 +9,15 @@ import io.netty.buffer.Unpooled
 
 class ConnectionQuerySpec extends Spec {
   "A postgres connection" should {
-    def toList[T](rows: AsyncStream[T]): List[T] = Await.result(rows.toSeq).toList
+    def toList[T](rows: AsyncStream[T]): List[T] =
+      Await.result(rows.toSeq).toList
     "handle an empty query response" in {
       val connection = new Connection(Connected)
 
       connection.send(Query(""))
       connection.receive(EmptyQueryResponse)
-      val r@SelectResult(fields, rows) = connection.receive(ReadyForQuery('I')).get
+      val r @ SelectResult(fields, rows) =
+        connection.receive(ReadyForQuery('I')).get
 
       fields.length mustEqual 0
       r.complete.isDefined mustBe true
@@ -68,23 +70,43 @@ class ConnectionQuerySpec extends Spec {
       val connection = new Connection(Connected)
 
       connection.send(Query("select * from emails"))
-      val r@SelectResult(fields, rows) = connection.receive(RowDescription(Array(FieldDescription("email",16728,2,1043,-1,-1,0)))).get
+      val r @ SelectResult(fields, rows) = connection
+        .receive(
+          RowDescription(
+            Array(FieldDescription("email", 16728, 2, 1043, -1, -1, 0))
+          )
+        )
+        .get
       connection.receive(CommandComplete(Select(0)))
       connection.receive(ReadyForQuery('I'))
 
       assert(fields sameElements Array(Field("email", 0, 1043)))
       r.complete.isDefined mustBe true
-      toList(rows) must equal (List())
+      toList(rows) must equal(List())
     }
 
     "handle a select query" in {
       val connection = new Connection(Connected)
 
-      val row1 = DataRow(Array(Some(Unpooled.copiedBuffer("donald@duck.com".getBytes(Charsets.Utf8)))))
-      val row2 = DataRow(Array(Some(Unpooled.copiedBuffer("daisy@duck.com".getBytes(Charsets.Utf8)))))
+      val row1 = DataRow(
+        Array(
+          Some(Unpooled.copiedBuffer("donald@duck.com".getBytes(Charsets.Utf8)))
+        )
+      )
+      val row2 = DataRow(
+        Array(
+          Some(Unpooled.copiedBuffer("daisy@duck.com".getBytes(Charsets.Utf8)))
+        )
+      )
 
       connection.send(Query("select * from emails"))
-      val r@SelectResult(fields, rows) = connection.receive(RowDescription(Array(FieldDescription("email",16728,2,1043,-1,-1,0)))).get
+      val r @ SelectResult(fields, rows) = connection
+        .receive(
+          RowDescription(
+            Array(FieldDescription("email", 16728, 2, 1043, -1, -1, 0))
+          )
+        )
+        .get
 
       connection.receive(row1)
       connection.receive(row2)
@@ -93,7 +115,7 @@ class ConnectionQuerySpec extends Spec {
 
       fields must contain theSameElementsAs Array(Field("email", 0, 1043))
       r.complete.isDefined mustBe true
-      toList(rows) must equal (List(row1, row2))
+      toList(rows) must equal(List(row1, row2))
     }
   }
 }
diff --git a/src/test/scala/com/twitter/finagle/postgres/integration/CustomTypesSpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/CustomTypesSpec.scala
similarity index 74%
rename from src/test/scala/com/twitter/finagle/postgres/integration/CustomTypesSpec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/CustomTypesSpec.scala
index 37d481cb..c0411004 100644
--- a/src/test/scala/com/twitter/finagle/postgres/integration/CustomTypesSpec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/CustomTypesSpec.scala
@@ -5,7 +5,12 @@ import java.time.temporal.ChronoField
 
 import com.twitter.finagle.Postgres
 import com.twitter.finagle.postgres.values.{ValueDecoder, ValueEncoder}
-import com.twitter.finagle.postgres.{Generators, PostgresClient, ResultSet, Spec}
+import com.twitter.finagle.postgres.{
+  Generators,
+  PostgresClient,
+  ResultSet,
+  Spec
+}
 import com.twitter.util.Await
 import io.netty.buffer.Unpooled
 import org.scalacheck.Arbitrary
@@ -14,31 +19,30 @@ import Generators._
 
 class CustomTypesSpec extends Spec with ScalaCheckDrivenPropertyChecks {
 
-  def test[T : Arbitrary](
-    decoder: ValueDecoder[T])(
-    typ: String,
-    tester: (T, T) => Boolean = (a: T, b: T) => a == b)(
-    implicit client: PostgresClient,
-    manifest: Manifest[T],
-    binaryParams: Boolean,
-    valueEncoder: ValueEncoder[T]
+  def test[T: Arbitrary](
+      decoder: ValueDecoder[T]
+  )(typ: String, tester: (T, T) => Boolean = (a: T, b: T) => a == b)(implicit
+      client: PostgresClient,
+      manifest: Manifest[T],
+      binaryParams: Boolean,
+      valueEncoder: ValueEncoder[T]
   ) = {
     implicit val dec = decoder
-    forAll {
-      (t: T) =>
-        val m = manifest
-        val encoder = valueEncoder
-        val query = if(binaryParams)
-          client.prepareAndQuery(s"SELECT $$1::$typ AS out", t) {
-            row => row.get[T](0)
+    forAll { (t: T) =>
+      val m = manifest
+      val encoder = valueEncoder
+      val query =
+        if (binaryParams)
+          client.prepareAndQuery(s"SELECT $$1::$typ AS out", t) { row =>
+            row.get[T](0)
           }
         else
-          client.prepareAndQuery(s"SELECT $$1::$typ AS out", t) {
-            row => row.get[T](0)
+          client.prepareAndQuery(s"SELECT $$1::$typ AS out", t) { row =>
+            row.get[T](0)
           }
-        val result = Await.result(query).head
-        if(!tester(t, result))
-          fail(s"$t does not match $result")
+      val result = Await.result(query).head
+      if (!tester(t, result))
+        fail(s"$t does not match $result")
     }
   }
 
@@ -52,21 +56,23 @@ class CustomTypesSpec extends Spec with ScalaCheckDrivenPropertyChecks {
     useSsl = sys.env.getOrElse("USE_PG_SSL", "0") == "1"
   } yield {
 
-    implicit val client = Postgres.Client()
+    implicit val client = Postgres
+      .Client()
       .database(dbname)
       .withCredentials(user, password)
       .withBinaryParams(binaryParams)
       .withBinaryResults(binaryResults)
       .conditionally(useSsl, _.withTransport.tlsWithoutValidation)
-      .withSessionPool.maxSize(1)
+      .withSessionPool
+      .maxSize(1)
       .newRichClient(hostPort)
 
-
-    val mode = if(binaryResults) "binary mode" else "text mode"
-    val paramsMode = if(binaryParams)
-      "binary"
-    else
-      "text"
+    val mode = if (binaryResults) "binary mode" else "text mode"
+    val paramsMode =
+      if (binaryParams)
+        "binary"
+      else
+        "text"
 
     implicit val useBinaryParams = binaryParams
 
@@ -85,13 +91,16 @@ class CustomTypesSpec extends Spec with ScalaCheckDrivenPropertyChecks {
       "parse shorts" in test(ValueDecoder.int2)("int2")
       "parse ints" in test(ValueDecoder.int4)("int4")
       "parse longs" in test(ValueDecoder.int8)("int8")
-      //precision seems to be an issue when postgres parses text floats
+      // precision seems to be an issue when postgres parses text floats
       "parse floats" in test(ValueDecoder.float4)("numeric::float4")
       "parse doubles" in test(ValueDecoder.float8)("numeric::float8")
       "parse numerics" in test(ValueDecoder.bigDecimal)("numeric")
       "parse timestamps" in test(ValueDecoder.localDateTime)(
         "timestamp",
-        (a, b) => a.getLong(ChronoField.MICRO_OF_DAY) == b.getLong(ChronoField.MICRO_OF_DAY)
+        (a, b) =>
+          a.getLong(ChronoField.MICRO_OF_DAY) == b.getLong(
+            ChronoField.MICRO_OF_DAY
+          )
       )
       "parse timestamps with time zone" in test(ValueDecoder.zonedDateTime)(
         "timestamptz",
diff --git a/src/test/scala/com/twitter/finagle/postgres/integration/IntegrationSpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/IntegrationSpec.scala
similarity index 68%
rename from src/test/scala/com/twitter/finagle/postgres/integration/IntegrationSpec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/IntegrationSpec.scala
index 6f68f816..2479a6c6 100644
--- a/src/test/scala/com/twitter/finagle/postgres/integration/IntegrationSpec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/IntegrationSpec.scala
@@ -4,7 +4,9 @@ import java.sql.Timestamp
 import java.time.Instant
 
 import com.twitter.finagle.postgres._
+import com.twitter.finagle.postgres.Param.convert
 import com.twitter.finagle.postgres.codec.ServerError
+import com.twitter.finagle.postgres.values.ValueEncoder._
 import com.twitter.finagle.Postgres
 import com.twitter.finagle.Status
 import com.twitter.util.Try
@@ -39,16 +41,20 @@ class IntegrationSpec extends Spec {
     useSsl = sys.env.getOrElse("USE_PG_SSL", "0") == "1"
     sslHost = sys.env.get("PG_SSL_HOST")
   } yield {
-
-
     val queryTimeout = Duration.fromSeconds(2)
 
-    def getClient: PostgresClientImpl = {
-      val client = Postgres.Client()
+    def getClient: PostgresClientImpl = getConcurrentClient(maxConcurrency = 1)
+    def getConcurrentClient(maxConcurrency: Int): PostgresClientImpl = {
+      val client = Postgres
+        .Client()
         .withCredentials(user, password)
         .database(dbname)
-        .withSessionPool.maxSize(1)
-        .conditionally(useSsl, c => sslHost.fold(c.withTransport.tls)(c.withTransport.tls(_)))
+        .withSessionPool
+        .maxSize(maxConcurrency)
+        .conditionally(
+          useSsl,
+          c => sslHost.fold(c.withTransport.tls)(c.withTransport.tls(_))
+        )
         .newRichClient(hostPort)
 
       Await.result(Future[PostgresClientImpl] {
@@ -58,22 +64,28 @@ class IntegrationSpec extends Spec {
     }
 
     def getBadClient = {
-      Postgres.Client()
+      Postgres
+        .Client()
         .withCredentials(user, password)
         .database(dbname)
-        .withSessionPool.maxSize(1)
-        .conditionally(useSsl, c => sslHost.fold(c.withTransport.tls)(c.withTransport.tls(_)))
+        .withSessionPool
+        .maxSize(1)
+        .conditionally(
+          useSsl,
+          c => sslHost.fold(c.withTransport.tls)(c.withTransport.tls(_))
+        )
         .newRichClient("badhost:5432")
     }
 
     def cleanDb(client: PostgresClient): Unit = {
-      val dropQuery = client.executeUpdate("DROP TABLE IF EXISTS %s".format(IntegrationSpec.pgTestTable))
+      val dropQuery = client.executeUpdate(
+        "DROP TABLE IF EXISTS %s".format(IntegrationSpec.pgTestTable)
+      )
       val response = Await.result(dropQuery, queryTimeout)
 
       response must equal(OK(1))
 
-      val createTableQuery = client.executeUpdate(
-        """
+      val createTableQuery = client.executeUpdate("""
         |CREATE TABLE %s (
         | str_field VARCHAR(40),
         | int_field INT,
@@ -85,12 +97,13 @@ class IntegrationSpec extends Spec {
       val response2 = Await.result(createTableQuery, queryTimeout)
       response2 must equal(OK(1))
 
-      Try(Await.result(client.execute("create extension hstore"))) // enable hstore type
+      Try(
+        Await.result(client.execute("create extension hstore"))
+      ) // enable hstore type
     }
 
     def insertSampleData(client: PostgresClient): Unit = {
-      val insertDataQuery = client.executeUpdate(
-        """
+      val insertDataQuery = client.executeUpdate("""
         |INSERT INTO %s VALUES
         | ('hello', 1234, 10.5, '2015-01-08 11:55:12-0800', TRUE),
         | ('hello', 5557, -4.51, '2015-01-08 12:55:12-0800', TRUE),
@@ -110,9 +123,9 @@ class IntegrationSpec extends Spec {
         insertSampleData(client)
 
         val selectQuery = client.select(
-          "SELECT * FROM %s WHERE str_field='hello' ORDER BY timestamp_field".format(IntegrationSpec.pgTestTable)
-        )(
-          identity)
+          "SELECT * FROM %s WHERE str_field='hello' ORDER BY timestamp_field"
+            .format(IntegrationSpec.pgTestTable)
+        )(identity)
 
         val resultRows = Await.result(selectQuery, queryTimeout)
 
@@ -124,9 +137,11 @@ class IntegrationSpec extends Spec {
         firstRow.getOption[String]("str_field") must equal(Some("hello"))
         firstRow.getOption[Int]("int_field") must equal(Some(7787))
         firstRow.getOption[Double]("double_field") must equal(Some(-42.51))
-        firstRow.getOption[Instant]("timestamp_field") must equal(Some(
-          new Timestamp(1387897260000L).toInstant
-        ))
+        firstRow.getOption[Instant]("timestamp_field") must equal(
+          Some(
+            new Timestamp(1387897260000L).toInstant
+          )
+        )
         firstRow.getOption[Boolean]("bool_field") must equal(Some(false))
         firstRow.getOption[String]("bad_column") must equal(None)
 
@@ -138,53 +153,44 @@ class IntegrationSpec extends Spec {
 
         insertSampleData(client)
 
-        val
-        selectQuery = client.select(
-          "SELECT * FROM %s WHERE str_field='xxxx' ORDER BY timestamp_field".
-            format(
-
-              IntegrationSpec.pgTestTable)
+        val selectQuery = client.select(
+          "SELECT * FROM %s WHERE str_field='xxxx' ORDER BY timestamp_field"
+            .format(IntegrationSpec.pgTestTable)
         )(identity)
 
-        val
-
-        resultRows = Await.result(
-          selectQuery, queryTimeout)
+        val resultRows = Await.result(selectQuery, queryTimeout)
         resultRows.size must equal(0)
       }
 
-
       "update a row" in {
         val client = getClient
         cleanDb(client)
         insertSampleData(client)
 
         val updateQuery = client.executeUpdate(
-
-          "UPDATE %s SET str_field='hello_updated' where int_field=4567".format(IntegrationSpec.pgTestTable)
+          "UPDATE %s SET str_field='hello_updated' where int_field=4567".format(
+            IntegrationSpec.pgTestTable
+          )
         )
 
-        val response = Await.
-
-          result(updateQuery, queryTimeout)
+        val response = Await.result(updateQuery, queryTimeout)
 
         response must equal(OK(1))
 
         val selectQuery = client.select(
+          "SELECT * FROM %s WHERE str_field='hello_updated'".format(
+            IntegrationSpec.pgTestTable
+          )
+        )(identity)
 
-          "SELECT * FROM %s WHERE str_field='hello_updated'".format(IntegrationSpec.pgTestTable)
-        )(
-
-          identity)
-
-        val
-        resultRows = Await.result(selectQuery, queryTimeout)
+        val resultRows = Await.result(selectQuery, queryTimeout)
 
         resultRows.size must equal(1)
-        resultRows.head.getOption[String]("str_field") must equal(Some("hello_updated"))
+        resultRows.head.getOption[String]("str_field") must equal(
+          Some("hello_updated")
+        )
       }
 
-
       "delete rows" in {
         val client = getClient
         cleanDb(client)
@@ -205,20 +211,24 @@ class IntegrationSpec extends Spec {
 
         val resultRows = Await.result(selectQuery, queryTimeout)
 
-        resultRows.size must equal (1)
-        resultRows.head.getOption[String]("str_field") must equal(Some("goodbye"))
+        resultRows.size must equal(1)
+        resultRows.head.getOption[String]("str_field") must equal(
+          Some("goodbye")
+        )
       }
 
-
       "select rows via a prepared query" in {
         val client = getClient
         cleanDb(client)
         insertSampleData(client)
 
         val preparedQuery = client.prepareAndQuery(
-          "SELECT * FROM %s WHERE str_field=$1 AND bool_field=$2".format(IntegrationSpec.pgTestTable),
+          "SELECT * FROM %s WHERE str_field=$1 AND bool_field=$2".format(
+            IntegrationSpec.pgTestTable
+          ),
           Param("hello"),
-          Param(true))(identity)
+          Param(true)
+        )(identity)
 
         val resultRows = Await.result(
           preparedQuery,
@@ -226,10 +236,9 @@ class IntegrationSpec extends Spec {
         )
 
         resultRows.size must equal(2)
-        resultRows.foreach {
-          row =>
-            row.getOption[String]("str_field") must equal(Some("hello"))
-            row.getOption[Boolean]("bool_field") must equal(Some(true))
+        resultRows.foreach { row =>
+          row.getOption[String]("str_field") must equal(Some("hello"))
+          row.getOption[Boolean]("bool_field") must equal(Some(true))
         }
       }
 
@@ -239,15 +248,20 @@ class IntegrationSpec extends Spec {
         insertSampleData(client)
 
         val preparedQuery = client.prepareAndExecute(
-          "UPDATE %s SET str_field = $1 where int_field = 4567".format(IntegrationSpec.pgTestTable),
+          "UPDATE %s SET str_field = $1 where int_field = 4567".format(
+            IntegrationSpec.pgTestTable
+          ),
           Param("hello_updated")
         )
-    
+
         val numRows = Await.result(preparedQuery)
-    
-        val resultRows = Await.result(client.select(
-          "SELECT * from %s WHERE str_field = 'hello_updated' AND int_field = 4567".format(IntegrationSpec.pgTestTable)
-        )(identity))
+
+        val resultRows = Await.result(
+          client.select(
+            "SELECT * from %s WHERE str_field = 'hello_updated' AND int_field = 4567"
+              .format(IntegrationSpec.pgTestTable)
+          )(identity)
+        )
 
         resultRows.size must equal(numRows)
       }
@@ -257,17 +271,21 @@ class IntegrationSpec extends Spec {
         cleanDb(client)
         insertSampleData(client)
 
-
         val preparedQuery = client.prepareAndExecute(
-          "UPDATE %s SET str_field = $1 where int_field = 4567".format(IntegrationSpec.pgTestTable),
+          "UPDATE %s SET str_field = $1 where int_field = 4567".format(
+            IntegrationSpec.pgTestTable
+          ),
           Some("hello_updated_some")
         )
 
         val numRows = Await.result(preparedQuery)
 
-        val resultRows = Await.result(client.select(
-          "SELECT * from %s WHERE str_field = 'hello_updated_some' AND int_field = 4567".format(IntegrationSpec.pgTestTable)
-        )(identity))
+        val resultRows = Await.result(
+          client.select(
+            "SELECT * from %s WHERE str_field = 'hello_updated_some' AND int_field = 4567"
+              .format(IntegrationSpec.pgTestTable)
+          )(identity)
+        )
 
         resultRows.size must equal(numRows)
       }
@@ -277,17 +295,21 @@ class IntegrationSpec extends Spec {
         cleanDb(client)
         insertSampleData(client)
 
-
         val preparedQuery = client.prepareAndExecute(
-          "UPDATE %s SET str_field = $1 where int_field = 4567".format(IntegrationSpec.pgTestTable),
+          "UPDATE %s SET str_field = $1 where int_field = 4567".format(
+            IntegrationSpec.pgTestTable
+          ),
           None: Option[String]
         )
 
         val numRows = Await.result(preparedQuery)
 
-        val resultRows = Await.result(client.select(
-          "SELECT * from %s WHERE str_field IS NULL AND int_field = 4567".format(IntegrationSpec.pgTestTable)
-        )(identity))
+        val resultRows = Await.result(
+          client.select(
+            "SELECT * from %s WHERE str_field IS NULL AND int_field = 4567"
+              .format(IntegrationSpec.pgTestTable)
+          )(identity)
+        )
 
         resultRows.size must equal(numRows)
       }
@@ -297,9 +319,9 @@ class IntegrationSpec extends Spec {
         cleanDb(client)
         insertSampleData(client)
 
-
         val preparedQuery = client.prepareAndQuery(
-          "UPDATE %s SET str_field = $1 where int_field = 4567 RETURNING *".format(IntegrationSpec.pgTestTable),
+          "UPDATE %s SET str_field = $1 where int_field = 4567 RETURNING *"
+            .format(IntegrationSpec.pgTestTable),
           Param("hello_updated")
         )(identity)
 
@@ -314,32 +336,36 @@ class IntegrationSpec extends Spec {
         cleanDb(client)
         insertSampleData(client)
 
-        Await.result(client.prepareAndExecute(
-          s"""INSERT INTO ${IntegrationSpec.pgTestTable}
+        Await.result(
+          client.prepareAndExecute(
+            s"""INSERT INTO ${IntegrationSpec.pgTestTable}
               VALUES ('delete', 9012, 15.8, '2015-01-09 16:55:12+0500', FALSE)"""
-        ))
+          )
+        )
 
-        val preparedQuery = client.prepareAndQuery (
-          "DELETE FROM %s where int_field = 9012 RETURNING *".format(IntegrationSpec.pgTestTable)
+        val preparedQuery = client.prepareAndQuery(
+          "DELETE FROM %s where int_field = 9012 RETURNING *".format(
+            IntegrationSpec.pgTestTable
+          )
         )(identity)
-    
+
         val resultRows = Await.result(preparedQuery)
 
         resultRows.size must equal(1)
         resultRows.head.get[String]("str_field") must equal("delete")
       }
 
-
       "execute an UPDATE...RETURNING that updates nothing" in {
         val client = getClient
         cleanDb(client)
         insertSampleData(client)
         val preparedQuery = client.prepareAndQuery(
-          "UPDATE %s SET str_field = $1 where str_field = $2 RETURNING *".format(IntegrationSpec.pgTestTable),
+          "UPDATE %s SET str_field = $1 where str_field = $2 RETURNING *"
+            .format(IntegrationSpec.pgTestTable),
           Param("hello_updated"),
           Param("xxxx")
         )(identity)
-    
+
         val resultRows = Await.result(preparedQuery)
 
         resultRows.size must equal(0)
@@ -352,19 +378,22 @@ class IntegrationSpec extends Spec {
         insertSampleData(client)
 
         val preparedQuery = client.prepareAndQuery(
-          "DELETE FROM %s WHERE str_field=$1".format(IntegrationSpec.pgTestTable),
+          "DELETE FROM %s WHERE str_field=$1".format(
+            IntegrationSpec.pgTestTable
+          ),
           Param("xxxx")
         )(identity)
-    
+
         val resultRows = Await.result(preparedQuery)
         resultRows.size must equal(0)
       }
 
       // this test will fail if the test DB user doesn't have permission
       "create an extension using CREATE EXTENSION" in {
-        if(user == "postgres") {
+        if (user == "postgres") {
           val client = getClient
-          val result = client.prepareAndExecute("CREATE EXTENSION IF NOT EXISTS hstore")
+          val result =
+            client.prepareAndExecute("CREATE EXTENSION IF NOT EXISTS hstore")
           Await.result(result)
         }
       }
@@ -380,6 +409,11 @@ class IntegrationSpec extends Spec {
         Await.result(result)
       }
 
+      "support sending SET commands" in {
+        val client = getClient
+        val result = client.query("SET TIME ZONE DEFAULT;")
+        Await.result(result)
+      }
 
       "throw a ServerError" when {
         "query has error" in {
@@ -387,7 +421,9 @@ class IntegrationSpec extends Spec {
           cleanDb(client)
 
           val selectQuery = client.select(
-            "SELECT * FROM %s WHERE unknown_column='hello_updated'".format(IntegrationSpec.pgTestTable)
+            "SELECT * FROM %s WHERE unknown_column='hello_updated'".format(
+              IntegrationSpec.pgTestTable
+            )
           )(identity)
 
           a[ServerError] must be thrownBy {
@@ -397,7 +433,7 @@ class IntegrationSpec extends Spec {
 
         "query in a prepared statement has an error" in {
           val client = getClient
-          a [ServerError] must be thrownBy {
+          a[ServerError] must be thrownBy {
             Await.result(client.prepareAndQuery("Garbage query")(identity))
           }
         }
@@ -408,11 +444,13 @@ class IntegrationSpec extends Spec {
           cleanDb(client)
 
           val preparedQuery = client.prepareAndQuery(
-            "SELECT * FROM %s WHERE str_field=$1 AND bool_field=$2".format(IntegrationSpec.pgTestTable),
+            "SELECT * FROM %s WHERE str_field=$1 AND bool_field=$2".format(
+              IntegrationSpec.pgTestTable
+            ),
             Param("hello")
           )(identity)
 
-          a [ServerError] must be thrownBy {
+          a[ServerError] must be thrownBy {
             Await.result(
               preparedQuery,
               queryTimeout
@@ -431,7 +469,7 @@ class IntegrationSpec extends Spec {
         "client is bad" in {
           val badClient: PostgresClient = getBadClient
           badClient.isAvailable must equal(false)
-          Set(Status.Busy, Status.Closed) must contain (badClient.status)
+          Set(Status.Busy, Status.Closed) must contain(badClient.status)
         }
         "client is closed" in {
           val client: PostgresClient = getClient
@@ -440,6 +478,35 @@ class IntegrationSpec extends Spec {
           client.status must equal(Status.Closed)
         }
       }
+
+      "generate unique names per prepared statement" in {
+        val client = getConcurrentClient(maxConcurrency = 10)
+        cleanDb(client)
+
+        val concurrentQueries = (1 to 1000).map {
+          case number if number % 2 == 0 =>
+            client.prepareAndExecute(
+              "INSERT INTO %s (str_field, int_field, double_field, bool_field) VALUES ($1, $2, $3, $4)"
+                .format(IntegrationSpec.pgTestTable),
+              number.toString,
+              number,
+              number,
+              true: Boolean
+            )
+          case number =>
+            client.prepareAndExecute(
+              "INSERT INTO %s (str_field) VALUES ($1)".format(
+                IntegrationSpec.pgTestTable
+              ),
+              number.toString
+            )
+        }
+
+        val result = Await.result(
+          Future.collect(concurrentQueries.seq)
+        )
+        result.size must equal(1000)
+      }
     }
 
   }
diff --git a/src/test/scala/com/twitter/finagle/postgres/integration/NumericSpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/NumericSpec.scala
similarity index 81%
rename from src/test/scala/com/twitter/finagle/postgres/integration/NumericSpec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/NumericSpec.scala
index 23321a96..48e4a7b1 100644
--- a/src/test/scala/com/twitter/finagle/postgres/integration/NumericSpec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/NumericSpec.scala
@@ -7,7 +7,6 @@ import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 
 class NumericSpec extends Spec with ScalaCheckDrivenPropertyChecks {
 
-
   for {
     hostPort <- sys.env.get("PG_HOST_PORT")
     user <- sys.env.get("PG_USER")
@@ -16,35 +15,39 @@ class NumericSpec extends Spec with ScalaCheckDrivenPropertyChecks {
     useSsl = sys.env.getOrElse("USE_PG_SSL", "0") == "1"
   } yield {
 
-    val binaryClient = Postgres.Client()
+    val binaryClient = Postgres
+      .Client()
       .database(dbname)
       .withCredentials(user, password)
       .withBinaryParams(true)
       .withBinaryResults(true)
       .newRichClient(hostPort)
 
-    val textClient = Postgres.Client()
+    val textClient = Postgres
+      .Client()
       .database(dbname)
       .withCredentials(user, password)
       .withBinaryParams(false)
       .withBinaryResults(false)
       .newRichClient(hostPort)
 
-    Await.result((textClient.query(
-      """
+    Await.result((textClient.query("""
         |DROP TABLE IF EXISTS numeric_test;
         |CREATE TABLE numeric_test(d DECIMAL NOT NULL);
       """.stripMargin)))
 
     def rowsOf(qr: QueryResponse): Future[Seq[Row]] = qr match {
-      case OK(_) => Future.value(Seq.empty)
+      case OK(_)         => Future.value(Seq.empty)
       case ResultSet(rs) => rs.toSeq
     }
 
     def testBinaryEncode(in: BigDecimal) = Await.result {
       for {
         _ <- binaryClient.execute("DELETE FROM numeric_test")
-        _ <- binaryClient.prepareAndExecute("INSERT INTO numeric_test VALUES($1)", Param(in))
+        _ <- binaryClient.prepareAndExecute(
+          "INSERT INTO numeric_test VALUES($1)",
+          Param(in)
+        )
         r <- textClient.query("SELECT * FROM numeric_test")
         rows <- rowsOf(r)
       } yield rows.map(_.get[BigDecimal](0)) must equal(Seq(in))
@@ -53,7 +56,10 @@ class NumericSpec extends Spec with ScalaCheckDrivenPropertyChecks {
     def testBinaryDecode(in: BigDecimal) = Await.result {
       for {
         _ <- textClient.execute("DELETE FROM numeric_test")
-        _ <- textClient.prepareAndExecute("INSERT INTO numeric_test VALUES($1)", Param(in))
+        _ <- textClient.prepareAndExecute(
+          "INSERT INTO numeric_test VALUES($1)",
+          Param(in)
+        )
         r <- binaryClient.query("SELECT * FROM numeric_test")
         rows <- rowsOf(r)
       } yield rows.map(_.get[BigDecimal](0)) must equal(Seq(in))
diff --git a/src/test/scala/com/twitter/finagle/postgres/integration/TransactionSpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/TransactionSpec.scala
similarity index 72%
rename from src/test/scala/com/twitter/finagle/postgres/integration/TransactionSpec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/TransactionSpec.scala
index 0c828fe1..4386b8dc 100644
--- a/src/test/scala/com/twitter/finagle/postgres/integration/TransactionSpec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/integration/TransactionSpec.scala
@@ -13,14 +13,14 @@ class TransactionSpec extends Spec {
     useSsl = sys.env.getOrElse("USE_PG_SSL", "0") == "1"
   } yield {
 
-    val client = Postgres.Client()
+    val client = Postgres
+      .Client()
       .withCredentials(user, password)
       .database(dbname)
       .conditionally(useSsl, _.withTransport.tlsWithoutValidation)
       .newRichClient(hostPort)
 
-    Await.result(client.query(
-      """
+    Await.result(client.query("""
         |DROP TABLE IF EXISTS transaction_test;
         |CREATE TABLE transaction_test(id integer primary key);
       """.stripMargin))
@@ -29,23 +29,29 @@ class TransactionSpec extends Spec {
 
       "commit if the transaction future is successful" in {
         Await.result {
-          client.inTransaction {
-            c => for {
+          client.inTransaction { c =>
+            for {
               _ <- c.prepareAndExecute("DELETE FROM transaction_test")
               _ <- c.prepareAndExecute("INSERT INTO transaction_test VALUES(1)")
               _ <- c.prepareAndExecute("INSERT INTO transaction_test VALUES(2)")
             } yield ()
           }
         }
-        val count = Await.result(client.prepareAndQuery("SELECT COUNT(*)::int4 AS count FROM transaction_test WHERE id IN (1,2)") {
-          row => row.get[Int]("count")
-        }.map(_.head))
+        val count = Await.result(
+          client
+            .prepareAndQuery(
+              "SELECT COUNT(*)::int4 AS count FROM transaction_test WHERE id IN (1,2)"
+            ) { row =>
+              row.get[Int]("count")
+            }
+            .map(_.head)
+        )
         assert(count == 2)
       }
 
       "rollback the transaction if the transaction future fails" in {
-        val failed = client.inTransaction {
-          c => for {
+        val failed = client.inTransaction { c =>
+          for {
             _ <- c.prepareAndExecute("DELETE FROM transaction_test")
             _ <- c.prepareAndExecute("INSERT INTO transaction_test VALUES(3)")
             _ <- c.prepareAndExecute("INSERT INTO transaction_test VALUES(4)")
@@ -56,9 +62,12 @@ class TransactionSpec extends Spec {
 
         val failedResult = Await.result(failed)
 
-        val inTable = Await.result(client.prepareAndQuery("SELECT * FROM transaction_test") {
-          row => row.get[Int]("id")
-        }).toList.sorted
+        val inTable = Await
+          .result(client.prepareAndQuery("SELECT * FROM transaction_test") {
+            row => row.get[Int]("id")
+          })
+          .toList
+          .sorted
         assert(inTable == List(1, 2))
       }
 
diff --git a/src/test/scala/com/twitter/finagle/postgres/messages/PacketSpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/messages/PacketSpec.scala
similarity index 99%
rename from src/test/scala/com/twitter/finagle/postgres/messages/PacketSpec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/messages/PacketSpec.scala
index dccb9d31..85cce70c 100644
--- a/src/test/scala/com/twitter/finagle/postgres/messages/PacketSpec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/messages/PacketSpec.scala
@@ -52,4 +52,4 @@ class PacketSpec extends Spec {
       pack.readInt must equal(30)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/test/scala/com/twitter/finagle/postgres/values/UtilsSpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/values/UtilsSpec.scala
similarity index 69%
rename from src/test/scala/com/twitter/finagle/postgres/values/UtilsSpec.scala
rename to finagle-postgres/src/test/scala/com/twitter/finagle/postgres/values/UtilsSpec.scala
index 1414eb7f..08937e13 100644
--- a/src/test/scala/com/twitter/finagle/postgres/values/UtilsSpec.scala
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/values/UtilsSpec.scala
@@ -40,7 +40,8 @@ class UtilsSpec extends Spec with ScalaCheckDrivenPropertyChecks {
     }
 
     "throw an appropriate exception if string passed is not C style" in {
-      val bufferWithWrongString = Unpooled.copiedBuffer("not a C style string", Charsets.Utf8)
+      val bufferWithWrongString =
+        Unpooled.copiedBuffer("not a C style string", Charsets.Utf8)
 
       an[IndexOutOfBoundsException] must be thrownBy {
         Buffers.readCString(bufferWithWrongString)
@@ -54,15 +55,36 @@ class UtilsSpec extends Spec with ScalaCheckDrivenPropertyChecks {
     "encrypt everything correctly" in {
       val samples =
         List(
-          (ba("john"), ba("john25"), Array[Byte](1, 2, 3, 4), "md5305d62541687fa0c5871edfdb1140133"),
-          (ba("john"), ba("john25"), Array[Byte](4, 3, 1, 2), "md5156cf720128cad07c39e018eca91ff8d"),
-          (ba("john"), ba("john22"), Array[Byte](1, 2, 3, 4), "md57042902d6531e1840b3019a880f66edc"),
-          (ba("lomack"), ba("lowmuck245$3"), Array[Byte](15, 19, 33, 1), "md56aa29016af76de6b793f3e7e009a26c2")
+          (
+            ba("john"),
+            ba("john25"),
+            Array[Byte](1, 2, 3, 4),
+            "md5305d62541687fa0c5871edfdb1140133"
+          ),
+          (
+            ba("john"),
+            ba("john25"),
+            Array[Byte](4, 3, 1, 2),
+            "md5156cf720128cad07c39e018eca91ff8d"
+          ),
+          (
+            ba("john"),
+            ba("john22"),
+            Array[Byte](1, 2, 3, 4),
+            "md57042902d6531e1840b3019a880f66edc"
+          ),
+          (
+            ba("lomack"),
+            ba("lowmuck245$3"),
+            Array[Byte](15, 19, 33, 1),
+            "md56aa29016af76de6b793f3e7e009a26c2"
+          )
         )
 
-      samples.foreach {
-        case (user, password, salt, result) =>
-          new String(Md5Encryptor.encrypt(user, password, salt)) must equal(result)
+      samples.foreach { case (user, password, salt, result) =>
+        new String(Md5Encryptor.encrypt(user, password, salt)) must equal(
+          result
+        )
       }
     }
 
@@ -99,10 +121,9 @@ class UtilsSpec extends Spec with ScalaCheckDrivenPropertyChecks {
   }
 
   "Numeric utils" should {
-    "write a numeric value" in forAll {
-      bd: BigDecimal =>
-        val read = Numerics.readNumeric(Numerics.writeNumeric(bd))
-        read must equal (bd)
+    "write a numeric value" in forAll { bd: BigDecimal =>
+      val read = Numerics.readNumeric(Numerics.writeNumeric(bd))
+      read must equal(bd)
     }
   }
 }
diff --git a/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/values/ValuesSpec.scala b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/values/ValuesSpec.scala
new file mode 100644
index 00000000..359acf9d
--- /dev/null
+++ b/finagle-postgres/src/test/scala/com/twitter/finagle/postgres/values/ValuesSpec.scala
@@ -0,0 +1,294 @@
+package com.twitter.finagle.postgres.values
+
+import java.nio.charset.Charset
+import java.nio.charset.StandardCharsets
+import java.time._
+import java.time.temporal.ChronoField
+import java.util.TimeZone
+
+import com.twitter.finagle.Postgres
+import com.twitter.finagle.postgres.Generators._
+import com.twitter.finagle.postgres.PostgresClient
+import com.twitter.finagle.postgres.PostgresClient.TypeSpecifier
+import com.twitter.finagle.postgres.ResultSet
+import com.twitter.finagle.postgres.Spec
+import com.twitter.finagle.postgres.messages.DataRow
+import com.twitter.finagle.postgres.messages.Field
+import com.twitter.util.Await
+import io.netty.buffer.Unpooled
+import org.scalacheck.{Arbitrary, Gen}
+import Arbitrary.arbitrary
+import com.twitter.concurrent.AsyncStream
+import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
+import io.circe.testing.instances.arbitraryJson
+
+class ValuesSpec extends Spec with ScalaCheckDrivenPropertyChecks {
+
+  for {
+    hostPort <- sys.env.get("PG_HOST_PORT")
+    user <- sys.env.get("PG_USER")
+    password = sys.env.get("PG_PASSWORD")
+    dbname <- sys.env.get("PG_DBNAME")
+    useSsl = sys.env.getOrElse("USE_PG_SSL", "0") == "1"
+  } yield {
+    val client = Postgres
+      .Client()
+      .database(dbname)
+      .withCredentials(user, password)
+      .conditionally(useSsl, _.withTransport.tlsWithoutValidation)
+      .withSessionPool
+      .maxSize(1)
+      .newRichClient(hostPort)
+
+    def tzSensitive(tst: TimeZone => Unit) = {
+      tst(TimeZone.getTimeZone("UTC"))
+      tst(TimeZone.getTimeZone("America/Montreal"))
+    }
+
+    def test[T: Arbitrary](decoder: ValueDecoder[T], encoder: ValueEncoder[T])(
+        send: String,
+        typ: String,
+        toStr: T => String = (t: T) => t.toString,
+        tester: (T, T) => Boolean = (a: T, b: T) => a == b,
+        nonDefault: Boolean = false,
+        localTz: TimeZone = TimeZone.getDefault
+    ) = {
+      val recv = send.replace("send", "recv")
+      implicit val dec = decoder
+      val oldDefault = TimeZone.getDefault
+      TimeZone.setDefault(localTz)
+      try {
+        forAll { (t: T) =>
+          val str = toStr(t)
+          val bytes = Await
+            .result(
+              client.prepareAndQuery(s"SELECT $send($$1::$typ) AS out", str)(
+                _.get[Array[Byte]]("out")
+              )
+            )
+            .head
+          val textString = Await
+            .result(
+              client.prepareAndQuery(
+                s"SELECT CAST($$1::$typ AS text) AS out",
+                str
+              )(_.get[String]("out"))
+            )
+            .head
+          val binaryOut = decoder
+            .decodeBinary(recv, Unpooled.wrappedBuffer(bytes), client.charset)
+            .get
+          val textOut = decoder.decodeText(recv, textString).get
+
+          if (!tester(t, binaryOut))
+            fail(s"binary: $t does not match $binaryOut")
+
+          if (!tester(t, textOut))
+            fail(s"text: $t does not match $textOut")
+
+          val encodedBinary = encoder
+            .encodeBinary(t, client.charset)
+            .getOrElse(fail("Binary encoding produced null"))
+          val encodedText =
+            encoder.encodeText(t).getOrElse(fail("Text encoding produced null"))
+
+          val binaryInOut = decoder
+            .decodeBinary(recv, encodedBinary.duplicate(), client.charset)
+            .get
+          val textInOut = decoder.decodeText(recv, encodedText).get
+
+          if (!tester(t, binaryInOut))
+            fail(s"binary: $t was encoded/decoded to $binaryInOut")
+
+          if (!tester(t, textInOut))
+            fail(s"text: $t was encoded/decoded to $textInOut")
+
+          if (!nonDefault) {
+            val List(rowBinary) = Await.result(
+              ResultSet(
+                Array(Field("column", 1, 0)),
+                StandardCharsets.UTF_8,
+                AsyncStream.fromSeq(List(DataRow(Array(Some(encodedBinary))))),
+                Map(0 -> TypeSpecifier(recv, typ, 0)),
+                ValueDecoder.decoders
+              ).rows.toSeq.map(_.toList)
+            )
+
+            assert(
+              tester(rowBinary.getAnyOption("column").get.asInstanceOf[T], t)
+            )
+            assert(tester(rowBinary.getAnyOption(0).get.asInstanceOf[T], t))
+            assert(tester(rowBinary.getOption[T]("column").get, t))
+            assert(tester(rowBinary.getOption[T](0).get, t))
+            assert(tester(rowBinary.get[T]("column"), t))
+            assert(tester(rowBinary.get[T](0), t))
+            assert(tester(rowBinary.getTry[T]("column").get, t))
+            assert(tester(rowBinary.getTry[T](0).get, t))
+
+            val List(rowText) = Await.result(
+              ResultSet(
+                Array(Field("column", 0, 0)),
+                StandardCharsets.UTF_8,
+                AsyncStream.fromSeq(
+                  List(
+                    DataRow(
+                      Array(
+                        Some(
+                          Unpooled.copiedBuffer(
+                            encodedText,
+                            StandardCharsets.UTF_8
+                          )
+                        )
+                      )
+                    )
+                  )
+                ),
+                Map(0 -> TypeSpecifier(recv, typ, 0)),
+                ValueDecoder.decoders
+              ).rows.toSeq.map(_.toList)
+            )
+
+            assert(
+              tester(rowText.getAnyOption("column").get.asInstanceOf[T], t)
+            )
+            assert(tester(rowText.getAnyOption(0).get.asInstanceOf[T], t))
+            assert(tester(rowText.getOption[T]("column").get, t))
+            assert(tester(rowText.getOption[T](0).get, t))
+            assert(tester(rowText.get[T]("column"), t))
+            assert(tester(rowText.get[T](0), t))
+            assert(tester(rowText.getTry[T]("column").get, t))
+            assert(tester(rowText.getTry[T](0).get, t))
+          }
+        }
+      } finally {
+        TimeZone.setDefault(oldDefault)
+      }
+
+    }
+
+    "ValueDecoders" should {
+      "parse varchars" in test(ValueDecoder.string, ValueEncoder.string)(
+        "varcharsend",
+        "varchar"
+      )
+      "parse text" in test(ValueDecoder.string, ValueEncoder.string)(
+        "textsend",
+        "text"
+      )
+      "parse booleans" in test(ValueDecoder.boolean, ValueEncoder.boolean)(
+        "boolsend",
+        "boolean",
+        b => if (b) "t" else "f"
+      )
+      "parse shorts" in test(ValueDecoder.int2, ValueEncoder.int2)(
+        "int2send",
+        "int2"
+      )
+      "parse ints" in test(ValueDecoder.int4, ValueEncoder.int4)(
+        "int4send",
+        "int4"
+      )
+      "parse longs" in test(ValueDecoder.int8, ValueEncoder.int8)(
+        "int8send",
+        "int8"
+      )
+      // precision seems to be an issue when postgres parses text floats
+      "parse floats" in test(ValueDecoder.float4, ValueEncoder.float4)(
+        "float4send",
+        "numeric"
+      )
+      "parse doubles" in test(ValueDecoder.float8, ValueEncoder.float8)(
+        "float8send",
+        "numeric"
+      )
+      "parse numerics" in test(ValueDecoder.bigDecimal, ValueEncoder.numeric)(
+        "numeric_send",
+        "numeric"
+      )
+
+      tzSensitive { tz =>
+        s"parse timestamps when local timezone is ${tz.getID}" in test(
+          ValueDecoder.localDateTime,
+          ValueEncoder.timestamp
+        )(
+          "timestamp_send",
+          "timestamp",
+          ts =>
+            java.sql.Timestamp
+              .from(ts.atZone(ZoneId.systemDefault()).toInstant)
+              .toString,
+          (a, b) =>
+            a.getLong(ChronoField.MICRO_OF_DAY) == b.getLong(
+              ChronoField.MICRO_OF_DAY
+            )
+        )
+
+        s"parse timestamps with time zone when local timezone is ${tz.getID}" in
+          test(ValueDecoder.zonedDateTime, ValueEncoder.timestampTz)(
+            "timestamptz_send",
+            "timestamptz",
+            ts => ts.toOffsetDateTime.toString,
+            (a, b) => {
+              // when reading the value, the timezone may have changed:
+              //   the binary protocol does not include timezone information (everything is in UTC)
+              //   the text protocol returns in the server's timezone which may be different than the supplied tz.
+              // so we convert the input value to the read value's timezone and then compare them
+              a.withZoneSameInstant(b.getOffset) == b
+            },
+            nonDefault = true,
+            localTz = tz
+          )
+
+        s"parse timestamps as instants when local timezone is ${tz.getID}" in
+          test(ValueDecoder.instant, ValueEncoder.instant)(
+            "timestamptz_send",
+            "timestamptz",
+            ts => ts.toString,
+            localTz = tz
+          )
+      }
+      "parse uuids" in test(ValueDecoder.uuid, ValueEncoder.uuid)(
+        "uuid_send",
+        "uuid"
+      )
+      "parse dates" in test(ValueDecoder.localDate, ValueEncoder.date)(
+        "date_send",
+        "date"
+      )
+
+      "parse jsonb" in {
+        val json = "{\"a\":\"b\"}"
+        val createBuffer = () => {
+          ValueEncoder[JSONB]
+            .encodeBinary(JSONB(json.getBytes), Charset.defaultCharset())
+            .get
+        }
+        val buffer = createBuffer()
+        val version = buffer.readByte()
+        val encoded = Array.fill(buffer.readableBytes())(buffer.readByte())
+        version must equal(1)
+        encoded must equal(json.getBytes)
+
+        val decoded = ValueDecoder[JSONB]
+          .decodeBinary("", createBuffer(), Charset.defaultCharset())
+          .get()
+        JSONB.stringify(decoded) must equal(json)
+      }
+
+      "parse json" in test(ValueDecoder.string, ValueEncoder.string)(
+        "json_send",
+        "json"
+      )(
+        Arbitrary(
+          Gen
+            .oneOf(
+              arbitraryJson.arbitrary.map(_.noSpaces),
+              arbitraryJson.arbitrary.map(_.spaces4),
+              arbitraryJson.arbitrary.map(_.spaces2)
+            )
+            .map(_.replace("\u0000", "\\u0000"))
+        )
+      )
+    }
+  }
+}
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 00000000..ed2d0234
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,138 @@
+{
+  "nodes": {
+    "devshell": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1688380630,
+        "narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1689068808,
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1677383253,
+        "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1690720142,
+        "narHash": "sha256-GywuiZjBKfFkntQwpNQfL+Ksa2iGjPprBGL0/psgRZM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3acb5c4264c490e7714d503c7166a3fde0c51324",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": [
+          "typelevel-nix",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "typelevel-nix",
+          "nixpkgs"
+        ],
+        "typelevel-nix": "typelevel-nix"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "typelevel-nix": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1690816132,
+        "narHash": "sha256-9VwsNUnHE5oES5i48vUpEDbR0iLJTGgtX+i4AGvjGF4=",
+        "owner": "typelevel",
+        "repo": "typelevel-nix",
+        "rev": "7439a681d52a7e7ed344b6301e6f8d5bb4ec582a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "typelevel",
+        "repo": "typelevel-nix",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 00000000..f27d6779
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,27 @@
+{
+  inputs = {
+    typelevel-nix.url = "github:typelevel/typelevel-nix";
+    nixpkgs.follows = "typelevel-nix/nixpkgs";
+    flake-utils.follows = "typelevel-nix/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, typelevel-nix }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [ typelevel-nix.overlay ];
+        };
+      in
+      {
+        devShell = pkgs.devshell.mkShell {
+          imports = [ typelevel-nix.typelevelShell ];
+          name = "finagle-postgres-shell";
+          typelevelShell = {
+            jdk.package = pkgs.jdk11;
+            nodejs.enable = true;
+          };
+        };
+      }
+    );
+}
diff --git a/project/MdocSitePlugin.scala b/project/MdocSitePlugin.scala
deleted file mode 100644
index c0b092b7..00000000
--- a/project/MdocSitePlugin.scala
+++ /dev/null
@@ -1,30 +0,0 @@
-import com.typesafe.sbt.site.SitePlugin.autoImport._
-import mdoc.MdocPlugin, MdocPlugin.autoImport._
-import sbt._, Keys._
-import sbt.plugins.{JvmPlugin, SbtPlugin}
-
-/** Provides glue to integrate mdoc with sbt-site. */
-object MdocSitePlugin extends AutoPlugin {
-  override def trigger = allRequirements
-
-  override def requires = JvmPlugin && MdocPlugin
-
-  object autoImport {
-    val mdocSite    = taskKey[Seq[(File, String)]]("create mdoc documentation in a way that lets sbt-site grab it")
-    val mdocSiteOut = settingKey[String]("name of the directory in which sbt-site will store mdoc documentation")
-  }
-
-  import autoImport._
-
-  override def projectSettings: Seq[Setting[_]] = Seq(
-    mdocSite := {
-      mdoc.toTask(" ").value
-      val out = mdocOut.value
-      for {
-        (file, name) <- out ** AllPassFilter --- out pair Path.relativeTo(out)
-      } yield file -> name
-    },
-    mdocSiteOut := "./",
-    addMappingsToSiteDir(mdocSite, mdocSiteOut)
-  )
-}
diff --git a/project/build.properties b/project/build.properties
index 0caa33f3..52413ab7 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.12
\ No newline at end of file
+sbt.version=1.9.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
index f4aeb70b..b20c945d 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,15 +1,4 @@
-resolvers ++= Seq(
-  Classpaths.typesafeReleases,
-  Classpaths.sbtPluginReleases
-)
-
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.21")
-addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.7.0")
-addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.7")
-
-addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
-addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.5.0-RC10")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.5.0-RC10")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
diff --git a/quill-finagle-postgres/src/main/scala/io/getquill/FinaglePostgresContext.scala b/quill-finagle-postgres/src/main/scala/io/getquill/FinaglePostgresContext.scala
new file mode 100644
index 00000000..aba47bbb
--- /dev/null
+++ b/quill-finagle-postgres/src/main/scala/io/getquill/FinaglePostgresContext.scala
@@ -0,0 +1,179 @@
+package io.getquill
+
+import com.twitter.util.{Await, Future, Local}
+import com.twitter.finagle.postgres._
+import com.typesafe.config.Config
+import io.getquill.ReturnAction.{ReturnColumns, ReturnNothing, ReturnRecord}
+import io.getquill.context.finagle.postgres._
+import io.getquill.context.sql.SqlContext
+import io.getquill.util.{ContextLogger, LoadConfig}
+
+import scala.util.Try
+import io.getquill.context.{Context, ContextVerbTranslate}
+
+class FinaglePostgresContext[N <: NamingStrategy](
+    val naming: N,
+    client: PostgresClient
+) extends Context[FinaglePostgresDialect, N]
+    with ContextVerbTranslate
+    with SqlContext[FinaglePostgresDialect, N]
+    with FinaglePostgresEncoders
+    with FinaglePostgresDecoders {
+
+  import FinaglePostgresContext._
+
+  def this(naming: N, config: FinaglePostgresContextConfig) =
+    this(naming, config.client)
+  def this(naming: N, config: Config) =
+    this(naming, FinaglePostgresContextConfig(config))
+  def this(naming: N, configPrefix: String) =
+    this(naming, LoadConfig(configPrefix))
+
+  val idiom = FinaglePostgresDialect
+
+  private val logger = ContextLogger(classOf[FinaglePostgresContext[_]])
+  override type Session = Unit
+
+  override type PrepareRow = List[Param[_]]
+  override type ResultRow = Row
+
+  override type Result[T] = Future[T]
+  override type RunQueryResult[T] = List[T]
+  override type RunQuerySingleResult[T] = T
+  override type RunActionResult = Long
+  override type RunActionReturningResult[T] = T
+  override type RunBatchActionResult = List[Long]
+  override type RunBatchActionReturningResult[T] = List[T]
+
+  override type NullChecker = FinaglePgNullChecker
+
+  class FinaglePgNullChecker extends BaseNullChecker {
+    override def apply(v1: Index, v2: ResultRow): Boolean = {
+      v2.getAnyOption(v1).exists(_ != null)
+    }
+  }
+
+  implicit val nullChecker: NullChecker = new FinaglePgNullChecker()
+
+  private val currentClient = new Local[PostgresClient]
+
+  override def close = Await.result(client.close())
+
+  private def expandAction(sql: String, returningAction: ReturnAction): String =
+    returningAction match {
+      // The Postgres dialect will create SQL that has a 'RETURNING' clause so we don't have to add one.
+      case ReturnRecord => s"$sql"
+      // The Postgres dialect will not actually use these below variants but in case we decide to plug
+      // in some other dialect into this context...
+      case ReturnColumns(columns) => s"$sql RETURNING ${columns.mkString(", ")}"
+      case ReturnNothing          => s"$sql"
+    }
+
+  def probe(sql: String) = Try(Await.result(client.query(sql)))
+
+  // Only create a client if none exists to allow nested transactions.
+  def transaction[T](f: => Future[T]) = currentClient() match {
+    case None =>
+      client.inTransaction { c =>
+        currentClient.let(c) { f }
+      }
+    case Some(c) =>
+      f
+  }
+
+  def executeQuery[T](
+      sql: String,
+      prepare: Prepare = identityPrepare,
+      extractor: Extractor[T] = identityExtractor
+  ): Future[List[T]] = {
+    val (params, prepared) = prepare(Nil, ())
+    logger.logQuery(sql, params)
+    withClient(
+      _.prepareAndQuery(sql, prepared: _*)(extractor(_, ())).map(_.toList)
+    )
+  }
+
+  def executeQuerySingle[T](
+      sql: String,
+      prepare: Prepare = identityPrepare,
+      extractor: Extractor[T] = identityExtractor
+  ): Future[T] =
+    executeQuery(sql, prepare, extractor).map(handleSingleResult(sql, _))
+
+  def executeAction[T](
+      sql: String,
+      prepare: Prepare = identityPrepare,
+      extractor: Extractor[T] = identityExtractor
+  ): Future[Long] = {
+    val (params, prepared) = prepare(Nil, ())
+    logger.logQuery(sql, params)
+    withClient(_.prepareAndExecute(sql, prepared: _*)).map(_.toLong)
+  }
+
+  def executeBatchAction[B](groups: List[BatchGroup]): Future[List[Long]] =
+    Future
+      .collect {
+        groups.map { case BatchGroup(sql, prepare) =>
+          prepare
+            .foldLeft(Future.value(List.newBuilder[Long])) {
+              case (acc, prepare) =>
+                acc.flatMap { list =>
+                  executeAction(sql, prepare).map(list += _)
+                }
+            }
+            .map(_.result())
+        }
+      }
+      .map(_.flatten.toList)
+
+  def executeActionReturning[T](
+      sql: String,
+      prepare: Prepare = identityPrepare,
+      extractor: Extractor[T],
+      returningAction: ReturnAction
+  ): Future[T] = {
+    val (params, prepared) = prepare(Nil, ())
+    logger.logQuery(sql, params)
+    withClient(
+      _.prepareAndQuery(expandAction(sql, returningAction), prepared: _*)(
+        extractor(_, ())
+      )
+    ).map(v => handleSingleResult(sql, v.toList))
+  }
+
+  def executeBatchActionReturning[T](
+      groups: List[BatchGroupReturning],
+      extractor: Extractor[T]
+  ): Future[List[T]] =
+    Future
+      .collect {
+        groups.map { case BatchGroupReturning(sql, column, prepare) =>
+          prepare
+            .foldLeft(Future.value(List.newBuilder[T])) { case (acc, prepare) =>
+              acc.flatMap { list =>
+                executeActionReturning(sql, prepare, extractor, column).map(
+                  list += _
+                )
+              }
+            }
+            .map(_.result())
+        }
+      }
+      .map(_.flatten.toList)
+
+  override private[getquill] def prepareParams(
+      statement: String,
+      prepare: Prepare
+  ): Seq[String] = {
+    prepare(Nil, ())._2.map(param => prepareParam(param.encode()))
+  }
+
+  private def withClient[T](f: PostgresClient => T) =
+    currentClient().map(f).getOrElse(f(client))
+}
+
+object FinaglePostgresContext {
+  implicit class EncodeParam[T](val param: Param[T]) extends AnyVal {
+    def encode(): Option[String] = param.encoder.encodeText(param.value)
+  }
+}
diff --git a/quill-finagle-postgres/src/main/scala/io/getquill/FinaglePostgresContextConfig.scala b/quill-finagle-postgres/src/main/scala/io/getquill/FinaglePostgresContextConfig.scala
new file mode 100644
index 00000000..d9bd2df2
--- /dev/null
+++ b/quill-finagle-postgres/src/main/scala/io/getquill/FinaglePostgresContextConfig.scala
@@ -0,0 +1,51 @@
+package io.getquill
+
+import com.twitter.finagle.Postgres
+import com.twitter.finagle.Postgres.{Client, CustomTypes}
+import com.twitter.finagle.postgres.PostgresClient
+import com.twitter.finagle.postgres.values._
+import com.twitter.finagle.service.RetryPolicy
+import com.typesafe.config.Config
+
+import scala.util.Try
+
+case class FinaglePostgresContextConfig(config: Config) {
+  def host: String = config.getString("host")
+  def username: String = config.getString("user")
+  def password: Option[String] = Try(config.getString("password")).toOption
+  def database: String = config.getString("database")
+  def useSsl: Boolean = Try(config.getBoolean("useSsl")).getOrElse(false)
+  def hostConnectionLimit: Int =
+    Try(config.getInt("hostConnectionLimit")).getOrElse(1)
+  def numRetries: Int = Try(config.getInt("numRetries")).getOrElse(4)
+  def customTypes: Boolean =
+    Try(config.getBoolean("customTypes")).getOrElse(false)
+  def customReceiveFunctions
+      : PartialFunction[String, ValueDecoder[T] forSome { type T }] =
+    ValueDecoder.decoders orElse { case "noop" => ValueDecoder.unknown }
+  def binaryResults: Boolean =
+    Try(config.getBoolean("binaryResults")).getOrElse(false)
+  def binaryParams: Boolean =
+    Try(config.getBoolean("binaryParams")).getOrElse(false)
+
+  private def clientSimple: Client = Postgres
+    .Client()
+    .withCredentials(username, password)
+    .database(database)
+    .withCustomReceiveFunctions(customReceiveFunctions)
+    .withSessionPool
+    .maxSize(hostConnectionLimit)
+    .withBinaryResults(binaryResults)
+    .withBinaryParams(binaryParams)
+    .withRetryPolicy(RetryPolicy.tries(numRetries))
+
+  private def clientCustomTypes: Client =
+    if (!customTypes) clientSimple.withDefaultTypes()
+    else clientSimple.configured(CustomTypes(None))
+
+  private def clientWithSSL: Client =
+    if (useSsl) clientCustomTypes.withTransport.tls else clientCustomTypes
+
+  def client: PostgresClient = clientWithSSL
+    .newRichClient(host)
+}
diff --git a/quill-finagle-postgres/src/main/scala/io/getquill/FinaglePostgresDialect.scala b/quill-finagle-postgres/src/main/scala/io/getquill/FinaglePostgresDialect.scala
new file mode 100644
index 00000000..a86e4c90
--- /dev/null
+++ b/quill-finagle-postgres/src/main/scala/io/getquill/FinaglePostgresDialect.scala
@@ -0,0 +1,9 @@
+package io.getquill
+
+import io.getquill.context.sql.idiom.PositionalBindVariables
+
+trait FinaglePostgresDialect
+    extends PostgresDialect
+    with PositionalBindVariables
+
+object FinaglePostgresDialect extends FinaglePostgresDialect
diff --git a/quill-finagle-postgres/src/main/scala/io/getquill/context/finagle/postgres/FinaglePostgresDecoders.scala b/quill-finagle-postgres/src/main/scala/io/getquill/context/finagle/postgres/FinaglePostgresDecoders.scala
new file mode 100644
index 00000000..2f82bb3d
--- /dev/null
+++ b/quill-finagle-postgres/src/main/scala/io/getquill/context/finagle/postgres/FinaglePostgresDecoders.scala
@@ -0,0 +1,107 @@
+package io.getquill.context.finagle.postgres
+
+import java.nio.charset.Charset
+import java.time.{LocalDate, LocalDateTime, ZoneId}
+import java.util.{Date, UUID}
+
+import com.twitter.finagle.postgres.values.ValueDecoder
+import com.twitter.util.Return
+import com.twitter.util.Throw
+import com.twitter.util.Try
+import io.getquill.FinaglePostgresContext
+import io.getquill.util.Messages.fail
+import io.netty.buffer.ByteBuf
+
+trait FinaglePostgresDecoders {
+  this: FinaglePostgresContext[_] =>
+
+  import ValueDecoder._
+
+  type Decoder[T] = FinaglePostgresDecoder[T]
+
+  case class FinaglePostgresDecoder[T](
+      vd: ValueDecoder[T],
+      default: Throwable => T = (e: Throwable) => fail(e.getMessage)
+  ) extends BaseDecoder[T] {
+    override def apply(index: Index, row: ResultRow, session: Session): T =
+      row.getTry[T](index)(vd) match {
+        case Return(r) => r
+        case Throw(e)  => default(e)
+      }
+
+    def orElse[U](
+        f: U => T
+    )(implicit vdu: ValueDecoder[U]): FinaglePostgresDecoder[T] = {
+      val mappedVd = vdu.map[T](f)
+      FinaglePostgresDecoder[T](
+        new ValueDecoder[T] {
+          def decodeText(recv: String, text: String): Try[T] = {
+            val t = vd.decodeText(recv, text)
+            if (t.isReturn) t
+            else mappedVd.decodeText(recv, text)
+          }
+          def decodeBinary(
+              recv: String,
+              bytes: ByteBuf,
+              charset: Charset
+          ): Try[T] = {
+            val t = vd.decodeBinary(recv, bytes, charset)
+            if (t.isReturn) t
+            else mappedVd.decodeBinary(recv, bytes, charset)
+          }
+        }
+      )
+    }
+  }
+
+  implicit def decoderDirectly[T](implicit vd: ValueDecoder[T]): Decoder[T] =
+    FinaglePostgresDecoder(vd)
+  def decoderMapped[U, T](f: U => T)(implicit vd: ValueDecoder[U]): Decoder[T] =
+    FinaglePostgresDecoder(vd.map[T](f))
+
+  implicit def optionDecoder[T](implicit d: Decoder[T]): Decoder[Option[T]] =
+    FinaglePostgresDecoder[Option[T]](
+      new ValueDecoder[Option[T]] {
+        def decodeText(recv: String, text: String): Try[Option[T]] =
+          Return(d.vd.decodeText(recv, text).toOption)
+        def decodeBinary(
+            recv: String,
+            bytes: ByteBuf,
+            charset: Charset
+        ): Try[Option[T]] =
+          Return(d.vd.decodeBinary(recv, bytes, charset).toOption)
+      },
+      _ => None
+    )
+
+  implicit def mappedDecoder[I, O](implicit
+      mapped: MappedEncoding[I, O],
+      d: Decoder[I]
+  ): Decoder[O] =
+    decoderMapped[I, O](mapped.f)(d.vd)
+
+  implicit val stringDecoder: Decoder[String] = decoderDirectly[String]
+  implicit val bigDecimalDecoder: Decoder[BigDecimal] =
+    decoderDirectly[BigDecimal]
+  implicit val booleanDecoder: Decoder[Boolean] = decoderDirectly[Boolean]
+  implicit val shortDecoder: Decoder[Short] = decoderDirectly[Short]
+  implicit val byteDecoder: Decoder[Byte] = decoderMapped[Short, Byte](_.toByte)
+  implicit val intDecoder: Decoder[Int] =
+    decoderDirectly[Int].orElse[Long](_.toInt)
+  implicit val longDecoder: Decoder[Long] =
+    decoderDirectly[Long].orElse[Int](_.toLong)
+  implicit val floatDecoder: Decoder[Float] =
+    decoderDirectly[Float].orElse[Double](_.toFloat)
+  implicit val doubleDecoder: Decoder[Double] = decoderDirectly[Double]
+  implicit val byteArrayDecoder: Decoder[Array[Byte]] =
+    decoderDirectly[Array[Byte]]
+  implicit val dateDecoder: Decoder[Date] =
+    decoderMapped[LocalDateTime, Date](d =>
+      Date.from(d.atZone(ZoneId.systemDefault()).toInstant)
+    )
+  implicit val localDateDecoder: Decoder[LocalDate] =
+    decoderDirectly[LocalDate].orElse[LocalDateTime](_.toLocalDate)
+  implicit val localDateTimeDecoder: Decoder[LocalDateTime] =
+    decoderDirectly[LocalDateTime].orElse[LocalDate](_.atStartOfDay)
+  implicit val uuidDecoder: Decoder[UUID] = decoderDirectly[UUID]
+}
diff --git a/quill-finagle-postgres/src/main/scala/io/getquill/context/finagle/postgres/FinaglePostgresEncoders.scala b/quill-finagle-postgres/src/main/scala/io/getquill/context/finagle/postgres/FinaglePostgresEncoders.scala
new file mode 100644
index 00000000..9762639d
--- /dev/null
+++ b/quill-finagle-postgres/src/main/scala/io/getquill/context/finagle/postgres/FinaglePostgresEncoders.scala
@@ -0,0 +1,60 @@
+package io.getquill.context.finagle.postgres
+
+import com.twitter.finagle.postgres._
+import com.twitter.finagle.postgres.values._
+import com.twitter.finagle.postgres.values.ValueEncoder._
+import io.getquill.FinaglePostgresContext
+import java.util.{Date, UUID}
+import java.time._
+
+trait FinaglePostgresEncoders {
+  this: FinaglePostgresContext[_] =>
+
+  type Encoder[T] = FinaglePostgresEncoder[T]
+
+  case class FinaglePostgresEncoder[T](encoder: ValueEncoder[T])
+      extends BaseEncoder[T] {
+    override def apply(
+        index: Index,
+        value: T,
+        row: PrepareRow,
+        session: Session
+    ) =
+      row :+ Param(value)(encoder)
+  }
+
+  def encoder[T](implicit e: ValueEncoder[T]): Encoder[T] =
+    FinaglePostgresEncoder(e)
+
+  def encoder[T, U](f: U => T)(implicit e: ValueEncoder[T]): Encoder[U] =
+    encoder[U](e.contraMap(f))
+
+  implicit def mappedEncoder[I, O](implicit
+      mapped: MappedEncoding[I, O],
+      e: Encoder[O]
+  ): Encoder[I] =
+    FinaglePostgresEncoder(e.encoder.contraMap(mapped.f))
+
+  implicit def optionEncoder[T](implicit e: Encoder[T]): Encoder[Option[T]] =
+    FinaglePostgresEncoder[Option[T]](option(e.encoder))
+
+  implicit val stringEncoder: Encoder[String] = encoder[String]
+  implicit val bigDecimalEncoder: Encoder[BigDecimal] = encoder[BigDecimal]
+  implicit val booleanEncoder: Encoder[Boolean] = encoder[Boolean]
+  implicit val byteEncoder: Encoder[Byte] = encoder[Short, Byte](_.toShort)
+  implicit val shortEncoder: Encoder[Short] = encoder[Short]
+  implicit val intEncoder: Encoder[Int] = encoder[Int]
+  implicit val longEncoder: Encoder[Long] = encoder[Long]
+  implicit val floatEncoder: Encoder[Float] = encoder[Float]
+  implicit val doubleEncoder: Encoder[Double] = encoder[Double]
+  implicit val byteArrayEncoder: Encoder[Array[Byte]] =
+    encoder[Array[Byte]](bytea)
+  implicit val dateEncoder: Encoder[Date] =
+    encoder[LocalDateTime, Date]((v: Date) =>
+      LocalDateTime.ofInstant(v.toInstant, ZoneId.systemDefault())
+    )
+  implicit val localDateEncoder: Encoder[LocalDate] = encoder[LocalDate]
+  implicit val localDateTimeEncoder: Encoder[LocalDateTime] =
+    encoder[LocalDateTime]
+  implicit val uuidEncoder: Encoder[UUID] = encoder[UUID]
+}
diff --git a/src/main/scala/com/twitter/finagle/postgres/codec/Errors.scala b/src/main/scala/com/twitter/finagle/postgres/codec/Errors.scala
deleted file mode 100644
index d81314ef..00000000
--- a/src/main/scala/com/twitter/finagle/postgres/codec/Errors.scala
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.twitter.finagle.postgres.codec
-
-import com.twitter.finagle.postgres.messages.PgRequest
-import com.twitter.finagle.postgres.messages.Error
-
-/*
- * An error generated by Postgres.
- */
-case class ServerError(
-  message : String,
-  request: Option[PgRequest],
-  severity: Option[String],
-  sqlState: Option[String] = None,
-  detail: Option[String] = None,
-  hint: Option[String] = None,
-  position: Option[String] = None
-) extends Exception(message) {
-  override def toString: String = sqlState match {
-    case Some(state) => s"com.twitter.finagle.postgres.codec.ServerError: SQLSTATE $state: $message"
-    case None => super.toString
-  }
-}
-
-/*
- * An error caused on the client side (e.g., a badly-formed query).
- */
-case class ClientError(message : String) extends Exception(message)
-
-/*
- * An error arising from attempting to access a NULL field
- */
-case object NullValue extends Exception("Value is NULL")
-
-object Errors {
-  def client(message : String) = ClientError(message)
-  def server(message : String,
-             request: Option[PgRequest] = None,
-             severity: Option[String] = None,
-             sqlState: Option[String] = None,
-             detail: Option[String] = None,
-             hint: Option[String] = None,
-             position: Option[String] = None) =
-    ServerError(message, request, severity, sqlState, detail, hint, position)
-
-  def server(error: Error, request: Option[PgRequest]): ServerError = {
-    import error._
-    server(msg.getOrElse("unknown failure"), request, severity, sqlState, detail, hint, position)
-  }
-}
diff --git a/src/main/scala/com/twitter/finagle/postgres/connection/ConnectionStateMachine.scala b/src/main/scala/com/twitter/finagle/postgres/connection/ConnectionStateMachine.scala
deleted file mode 100644
index f797833e..00000000
--- a/src/main/scala/com/twitter/finagle/postgres/connection/ConnectionStateMachine.scala
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.twitter.finagle.postgres.connection
-
-import com.twitter.concurrent.AsyncStream
-import com.twitter.finagle.postgres.codec.Errors
-import com.twitter.finagle.postgres.messages.{Terminated => _, _}
-import com.twitter.logging.Logger
-import com.twitter.util.{Promise, Return, Throw}
-
-/*
- * State machine that captures transitions between states.
- *
- * See associated Postgres documentation: http://www.postgresql.org/docs/9.0/static/protocol-flow.html
- */
-class ConnectionStateMachine(state: State = AuthenticationRequired, val id: Int) extends StateMachine[Message, PgResponse, State] {
-  private[this] val logger = Logger(s"${getClass.getName}.psql state machine:$id")
-
-  startState(state)
-
-  transition {
-    case (SslRequestMessage(), RequestingSsl) => (None, AwaitingSslResponse)
-    case (SwitchToSsl, AwaitingSslResponse) => (Some(SslSupportedResponse), AuthenticationRequired)
-    case (SslNotSupported, AwaitingSslResponse) => (Some(SslNotSupportedResponse), AuthenticationRequired)
-  }
-
-  transition {
-    case (StartupMessage(_, _), AuthenticationRequired) => (None, AuthenticationInProgress)
-    case (AuthenticationOk(), AuthenticationInProgress) => (None, AggregatingAuthData(Map(), -1, -1))
-    case (AuthenticationCleartextPassword(), AuthenticationInProgress) =>
-      (Some(PasswordRequired(ClearText)), AwaitingPassword)
-    case (AuthenticationMD5Password(salt), AuthenticationInProgress) =>
-      (Some(PasswordRequired(Md5(salt))), AwaitingPassword)
-    case (PasswordMessage(_), AwaitingPassword) => (None, AuthenticationInProgress)
-
-    case (ErrorResponse(details), AuthenticationRequired | AuthenticationInProgress | AwaitingPassword) =>
-      (Some(Error(details)), AuthenticationRequired)
-  }
-
-  transition {
-    case (ParameterStatus(name, value), AggregatingAuthData(statuses, processId, secretKey)) =>
-      (None, AggregatingAuthData(statuses = statuses + (name -> value), processId, secretKey))
-    case (BackendKeyData(processId, secretKey), AggregatingAuthData(statuses, _, _)) =>
-      (None, AggregatingAuthData(statuses, processId, secretKey))
-    case (ReadyForQuery(_), AggregatingAuthData(statuses, processId, secretKey)) =>
-      (Some(AuthenticatedResponse(statuses, processId, secretKey)), Connected)
-
-    case (ErrorResponse(details), AggregatingAuthData(_, _, _)) => (Some(Error(details)), AuthenticationRequired)
-  }
-
-  transition {
-    case (Query(_), Connected) => (None, SimpleQuery)
-    case (Parse(_, _, _), Connected) => (None, Parsing)
-    case (Bind(_, _, _, _, _), Connected) => (None, Binding)
-    case (Describe(_, _), Connected) => (None, AwaitParamsDescription)
-    case (Execute(_, _), Connected) => (None, ExecutePreparedStatement)
-    case (Sync, Connected) => (None, Syncing)
-    case (Sync, state: ExtendedQueryState) => (None, Syncing)
-    case (ErrorResponse(details), Connected) => (Some(Error(details)), Connected)
-  }
-
-  transition {
-    case (ParameterDescription(types), AwaitParamsDescription) => (None, AwaitRowDescription(types))
-    case (RowDescription(fields), AwaitParamsDescription) =>
-      (Some(RowDescriptions(fields.map(f => Field(f.name, f.fieldFormat, f.dataType)))), Connected)
-    case (NoData, AwaitParamsDescription) => (Some(RowDescriptions(Array.empty)), Connected)
-    case (ErrorResponse(details), AwaitParamsDescription) => (Some(Error(details)), Connected)
-  }
-
-  transition {
-    case (RowDescription(fields), AwaitRowDescription(types)) =>
-      (Some(RowDescriptions(fields.map(f => Field(f.name, f.fieldFormat, f.dataType)))), Connected)
-    case (NoData, AwaitRowDescription(types)) => (Some(RowDescriptions(Array.empty)), Connected)
-    case (ErrorResponse(details), AwaitRowDescription(_)) => (Some(Error(details)), Connected)
-  }
-
-  transition {
-    case (BindComplete, Binding) => (Some(BindCompletedResponse), Connected)
-    case (ErrorResponse(details), Binding) => (Some(Error(details)), Connected)
-  }
-
-  transition {
-    case (ParseComplete, Parsing) => (Some(ParseCompletedResponse), Connected)
-    case (ErrorResponse(details), Parsing) => (Some(Error(details)), Connected)
-  }
-
-  transition {
-    case (ReadyForQuery(_), Syncing) => (Some(ReadyForQueryResponse), Connected)
-    case (ErrorResponse(details), Syncing) => throw new IllegalStateException("Received an error in response to Sync")
-  }
-
-  transition {
-    case (EmptyQueryResponse, SimpleQuery) =>
-      (None, EmitOnReadyForQuery(SelectResult.Empty))
-    case (CommandComplete(CreateExtension | CreateFunction | CreateIndex | CreateTable | CreateTrigger | CreateType), SimpleQuery) =>
-      (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
-    case (CommandComplete(DropTable), SimpleQuery) => (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
-    case (CommandComplete(Insert(count)), SimpleQuery) => (None, EmitOnReadyForQuery(CommandCompleteResponse(count)))
-    case (CommandComplete(Update(count)), SimpleQuery) => (None, EmitOnReadyForQuery(CommandCompleteResponse(count)))
-    case (CommandComplete(Delete(count)), SimpleQuery) => (None, EmitOnReadyForQuery(CommandCompleteResponse(count)))
-    case (CommandComplete(DiscardAll), SimpleQuery) => (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
-    case (CommandComplete(Begin | Savepoint | Release | RollBack | Commit), SimpleQuery) =>
-      (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
-    case (CommandComplete(Do), SimpleQuery) => (None, EmitOnReadyForQuery(CommandCompleteResponse(1)))
-
-    case (RowDescription(fields), SimpleQuery) =>
-      val complete = new Promise[Unit]()
-      val nextRow = StreamRows(complete, extended = false)
-      (Some(SelectResult(fields.map(f => Field(f.name, f.fieldFormat, f.dataType)), nextRow.asyncStream)(complete)), nextRow)
-    case (ErrorResponse(details), SimpleQuery) =>
-      (None, EmitOnReadyForQuery(Error(details)))
-  }
-
-  transition {
-    //for multiple commands in one query, we recieve multiple CommandComplete tags before becoming ready
-    case (CommandComplete(_), EmitOnReadyForQuery(old)) => (None, EmitOnReadyForQuery(old))
-  }
-
-  transition {
-    case (EmptyQueryResponse, ExecutePreparedStatement) => (Some(SelectResult.Empty), Connected)
-    case (CommandComplete(CreateExtension | CreateFunction | CreateIndex | CreateTable | CreateType | CreateTrigger), ExecutePreparedStatement) =>
-      (Some(CommandCompleteResponse(1)), Connected)
-    case (CommandComplete(DropTable), ExecutePreparedStatement) => (Some(CommandCompleteResponse(1)), Connected)
-    case (CommandComplete(Insert(count)), ExecutePreparedStatement) => (Some(CommandCompleteResponse(count)), Connected)
-    case (CommandComplete(Update(count)), ExecutePreparedStatement) => (Some(CommandCompleteResponse(count)), Connected)
-    case (CommandComplete(Delete(count)), ExecutePreparedStatement) => (Some(CommandCompleteResponse(count)), Connected)
-    case (CommandComplete(Begin), ExecutePreparedStatement) => (Some(CommandCompleteResponse(1)), Connected)
-    case (CommandComplete(Savepoint), ExecutePreparedStatement) => (Some(CommandCompleteResponse(1)), Connected)
-    case (CommandComplete(RollBack), ExecutePreparedStatement) => (Some(CommandCompleteResponse(1)), Connected)
-    case (CommandComplete(Commit), ExecutePreparedStatement) => (Some(CommandCompleteResponse(1)), Connected)
-    case (CommandComplete(Do), ExecutePreparedStatement) => (Some(CommandCompleteResponse(1)), Connected)
-    case (row: DataRow, ExecutePreparedStatement) =>
-      val complete = new Promise[Unit]
-      val nextRow = StreamRows(complete, extended = true)
-      val thisRow = AsyncStream.mk(row, nextRow.asyncStream)
-      val response = Rows(thisRow)(complete)
-      (Some(response), nextRow)
-    case (CommandComplete(Select(0)), ExecutePreparedStatement) =>
-      (Some(Rows.Empty), Connected)
-    case (ErrorResponse(details), ExecutePreparedStatement) =>
-      (Some(Error(details)), Connected)
-  }
-
-  fullTransition {
-    case (row: DataRow, StreamRows(complete, extended, thisRow)) =>
-      val nextRow = StreamRows(complete, extended)
-      thisRow.setValue(AsyncStream.mk(row, nextRow.asyncStream))
-      (None, nextRow)
-    case (PortalSuspended, StreamRows(complete, _, thisRow)) =>
-      thisRow.setValue(AsyncStream.empty)
-      (Some(StateMachine.Complete(complete, Return.Unit)), Connected)
-    case (CommandComplete(_), StreamRows(complete, extended, thisRow)) =>
-      thisRow.setValue(AsyncStream.empty)
-      val response = StateMachine.Complete(complete, Return.Unit)
-      if (extended) {
-        // in extended mode, we don't expect a ReadyForQuery, so we respond now
-        (Some(response), Connected)
-      } else {
-        (None, EmitOnReadyForQuery(response))
-      }
-    case (ErrorResponse(details), StreamRows(complete, extended, thisRow)) =>
-      val exn = Errors.server(Error(details), None)
-      thisRow.setValue(AsyncStream.exception(exn))
-      val response = StateMachine.Complete(complete, Throw(exn))
-      if (extended) {
-        // in extended mode, we don't expect a ReadyForQuery, so we respond now
-        (Some(response), Connected)
-      } else {
-        (None, EmitOnReadyForQuery(response))
-      }
-  }
-
-  fullTransition {
-    case (ReadyForQuery(_), EmitOnReadyForQuery(response)) => (Some(response), Connected)
-    case (ErrorResponse(details), EmitOnReadyForQuery(StateMachine.Response(_))) =>
-      (Some(StateMachine.Response(Error(details))), Connected)
-    case (ErrorResponse(details), EmitOnReadyForQuery(StateMachine.Complete(promise, _))) =>
-      val exn = Errors.server(Error(details), None)
-      (Some(StateMachine.Complete(promise, Throw(exn))), Connected)
-  }
-
-  transition {
-    case (Terminate, _) => (Some(com.twitter.finagle.postgres.messages.Terminated), Terminated)
-    case (_, Terminated) => (Some(com.twitter.finagle.postgres.messages.Terminated), Terminated)
-  }
-
-  transition {
-    case (NoticeResponse(details), s) =>
-      logger.ifDebug("Notice from server: %s".format(details))
-      (None, s)
-    case (notification: NotificationResponse, s) =>
-      logger.ifDebug("Notification from server: %s".format(notification))
-      (None, s)
-    case (ParameterStatus(name, value), s) =>
-      logger.ifDebug("Params changed: %s %s".format(name, value))
-      (None, s)
-  }
-}
diff --git a/src/main/scala/com/twitter/finagle/postgres/values/HStores.scala b/src/main/scala/com/twitter/finagle/postgres/values/HStores.scala
deleted file mode 100644
index d97c13b8..00000000
--- a/src/main/scala/com/twitter/finagle/postgres/values/HStores.scala
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.twitter.finagle.postgres.values
-
-import java.nio.charset.Charset
-
-import scala.util.parsing.combinator.RegexParsers
-
-import io.netty.buffer.{ByteBuf, Unpooled}
-
-object HStores {
-  object HStoreStringParser extends RegexParsers {
-    def key:Parser[String] = "\"" ~ """([^"\\]*(\\.[^"\\]*)*)""".r ~ "\"" ^^ {
-      case o~value~c => value.replace("\\\"", "\"").replace("\\\\", "\\")
-    }
-
-    def value = key | "NULL"
-
-    def item:Parser[(String, Option[String])] = key ~ "=>" ~ value ^^ {
-      case key~arrow~"NULL" => (key, None)
-      case key~arrow~value => (key, Some(value))
-    }
-
-    def items:Parser[Map[String, Option[String]]] = repsep(item, ", ") ^^ { l => l.toMap }
-
-    def apply(input:String):Option[Map[String, Option[String]]] = parseAll(items, input) match {
-      case Success(result, _) => Some(result)
-      case failure:NoSuccess => None
-    }
-  }
-
-  def parseHStoreString(str: String) = HStoreStringParser(str)
-
-  def formatHStoreString(hstore: Map[String, Option[String]]) = hstore.map {
-    case (k, v) =>
-      val key = s""""${k.replace("\"", "\\\"")}""""
-      val value = v.map(str => s""""${str.replace("\"", "\\\"")}"""").getOrElse("NULL")
-      s"""$key => $value"""
-  }.mkString(",")
-
-  def decodeHStoreBinary(buf: ByteBuf, charset: Charset) = {
-    val count = buf.readInt()
-    val pairs = Array.fill(count) {
-      val keyLength = buf.readInt()
-      val key = Array.fill(keyLength)(buf.readByte())
-      val valueLength = buf.readInt()
-      val value = valueLength match {
-        case -1 => None
-        case l =>
-          val valueBytes = Array.fill(l)(buf.readByte())
-          Some(valueBytes)
-      }
-      new String(key, charset) -> value.map(new String(_, charset))
-    }
-    pairs.toMap
-  }
-
-  def encodeHStoreBinary(hstore: Map[String, Option[String]], charset: Charset) = {
-    val buf = Unpooled.buffer()
-    buf.writeInt(hstore.size)
-    hstore foreach {
-      case (key, value) =>
-        val keyBytes = key.getBytes(charset)
-        buf.writeInt(keyBytes.length)
-        buf.writeBytes(keyBytes)
-        value match {
-          case None => buf.writeInt(-1)
-          case Some(v) =>
-            val valueBytes = v.getBytes(charset)
-            buf.writeInt(valueBytes.length)
-            buf.writeBytes(valueBytes)
-        }
-    }
-    buf
-  }
-
-}
diff --git a/src/main/scala/com/twitter/finagle/postgres/values/Time.scala b/src/main/scala/com/twitter/finagle/postgres/values/Time.scala
deleted file mode 100644
index 2471c4dd..00000000
--- a/src/main/scala/com/twitter/finagle/postgres/values/Time.scala
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.twitter.finagle.postgres.values
-
-import java.text.NumberFormat
-import java.time._
-import java.time.format.{DateTimeFormatter, DateTimeFormatterBuilder, ResolverStyle}
-import java.time.temporal.{ChronoField, TemporalAccessor, TemporalQuery}
-
-import io.netty.buffer.{ByteBuf, Unpooled}
-
-private object DateTimeUtils {
-  val POSTGRES_EPOCH_MICROS = 946684800000000L
-  val ZONE_REGEX = "(.*)(-|\\+)([0-9]{2})".r
-
-  private val timeTzParser = new DateTimeFormatterBuilder()
-    .parseCaseInsensitive()
-    .append(DateTimeFormatter.ISO_LOCAL_TIME)
-    .optionalStart()
-    .appendOffset("+HH:MM:ss", "Z")
-    .optionalEnd()
-    .optionalStart()
-    .appendOffset("+HH:mm", "Z")
-    .optionalEnd()
-    .optionalStart()
-    .appendOffset("+HH", "Z")
-    .optionalEnd()
-    .toFormatter
-
-  /**
-    * https://www.postgresql.org/docs/current/datatype-datetime.html
-    *
-    * ISO 8601 specifies the use of uppercase letter T to separate the date and time.
-    * PostgreSQL accepts that format on input, but on output it uses a space rather than T, as shown above.
-    * This is for readability and for consistency with RFC 3339 as well as some other database systems.
-    */
-  private val PostgresDateTimeFormat = new DateTimeFormatterBuilder()
-    .parseCaseInsensitive()
-    .append(DateTimeFormatter.ISO_LOCAL_DATE)
-    .appendLiteral(' ')
-    .append(DateTimeFormatter.ISO_LOCAL_TIME)
-    .optionalStart()
-    .appendOffsetId()
-    .toFormatter()
-
-  def format(i: Instant) = PostgresDateTimeFormat.withZone(ZoneOffset.UTC).format(i)
-  def format(zdt: ZonedDateTime) = PostgresDateTimeFormat.format(zdt)
-  def format(ldt: LocalDateTime) = PostgresDateTimeFormat.format(ldt)
-
-  private val PostgresDateTimeParser = new DateTimeFormatterBuilder()
-    .parseCaseInsensitive()
-    .append(DateTimeFormatter.ISO_LOCAL_DATE)
-    .appendLiteral(' ')
-    .append(timeTzParser)
-    .toFormatter()
-
-  // NOTE: this is Scala 2.11 interrop. Scala 2.12 automatically does this for us.
-  private def query[T](f: TemporalAccessor => T): TemporalQuery[T] = new TemporalQuery[T] {
-    override def queryFrom(temporal: TemporalAccessor): T = f(temporal)
-  }
-
-  def parseLocalDateTime(s: String) = PostgresDateTimeParser.parse(s, query(LocalDateTime.from))
-  def parseInstant(s: String) = PostgresDateTimeParser.withZone(ZoneOffset.UTC).parse(s, query(Instant.from))
-  def parseZonedDateTime(s: String) = PostgresDateTimeParser.parse(s, query(ZonedDateTime.from))
-
-  def readTimestamp(buf: ByteBuf) = {
-    val micros = buf.readLong() + POSTGRES_EPOCH_MICROS
-    val seconds = micros / 1000000L
-    val nanos = (micros - seconds * 1000000L) * 1000
-    Instant.ofEpochSecond(seconds, nanos)
-  }
-
-  def readTimeTz(buf: ByteBuf) = {
-    val time = LocalTime.ofNanoOfDay(buf.readLong() * 1000)
-    val zone = ZoneOffset.ofTotalSeconds(-buf.readInt())
-    time.atOffset(zone)
-  }
-
-  def readInterval(buf: ByteBuf) = {
-    val micros = buf.readLong()
-    val days = buf.readInt()
-    val months = buf.readInt()
-    Interval(Duration.ofNanos(micros * 1000), Period.ofMonths(months).plusDays(days))
-  }
-
-  def parseTimeTz(str: String) = OffsetTime.parse(str, timeTzParser)
-
-  def writeInstant(instant: Instant) = {
-    val seconds = instant.getEpochSecond
-    val micros = instant.getLong(ChronoField.MICRO_OF_SECOND) + seconds * 1000000
-    val buf = Unpooled.buffer(8)
-    buf.writeLong(micros - POSTGRES_EPOCH_MICROS)
-    buf
-  }
-
-  def writeTimestamp(timestamp: LocalDateTime) = writeInstant(timestamp.atOffset(ZoneOffset.UTC).toInstant)
-
-  def writeTimestampTz(timestamp: ZonedDateTime) = writeInstant(timestamp.toInstant)
-
-  def writeTimeTz(time: OffsetTime) = {
-    val buf = Unpooled.buffer(12)
-    buf.writeLong(time.toLocalTime.toNanoOfDay / 1000)
-    buf.writeInt(-time.getOffset.getTotalSeconds)
-    buf
-  }
-
-  def writeInterval(interval: Interval) = {
-    val buf = Unpooled.buffer(16)
-    buf.writeLong(interval.timeDifference.getSeconds * 1000000 + interval.timeDifference.getNano / 1000)
-    buf.writeInt(interval.dateDifference.getDays)
-    buf.writeInt(interval.dateDifference.getYears * 12 + interval.dateDifference.getMonths)
-    buf
-  }
-}
-
-// Java time doesn't have the same notion of Interval that Postgres has
-// The simplest way to model it is by capturing the time portion and date portion separately (as postgres does)
-// TODO: this could probably implement Temporal to unify with java.time API
-case class Interval(timeDifference: Duration, dateDifference: Period) {
-  override def toString: String = {
-    val timePart = Option(timeDifference).filter(_.getSeconds != 0).map {
-      t =>
-        val sign = if(t.getSeconds < 0) "-" else "+"
-        val totalSeconds = Math.abs(t.getSeconds)
-        val totalMinutes = totalSeconds / 60
-        val totalHours = totalMinutes / 60
-        val seconds = (totalSeconds % 60).toString.reverse.padTo(2, '0').reverse
-        val minutes = (totalMinutes - totalHours * 60).toString.reverse.padTo(2, '0').reverse
-        val hours = totalHours.toString.reverse.padTo(2, '0').reverse
-        val micros = (t.getNano / 1000).toString.reverse.padTo(6, '0').reverse
-        s"$sign$hours:$minutes:$seconds.$micros"
-    }
-
-    val datePart = Option(dateDifference).filterNot(dd => dd.getDays == 0 && dd.getMonths == 0 && dd.getYears == 0).map {
-      d =>
-        def sign(i: Int) = if(i > 0) s"+$i" else i.toString
-        val years = Option(d.getYears).filter(_ != 0).map(y => s"${sign(y)} years")
-        val months = Option(d.getMonths).filter(_ != 0).map(m => s"${sign(m)} mons")
-        val days = Option(d.getDays).filter(_ != 0).map(d => s"${sign(d)} days")
-        List(years, months, days).flatten.mkString(" ")
-    }
-
-    List(datePart, timePart).flatten.mkString(" ")
-  }
-
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case Interval(td, dd) =>
-      val e = td.getSeconds == timeDifference.getSeconds && td.getNano == timeDifference.getNano &&
-      dd.getYears * 12 + dd.getMonths == dateDifference.getYears * 12 + dateDifference.getMonths &&
-      dd.getDays == dateDifference.getDays
-      if(!e) {
-        println("debug")
-      }
-      e
-    case _ => false
-  }
-}
-
-object Interval {
-  val regex = """(?:([\-+]?\d+) years? )?(?:([\-+]?\d+) mons? )?(?:([\-+]?\d+) days? )?(?:(-|\+)?(\d{2}):(\d{2}):(\d{2})(\.\d+)?)?""".r
-  def parse(s: String) = {
-    val t = regex.findFirstMatchIn(s).map {
-      m =>
-        val period = Period.ofYears(Option(m.group(1)).map(_.toInt).getOrElse(0))
-          .plusMonths(Option(m.group(2)).map(_.toLong).getOrElse(0))
-          .plusDays(Option(m.group(3)).map(_.toLong).getOrElse(0))
-        val duration = if(m.group(4) == "-") {
-          Duration.ofHours(Option(m.group(5)).map(h => -1 * h.toLong).getOrElse(0))
-            .minusMinutes(Option(m.group(6)).map(_.toLong).getOrElse(0))
-            .minusSeconds(Option(m.group(7)).map(_.toLong).getOrElse(0))
-            .minusNanos(Option(m.group(8)).map(BigDecimal.apply).map(_ * 1000000000L).map(_.toLong).getOrElse(0))
-        } else {
-          Duration.ofHours(Option(m.group(5)).map(_.toLong).getOrElse(0))
-            .plusMinutes(Option(m.group(6)).map(_.toLong).getOrElse(0))
-            .plusSeconds(Option(m.group(7)).map(_.toLong).getOrElse(0))
-            .plusNanos(Option(m.group(8)).map(BigDecimal.apply).map(_ * 1000000000L).map(_.toLong).getOrElse(0))
-        }
-        Interval(duration, period)
-    }
-    t.getOrElse(throw new DateTimeException("Interval could not be parsed"))
-  }
-}
diff --git a/src/main/scala/com/twitter/finagle/postgres/values/ValueDecoder.scala b/src/main/scala/com/twitter/finagle/postgres/values/ValueDecoder.scala
deleted file mode 100644
index b909ec74..00000000
--- a/src/main/scala/com/twitter/finagle/postgres/values/ValueDecoder.scala
+++ /dev/null
@@ -1,186 +0,0 @@
-package com.twitter.finagle.postgres.values
-
-import java.net.InetAddress
-import java.nio.charset.Charset
-import java.time._
-import java.time.temporal.JulianFields
-import java.util.UUID
-
-import com.twitter.util.{Return, Throw, Try}
-import io.netty.buffer.ByteBuf
-
-
-/**
-  * Typeclass supporting type-safe decoding of values from PostgreSQL in text and binary formats
-  */
-trait ValueDecoder[T] {
-
-  /**
-    * Attempt to decode the given text with the Postgres data type represented by `recv` into [[T]]
-    * @param recv The name of PostgreSQL's receive function for the text's data type
-    * @param text The text to be decoded
-    * @return A [[Try]] encapsulating the decoding attempt
-    */
-  def decodeText(recv: String, text: String): Try[T]
-
-  /**
-    * Attempt to decode the given bytes with the Postgres data type represented by `recv` into [[T]]
-    * @param recv    The name of PostgreSQL's receive function for the text's data type
-    * @param bytes   The bytes to be decoded; must be at the correct position (beginning of bytes for this value)
-    * @param charset The character set that is being used to communicate with Postgres
-    * @return A [[Try]] encapsulating the decoding attempt
-    */
-  def decodeBinary(recv: String, bytes: ByteBuf, charset: Charset): Try[T]
-
-  /**
-    * Create a new [[ValueDecoder]] which is the composition of this decoder with the given function
-    * @param fn The function which will transform [[T]]
-    * @tparam U The type parameter of the new decoder
-    * @return A new [[ValueDecoder]] decoding [[U]]
-    */
-  def map[U](fn: T => U): ValueDecoder[U] = new ValueDecoder[U] {
-    def decodeText(recv: String, text: String) = ValueDecoder.this.decodeText(recv, text).map(fn)
-    def decodeBinary(recv: String, bytes: ByteBuf, charset: Charset) =
-      ValueDecoder.this.decodeBinary(recv, bytes, charset).map(fn)
-  }
-}
-
-object ValueDecoder {
-
-  def apply[T : ValueDecoder] = implicitly[ValueDecoder[T]]
-
-  def instance[T](text: String => Try[T], binary: (ByteBuf, Charset) => Try[T]): ValueDecoder[T] =
-    new ValueDecoder[T] {
-      def decodeText(recv: String, s: String) = text(s)
-      def decodeBinary(recv: String, b: ByteBuf, charset: Charset) = binary(b, charset)
-    }
-
-  def instance[T](text: (String, String) => Try[T], binary: (String, ByteBuf, Charset) => Try[T]): ValueDecoder[T] =
-    new ValueDecoder[T] {
-      def decodeText(recv: String, s: String) = text(recv, s)
-      def decodeBinary(recv: String, b: ByteBuf, charset: Charset) = binary(recv, b, charset)
-    }
-
-  private def readInetAddress(buf: ByteBuf) = {
-    val family = buf.readByte()
-    val bits = buf.readByte()
-    val i = buf.readByte()
-    val nb = buf.readByte()
-    val arr = Array.fill(nb)(buf.readByte())
-    InetAddress.getByAddress(arr)
-  }
-
-  implicit val boolean: ValueDecoder[Boolean] = instance(s => Return(s == "t" || s == "true"), (b,c) => Try(b.readByte() != 0))
-  implicit val bytea: ValueDecoder[Array[Byte]] = instance(
-    s => Try(s.stripPrefix("\\x").sliding(2, 2).toArray.map(Integer.parseInt(_, 16).toByte)),
-    (b,c) => Try(Buffers.readBytes(b)))
-
-  // for String, we have a special case of `jsonb` - the user might want it as a String, but if it's jsonb we need
-  // to strip off the version byte in the binary case
-  implicit val string: ValueDecoder[String] =
-  instance((recv, s) => Return(s), (recv, b,c) => recv match {
-    case "jsonb_recv" => b.readByte; Try(Buffers.readString(b, c))
-    case _ => Try(Buffers.readString(b, c))
-  })
-
-  implicit val int2: ValueDecoder[Short] = instance(s => Try(s.toShort), (b,c) => Try(b.readShort()))
-  implicit val int4: ValueDecoder[Int] = instance(s => Try(s.toInt), (b,c) => Try(b.readInt()))
-  implicit val int8: ValueDecoder[Long] = instance(s => Try(s.toLong), (b,c) => Try(b.readLong()))
-  implicit val float4: ValueDecoder[Float] = instance(s => Try(s.toFloat), (b,c) => Try(b.readFloat()))
-  implicit val float8: ValueDecoder[Double] = instance(s => Try(s.toDouble), (b,c) => Try(b.readDouble()))
-  val Oid = instance(s => Try(s.toLong), (b,c) => Try(Integer.toUnsignedLong(b.readInt())))
-  implicit val inet: ValueDecoder[InetAddress] = instance(s => Try(InetAddress.getByName(s)), (b, c) => Try(readInetAddress(b)))
-  implicit val localDate: ValueDecoder[LocalDate] = instance(
-    s => Try(LocalDate.parse(s)),
-    (b, c) => Try(LocalDate.now().`with`(JulianFields.JULIAN_DAY, b.readInt() + 2451545)))
-  implicit val localTime: ValueDecoder[LocalTime] = instance(
-    s => Try(LocalTime.parse(s)),
-    (b, c) => Try(LocalTime.ofNanoOfDay(b.readLong() * 1000))
-  )
-  implicit val offsetTime: ValueDecoder[OffsetTime] = instance(
-    s => Try(DateTimeUtils.parseTimeTz(s)),
-    (b, c) => Try(DateTimeUtils.readTimeTz(b))
-  )
-  implicit val localDateTime: ValueDecoder[LocalDateTime] = instance(
-    s => Try(DateTimeUtils.parseLocalDateTime(s)),
-    (b, c) => Try(LocalDateTime.ofInstant(DateTimeUtils.readTimestamp(b), ZoneOffset.UTC))
-  )
-
-  implicit val instant: ValueDecoder[Instant] = instance(
-    s => Try(DateTimeUtils.parseInstant(s)),
-    (b, c) => Try(DateTimeUtils.readTimestamp(b))
-  )
-  implicit val zonedDateTime: ValueDecoder[ZonedDateTime] = instance(
-    s => Try(DateTimeUtils.parseZonedDateTime(s)),
-    (b, c) => Try(DateTimeUtils.readTimestamp(b).atZone(ZoneOffset.UTC)) // binary mode does not provide the zone
-  )
-  implicit val offsetDateTime: ValueDecoder[OffsetDateTime] = zonedDateTime.map(_.toOffsetDateTime)
-
-  implicit val interval: ValueDecoder[Interval] = instance(
-    s => Try(com.twitter.finagle.postgres.values.Interval.parse(s)),
-    (b, c) => Try(DateTimeUtils.readInterval(b))
-  )
-
-  implicit val uuid: ValueDecoder[UUID] = instance(s => Try(UUID.fromString(s)), (b, c) => Try(new UUID(b.readLong(), b.readLong())))
-  implicit val bigDecimal: ValueDecoder[BigDecimal] = instance(
-    s => Try(BigDecimal(s)),
-    (b, c) => Try(Numerics.readNumeric(b))
-  )
-
-  implicit val javaBigDecimal: ValueDecoder[java.math.BigDecimal] = bigDecimal.map(_.bigDecimal)
-
-  implicit val jsonb: ValueDecoder[JSONB] = instance(
-    s => Return(JSONB(s)),
-    (b, c) => Try {
-      b.readByte()  //discard version number
-      JSONB(new String(Array.fill(b.readableBytes())(b.readByte()), c))
-    }
-  )
-
-  implicit val hstoreMap: ValueDecoder[Map[String, Option[String]]] = instance(
-    s => Try {
-      HStores.parseHStoreString(s)
-        .getOrElse(throw new IllegalArgumentException("Invalid format for hstore"))
-    },
-    (buf, charset) => Try(HStores.decodeHStoreBinary(buf, charset))
-  )
-
-  val unknown: ValueDecoder[Either[String, Array[Byte]]] = instance(
-    s => Return(Left(s)),
-    (b, c) => Return(Right(Buffers.readBytes(b)))
-  )
-
-  val never: ValueDecoder[Nothing] = instance(
-    (recv, _) => Throw(new NoSuchElementException(s"No decoder available for $recv")),
-    (recv, _ , _) => Throw(new NoSuchElementException(s"No decoder available for $recv"))
-  )
-
-  def unknownBinary(t: (ByteBuf, Charset)): Try[Any] = Return(Buffers.readBytes(t._1))
-
-  val decoders: PartialFunction[String, ValueDecoder[T] forSome { type T }] = {
-    case "boolrecv" => boolean
-    case "bytearecv" => bytea
-    case   "charrecv" | "namerecv" | "varcharrecv" | "xml_recv" | "json_recv"
-           | "textrecv" | "bpcharrecv" | "cstring_recv" | "citextrecv" | "enum_recv"  => string
-    case "int8recv" => int8
-    case "int4recv" => int4
-    case "int2recv" => int2
-    //TODO: cidr
-    case "float4recv" => float4
-    case "float8recv" => float8
-    case "inet_recv" => inet
-    case "date_recv" => localDate
-    case "time_recv" => localTime
-    case "timetz_recv" => offsetTime
-    case "timestamp_recv" => localDateTime
-    case "timestamptz_recv" => instant // TODO: this should be zonedDateTime since in text mode, using instant will lose the timezone
-    case "interval_recv" => interval
-    //TODO: bit
-    //TODO: varbit
-    case "numeric_recv" => bigDecimal
-    case "uuid_recv" => uuid
-    case "jsonb_recv" => jsonb
-    case "hstore_recv" => hstoreMap
-  }
-
-}
diff --git a/src/test/scala/com/twitter/finagle/postgres/Generators.scala b/src/test/scala/com/twitter/finagle/postgres/Generators.scala
deleted file mode 100644
index 663df9a7..00000000
--- a/src/test/scala/com/twitter/finagle/postgres/Generators.scala
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.twitter.finagle.postgres
-
-import java.nio.charset.StandardCharsets
-import java.time.{ZonedDateTime, _}
-import java.time.temporal.JulianFields
-import java.util.UUID
-
-import org.scalacheck.{Arbitrary, Gen}
-import Arbitrary.arbitrary
-import com.twitter.finagle.postgres.values.Interval
-
-object Generators {
-  //need a more sensible BigDecimal generator, because ScalaCheck goes crazy with it and we can't even stringify them
-  //this will be sufficient to test the decoder
-  implicit val arbBD: Arbitrary[BigDecimal] = Arbitrary(for {
-    precision <- Gen.choose(1, 32)
-    scale <- Gen.choose(-precision, precision)
-    digits <- Gen.listOfN[Char](precision, Gen.numChar)
-  } yield BigDecimal(BigDecimal(digits.mkString).bigDecimal.movePointLeft(scale)))
-
-  implicit val arbDate = Arbitrary[LocalDate](for {
-    julian <- Gen.choose(1721060, 5373484)  //Postgres date parser doesn't like dates outside year range 0000-9999
-  } yield LocalDate.now().`with`(JulianFields.JULIAN_DAY, julian))
-
-  implicit val arbTime: Arbitrary[LocalTime] = Arbitrary[LocalTime](for {
-    usec <- Gen.choose(0L, 24L * 60 * 60 * 1000000 - 1)
-  } yield LocalTime.ofNanoOfDay(usec * 1000))
-
-  implicit val arbInstant = Arbitrary[Instant](for {
-    milli <- Gen.posNum[Long]
-  } yield Instant.ofEpochMilli(milli))
-
-  implicit val arbTimestamp = Arbitrary[LocalDateTime](for {
-    milli <- Gen.posNum[Long]
-  } yield LocalDateTime.ofInstant(Instant.ofEpochMilli(milli), ZoneId.systemDefault()))
-
-  implicit val arbTimestampTz = Arbitrary[ZonedDateTime](for {
-    milli <- Gen.posNum[Long]
-  } yield ZonedDateTime.ofInstant(Instant.ofEpochMilli(milli), ZoneId.systemDefault()))
-
-  implicit val arbZoneOffset = Arbitrary(Gen.choose(-12, 12).map(ZoneOffset.ofHours))
-
-  implicit val arbInterval = Arbitrary(for {
-    months <- Gen.choose(-120, 120)
-    years <- Gen.choose(-10, 10)
-    days <- Gen.choose(-50, 50)
-    hours <- Gen.choose(-50, 50)
-    minutes <- Gen.choose(0, 59)
-    seconds <- Gen.choose(0, 59)
-  } yield Interval(
-    Duration.ofSeconds(seconds).plusMinutes(minutes).plusHours(hours),
-    Period.ofMonths(months).plusYears(years).plusDays(days)
-  ))
-
-  implicit val arbTimeTz = Arbitrary[OffsetTime](for {
-    time <- arbitrary[LocalTime]
-    offs <- arbitrary[ZoneOffset]
-  } yield time.atOffset(offs))
-
-  implicit val arbUUID = Arbitrary[UUID](Gen.uuid)
-
-  // arbitrary string that only contains valid UTF-8 characters
-  val utf8 = StandardCharsets.UTF_8.newEncoder()
-  implicit val arbUTF8String = Arbitrary(arbitrary[String].filter {
-    str => utf8.canEncode(str) && !str.contains('\u0000')
-  })
-
-  // TODO: can empty maps be supported?
-  implicit val arbHStore: Arbitrary[Map[String, Option[String]]] = Arbitrary(
-    Gen.mapOf(for {
-      k <- Gen.identifier
-      v <- Gen.oneOf(Gen.alphaStr.map(Some(_)), Gen.const(None))
-    } yield (k, v)).suchThat(_.nonEmpty)
-  )
-
-  // postgres has slightly different precision rules, but that doesn't mean the decoder isn't working
-  implicit val arbFloat = Arbitrary[Float](for {
-    precision <- Gen.choose(1, 6)
-    scale <- Gen.choose(-10, 10)
-    digits <- Gen.listOfN[Char](precision, Gen.numChar)
-  } yield BigDecimal(BigDecimal(digits.mkString).bigDecimal.movePointLeft(scale)).toFloat)
-
-  implicit val arbDouble = Arbitrary[Double](for {
-    precision <- Gen.choose(1, 15)
-    scale <- Gen.choose(-20, 20)
-    digits <- Gen.listOfN[Char](precision, Gen.numChar)
-  } yield BigDecimal(BigDecimal(digits.mkString).bigDecimal.movePointLeft(scale)).toDouble)
-}
diff --git a/src/test/scala/com/twitter/finagle/postgres/values/ValuesSpec.scala b/src/test/scala/com/twitter/finagle/postgres/values/ValuesSpec.scala
deleted file mode 100644
index 18d18440..00000000
--- a/src/test/scala/com/twitter/finagle/postgres/values/ValuesSpec.scala
+++ /dev/null
@@ -1,206 +0,0 @@
-package com.twitter.finagle.postgres.values
-
-import java.nio.charset.Charset
-import java.nio.charset.StandardCharsets
-import java.time._
-import java.time.temporal.ChronoField
-import java.util.TimeZone
-
-import com.twitter.finagle.Postgres
-import com.twitter.finagle.postgres.Generators._
-import com.twitter.finagle.postgres.PostgresClient
-import com.twitter.finagle.postgres.PostgresClient.TypeSpecifier
-import com.twitter.finagle.postgres.ResultSet
-import com.twitter.finagle.postgres.Spec
-import com.twitter.finagle.postgres.messages.DataRow
-import com.twitter.finagle.postgres.messages.Field
-import com.twitter.util.Await
-import io.netty.buffer.Unpooled
-import org.scalacheck.{Arbitrary, Gen}
-import Arbitrary.arbitrary
-import com.twitter.concurrent.AsyncStream
-import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
-import io.circe.testing.instances.arbitraryJson
-
-class ValuesSpec extends Spec with ScalaCheckDrivenPropertyChecks {
-
-  for {
-    hostPort <- sys.env.get("PG_HOST_PORT")
-    user <- sys.env.get("PG_USER")
-    password = sys.env.get("PG_PASSWORD")
-    dbname <- sys.env.get("PG_DBNAME")
-    useSsl = sys.env.getOrElse("USE_PG_SSL", "0") == "1"
-  } yield {
-    val client = Postgres.Client()
-      .database(dbname)
-      .withCredentials(user, password)
-      .conditionally(useSsl, _.withTransport.tlsWithoutValidation)
-      .withSessionPool.maxSize(1)
-      .newRichClient(hostPort)
-
-    def tzSensitive(tst: TimeZone => Unit) = {
-      tst(TimeZone.getTimeZone("UTC"))
-      tst(TimeZone.getTimeZone("America/Montreal"))
-    }
-
-    def test[T: Arbitrary](
-      decoder: ValueDecoder[T],
-      encoder: ValueEncoder[T])(
-      send: String,
-      typ: String,
-      toStr: T => String = (t: T) => t.toString,
-      tester: (T, T) => Boolean = (a: T, b: T) => a == b,
-      nonDefault: Boolean = false,
-      localTz: TimeZone = TimeZone.getDefault
-    ) = {
-      val recv = send.replace("send", "recv")
-      implicit val dec = decoder
-      val oldDefault = TimeZone.getDefault
-      TimeZone.setDefault(localTz)
-      try {
-        forAll {
-          (t: T) =>
-            val str = toStr(t)
-            val bytes = Await.result(
-              client.prepareAndQuery(s"SELECT $send($$1::$typ) AS out", str)(_.get[Array[Byte]]("out"))
-            ).head
-            val textString = Await.result(
-              client.prepareAndQuery(s"SELECT CAST($$1::$typ AS text) AS out", str)(_.get[String]("out"))
-            ).head
-            val binaryOut = decoder.decodeBinary(recv, Unpooled.wrappedBuffer(bytes), client.charset).get
-            val textOut = decoder.decodeText(recv, textString).get
-
-            if (!tester(t, binaryOut))
-              fail(s"binary: $t does not match $binaryOut")
-
-            if (!tester(t, textOut))
-              fail(s"text: $t does not match $textOut")
-
-            val encodedBinary = encoder.encodeBinary(t, client.charset).getOrElse(fail("Binary encoding produced null"))
-            val encodedText = encoder.encodeText(t).getOrElse(fail("Text encoding produced null"))
-
-            val binaryInOut = decoder.decodeBinary(recv, encodedBinary.duplicate(), client.charset).get
-            val textInOut = decoder.decodeText(recv, encodedText).get
-
-            if (!tester(t, binaryInOut))
-              fail(s"binary: $t was encoded/decoded to $binaryInOut")
-
-            if (!tester(t, textInOut))
-              fail(s"text: $t was encoded/decoded to $textInOut")
-
-            if (!nonDefault) {
-              val List(rowBinary) = Await.result(
-                ResultSet(
-                  Array(Field("column", 1, 0)), StandardCharsets.UTF_8,
-                  AsyncStream.fromSeq(List(DataRow(Array(Some(encodedBinary))))),
-                  Map(0 -> TypeSpecifier(recv, typ, 0)), ValueDecoder.decoders
-                ).rows.toSeq.map(_.toList)
-              )
-
-              assert(tester(rowBinary.getAnyOption("column").get.asInstanceOf[T], t))
-              assert(tester(rowBinary.getAnyOption(0).get.asInstanceOf[T], t))
-              assert(tester(rowBinary.getOption[T]("column").get, t))
-              assert(tester(rowBinary.getOption[T](0).get, t))
-              assert(tester(rowBinary.get[T]("column"), t))
-              assert(tester(rowBinary.get[T](0), t))
-              assert(tester(rowBinary.getTry[T]("column").get, t))
-              assert(tester(rowBinary.getTry[T](0).get, t))
-
-              val List(rowText) = Await.result(
-                ResultSet(
-                  Array(Field("column", 0, 0)), StandardCharsets.UTF_8,
-                  AsyncStream.fromSeq(List(DataRow(Array(Some(Unpooled.copiedBuffer(encodedText, StandardCharsets.UTF_8)))))),
-                  Map(0 -> TypeSpecifier(recv, typ, 0)), ValueDecoder.decoders
-                ).rows.toSeq.map(_.toList)
-              )
-
-              assert(tester(rowText.getAnyOption("column").get.asInstanceOf[T], t))
-              assert(tester(rowText.getAnyOption(0).get.asInstanceOf[T], t))
-              assert(tester(rowText.getOption[T]("column").get, t))
-              assert(tester(rowText.getOption[T](0).get, t))
-              assert(tester(rowText.get[T]("column"), t))
-              assert(tester(rowText.get[T](0), t))
-              assert(tester(rowText.getTry[T]("column").get, t))
-              assert(tester(rowText.getTry[T](0).get, t))
-            }
-        }
-      } finally {
-        TimeZone.setDefault(oldDefault)
-      }
-
-    }
-
-    "ValueDecoders" should {
-      "parse varchars" in test(ValueDecoder.string, ValueEncoder.string)("varcharsend", "varchar")
-      "parse text" in test(ValueDecoder.string, ValueEncoder.string)("textsend", "text")
-      "parse booleans" in test(ValueDecoder.boolean, ValueEncoder.boolean)("boolsend", "boolean", b => if(b) "t" else "f")
-      "parse shorts" in test(ValueDecoder.int2, ValueEncoder.int2)("int2send", "int2")
-      "parse ints" in test(ValueDecoder.int4, ValueEncoder.int4)("int4send", "int4")
-      "parse longs" in test(ValueDecoder.int8, ValueEncoder.int8)("int8send", "int8")
-      //precision seems to be an issue when postgres parses text floats
-      "parse floats" in test(ValueDecoder.float4, ValueEncoder.float4)("float4send", "numeric")
-      "parse doubles" in test(ValueDecoder.float8, ValueEncoder.float8)("float8send", "numeric")
-      "parse numerics" in test(ValueDecoder.bigDecimal, ValueEncoder.numeric)("numeric_send", "numeric")
-
-      tzSensitive { tz =>
-        s"parse timestamps when local timezone is ${tz.getID}" in test(ValueDecoder.localDateTime, ValueEncoder.timestamp)(
-          "timestamp_send",
-          "timestamp",
-          ts => java.sql.Timestamp.from(ts.atZone(ZoneId.systemDefault()).toInstant).toString,
-          (a, b) => a.getLong(ChronoField.MICRO_OF_DAY) == b.getLong(ChronoField.MICRO_OF_DAY)
-        )
-
-        s"parse timestamps with time zone when local timezone is ${tz.getID}" in
-          test(ValueDecoder.zonedDateTime, ValueEncoder.timestampTz)(
-            "timestamptz_send",
-            "timestamptz",
-            ts => ts.toOffsetDateTime.toString,
-            (a, b) => {
-              // when reading the value, the timezone may have changed:
-              //   the binary protocol does not include timezone information (everything is in UTC)
-              //   the text protocol returns in the server's timezone which may be different than the supplied tz.
-              // so we convert the input value to the read value's timezone and then compare them
-              a.withZoneSameInstant(b.getOffset) == b
-            },
-            nonDefault = true,
-            localTz = tz
-          )
-
-        s"parse timestamps as instants when local timezone is ${tz.getID}" in
-          test(ValueDecoder.instant, ValueEncoder.instant)(
-            "timestamptz_send",
-            "timestamptz",
-            ts => ts.toString,
-            localTz = tz
-          )
-      }
-      "parse uuids" in test(ValueDecoder.uuid, ValueEncoder.uuid)("uuid_send", "uuid")
-      "parse dates" in test(ValueDecoder.localDate, ValueEncoder.date)("date_send", "date")
-
-      "parse jsonb" in {
-        val json = "{\"a\":\"b\"}"
-        val createBuffer = () => {
-          ValueEncoder[JSONB].encodeBinary(JSONB(json.getBytes), Charset.defaultCharset()).get
-        }
-        val buffer = createBuffer()
-        val version = buffer.readByte()
-        val encoded = Array.fill(buffer.readableBytes())(buffer.readByte())
-        version must equal(1)
-        encoded must equal(json.getBytes)
-
-        val decoded = ValueDecoder[JSONB].decodeBinary("", createBuffer(), Charset.defaultCharset()).get()
-        JSONB.stringify(decoded) must equal(json)
-      }
-
-      "parse json" in test(ValueDecoder.string, ValueEncoder.string)("json_send", "json")(
-        Arbitrary(
-          Gen.oneOf(
-            arbitraryJson.arbitrary.map(_.noSpaces),
-            arbitraryJson.arbitrary.map(_.spaces4),
-            arbitraryJson.arbitrary.map(_.spaces2)
-          ).map(_.replace("\u0000", "\\u0000"))
-        )
-      )
-    }
-  }
-}
diff --git a/version.sbt b/version.sbt
deleted file mode 100644
index c111e9fe..00000000
--- a/version.sbt
+++ /dev/null
@@ -1 +0,0 @@
-version in ThisBuild := "0.14.0-SNAPSHOT"