diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
new file mode 100644
index 00000000000..fb0d88a8b99
--- /dev/null
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<!-- IMPORTANT ECLIPSE NOTE: If you change this file, you must restart Eclipse
+ for your changes to take effect in its Checkstyle integration. -->
+<suppressions>
+    <!-- Suppress test classes -->
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="Javadoc*" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VariableDeclarationUsageDistance" />
+
+    <!-- JavadocStyle enforces existence of package-info.java package-level Javadoc; we consider this a bug. -->
+    <suppress files="package-info.java" checks="JavadocStyle" />
+
+    <!-- non-code classes -->
+    <suppress files="\.(bdr|eot|gif|gzip|jar|json|otf|png|svg|ttf|woff|zip)$" checks="FileTabCharacter" />
+    <suppress files="\.(bdr|eot|gif|gzip|jar|json|otf|png|svg|ttf|woff|zip)$" checks="NewlineAtEndOfFile" />
+
+    <!-- Generated code should not be subjected to checkstyle. -->
+    <suppress files="[/\\].*[/\\]generated_src[/\\]" checks="." />
+    <suppress files="[/\\].*[/\\]generated_testSrc[/\\]" checks="." />
+
+    <!-- Temporarily suppress abbreviations. -->
+    <suppress files="[/\\](.*KV.*|CQL.*KeyValueServices?|CQLStatementCache|StorageServiceMBean)\.java$" checks="AbbreviationAsWordInName" />
+</suppressions>
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
new file mode 100644
index 00000000000..6f7e1c7ef3e
--- /dev/null
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -0,0 +1,402 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+    Palantir Baseline Checkstyle configuration.
+    Authors: Robert Fink, Brian Worth, Merrick Zoubeiri, and many other contributors. Based in part on http://checkstyle.sourceforge.net/google_style.html
+    Please keep checks alphabetized with one exception: "relaxed" checks are grouped together at the bottom for easier disabling.
+    Check-specific comments reference documents internal to Palantir and can be safely ignored or removed.
+ -->
+
+<module name="Checker">
+    <property name="charset" value="UTF-8"/>
+    <property name="severity" value="error"/>
+
+    <module name="FileLength"> <!-- Java Style Guide: File length: 2000 lines -->
+        <property name="fileExtensions" value="java"/>
+    </module>
+    <module name="FileTabCharacter"/> <!-- Java Style Guide: Whitespace characters -->
+    <module name="NewlineAtEndOfFile"> <!-- Java Style Guide: Line ending: LF -->
+        <property name="lineSeparator" value="lf"/>
+    </module>
+    <module name="RegexpHeader">
+        <!-- <property name="header" value="^/\*$\n^ \* Copyright \d{4} Palantir Technologies, Inc\. All rights reserved\.$"/> -->
+        <property name="header" value="^/\*\*$\n^ \* Copyright \d{4} Palantir Technologies$"/>
+        <property name="fileExtensions" value=".java,.ts"/>
+    </module>
+    <module name="RegexpMultiline"> <!-- Development Practices: Writing good unit tests -->
+        <property name="fileExtensions" value="java"/>
+        <property name="format" value="@VisibleForTesting\s+(protected|public)"/>
+        <property name="message" value="@VisibleForTesting members should be package-private."/>
+    </module>
+    <module name="RegexpSingleline"> <!-- No reference needed as this is evident. -->
+        <property name="format" value="&lt;&lt;&lt;&lt;&lt;&lt;&lt;"/>
+        <property name="message" value="Found (&lt;&lt;&lt;&lt;&lt;&lt;&lt;), so it looks like you had a merge conflict that compiles. Please fix it."/>
+    </module>
+    <module name="RegexpSingleline"> <!-- No reference needed as this is evident. -->
+        <property name="format" value="&gt;&gt;&gt;&gt;&gt;&gt;&gt;"/>
+        <property name="message" value="Found (&gt;&gt;&gt;&gt;&gt;&gt;&gt;), so it looks like you had a merge conflict that compiles. Please fix it."/>
+    </module>
+    <module name="RegexpSingleline">
+        <property name="format" value="\s+$"/>
+        <property name="message" value="Whitespace at end-of-line"/>
+    </module>
+    <module name="SuppressionFilter"> <!-- baseline-gradle: README.md -->
+        <property name="file" value="${samedir}/checkstyle-suppressions.xml"/>
+    </module>
+    <module name="SuppressWarningsFilter"/> <!-- baseline-gradle: README.md -->
+    <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
+    <module name="TreeWalker">
+        <module name="AbbreviationAsWordInName"> <!-- Java Style Guide: Camel case : defined -->
+            <property name="ignoreFinal" value="false"/>
+            <property name="allowedAbbreviationLength" value="1"/>
+        </module>
+        <module name="AnnotationLocation"> <!-- Java Style Guide: Annotations -->
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
+        </module>
+        <module name="AnnotationLocation"> <!-- Java Style Guide: Annotations -->
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="allowSamelineMultipleAnnotations" value="true"/>
+        </module>
+        <module name="AnnotationUseStyle"/> <!-- Java Style Guide: Annotations -->
+        <module name="ArrayTypeStyle"/> <!-- Java Style Guide: No C-style array declarations -->
+        <module name="AvoidEscapedUnicodeCharacters"> <!-- Java Style Guide: Non-ASCII characters -->
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+        <module name="AvoidNestedBlocks"> <!-- Java Coding Guidelines: Avoid nested blocks -->
+            <property name="allowInSwitchCase" value="true"/>
+        </module>
+        <module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
+        <module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
+            <property name="excludes" value="org.junit.Assert.*,org.junit.Assume.*,org.hamcrest.Matchers.*,org.mockito.Mockito.*,org.mockito.Matchers.*,org.assertj.core.api.Assertions.*,com.google.common.base.Preconditions.*,org.apache.commons.lang3.Validate.*,com.google.common.truth.Truth.*"/>
+        </module>
+        <module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern" value="Class type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="CovariantEquals"/> <!-- Java Coding Guidelines: Override ``Object#equals`` consistently -->
+        <module name="DefaultComesLast"/> <!-- Java Style Guide: The default case is present -->
+        <module name="EmptyBlock"> <!-- Java Style Guide: Empty blocks: documented -->
+            <property name="option" value="TEXT"/>
+        </module>
+        <module name="EmptyCatchBlock"> <!-- Java Style Guide: Empty blocks: documented -->
+            <property name="exceptionVariableName" value="expected"/>
+        </module>
+        <module name="EmptyForInitializerPad"/> <!-- Java Style Guide: Horizontal whitespace -->
+        <module name="EmptyLineSeparator"> <!-- Java Style Guide: Source file structure -->
+            <property name="tokens" value="IMPORT, CLASS_DEF, ENUM_DEF, INTERFACE_DEF, CTOR_DEF, STATIC_INIT, INSTANCE_INIT, VARIABLE_DEF"/>
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="EmptyStatement"/> <!-- Java Style Guide: One statement per line -->
+        <module name="EqualsHashCode"/>
+        <module name="FallThrough"/> <!-- Java Style Guide: Fall-through: commented -->
+        <module name="FileContentsHolder"/> <!-- Required for SuppressionCommentFilter -->
+        <module name="FinalClass"/> <!-- Java Coding Guidelines: Private constructors -->
+        <module name="GenericWhitespace"> <!-- Java Style Guide: Horizontal whitespace -->
+            <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+            <message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+            <message key="ws.illegalFollow" value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+            <message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="HiddenField"> <!-- Java Coding Guide: Avoid shadowing -->
+            <property name="ignoreConstructorParameter" value="true"/>
+            <property name="ignoreSetter" value="true"/>
+            <property name="setterCanReturnItsClass" value="true"/>
+        </module>
+        <module name="HideUtilityClassConstructor"/> <!-- Java Coding Guidelines: Private constructors -->
+        <module name="IllegalImport"> <!-- Java Coding Guidelines: Use JUnit 4-style test classes and assertions -->
+            <property name="illegalPkgs" value="junit.framework"/>
+            <message key="import.illegal" value="Use JUnit 4-style (org.junit.*) test classes and assertions instead of JUnit 3 (junit.framework.*)."/>
+        </module>
+        <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
+            <property name="illegalPkgs" value="sun, org.elasticsearch.common.base, jersey.repackaged.com.google.common, com.google.api.client.repackaged, org.apache.hadoop.thirdparty.guava"/>
+            <message key="import.illegal" value="Must not import repackaged classes."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="org.apache.commons.lang"/>
+            <message key="import.illegal" value="lang is deprecated, use lang3 instead."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="org.apache.commons.math"/>
+            <message key="import.illegal" value="math is deprecated, use math3 instead."/>
+        </module>
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="org.apache.log4j, org.apache.logging.log4j, java.util.logging, ch.qos.logback"/>
+            <message key="import.illegal" value="Use SLF4J instead of a logging framework directly."/>
+        </module>
+        <module name="IllegalInstantiation"> <!-- Java Coding Guidelines: Never instantiate primitive types -->
+            <property name="classes" value="java.lang.Boolean"/>
+            <property name="classes" value="java.lang.Byte"/>
+            <property name="classes" value="java.lang.Character"/>
+            <property name="classes" value="java.lang.Double"/>
+            <property name="classes" value="java.lang.Float"/>
+            <property name="classes" value="java.lang.Integer"/>
+            <property name="classes" value="java.lang.Long"/>
+        </module>
+        <module name="IllegalThrows"/> <!-- Java Coding Guidelines: Throwable, Error, RuntimeException: Not declared -->
+        <module name="IllegalTokenText"> <!-- Java Style Guide: Special escape sequences -->
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
+        </module>
+        <module name="IllegalType"> <!-- Java Coding Guide: Limit coupling on concrete classes -->
+            <property name="illegalClassNames" value="java.util.HashSet, java.util.HashMap, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
+        </module>
+        <module name="ImportOrder"> <!-- Java Style Guide: Ordering and spacing -->
+            <!-- <property name="groups" value="/.*/"/> -->
+            <property name="groups" value="java,javax,org,com"/>
+            <property name="option" value="top"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
+        <module name="Indentation"> <!-- Java Style Guide: Block indentation: +4 spaces -->
+            <property name="arrayInitIndent" value="8"/>
+            <property name="lineWrappingIndentation" value="8"/>
+        </module>
+        <module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used -->
+        <module name="LeftCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
+            <property name="maxLineLength" value="120"/>
+        </module>
+        <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
+            <property name="max" value="120"/>
+            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        </module>
+        <module name="MemberName"> <!-- Java Style Guide: Non-constant field names -->
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodName"> <!-- Java Style Guide: Method names -->
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <message key="name.invalidPattern" value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodParamPad"/> <!-- Java Style Guide: Horizontal whitespace -->
+        <module name="MissingDeprecated"/> <!-- Java Coding Guide: Deprecate per annotation and Javadoc -->
+        <module name="MissingSwitchDefault"/> <!-- Java Style Guide: The default case is present -->
+        <module name="ModifiedControlVariable"/> <!-- Java Coding Guide: For-loop control variables: never modified -->
+        <module name="ModifierOrder"/> <!-- Java Style Guide: Modifiers -->
+        <module name="MultipleVariableDeclarations"/> <!-- Java Style Guide: One variable per declaration -->
+        <module name="MutableException"/> <!-- Java Coding Guidelines: Exceptions: Always immutable -->
+        <module name="NeedBraces"/> <!-- Java Style Guide: Braces are used where optional -->
+        <module name="NoClone"/> <!-- Java Coding Guidelines: Never override Object#finalize or Object#clone -->
+        <module name="NoFinalizer"/> <!-- Java Coding Guidelines: Never override Object#finalize -->
+        <module name="NoLineWrap"/> <!-- Java Style Guide: No line-wrapping -->
+        <module name="NoWhitespaceAfter"> <!-- Java Style Guide: Horizontal whitespace -->
+            <property name="allowLineBreaks" value="false"/>
+            <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+        </module>
+        <module name="NoWhitespaceBefore"> <!-- Java Style Guide: Horizontal whitespace -->
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+        <module name="OneStatementPerLine"/> <!-- Java Style Guide: One statement per line -->
+        <module name="OneTopLevelClass"/> <!-- Java Style Guide: Exactly one top-level class declaration -->
+        <module name="OperatorWrap"> <!-- Java Style Guide: Where to break -->
+            <property name="option" value="NL"/>
+            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
+        </module>
+        <module name="OuterTypeFilename"/> <!-- Java Style Guide: File name -->
+        <module name="OverloadMethodsDeclarationOrder"/> <!-- Java Style Guide: Overloads: never split -->
+        <module name="PackageAnnotation"/> <!-- Java Style Guide: Package statement -->
+        <module name="PackageDeclaration"/> <!-- Java Style Guide: Package statement -->
+        <module name="PackageName"> <!-- Java Style Guide: Package names -->
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+            <message key="name.invalidPattern" value="Package name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ParameterAssignment"/> <!-- Java Coding Guidelines: Final variables and parameters -->
+        <module name="ParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
+        <module name="RedundantImport"/> <!-- Java Style Guide: No unused imports -->
+        <module name="RedundantModifier"/> <!-- Java Coding Guidelines: Avoid redundant modifiers -->
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
+            <property name="format" value="assertEquals\(false,"/>
+            <property name="message" value="Use assertFalse() instead."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
+            <property name="format" value="assertEquals\(null,"/>
+            <property name="message" value="Use assertNull() instead."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
+            <property name="format" value="assertEquals\(true,"/>
+            <property name="message" value="Use assertTrue() instead."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
+            <property name="format" value="assertFalse\(.*[!=]="/>
+            <property name="message" value="Use better assertion method(s): assertEquals(), assertNull(), assertSame(), etc."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
+            <property name="format" value="assertTrue\(!"/>
+            <property name="message" value="Use assertFalse()."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
+            <property name="format" value="assertTrue\(.*[!=]="/>
+            <property name="message" value="Use better assertion method(s): assertEquals(), assertNull(), assertSame(), etc."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Avoid Generics clutter where possible -->
+            <property name="format" value="Collections\.EMPTY_LIST"/>
+            <property name="message" value="Use Collections.emptyList() or, better, ImmutableList.of()."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Avoid Generics clutter where possible -->
+            <property name="format" value="Collections\.EMPTY_MAP"/>
+            <property name="message" value="Use Collections.emptyMap() or, better, ImmutableMap.of()."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Avoid Generics clutter where possible -->
+            <property name="format" value="Collections\.EMPTY_SET"/>
+            <property name="message" value="Use Collections.emptySet() or, better, ImmutableSet.of()."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
+            <property name="format" value="CoreMatchers\.equalTo"/>
+            <property name="message" value="Use Assert.assertEquals()."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
+            <property name="format" value="CoreMatchers\.notNull"/>
+            <property name="message" value="Use better assertion method(s): Assert.assertEquals(), assertNull(), assertSame(), etc."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Check parameters for validity -->
+            <property name="format" value="Preconditions\.checkNotNull\((?!.*,)([^()]*(\(([^()]*|\(([^()]*|\([^()]*\))*\))*\)[^()]*)*)\)"/>
+            <property name="message" value="Use Preconditions.checkNotNull(Object, String)."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Check parameters for validity -->
+            <property name="format" value="Validate\.notNull\((?!.*,)([^()]*(\(([^()]*|\(([^()]*|\([^()]*\))*\))*\)[^()]*)*)\)"/>
+            <property name="message" value="Use Validate.notNull(Object, String)."/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="^\s*super\(\);"/>
+            <property name="message" value="This is unnecessary; please delete."/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="@return.*\.$"/>
+            <property name="message" value="Please delete the period."/>
+        </module>
+        <module name="RegexpSinglelineJava"> <!-- Java Style Guide: Horizontal whitespace -->
+            <property name="format" value="\s+$"/>
+            <property name="message" value="Trailing whitespace is not allowed."/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="\? extends Object\W"/>
+            <property name="message" value="Use ? rather than ? extends Object."/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="\bPreconditions\.check.*\{\}"/>
+            <property name="message" value="Use printf-style formatting in Preconditions, not '{}' style formatting."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="(?i)log(ger)?\.(debug|info|warn|error)\(.*%[sd]"/>
+            <property name="message" value="SLF4J loggers support '{}' style formatting."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="\.printStackTrace\(\)"/>
+            <property name="message" value="printStackTrace is not generally allowed."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="\bCharsets\."/>
+            <property name="message" value="Use JDK StandardCharsets instead of alternatives."/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="\bCharset.defaultCharset\("/>
+            <property name="message" value="Use explicit charset (e.g. StandardCharsets.UTF-8) instead of default."/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="\bIOUtils\.toString\("/>
+            <property name="message" value="Prefer Guava''s [CharStreams,Files,Resources].toString to avoid charset/stream closing issues."/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="static enum"/>
+            <property name="message" value="Redundant ''static'' modifier."/>
+        </module>
+        <module name="RightCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style -->
+        <module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
+            <property name="option" value="alone"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+        </module>
+        <module name="SeparatorWrap"> <!-- Java Style Guide: Where to break -->
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap"> <!-- Java Style Guide: Where to break -->
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="SimplifyBooleanExpression"/> <!-- Java Coding Guidelines: Keep Boolean expressions simple -->
+        <module name="SimplifyBooleanReturn"/> <!-- Java Coding Guidelines: Keep Boolean expressions simple -->
+        <module name="StaticVariableName"/> <!-- Java Style Guide: Naming -->
+        <module name="StringLiteralEquality"/> <!-- Java Coding Guidelines: String equality: use String#equals -->
+        <module name="SuperClone"/>
+        <module name="SuppressWarnings">
+            <property name="format" value="serial"/>
+        </module>
+        <module name="SuppressWarningsHolder" />  <!-- Required for SuppressWarningsFilter -->
+        <module name="TypeName"> <!-- Java Style Guide: Class names -->
+            <message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="TypecastParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
+        <module name="UnnecessaryParentheses"/>
+        <module name="UnusedImports"> <!-- Java Style Guide: No unused imports -->
+            <property name="processJavadoc" value="true"/>
+        </module>
+        <module name="UpperEll"/> <!-- Java Style Guide: Numeric Literals -->
+        <!-- <module name="VisibilityModifier"/> --> <!-- Java Coding Guidelines: Minimize mutability -->
+        <module name="WhitespaceAfter"/> <!-- Java Style Guide: Horizontal whitespace -->
+        <module name="WhitespaceAround"> <!-- Java Style Guide: Horizontal whitespace -->
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLoops" value="true"/>
+            <property name="ignoreEnhancedForColon" value="false"/>
+            <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+            <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+        </module>
+
+        <!-- Stricter checks begin: delete some or all of the following for faster prototyping, but please restore before pushing to production. -->
+
+        <module name="AtclauseOrder"> <!-- Java Style Guide: At-clauses -->
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+            <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+        </module>
+        <!-- <module name="CyclomaticComplexity"/> --> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
+        <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
+            <property name="scope" value="public"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingThrowsTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="minLineCount" value="99999999"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="allowThrowsTagsForSubclasses" value="true"/>
+            <property name="suppressLoadErrors" value="true" />
+        </module>
+        <module name="JavadocStyle"/> <!-- Java Style Guide: Javadoc -->
+        <module name="JavadocTagContinuationIndentation"> <!-- Java Style Guide: At-clauses -->
+            <property name="offset" value="0"/>
+        </module>
+        <module name="LocalFinalVariableName"/> <!-- Java Style Guide: Local variable names -->
+        <module name="LocalVariableName"> <!-- Java Style Guide: Local variable names -->
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="allowOneCharVarInForLoop" value="true"/>
+            <message key="name.invalidPattern" value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodLength"/> <!-- Java Coding Guide: Methods and functions: focused, crisp, concise -->
+        <module name="MethodTypeParameterName"> <!-- Java Style Guide: Type variable names -->
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern" value="Method type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="NestedForDepth">
+            <property name="max" value="2"/>
+        </module>
+        <module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
+        <module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
+        <module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
+        <module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
+            <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+        </module>
+
+        <!-- Stricter checks end -->
+    </module>
+</module>
diff --git a/.baseline/copyright/bsd-3.txt b/.baseline/copyright/bsd-3.txt
new file mode 100644
index 00000000000..95faa57bd2b
--- /dev/null
+++ b/.baseline/copyright/bsd-3.txt
@@ -0,0 +1,13 @@
+Copyright ${today.year} Palantir Technologies
+
+Licensed under the BSD-3 License (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://opensource.org/licenses/BSD-3-Clause
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/.baseline/eclipse/dynamic/dotfile.checkstyle b/.baseline/eclipse/dynamic/dotfile.checkstyle
new file mode 100644
index 00000000000..c176af2f34e
--- /dev/null
+++ b/.baseline/eclipse/dynamic/dotfile.checkstyle
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="Baseline" location="${configDir}/checkstyle/checkstyle.xml" type="external" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="Baseline" local="true">
+    <file-match-pattern match-pattern="." include-pattern="false"/>
+    <file-match-pattern match-pattern=".*\\.java" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.cfg" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.coffee" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.erb" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.groovy" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.handlebars" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.json" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.less" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.pl" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.pp" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.sh" include-pattern="true"/>
+    <file-match-pattern match-pattern=".*\\.xml" include-pattern="true"/>
+    <file-match-pattern match-pattern="src/test/resources/.*" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/.baseline/eclipse/dynamic/dotfile.settings/edu.umd.cs.findbugs.core.prefs b/.baseline/eclipse/dynamic/dotfile.settings/edu.umd.cs.findbugs.core.prefs
new file mode 100644
index 00000000000..353d91daf5f
--- /dev/null
+++ b/.baseline/eclipse/dynamic/dotfile.settings/edu.umd.cs.findbugs.core.prefs
@@ -0,0 +1,171 @@
+#FindBugs User Preferences
+#Sun Mar 02 18:15:35 EST 2014
+cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud
+detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true
+detectorAtomicityProblem=AtomicityProblem|true
+detectorBadAppletConstructor=BadAppletConstructor|false
+detectorBadResultSetAccess=BadResultSetAccess|true
+detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true
+detectorBadUseOfReturnValue=BadUseOfReturnValue|true
+detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true
+detectorBooleanReturnNull=BooleanReturnNull|true
+detectorBuildInterproceduralCallGraph=BuildInterproceduralCallGraph|false
+detectorBuildObligationPolicyDatabase=BuildObligationPolicyDatabase|true
+detectorCallToUnsupportedMethod=CallToUnsupportedMethod|false
+detectorCalledMethods=CalledMethods|true
+detectorCheckCalls=CheckCalls|false
+detectorCheckExpectedWarnings=CheckExpectedWarnings|false
+detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true
+detectorCheckRelaxingNullnessAnnotation=CheckRelaxingNullnessAnnotation|true
+detectorCheckTypeQualifiers=CheckTypeQualifiers|true
+detectorCloneIdiom=CloneIdiom|true
+detectorComparatorIdiom=ComparatorIdiom|true
+detectorConfusedInheritance=ConfusedInheritance|true
+detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true
+detectorCovariantArrayAssignment=CovariantArrayAssignment|false
+detectorCrossSiteScripting=CrossSiteScripting|true
+detectorDefaultEncodingDetector=DefaultEncodingDetector|true
+detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true
+detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true
+detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true
+detectorDontUseEnum=DontUseEnum|true
+detectorDroppedException=DroppedException|true
+detectorDumbMethodInvocations=DumbMethodInvocations|true
+detectorDumbMethods=DumbMethods|true
+detectorDuplicateBranches=DuplicateBranches|true
+detectorEmptyZipFileEntry=EmptyZipFileEntry|true
+detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true
+detectorExplicitSerialization=ExplicitSerialization|true
+detectorFieldItemSummary=FieldItemSummary|true
+detectorFinalizerNullsFields=FinalizerNullsFields|true
+detectorFindBadCast2=FindBadCast2|true
+detectorFindBadForLoop=FindBadForLoop|true
+detectorFindBugsSummaryStats=FindBugsSummaryStats|true
+detectorFindCircularDependencies=FindCircularDependencies|false
+detectorFindComparatorProblems=FindComparatorProblems|true
+detectorFindDeadLocalStores=FindDeadLocalStores|true
+detectorFindDoubleCheck=FindDoubleCheck|true
+detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true
+detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true
+detectorFindFinalizeInvocations=FindFinalizeInvocations|true
+detectorFindFloatEquality=FindFloatEquality|true
+detectorFindHEmismatch=FindHEmismatch|true
+detectorFindInconsistentSync2=FindInconsistentSync2|true
+detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true
+detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true
+detectorFindMaskedFields=FindMaskedFields|true
+detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true
+detectorFindNakedNotify=FindNakedNotify|true
+detectorFindNonShortCircuit=FindNonShortCircuit|true
+detectorFindNullDeref=FindNullDeref|true
+detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true
+detectorFindOpenStream=FindOpenStream|true
+detectorFindPuzzlers=FindPuzzlers|true
+detectorFindRefComparison=FindRefComparison|true
+detectorFindReturnRef=FindReturnRef|true
+detectorFindRoughConstants=FindRoughConstants|true
+detectorFindRunInvocations=FindRunInvocations|true
+detectorFindSelfComparison=FindSelfComparison|true
+detectorFindSelfComparison2=FindSelfComparison2|true
+detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true
+detectorFindSpinLoop=FindSpinLoop|true
+detectorFindSqlInjection=FindSqlInjection|true
+detectorFindTwoLockWait=FindTwoLockWait|true
+detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true
+detectorFindUnconditionalWait=FindUnconditionalWait|true
+detectorFindUninitializedGet=FindUninitializedGet|true
+detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true
+detectorFindUnreleasedLock=FindUnreleasedLock|true
+detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true
+detectorFindUnsyncGet=FindUnsyncGet|true
+detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true
+detectorFindUselessControlFlow=FindUselessControlFlow|true
+detectorFindUselessObjects=FindUselessObjects|true
+detectorFormatStringChecker=FormatStringChecker|true
+detectorFunctionsThatMightBeMistakenForProcedures=FunctionsThatMightBeMistakenForProcedures|true
+detectorHugeSharedStringConstants=HugeSharedStringConstants|true
+detectorIDivResultCastToDouble=IDivResultCastToDouble|true
+detectorIncompatMask=IncompatMask|true
+detectorInconsistentAnnotations=InconsistentAnnotations|true
+detectorInefficientMemberAccess=InefficientMemberAccess|false
+detectorInefficientToArray=InefficientToArray|true
+detectorInfiniteLoop=InfiniteLoop|true
+detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true
+detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true
+detectorInitializationChain=InitializationChain|true
+detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true
+detectorInstantiateStaticClass=InstantiateStaticClass|true
+detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true
+detectorInvalidJUnitTest=InvalidJUnitTest|true
+detectorIteratorIdioms=IteratorIdioms|true
+detectorLazyInit=LazyInit|true
+detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true
+detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true
+detectorMethodReturnCheck=MethodReturnCheck|true
+detectorMethods=Methods|true
+detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true
+detectorMutableEnum=MutableEnum|true
+detectorMutableLock=MutableLock|true
+detectorMutableStaticFields=MutableStaticFields|true
+detectorNaming=Naming|true
+detectorNoise=Noise|false
+detectorNoiseNullDeref=NoiseNullDeref|false
+detectorNoteAnnotationRetention=NoteAnnotationRetention|true
+detectorNoteCheckReturnValueAnnotations=NoteCheckReturnValueAnnotations|true
+detectorNoteDirectlyRelevantTypeQualifiers=NoteDirectlyRelevantTypeQualifiers|true
+detectorNoteJCIPAnnotation=NoteJCIPAnnotation|true
+detectorNoteNonNullAnnotations=NoteNonNullAnnotations|true
+detectorNoteNonnullReturnValues=NoteNonnullReturnValues|true
+detectorNoteSuppressedWarnings=NoteSuppressedWarnings|true
+detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true
+detectorNumberConstructor=NumberConstructor|true
+detectorOptionalReturnNull=OptionalReturnNull|true
+detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true
+detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true
+detectorPublicSemaphores=PublicSemaphores|false
+detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true
+detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true
+detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true
+detectorRedundantConditions=RedundantConditions|true
+detectorRedundantInterfaces=RedundantInterfaces|true
+detectorReflectiveClasses=ReflectiveClasses|true
+detectorRepeatedConditionals=RepeatedConditionals|true
+detectorResolveAllReferences=ResolveAllReferences|false
+detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true
+detectorSerializableIdiom=SerializableIdiom|true
+detectorStartInConstructor=StartInConstructor|true
+detectorStaticCalendarDetector=StaticCalendarDetector|true
+detectorStringConcatenation=StringConcatenation|true
+detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true
+detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true
+detectorSwitchFallthrough=SwitchFallthrough|true
+detectorSynchronizationOnSharedBuiltinConstant=SynchronizationOnSharedBuiltinConstant|true
+detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true
+detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true
+detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true
+detectorTestASM=TestASM|false
+detectorTestDataflowAnalysis=TestDataflowAnalysis|false
+detectorTestingGround=TestingGround|false
+detectorTestingGround2=TestingGround2|false
+detectorTrainFieldStoreTypes=TrainFieldStoreTypes|true
+detectorTrainLongInstantfParams=TrainLongInstantfParams|true
+detectorTrainNonNullAnnotations=TrainNonNullAnnotations|true
+detectorTrainUnconditionalDerefParams=TrainUnconditionalDerefParams|true
+detectorURLProblems=URLProblems|true
+detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true
+detectorUnnecessaryMath=UnnecessaryMath|true
+detectorUnreadFields=UnreadFields|true
+detectorUselessSubclassMethod=UselessSubclassMethod|true
+detectorVarArgsProblems=VarArgsProblems|true
+detectorVolatileUsage=VolatileUsage|true
+detectorWaitInLoop=WaitInLoop|true
+detectorWrongMapIterator=WrongMapIterator|true
+detectorXMLFactoryBypass=XMLFactoryBypass|true
+detector_threshold=2
+effort=max
+excludefilter0=${configDir}/findbugs/excludeFilter.xml|true
+filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,EXPERIMENTAL,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|20
+filter_settings_neg=NOISE|
+plugin0=edu.umd.cs.findbugs.plugins.findbugsCommunalCloud|false
+plugin1=edu.umd.cs.findbugs.plugins.webCloud|false
+run_at_full_build=true
diff --git a/.baseline/eclipse/org.eclipse.jdt.core.prefs b/.baseline/eclipse/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..dc125f1d3f9
--- /dev/null
+++ b/.baseline/eclipse/org.eclipse.jdt.core.prefs
@@ -0,0 +1,313 @@
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull
+org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.CheckForNull
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=${javaTargetVersion}
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=${javaTargetVersion}
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.source=${javaSourceVersion}
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=32
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/.baseline/eclipse/static/dotfile.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs b/.baseline/eclipse/static/dotfile.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs
new file mode 100644
index 00000000000..c513986b8b7
--- /dev/null
+++ b/.baseline/eclipse/static/dotfile.settings/edu.umd.cs.findbugs.plugin.eclipse.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+edu.umd.cs.findbugs.plugin.eclipse.findbugsMarkerOfConcern=Warning
+edu.umd.cs.findbugs.plugin.eclipse.findbugsMarkerScariest=Error
+edu.umd.cs.findbugs.plugin.eclipse.findbugsMarkerScary=Warning
+edu.umd.cs.findbugs.plugin.eclipse.findbugsMarkerTroubling=Warning
diff --git a/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..e39f3fb909b
--- /dev/null
+++ b/.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,66 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Baseline Profile
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=false
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * Copyright 2016 Palantir Technologies, Inc. All rights reserved.\n */\n\n${package_declaration}\n\n/**\n * \n */\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/.baseline/findbugs/excludeFilter.xml b/.baseline/findbugs/excludeFilter.xml
new file mode 100644
index 00000000000..5153e28525f
--- /dev/null
+++ b/.baseline/findbugs/excludeFilter.xml
@@ -0,0 +1,44 @@
+<!-- See http://findbugs.sourceforge.net/manual/filter.html for syntax -->
+<FindBugsFilter>
+
+    <Match>
+        <Source name="~.*\.scala" />
+    </Match>
+
+    <!-- @NonnullByDefault doesn't play nicely with overriding @Nullable parameters/outputs -->
+    <Match>
+        <Bug pattern="NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE" />
+    </Match>
+
+    <!-- Custom for Atlas -->
+    <Match>
+        <Or>
+            <!-- Too time consuming to fix these for now -->
+            <Bug pattern="EI_EXPOSE_REP" />
+            <Bug pattern="EI_EXPOSE_REP2" />
+            <Bug pattern="MS_EXPOSE_REP" />
+            <Bug pattern="PT_EXTENDS_CONCRETE_TYPE" />
+            <Bug pattern="PT_FINAL_TYPE_CONSTRUCTOR" />
+            <Bug pattern="PT_FINAL_TYPE_PARAM" />
+            <Bug pattern="PT_FINAL_TYPE_RETURN" />
+
+            <And>
+                <Class name="~.*\.DynamicPartitionMapImpl" />
+                <Bug pattern="IS_FIELD_NOT_GUARDED" />
+            </And>
+        </Or>
+    </Match>
+
+    <!-- Ignore the following bug patterns in test code -->
+    <!-- (i.e., classes ending in 'Test' or 'Tests', and inner classes of same) -->
+    <Match>
+        <Class name="~.*\.*Tests?(\$.*)?" />
+        <Or>
+            <Bug pattern="NP_NONNULL_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/> <!-- common in tests to have non-final variables instantiated in @Before methods, which FindBugs can't detect -->
+            <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/> <!-- if a null is dereferenced, test will fail anyway. Plus assertNotNull() is often a bad pattern. -->
+            <Bug pattern="RV_RETURN_VALUE_IGNORED_INFERRED"/> <!-- common in tests to call a method [that has a return value] to deliberately cause an exception, then test that exception -->
+            <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/> <!-- ditto above -->
+            <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD"/> <!-- @Rule ivars can be public and unused -->
+        </Or>
+    </Match>
+</FindBugsFilter>
diff --git a/.baseline/idea/intellij-java-palantir-style.xml b/.baseline/idea/intellij-java-palantir-style.xml
new file mode 100644
index 00000000000..6ced7a62630
--- /dev/null
+++ b/.baseline/idea/intellij-java-palantir-style.xml
@@ -0,0 +1,468 @@
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+        <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+        <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+        <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+        <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+        <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+        <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+        <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+        <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+        <option name="ASSIGNMENT_WRAP" value="5" />
+        <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+        <option name="BINARY_OPERATION_WRAP" value="1" />
+        <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+        <option name="CALL_PARAMETERS_WRAP" value="1" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="DOWHILE_BRACE_FORCE" value="3" />
+        <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+        <option name="EXTENDS_LIST_WRAP" value="1" />
+        <option name="FOR_BRACE_FORCE" value="3" />
+        <option name="FOR_STATEMENT_WRAP" value="1" />
+        <option name="IF_BRACE_FORCE" value="3" />
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <!--
+            <package name="" static="true" withSubpackages="true" />
+            <emptyLine />
+            <package name="" static="false" withSubpackages="true" />
+            -->
+            <package name="java" static="true" withSubpackages="true" />
+            <emptyLine />
+            <package name="javax" static="true" withSubpackages="true" />
+            <emptyLine />
+            <package name="org" static="true" withSubpackages="true" />
+            <emptyLine />
+            <package name="com" static="true" withSubpackages="true" />
+            <emptyLine />
+            <package name="" static="true" withSubpackages="true" />
+            <emptyLine />
+            <package name="java" static="false" withSubpackages="true" />
+            <emptyLine />
+            <package name="javax" static="false" withSubpackages="true" />
+            <emptyLine />
+            <package name="org" static="false" withSubpackages="true" />
+            <emptyLine />
+            <package name="com" static="false" withSubpackages="true" />
+            <emptyLine />
+            <package name="" static="false" withSubpackages="true" />
+          </value>
+        </option>
+        <GroovyCodeStyleSettings>
+          <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+          <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+          <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+            <value />
+          </option>
+          <option name="IMPORT_LAYOUT_TABLE">
+            <value>
+              <package name="" withSubpackages="true" static="true" />
+              <emptyLine />
+              <package name="" withSubpackages="true" static="false" />
+            </value>
+          </option>
+        </GroovyCodeStyleSettings>
+        <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+        <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+        <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+        <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+        <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+        <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+        <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+        <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+        <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+        <option name="METHOD_PARAMETERS_WRAP" value="1" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+        <option name="OTHER_INDENT_OPTIONS">
+          <value>
+            <option name="INDENT_SIZE" value="4" />
+            <option name="CONTINUATION_INDENT_SIZE" value="8" />
+            <option name="TAB_SIZE" value="4" />
+            <option name="USE_TAB_CHARACTER" value="false" />
+            <option name="SMART_TABS" value="false" />
+            <option name="LABEL_INDENT_SIZE" value="0" />
+            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
+          </value>
+         </option>
+        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+          <value />
+        </option>
+        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+        <option name="TERNARY_OPERATION_WRAP" value="1" />
+        <option name="THROWS_KEYWORD_WRAP" value="1" />
+        <option name="THROWS_LIST_WRAP" value="1" />
+        <option name="WHILE_BRACE_FORCE" value="3" />
+        <option name="WRAP_COMMENTS" value="true" />
+        <codeStyleSettings language="JAVA">
+          <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          </indentOptions>
+          <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+          <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+          <option name="BINARY_OPERATION_WRAP" value="1" />
+          <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="3" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="FOR_BRACE_FORCE" value="3" />
+          <option name="FOR_STATEMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="3" />
+          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+          <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+          <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+          <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+          <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+          <option name="METHOD_PARAMETERS_WRAP" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+          <option name="RESOURCE_LIST_WRAP" value="5" />
+          <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="TERNARY_OPERATION_WRAP" value="1" />
+          <option name="THROWS_KEYWORD_WRAP" value="1" />
+          <option name="THROWS_LIST_WRAP" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="3" />
+          <arrangement>
+            <rules>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <FINAL>true</FINAL>
+                      <PUBLIC>true</PUBLIC>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <FINAL>true</FINAL>
+                      <PROTECTED>true</PROTECTED>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <FINAL>true</FINAL>
+                      <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <FINAL>true</FINAL>
+                      <PRIVATE>true</PRIVATE>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <PUBLIC>true</PUBLIC>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <PROTECTED>true</PROTECTED>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <PRIVATE>true</PRIVATE>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <FINAL>true</FINAL>
+                      <PUBLIC>true</PUBLIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <FINAL>true</FINAL>
+                      <PROTECTED>true</PROTECTED>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <FINAL>true</FINAL>
+                      <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <FINAL>true</FINAL>
+                      <PRIVATE>true</PRIVATE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <PUBLIC>true</PUBLIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <PROTECTED>true</PROTECTED>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <FIELD>true</FIELD>
+                      <PRIVATE>true</PRIVATE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <FIELD>true</FIELD>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <CONSTRUCTOR>true</CONSTRUCTOR>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <METHOD>true</METHOD>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <METHOD>true</METHOD>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <ENUM>true</ENUM>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <INTERFACE>true</INTERFACE>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <CLASS>true</CLASS>
+                      <STATIC>true</STATIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <CLASS>true</CLASS>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <ABSTRACT>true</ABSTRACT>
+                      <METHOD>true</METHOD>
+                      <PUBLIC>true</PUBLIC>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <ABSTRACT>true</ABSTRACT>
+                      <METHOD>true</METHOD>
+                      <PROTECTED>true</PROTECTED>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <METHOD>true</METHOD>
+                      <PUBLIC>true</PUBLIC>
+                      <SYNCHRONIZED>true</SYNCHRONIZED>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <METHOD>true</METHOD>
+                      <PROTECTED>true</PROTECTED>
+                      <SYNCHRONIZED>true</SYNCHRONIZED>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <METHOD>true</METHOD>
+                      <PRIVATE>true</PRIVATE>
+                      <SYNCHRONIZED>true</SYNCHRONIZED>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+            </rules>
+          </arrangement>
+        </codeStyleSettings>
+        <codeStyleSettings language="Groovy">
+          <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+          <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+          <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
+          <option name="SPACE_WITHIN_BRACES" value="false" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="1" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="THROWS_LIST_WRAP" value="1" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="THROWS_KEYWORD_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="1" />
+          <option name="TERNARY_OPERATION_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="FOR_BRACE_FORCE" value="3" />
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
diff --git a/.gitignore b/.gitignore
index d7e4ffb4e8b..f769a9870ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,13 +6,14 @@ Thumbs.db
 *.swo
 *.swn
 *.log
-*.prefs
 *.class
 *.profile
 *.iml
 *.ipr
 *.iws
 fix-ivy.py
+.idea
+.checkstyle
 .classpath
 .ecbuild
 .settings/
@@ -22,6 +23,7 @@ docs/build/
 .gradle
 bin/
 userdict.txt
+.apt_generated/
 generated_src/
 generated_testSrc/
 .factorypath
diff --git a/README.md b/README.md
index 12a29b9b5d6..26186282f0e 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,6 @@
 See more at [http://palantir.github.io/atlasdb/](http://palantir.github.io/atlasdb/).
 
 We use [ZenHub](https://www.zenhub.io/) for tracking our work inside github.  If you would like to better understand our progress/priorities we recommend installing the browser plugin.
+
+## Contributing
+Please see our docs on [Contributing to AtlasDB](http://palantir.github.io/atlasdb/html/miscellaneous/contributing.html)
\ No newline at end of file
diff --git a/atlasdb-api/build.gradle b/atlasdb-api/build.gradle
index 99b9d3a65ed..6046b8e1f23 100644
--- a/atlasdb-api/build.gradle
+++ b/atlasdb-api/build.gradle
@@ -1,10 +1,25 @@
+apply plugin: 'org.inferred.processors'
+
 apply from: "../gradle/shared.gradle"
 
 dependencies {
   compile(project(":atlasdb-commons"))
+  compile(project(":timestamp-api"))
   compile 'javax.ws.rs:javax.ws.rs-api:2.0.1'
   compile 'org.apache.commons:commons-lang3:3.1'
   compile 'com.fasterxml.jackson.core:jackson-annotations:' + libVersions.jackson_annotation
+
+  processor 'org.immutables:value:2.0.21'
+  compile 'com.fasterxml.jackson.core:jackson-databind:' + libVersions.jackson
+  compile 'javax.validation:validation-api:1.1.0.Final'
+
+
+  testCompile(group: 'junit', name: 'junit', version: libVersions.junit) {
+    exclude group: 'org.hamcrest'
+  }
+
+  testCompile 'org.hamcrest:hamcrest-core:' + libVersions.hamcrest
+  testCompile 'org.hamcrest:hamcrest-library:' + libVersions.hamcrest
 }
 
 task versionInfo << {
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java
index 4fe86a94961..412b934ca68 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/cleaner/api/OnCleanupTask.java
@@ -40,7 +40,8 @@ public interface OnCleanupTask {
      * <p>
      * If the current transaction fills up this method should return true and it will be called
      * again with a fresh transaction.  This is useful if a large cleanup is needed.
-     * @return true if this method should be called again with a fresh transaction.
+     *
+     * @return true if this method should be called again with a fresh transaction
      */
-    boolean cellsCleanedUp(Transaction t, Set<Cell> cells);
+    boolean cellsCleanedUp(Transaction transaction, Set<Cell> cells);
 }
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java
similarity index 70%
rename from atlasdb-config/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java
rename to atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java
index 57d39a5b146..b53af7281dd 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LeaderConfig.java
@@ -22,6 +22,7 @@
 
 import org.immutables.value.Value;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
@@ -45,26 +46,41 @@ public File acceptorLogDir() {
 
     public abstract String localServer();
 
-    @Size(min=1)
+    @Size(min = 1)
     public abstract Set<String> leaders();
 
+    @JsonProperty("lockCreator")
+    @Value.Default
+    public String lockCreator() {
+        return leaders().stream()
+                .sorted()
+                .findFirst()
+                .orElseThrow(() -> new IllegalStateException("The leaders block cannot be empty"));
+    }
+
     @Value.Default
     public long pingRateMs() {
-        return 5000l;
+        return 5000L;
     }
 
     @Value.Default
     public long randomWaitBeforeProposingLeadershipMs() {
-        return 1000l;
+        return 1000L;
     }
 
     @Value.Default
     public long leaderPingResponseWaitMs() {
-        return 5000l;
+        return 5000L;
     }
 
     @Value.Check
     protected final void check() {
+        Preconditions.checkState(quorumSize() > leaders().size() / 2,
+                "The quorumSize '%s' must be over half the amount of leader entries %s.", quorumSize(), leaders());
+        Preconditions.checkState(leaders().size() >= quorumSize(),
+                "The quorumSize '%s' must be less than or equal to the amount of leader entries %s.",
+                quorumSize(), leaders());
+
         Preconditions.checkArgument(leaders().contains(localServer()),
                 "The localServer '%s' must included in the leader entries %s.", localServer(), leaders());
         Preconditions.checkArgument(learnerLogDir().exists() || learnerLogDir().mkdirs(),
@@ -73,4 +89,8 @@ protected final void check() {
                 "Acceptor log directory '%s' does not exist and cannot be created.", acceptorLogDir());
     }
 
+    @Value.Derived
+    public LockLeader whoIsTheLockLeader() {
+        return LockLeader.fromBoolean(lockCreator().equals(localServer()));
+    }
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LockLeader.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LockLeader.java
new file mode 100644
index 00000000000..b6d9a3896de
--- /dev/null
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/config/LockLeader.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.config;
+
+public enum LockLeader {
+    SOMEONE_ELSE_IS_THE_LOCK_LEADER,
+    I_AM_THE_LOCK_LEADER;
+
+    public static LockLeader fromBoolean(boolean isLockLeader) {
+        return isLockLeader ? LockLeader.I_AM_THE_LOCK_LEADER : LockLeader.SOMEONE_ELSE_IS_THE_LOCK_LEADER;
+    }
+}
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java
index 0706abcac4b..a387c9a452d 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/encoding/PtBytes.java
@@ -15,7 +15,8 @@
  */
 package com.palantir.atlasdb.encoding;
 
-import com.google.common.base.Charsets;
+import java.nio.charset.StandardCharsets;
+
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.cache.Cache;
@@ -67,56 +68,56 @@ public static byte[] toBytes(long val) {
     /**
      * Converts a string to a UTF-8 byte array.
      */
-    public static byte[] toBytes(String s) {
-        return s.getBytes(Charsets.UTF_8);
+    public static byte[] toBytes(String str) {
+        return str.getBytes(StandardCharsets.UTF_8);
     }
 
     /**
      * Converts a string to a UTF-8 byte array. This method will cache results and return cached
      * results, so the resulting byte arrays must not be modified.
      */
-    public static byte[] toCachedBytes(String s) {
-        byte[] bytes = cache.getIfPresent(s);
+    public static byte[] toCachedBytes(String str) {
+        byte[] bytes = cache.getIfPresent(str);
         if (bytes == null) {
-            bytes = toBytes(s);
-            cache.put(s, bytes);
+            bytes = toBytes(str);
+            cache.put(str, bytes);
         }
         return bytes;
     }
 
-    public static byte[] tail(final byte[] a, final int length) {
-        if (a.length < length) {
+    public static byte[] tail(final byte[] arr, final int length) {
+        if (arr.length < length) {
             return null;
         }
         byte[] result = new byte[length];
-        System.arraycopy(a, a.length - length, result, 0, length);
+        System.arraycopy(arr, arr.length - length, result, 0, length);
         return result;
     }
 
-    public static byte[] head(final byte[] a, final int length) {
-        if (a.length < length) {
+    public static byte[] head(final byte[] arr, final int length) {
+        if (arr.length < length) {
             return null;
         }
         byte[] result = new byte[length];
-        System.arraycopy(a, 0, result, 0, length);
+        System.arraycopy(arr, 0, result, 0, length);
         return result;
     }
 
-    public static String toString(final byte[] b) {
-        if (b == null) {
+    public static String toString(final byte[] arr) {
+        if (arr == null) {
             return null;
         }
-        return toString(b, 0, b.length);
+        return toString(arr, 0, arr.length);
     }
 
-    public static String toString(final byte[] b, int off, int len) {
-        if (b == null) {
+    public static String toString(final byte[] arr, int off, int len) {
+        if (arr == null) {
             return null;
         }
         if (len == 0) {
             return "";
         }
-        return new String(b, off, len, Charsets.UTF_8);
+        return new String(arr, off, len, StandardCharsets.UTF_8);
     }
 
     public static String encodeHexString(byte[] name) {
@@ -126,12 +127,7 @@ public static String encodeHexString(byte[] name) {
         return BaseEncoding.base16().lowerCase().encode(name);
     }
 
-    public static final Function<byte[], String> BYTES_TO_HEX_STRING = new Function<byte[], String>() {
-        @Override
-        public String apply(byte[] input) {
-            return encodeHexString(input);
-        }
-    };
+    public static final Function<byte[], String> BYTES_TO_HEX_STRING = PtBytes::encodeHexString;
 
     public static void addIfNotEmpty(MoreObjects.ToStringHelper helper, String name, byte[] bytes) {
         if (bytes != null && bytes.length > 0) {
@@ -167,7 +163,9 @@ public static boolean startsWith(byte[] bytes, byte[] prefix) {
     }
 
     /**
-     * @return 0 if equal, &lt; 0 if left is less than right, etc.
+     * Compare two byte arrays.
+     *
+     * @return 0 if equal, &lt; 0 if left is less than right, etc
      */
     public static int compareTo(final byte[] left, final byte[] right) {
         return UnsignedBytes.lexicographicalComparator().compare(left, right);
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java
index 7c156a2640a..1ff819f59c6 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Cell.java
@@ -59,7 +59,7 @@ public static Cell create(byte[] rowName, byte[] columnName, long ttlDuration, T
     }
 
     public static boolean isNameValid(byte[] name) {
-        return name != null && name.length >0 && name.length <= MAX_NAME_LENGTH;
+        return name != null && name.length > 0 && name.length <= MAX_NAME_LENGTH;
     }
 
     public static void validateNameValid(byte[] name) {
@@ -116,18 +116,15 @@ private static long safeTimeConvert(long ttl, TimeUnit ttlUnit) {
         }
     }
 
-    public static final Function<Cell, Boolean> IS_EXPIRING = new Function<Cell, Boolean>() {
-        @Override
-        public Boolean apply(Cell from) {
-            return from.getTtlDurationMillis() != INVALID_TTL;
-        }
-    };
+    public static final Function<Cell, Boolean> IS_EXPIRING = from -> from.getTtlDurationMillis() != INVALID_TTL;
 
     @Override
-    public int compareTo(Cell o) {
-        int cmp = UnsignedBytes.lexicographicalComparator().compare(rowName, o.rowName);
-        if (cmp != 0) { return cmp; }
-        return UnsignedBytes.lexicographicalComparator().compare(columnName, o.columnName);
+    public int compareTo(Cell other) {
+        int cmp = UnsignedBytes.lexicographicalComparator().compare(rowName, other.rowName);
+        if (cmp != 0) {
+            return cmp;
+        }
+        return UnsignedBytes.lexicographicalComparator().compare(columnName, other.columnName);
     }
 
     @Override
@@ -135,7 +132,7 @@ public boolean equals(Object obj) {
         if (!(obj instanceof Cell)) {
             return false;
         }
-        Cell other = (Cell)obj;
+        Cell other = (Cell) obj;
         return Arrays.equals(rowName, other.rowName)
                 && Arrays.equals(columnName, other.columnName);
     }
@@ -158,7 +155,7 @@ public String toString() {
         return MoreObjects.toStringHelper(getClass())
                 .add("rowName", PtBytes.encodeHexString(rowName))
                 .add("columnName", PtBytes.encodeHexString(columnName))
-                .addValue(((ttlDurationMillis == INVALID_TTL) ? "no TTL" : "ttlDurationMillis=" + ttlDurationMillis))
+                .addValue((ttlDurationMillis == INVALID_TTL) ? "no TTL" : "ttlDurationMillis=" + ttlDurationMillis)
                 .toString();
     }
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java
new file mode 100644
index 00000000000..bbe7285afdf
--- /dev/null
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelection.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.api;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Joiner;
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.encoding.PtBytes;
+
+public class ColumnRangeSelection implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    // Inclusive start column name.
+    private final byte[] startCol;
+    // Exclusive end column name.
+    private final byte[] endCol;
+    private final int batchHint;
+
+    @JsonCreator
+    public ColumnRangeSelection(@JsonProperty("startInclusive") byte[] startCol,
+                                @JsonProperty("endExclusive") byte[] endCol,
+                                @JsonProperty("batchHint") int batchHint) {
+        this.startCol = MoreObjects.firstNonNull(startCol, PtBytes.EMPTY_BYTE_ARRAY);
+        this.endCol = MoreObjects.firstNonNull(endCol, PtBytes.EMPTY_BYTE_ARRAY);
+        this.batchHint = batchHint;
+    }
+
+    public byte[] getStartCol() {
+        return startCol;
+    }
+
+    public byte[] getEndCol() {
+        return endCol;
+    }
+
+    public int getBatchHint() {
+        return batchHint;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        ColumnRangeSelection that = (ColumnRangeSelection) obj;
+        return batchHint == that.batchHint
+                && Arrays.equals(startCol, that.startCol)
+                && Arrays.equals(endCol, that.endCol);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(Arrays.hashCode(startCol), Arrays.hashCode(endCol), batchHint);
+    }
+
+    private static final Pattern deserializeRegex = Pattern.compile("\\s*,\\s*");
+
+    public static ColumnRangeSelection valueOf(String serialized) {
+        String[] split = deserializeRegex.split(serialized);
+        byte[] startCol = PtBytes.decodeBase64(split[0]);
+        byte[] endCol = PtBytes.decodeBase64(split[1]);
+        int batchHint = Integer.parseInt(split[2]);
+        return new ColumnRangeSelection(startCol, endCol, batchHint);
+    }
+
+    @Override
+    public String toString() {
+        String start = PtBytes.encodeBase64String(startCol);
+        String end = PtBytes.encodeBase64String(endCol);
+        String batch = String.valueOf(batchHint);
+        return Joiner.on(',').join(ImmutableList.of(start, end, batch));
+    }
+}
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java
new file mode 100644
index 00000000000..7e8b2c495fd
--- /dev/null
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnRangeSelections.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.api;
+
+import java.io.Serializable;
+
+import com.google.common.base.Preconditions;
+import com.palantir.common.persist.Persistable;
+
+public final class ColumnRangeSelections implements Serializable {
+    private ColumnRangeSelections() {
+        // Utility class
+    }
+
+    public static ColumnRangeSelection createPrefixRange(byte[] prefix, int batchSize) {
+        byte[] startCol = Preconditions.checkNotNull(prefix, "prefix cannot be null").clone();
+        byte[] endCol = RangeRequests.createEndNameForPrefixScan(prefix);
+        return new ColumnRangeSelection(startCol, endCol, batchSize);
+    }
+
+    public static ColumnRangeSelection createPrefixRange(Persistable persistable, int batchSize) {
+        return createPrefixRange(persistable.persistToBytes(), batchSize);
+    }
+}
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java
index 335249be441..0ce6d6f6c33 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ColumnSelection.java
@@ -21,7 +21,6 @@
 import java.util.Set;
 import java.util.SortedSet;
 
-import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSortedSet;
@@ -30,7 +29,7 @@
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.encoding.PtBytes;
 
-public class ColumnSelection implements Serializable {
+public final class ColumnSelection implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private static final ColumnSelection allColumnsSelected = new ColumnSelection(null);
@@ -44,12 +43,12 @@ private ColumnSelection(SortedSet<byte[]> selectedColumns) {
 
     public static ColumnSelection valueOf(String serialized) {
         Set<byte[]> columns = Sets.newTreeSet(UnsignedBytes.lexicographicalComparator());
-        for (String strColumn : serialized.split("\\s*,\\s*")) {
-            strColumn = strColumn.trim();
-            if (strColumn.equals("")) {
+        for (String columnString : serialized.split("\\s*,\\s*")) {
+            String trimmedColumnString = columnString.trim();
+            if (trimmedColumnString.isEmpty()) {
                 continue;
             }
-            byte[] column = PtBytes.decodeBase64(strColumn);
+            byte[] column = PtBytes.decodeBase64(trimmedColumnString);
             assert !columns.contains(column);
             columns.add(column);
         }
@@ -64,13 +63,8 @@ public String toString() {
         if (selectedColumns == null) {
             return "";
         }
-        return Joiner.on(',').join(Iterables.transform(selectedColumns, new Function<byte[], String>() {
-            @Override
-            public String apply(byte[] input) {
-                return PtBytes.encodeBase64String(input);
-            }
-        }));
-    };
+        return Joiner.on(',').join(Iterables.transform(selectedColumns, PtBytes::encodeBase64String));
+    }
 
     // Factory methods.
     public static ColumnSelection all() {
@@ -78,19 +72,18 @@ public static ColumnSelection all() {
     }
 
     public static ColumnSelection create(Iterable<byte[]> selectedColumns) {
-        if (Iterables.isEmpty(Preconditions.checkNotNull(selectedColumns))) {
+        if (Iterables.isEmpty(Preconditions.checkNotNull(selectedColumns, "selectedColumns cannot be null"))) {
             return allColumnsSelected;
         }
 
         // Copy contents of 'selectedColumns' into a new set with proper deep comparison semantics.
-        return new ColumnSelection(ImmutableSortedSet.copyOf(UnsignedBytes.lexicographicalComparator(), selectedColumns));
+        return new ColumnSelection(ImmutableSortedSet.copyOf(
+                UnsignedBytes.lexicographicalComparator(),
+                selectedColumns));
     }
 
     public boolean contains(byte[] column) {
-        if (selectedColumns == null) {
-            return true;
-        }
-        return selectedColumns.contains(column);
+        return selectedColumns == null || selectedColumns.contains(column);
     }
 
     // allColumnsSelected() returns true if all columns are selected.  getSelectedColumns() should
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ExpiringKeyValueService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ExpiringKeyValueService.java
index cf8723f9b22..6d1486ed6b1 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ExpiringKeyValueService.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/ExpiringKeyValueService.java
@@ -27,23 +27,39 @@
  *
  * Contract with the user:
  * - This is for space and deletion time savings only.
- * - This does not fulfill the same goals/legal requirements as hard delete for sensitive data. (though data written by this service can itself be deleted by normal hard delete routines)
- * - // todo Only tables marked with 'AllowsSelfExpiringData' in their schema may use these features
+ * - This does not fulfill the same goals/legal requirements as hard delete for sensitive data.
+ *   (though data written by this service can itself be deleted by normal hard delete routines)
+ * - // TODO: Only tables marked with 'AllowsSelfExpiringData' in their schema may use these features
  *
- * - Normal atlasdb guarantees may be broken. Data written with expiration times are:
+ * - Normal AtlasDB guarantees may be broken. Data written with expiration times are:
  * 1. not guaranteed to expire atomically with the entire row or at any other level of granularity
- * 2. not guaranteed to exist at any time after being written (as this feature implicitly requires distributed wall clock time)
+ * 2. not guaranteed to exist at any time after being written (as this feature implicitly
+ *    requires distributed wall clock time)
  * 3. not guaranteed to be deleted after the specified expiration time
  *
- * That said, points #2 and #3 are attempted on a best-effort basis and should work adequately with synchronized cluster clocks and expiration durations generously outside what is strictly necessary for the application.
+ * That said, points #2 and #3 are attempted on a best-effort basis and should work adequately with synchronized
+ * cluster clocks and expiration durations generously outside what is strictly necessary for the application.
  *
  * @author clockfort
  *
  */
 public interface ExpiringKeyValueService extends KeyValueService {
+    void multiPut(
+            Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable,
+            long timestamp,
+            long time,
+            TimeUnit unit) throws KeyAlreadyExistsException;
 
-    public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable, final long timestamp, final long time, final TimeUnit unit) throws KeyAlreadyExistsException;
-    public void put(final TableReference tableRef, final Map<Cell, byte[]> values, final long timestamp, final long time, final TimeUnit unit);
-    public void putWithTimestamps(TableReference tableRef, Multimap<Cell, Value> values, final long time, final TimeUnit unit);
+    void put(
+            TableReference tableRef,
+            Map<Cell, byte[]> values,
+            long timestamp,
+            long time,
+            TimeUnit unit);
 
+    void putWithTimestamps(
+            TableReference tableRef,
+            Multimap<Cell, Value> values,
+            long time,
+            TimeUnit unit);
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/InsufficientConsistencyException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/InsufficientConsistencyException.java
index c99594fae50..dc076cdd007 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/InsufficientConsistencyException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/InsufficientConsistencyException.java
@@ -28,7 +28,7 @@ public InsufficientConsistencyException(String msg) {
         super(msg);
     }
 
-    public InsufficientConsistencyException(String msg, Throwable t) {
-        super(msg, t);
+    public InsufficientConsistencyException(String msg, Throwable ex) {
+        super(msg, ex);
     }
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java
index c392c32f04f..03332eb9a7e 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyAlreadyExistsException.java
@@ -25,16 +25,16 @@ public class KeyAlreadyExistsException extends PalantirRuntimeException {
 
     private final ImmutableList<Cell> existingKeys;
 
-    public KeyAlreadyExistsException(String msg, Throwable n) {
-        this(msg, n, ImmutableList.<Cell>of());
+    public KeyAlreadyExistsException(String msg, Throwable ex) {
+        this(msg, ex, ImmutableList.of());
     }
 
     public KeyAlreadyExistsException(String msg) {
-        this(msg, ImmutableList.<Cell>of());
+        this(msg, ImmutableList.of());
     }
 
-    public KeyAlreadyExistsException(String msg, Throwable n, Iterable<Cell> keys) {
-        super(msg, n);
+    public KeyAlreadyExistsException(String msg, Throwable ex, Iterable<Cell> keys) {
+        super(msg, ex);
         existingKeys = ImmutableList.copyOf(keys);
     }
 
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java
index 006137bf588..f4c41bc40ce 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/KeyValueService.java
@@ -100,6 +100,17 @@ Map<Cell, Value> getRows(@QueryParam("tableRef") TableReference tableRef,
                              @QueryParam("columnSelection") ColumnSelection columnSelection,
                              @QueryParam("timestamp") long timestamp);
 
+    @POST
+    @Path("get-rows-col-range")
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Idempotent
+    Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            @QueryParam("tableRef") TableReference tableRef,
+            Iterable<byte[]> rows,
+            @QueryParam("columnRangeSelection") ColumnRangeSelection columnRangeSelection,
+            @QueryParam("timestamp") long timestamp);
+
     /**
      * Gets values from the key-value store.
      *
@@ -153,7 +164,7 @@ Map<Cell, Long> getLatestTimestamps(@QueryParam("tableRef") TableReference table
      * try {@link #delete(TableReference, Multimap)}.
      * <p>
      * May throw KeyAlreadyExistsException, if storing a different value to existing key,
-     * but this is not guaranteed even if the key exists - see {@link putUnlessExists}.
+     * but this is not guaranteed even if the key exists - see {@link #putUnlessExists}}.
      * <p>
      * Must not throw KeyAlreadyExistsException when overwriting a cell with the original value (idempotent).
      *  @param tableRef the name of the table to put values into.
@@ -181,7 +192,7 @@ void put(@QueryParam("tableRef") TableReference tableRef,
      * try {@link #delete(TableReference, Multimap)}.
      * <p>
      * May throw KeyAlreadyExistsException, if storing a different value to existing key,
-     * but this is not guaranteed even if the key exists - see {@link putUnlessExists}.
+     * but this is not guaranteed even if the key exists - see {@link #putUnlessExists}.
      * <p>
      * Must not throw KeyAlreadyExistsException when overwriting a cell with the original value (idempotent).
      *  @param valuesByTable map containing the key-value entries to put by table.
@@ -210,7 +221,7 @@ void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable,
      * try {@link #delete(TableReference, Multimap)}.
      * <p>
      * May throw KeyAlreadyExistsException, if storing a different value to existing key,
-     * but this is not guaranteed even if the key exists - see {@link putUnlessExists}.
+     * but this is not guaranteed even if the key exists - see {@link #putUnlessExists}.
      * <p>
      * Must not throw KeyAlreadyExistsException when overwriting a cell with the original value (idempotent).
      *  @param tableRef the name of the table to put values into.
@@ -236,7 +247,8 @@ void putWithTimestamps(@QueryParam("tableRef") TableReference tableRef,
      * <p>
      * If the call completes successfully then you know that your value was written and no other value was written
      * first.  If a {@link KeyAlreadyExistsException} is thrown it may be because the underlying call did a retry and
-     * your value was actually put successfully.  It is recommended that you check the stored value to account for this case.
+     * your value was actually put successfully.  It is recommended that you check the stored value to account
+     * for this case.
      * <p>
      * Retry should be done by the underlying implementation to ensure that other exceptions besides
      * {@link KeyAlreadyExistsException} are not thrown spuriously.
@@ -316,7 +328,6 @@ void putUnlessExists(@QueryParam("tableRef") TableReference tableRef,
      * timestamp.
      *
      * Remember to close any {@link ClosableIterator}s you get in a finally block.
-     *  @param tableRef
      * @param rangeRequest the range to load.
      * @param timestamp specifies the maximum timestamp (exclusive) at which to retrieve each rows's
      */
@@ -336,7 +347,6 @@ ClosableIterator<RowResult<Value>> getRange(@QueryParam("tableRef") TableReferen
      * This has the same consistency guarantees that {@link #getRangeOfTimestamps(TableReference, RangeRequest, long)}.
      * <p>
      * Remember to close any {@link ClosableIterator}s you get in a finally block.
-     *  @param tableRef
      * @param rangeRequest the range to load.
      * @param timestamp specifies the maximum timestamp (exclusive) at which to
      */
@@ -370,9 +380,10 @@ ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(@QueryParam("tableRe
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
     @Idempotent
-    ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(@QueryParam("tableRef") TableReference tableRef,
-                                                                RangeRequest rangeRequest,
-                                                                @QueryParam("timestamp") long timestamp) throws InsufficientConsistencyException;
+    ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(
+            @QueryParam("tableRef") TableReference tableRef,
+            RangeRequest rangeRequest,
+            @QueryParam("timestamp") long timestamp) throws InsufficientConsistencyException;
 
     /**
      * For each range passed in the result will have the first page of results for that range.
@@ -395,7 +406,8 @@ ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(@QueryParam("tableRe
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
     @Idempotent
-    Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(@QueryParam("tableRef") TableReference tableRef,
+    Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            @QueryParam("tableRef") TableReference tableRef,
             Iterable<RangeRequest> rangeRequests,
             @QueryParam("timestamp") long timestamp);
 
@@ -405,7 +417,6 @@ Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirs
 
     /**
      * Drop the table, and also delete its table metadata.
-     * @param tableRef
      */
     @DELETE
     @Path("drop-table")
@@ -419,8 +430,6 @@ Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirs
      * Drops many tables in idempotent fashion. If you are dropping many tables at once,
      * use this call as the implementation can be much faster/less error-prone on some KVSs.
      * Also deletes corresponding table metadata.
-     *
-     * @param tableRefs
      */
     @DELETE
     @Path("drop-tables")
@@ -432,21 +441,18 @@ Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirs
     /**
      * Creates a table with the specified name. If the table already exists, no action is performed
      * (the table is left in its current state).
-     *  @param tableRef
-     * @param tableMetadata
      */
     @POST
     @Path("create-table")
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
     @Idempotent
-    void createTable(@QueryParam("tableRef") TableReference tableRef, byte[] tableMetadata) throws InsufficientConsistencyException;
+    void createTable(@QueryParam("tableRef") TableReference tableRef, byte[] tableMetadata)
+            throws InsufficientConsistencyException;
 
     /**
      * Creates many tables in idempotent fashion. If you are making many tables at once,
      * use this call as the implementation can be much faster/less error-prone on some KVSs.
-     *
-     * @param tableRefToTableMetadata
      */
     @POST
     @Path("create-tables")
@@ -473,7 +479,6 @@ Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirs
      *
      * @return a byte array representing the metadata for the table. Array is empty if no table
      * with the given name exists. Consider {@link TableMetadata#BYTES_HYDRATOR} for hydrating.
-     * @param tableRef
      */
     @Idempotent
     @POST
@@ -545,7 +550,6 @@ Multimap<Cell, Long> getAllTimestamps(@QueryParam("tableName") TableReference ta
      * deletions are performed.
      *
      * This call must be implemented so that it completes synchronously.
-     * @param tableRef
      */
     @POST
     @Path("compact-internally")
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java
index 468497add9b..8f3395ff243 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Namespace.java
@@ -33,14 +33,14 @@ public final class Namespace {
      * <p>
      * This will not protect you from creating namespace that are incompatible with your underlying datastore.
      * <p>
-     * Use {@link Namespace.LOOSELY_CHECKED_NAME} or {@link Namespace.STRICTLY_CHECKED_NAME} if possible.
+     * Use {@link Namespace#LOOSELY_CHECKED_NAME} or {@link Namespace#STRICTLY_CHECKED_NAME} if possible.
      */
     public static final Pattern UNCHECKED_NAME = Pattern.compile("^[^\\.\\s]+$");
 
     /**
      * Less restrictive name pattern (letters, numbers, underscores, and hyphens).
      * <p>
-     * Use {@link Namespace.STRICTLY_CHECKED_NAME} if possible.
+     * Use {@link Namespace#STRICTLY_CHECKED_NAME} if possible.
      */
     public static final Pattern LOOSELY_CHECKED_NAME = Pattern.compile("^[\\w-]+$");
 
@@ -55,10 +55,11 @@ public static Namespace create(String name) {
         return create(name, STRICTLY_CHECKED_NAME);
     }
 
-    public static Namespace create(String name, Pattern p) {
+    public static Namespace create(String name, Pattern pattern) {
         Validate.notEmpty(name, "namespace name cannot be empty (see Namespace.EMPTY_NAMESPACE instead).");
         Validate.isTrue(!name.contains("."), "namespace cannot contain dots (atlas reserved).");
-        Validate.isTrue(p.matcher(name).matches(), "'" + name + "' does not match namespace pattern '" + p + "'.");
+        Validate.isTrue(pattern.matcher(name).matches(),
+                "'" + name + "' does not match namespace pattern '" + pattern + "'.");
         return new Namespace(name);
     }
 
@@ -69,7 +70,7 @@ private Namespace(@JsonProperty("name") String name) {
 
     @JsonIgnore
     public boolean isEmptyNamespace() {
-        return this == EMPTY_NAMESPACE;
+        return this.equals(EMPTY_NAMESPACE);
     }
 
     public String getName() {
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java
index 34dbdd721d5..06aca4b6649 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Prefix.java
@@ -28,7 +28,7 @@ public class Prefix {
     private final byte[] bytes;
 
     public Prefix(byte[] bytes) {
-        this.bytes = Preconditions.checkNotNull(bytes).clone();
+        this.bytes = Preconditions.checkNotNull(bytes, "bytes cannot be null").clone();
     }
 
     @Nonnull
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java
index b361ce42571..bd0983411d2 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequest.java
@@ -17,6 +17,7 @@
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Set;
 import java.util.SortedSet;
 
@@ -50,7 +51,8 @@
  * To restrict the rows or columns,  call
  * the methods on the <code>RangeRequest</code> class.
  */
-@Immutable public final class RangeRequest implements Serializable {
+@Immutable
+public final class RangeRequest implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private final byte[] startInclusive;
@@ -69,14 +71,14 @@ public static Builder builder() {
         return new Builder(false);
     }
 
-    public static Builder reverseBuilder() {
-        return new Builder(true);
-    }
-
     public static Builder builder(boolean reverse) {
         return new Builder(reverse);
     }
 
+    public static Builder reverseBuilder() {
+        return new Builder(true);
+    }
+
     public static RangeRequest all() {
         return builder().build();
     }
@@ -149,11 +151,15 @@ public boolean inRange(byte[] position) {
         final boolean afterStart;
         final boolean afterEnd;
         if (reverse) {
-            afterStart = getStartInclusive().length == 0 || UnsignedBytes.lexicographicalComparator().compare(getStartInclusive(), position) >= 0;
-            afterEnd = getEndExclusive().length == 0 || UnsignedBytes.lexicographicalComparator().compare(getEndExclusive(), position) < 0;
+            afterStart = getStartInclusive().length == 0
+                    || UnsignedBytes.lexicographicalComparator().compare(getStartInclusive(), position) >= 0;
+            afterEnd = getEndExclusive().length == 0
+                    || UnsignedBytes.lexicographicalComparator().compare(getEndExclusive(), position) < 0;
         } else {
-            afterStart = getStartInclusive().length == 0 || UnsignedBytes.lexicographicalComparator().compare(getStartInclusive(), position) <= 0;
-            afterEnd = getEndExclusive().length == 0 || UnsignedBytes.lexicographicalComparator().compare(getEndExclusive(), position) > 0;
+            afterStart = getStartInclusive().length == 0
+                    || UnsignedBytes.lexicographicalComparator().compare(getStartInclusive(), position) <= 0;
+            afterEnd = getEndExclusive().length == 0
+                    || UnsignedBytes.lexicographicalComparator().compare(getEndExclusive(), position) > 0;
         }
 
         return afterStart && afterEnd;
@@ -183,13 +189,31 @@ public String toString() {
         PtBytes.addIfNotEmpty(helper, "startInclusive", startInclusive);
         PtBytes.addIfNotEmpty(helper, "endExclusive", endExclusive);
         if (columns != null && !columns.isEmpty()) {
-            helper.add("columns", FluentIterable.from(columns).filter(Predicates.notNull()).transform(PtBytes.BYTES_TO_HEX_STRING));
+            helper.add("columns", FluentIterable.from(columns)
+                    .filter(Predicates.notNull())
+                    .transform(PtBytes.BYTES_TO_HEX_STRING));
         }
         helper.add("batchHint", batchHint);
         helper.add("reverse", reverse);
         return helper.toString();
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        RangeRequest that = (RangeRequest) obj;
+        return reverse == that.reverse
+                && Arrays.equals(startInclusive, that.startInclusive)
+                && Arrays.equals(endExclusive, that.endExclusive)
+                && Objects.equals(columns, that.columns)
+                && Objects.equals(batchHint, that.batchHint);
+    }
+
     @Override
     public int hashCode() {
         /*
@@ -198,48 +222,19 @@ public int hashCode() {
          * allow for benign data races.
          */
         if (hashCode == 0) {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((batchHint == null) ? 0 : batchHint.hashCode());
-            result = prime * result + ((columns == null) ? 0 : columns.hashCode());
-            result = prime * result + Arrays.hashCode(endExclusive);
-            result = prime * result + (reverse ? 1231 : 1237);
-            result = prime * result + Arrays.hashCode(startInclusive);
-            hashCode = result;
+            hashCode = Objects.hash(
+                    Arrays.hashCode(startInclusive),
+                    Arrays.hashCode(endExclusive),
+                    columns,
+                    batchHint,
+                    reverse);
         }
         return hashCode;
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        RangeRequest other = (RangeRequest) obj;
-        if (batchHint == null) {
-            if (other.batchHint != null)
-                return false;
-        } else if (!batchHint.equals(other.batchHint))
-            return false;
-        if (columns == null) {
-            if (other.columns != null)
-                return false;
-        } else if (!columns.equals(other.columns))
-            return false;
-        if (!Arrays.equals(endExclusive, other.endExclusive))
-            return false;
-        if (reverse != other.reverse)
-            return false;
-        if (!Arrays.equals(startInclusive, other.startInclusive))
-            return false;
-        return true;
-    }
-
     private static ImmutableSortedSet<byte[]> cloneSet(Iterable<byte[]> set) {
-        ImmutableSortedSet.Builder<byte[]> builder = ImmutableSortedSet.orderedBy(UnsignedBytes.lexicographicalComparator());
+        ImmutableSortedSet.Builder<byte[]> builder =
+                ImmutableSortedSet.orderedBy(UnsignedBytes.lexicographicalComparator());
         for (byte[] col : set) {
             builder.add(col.clone());
         }
@@ -253,13 +248,15 @@ private static ImmutableSortedSet<byte[]> cloneSet(Iterable<byte[]> set) {
      * start will be on the left hand side and will be greater lexicographically
      */
     private static Pair<byte[], byte[]> createNamesForReversePrefixScan(@Nonnull byte[] name) {
-        Preconditions.checkArgument(Preconditions.checkNotNull(name).length <= Cell.MAX_NAME_LENGTH, "name is too long");
+        Preconditions.checkNotNull(name, "name cannot be null");
+        Preconditions.checkArgument(name.length <= Cell.MAX_NAME_LENGTH, "name is too long");
+
         if (name.length == 0) {
             return Pair.create(name, name);
         }
         byte[] startName = new byte[Cell.MAX_NAME_LENGTH];
         System.arraycopy(name, 0, startName, 0, name.length);
-        for (int i = name.length ; i < startName.length ; i++) {
+        for (int i = name.length; i < startName.length; i++) {
             startName[i] = (byte) 0xff;
         }
         byte[] endName = RangeRequests.previousLexicographicName(name);
@@ -292,19 +289,22 @@ public boolean isReverse() {
          * This will set the start and the end to get all rows that have a given prefix.
          */
         public Builder prefixRange(byte[] prefix) {
+            Preconditions.checkNotNull(prefix, "prefix cannot be null");
+
             if (reverse) {
                 Pair<byte[], byte[]> pair = createNamesForReversePrefixScan(prefix);
                 this.startInclusive = pair.lhSide;
                 this.endExclusive = pair.rhSide;
             } else {
-                this.startInclusive = Preconditions.checkNotNull(prefix).clone();
+                this.startInclusive = prefix.clone();
                 this.endExclusive = RangeRequests.createEndNameForPrefixScan(prefix);
             }
+
             return this;
         }
 
         public Builder startRowInclusive(byte[] start) {
-            this.startInclusive = Preconditions.checkNotNull(start).clone();
+            this.startInclusive = Preconditions.checkNotNull(start, "start cannot be null").clone();
             return this;
         }
 
@@ -317,7 +317,7 @@ public Builder startRowInclusive(Persistable start) {
         }
 
         public Builder endRowExclusive(byte[] end) {
-            this.endExclusive = Preconditions.checkNotNull(end).clone();
+            this.endExclusive = Preconditions.checkNotNull(end, "end cannot be null").clone();
             return this;
         }
 
@@ -346,7 +346,8 @@ public Builder retainColumns(ColumnSelection selection) {
          * read a lot from this range, then this should be pretty large for performance.  If we are only going to read
          * the first thing in a range, then this should be set to 1.
          * <p>
-         * If hint is null then the range will use the default. Usually for {@link Transaction#getRange(TableReference, RangeRequest)}
+         * If hint is null then the range will use the default. Usually for
+         * {@link Transaction#getRange(TableReference, RangeRequest)}
          * this means the batch size will be whatever is passed as the batch size to
          * BatchingVisitable#batchAccept(int, com.palantir.common.base.AbortingVisitor)
          */
@@ -370,7 +371,8 @@ public boolean isInvalidRange() {
         public RangeRequest build() {
             RangeRequest rangeRequest = new RangeRequest(startInclusive, endExclusive, columns, batchHint, reverse);
             if (isInvalidRange()) {
-                throw new IllegalArgumentException("Invalid range request, check row byte ordering for reverse ordered values: " + rangeRequest);
+                throw new IllegalArgumentException(
+                        "Invalid range request, check row byte ordering for reverse ordered values: " + rangeRequest);
             }
             return rangeRequest;
         }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java
index d080239a1d4..a068979da63 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RangeRequests.java
@@ -20,7 +20,10 @@
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.encoding.PtBytes;
 
-public class RangeRequests {
+public final class RangeRequests {
+    private RangeRequests() {
+        // Utility class
+    }
 
     /**
      * This will return the first byte[] less than the given byte[] lexicographically.
@@ -33,15 +36,15 @@ public class RangeRequests {
     public static byte[] previousLexicographicName(@Nonnull byte[] name) {
         Preconditions.checkArgument(name.length <= Cell.MAX_NAME_LENGTH, "name is too long");
         Preconditions.checkArgument(name.length > 0, "name is empty");
-        if (name[name.length-1] == 0) {
-            byte[] ret = new byte[name.length-1];
+        if (name[name.length - 1] == 0) {
+            byte[] ret = new byte[name.length - 1];
             System.arraycopy(name, 0, ret, 0, ret.length);
             return ret;
         }
         byte[] ret = new byte[Cell.MAX_NAME_LENGTH];
         System.arraycopy(name, 0, ret, 0, name.length);
-        ret[name.length-1]--;
-        for (int i = name.length ; i < ret.length ; i++) {
+        ret[name.length - 1]--;
+        for (int i = name.length; i < ret.length; i++) {
             ret[i] = (byte) 0xff;
         }
         return ret;
@@ -54,11 +57,13 @@ public static byte[] previousLexicographicName(@Nonnull byte[] name) {
      * @param rowName must be non-null
      */
     public static byte[] createEndNameForPrefixScan(@Nonnull byte[] rowName) {
-        Preconditions.checkArgument(Preconditions.checkNotNull(rowName).length <= Cell.MAX_NAME_LENGTH, "name is too long");
-        for (int i = rowName.length-1 ; i >= 0 ; i--) {
+        Preconditions.checkNotNull(rowName, "name cannot be null");
+        Preconditions.checkArgument(rowName.length <= Cell.MAX_NAME_LENGTH, "name is too long");
+
+        for (int i = rowName.length - 1; i >= 0; i--) {
             if ((rowName[i] & 0xff) != 0xff) {
-                byte[] ret = new byte[i+1];
-                System.arraycopy(rowName, 0, ret, 0, i+1);
+                byte[] ret = new byte[i + 1];
+                System.arraycopy(rowName, 0, ret, 0, i + 1);
                 ret[i]++;
                 return ret;
             }
@@ -75,7 +80,8 @@ public static byte[] nextLexicographicName(@Nonnull byte[] name) {
         return ret;
     }
 
-    final static byte[] ONE_AFTER_MAXIMUM_NAME;
+    static final byte[] ONE_AFTER_MAXIMUM_NAME;
+
     static {
         ONE_AFTER_MAXIMUM_NAME = new byte[Cell.MAX_NAME_LENGTH + 1];
         for (int i = 0; i < Cell.MAX_NAME_LENGTH; ++i) {
@@ -90,8 +96,6 @@ public static byte[] oneAfterMaximumName() {
 
     /**
      * This is a replacement for endRow when doing a non-reverse range request.
-     * @param rangeRequest
-     * @return
      */
     public static byte[] endRowExclusiveOrOneAfterMax(RangeRequest rangeRequest) {
         Preconditions.checkArgument(!rangeRequest.isReverse());
@@ -103,8 +107,6 @@ public static byte[] endRowExclusiveOrOneAfterMax(RangeRequest rangeRequest) {
 
     /**
      * This is a replacement for startRow when doing reverse range request.
-     * @param rangeRequest
-     * @return
      */
     public static byte[] startRowInclusiveOrLargestRow(RangeRequest rangeRequest) {
         Preconditions.checkArgument(rangeRequest.isReverse());
@@ -124,15 +126,15 @@ public static ColumnSelection extractColumnSelection(RangeRequest rangeRequest)
     private static byte[] nextLexicographicNameInternal(@Nonnull byte[] name) {
         Preconditions.checkArgument(name.length <= Cell.MAX_NAME_LENGTH, "name is too long");
         if (name.length < Cell.MAX_NAME_LENGTH) {
-            byte[] ret = new byte[name.length+1];
+            byte[] ret = new byte[name.length + 1];
             System.arraycopy(name, 0, ret, 0, name.length);
             ret[name.length] = (byte) 0;
             return ret;
         } else {
-            for (int i = name.length-1 ; i >= 0 ; i--) {
+            for (int i = name.length - 1; i >= 0; i--) {
                 if ((name[i] & 0xff) != 0xff) {
-                    byte[] ret = new byte[i+1];
-                    System.arraycopy(name, 0, ret, 0, i+1);
+                    byte[] ret = new byte[i + 1];
+                    System.arraycopy(name, 0, ret, 0, i + 1);
                     ret[i]++;
                     return ret;
                 }
@@ -147,7 +149,7 @@ public static byte[] getFirstRowName() {
 
     public static byte[] getLastRowName() {
         byte[] ret = new byte[Cell.MAX_NAME_LENGTH];
-        for (int i = 0 ; i < ret.length ; i++) {
+        for (int i = 0; i < ret.length; i++) {
             ret[i] = (byte) 0xff;
         }
         return ret;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/ClearStyle.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowColumnRangeIterator.java
similarity index 57%
rename from commons-db/src/main/java/com/palantir/nexus/db/sql/ClearStyle.java
rename to atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowColumnRangeIterator.java
index 65290d8ff4a..d9fbfae4006 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/ClearStyle.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowColumnRangeIterator.java
@@ -13,23 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.palantir.nexus.db.sql;
+package com.palantir.atlasdb.keyvalue.api;
 
-/**
- * Enumerates methods for clearing SQL tables.
- */
-enum ClearStyle {
-    /**
-     * Clear tables using TRUNCATE. Experts-only.
-     *
-     * NOTE: the semantics for executing a TRUNCATE TABLE statement within a
-     * transaction are vendor-specific. You must exercise caution when using
-     * this option!
-     */
-    TRUNCATE,
+import java.util.Iterator;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
-    /**
-     * Clear tables using DELETE. Always safe.
-     */
-    DELETE
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "@class")
+public interface RowColumnRangeIterator extends Iterator<Map.Entry<Cell, Value>> {
+    //
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java
index 6ad34f43d63..b9295682f16 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/RowResult.java
@@ -34,7 +34,7 @@
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.common.collect.Maps2;
 
-public class RowResult<T> implements Serializable {
+public final class RowResult<T> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private final byte[] row;
@@ -52,7 +52,8 @@ public static <T> RowResult<T> create(byte[] row, SortedMap<byte[], T> columns)
 
     private RowResult(byte[] row, SortedMap<byte[], T> columns) {
         Preconditions.checkArgument(Cell.isNameValid(row));
-        Preconditions.checkArgument(UnsignedBytes.lexicographicalComparator().equals(columns.comparator()), "comparator for the map must be the bytes comparator");
+        Preconditions.checkArgument(UnsignedBytes.lexicographicalComparator().equals(columns.comparator()),
+                "comparator for the map must be the bytes comparator");
         for (byte[] colName : columns.keySet()) {
             Preconditions.checkArgument(Cell.isNameValid(colName));
         }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java
index b920bf8b07b..a70d1795902 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/SweepResults.java
@@ -16,6 +16,7 @@
 package com.palantir.atlasdb.keyvalue.api;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 
@@ -64,24 +65,22 @@ public String toString() {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        SweepResults results = (SweepResults) o;
-
-        if (cellsExamined != results.cellsExamined) return false;
-        if (cellsSwept != results.cellsSwept) return false;
-        if (sweptTimestamp != results.sweptTimestamp) return false;
-        return Arrays.equals(nextStartRow, results.nextStartRow);
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        SweepResults that = (SweepResults) obj;
+        return cellsExamined == that.cellsExamined
+                && cellsSwept == that.cellsSwept
+                && sweptTimestamp == that.sweptTimestamp
+                && Arrays.equals(nextStartRow, that.nextStartRow);
     }
 
     @Override
     public int hashCode() {
-        int result = Arrays.hashCode(nextStartRow);
-        result = 31 * result + (int) (cellsExamined ^ (cellsExamined >>> 32));
-        result = 31 * result + (int) (cellsSwept ^ (cellsSwept >>> 32));
-        result = 31 * result + (int) (sweptTimestamp ^ (sweptTimestamp >>> 32));
-        return result;
+        return Objects.hash(Arrays.hashCode(nextStartRow), cellsExamined, cellsSwept, sweptTimestamp);
     }
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java
index 0882ff03572..29bb414ccce 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/TableReference.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.api;
 
+import java.util.Objects;
+
 import org.apache.commons.lang3.StringUtils;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
@@ -22,14 +24,16 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
 
-public class TableReference {
+public final class TableReference {
     private final Namespace namespace;
     private final String tablename;
 
     public static TableReference createFromFullyQualifiedName(String fullTableName) {
         int index = fullTableName.indexOf('.');
         Preconditions.checkArgument(index > 0, "Table name %s is not a fully qualified table name.");
-        return create(Namespace.create(fullTableName.substring(0, index), Namespace.UNCHECKED_NAME), fullTableName.substring(index + 1));
+        return create(
+                Namespace.create(fullTableName.substring(0, index), Namespace.UNCHECKED_NAME),
+                fullTableName.substring(index + 1));
     }
 
     public static TableReference create(Namespace namespace, String tablename) {
@@ -41,15 +45,15 @@ public static TableReference createWithEmptyNamespace(String tablename) {
     }
 
     public static TableReference createUnsafe(String fullTableName) {
-        return fullTableName.indexOf('.') < 0 ? createWithEmptyNamespace(fullTableName) : createFromFullyQualifiedName(fullTableName);
-    }
-
-    public static boolean isFullyQualifiedName(String tableName) {
-        return tableName.contains(".");
+        return fullTableName.indexOf('.') < 0
+                ? createWithEmptyNamespace(fullTableName)
+                : createFromFullyQualifiedName(fullTableName);
     }
 
     @JsonCreator
-    private TableReference(@JsonProperty("namespace") Namespace namespace, @JsonProperty("tablename") String tablename) {
+    private TableReference(
+            @JsonProperty("namespace") Namespace namespace,
+            @JsonProperty("tablename") String tablename) {
         this.namespace = namespace;
         this.tablename = tablename;
     }
@@ -64,7 +68,13 @@ public String getTablename() {
 
     @JsonIgnore
     public String getQualifiedName() {
-        return namespace.isEmptyNamespace() || namespace.getName().equals("met") ? tablename : namespace.getName() + "." + tablename;
+        return namespace.isEmptyNamespace() || namespace.getName().equals("met")
+                ? tablename
+                : namespace.getName() + "." + tablename;
+    }
+
+    public static boolean isFullyQualifiedName(String tableName) {
+        return tableName.contains(".");
     }
 
     @JsonIgnore
@@ -72,35 +82,22 @@ public boolean isFullyQualifiedName() {
         return getQualifiedName().contains(".");
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((namespace == null) ? 0 : namespace.hashCode());
-        result = prime * result + ((tablename == null) ? 0 : tablename.hashCode());
-        return result;
-    }
-
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        TableReference other = (TableReference) obj;
-        if (namespace == null) {
-            if (other.namespace != null)
-                return false;
-        } else if (!namespace.equals(other.namespace))
-            return false;
-        if (tablename == null) {
-            if (other.tablename != null)
-                return false;
-        } else if (!tablename.equals(other.tablename))
+        }
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
-        return true;
+        }
+        TableReference that = (TableReference) obj;
+        return Objects.equals(namespace, that.namespace)
+                && Objects.equals(tablename, that.tablename);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(namespace, tablename);
     }
 
     @Override
@@ -108,14 +105,14 @@ public String toString() {
         return getQualifiedName();
     }
 
-    public static TableReference fromString(String s) {
-        int dotCount = StringUtils.countMatches(s, ".");
+    public static TableReference fromString(String tableReferenceAsString) {
+        int dotCount = StringUtils.countMatches(tableReferenceAsString, ".");
         if (dotCount == 0) {
-            return TableReference.createWithEmptyNamespace(s);
-        } else if (dotCount == 1){
-            return TableReference.createFromFullyQualifiedName(s);
+            return TableReference.createWithEmptyNamespace(tableReferenceAsString);
+        } else if (dotCount == 1) {
+            return TableReference.createFromFullyQualifiedName(tableReferenceAsString);
         } else {
-            throw new IllegalArgumentException(s + " is not a valid table reference.");
+            throw new IllegalArgumentException(tableReferenceAsString + " is not a valid table reference.");
         }
     }
 
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java
index 08f88379741..f7870b1fdcb 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/keyvalue/api/Value.java
@@ -17,12 +17,14 @@
 
 import java.io.Serializable;
 import java.util.Arrays;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.palantir.atlasdb.encoding.PtBytes;
@@ -32,17 +34,14 @@
  * Values are stored in {@link Cell}s.
  * @see Cell
  */
-public class Value implements Serializable {
+public final class Value implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final long INVALID_VALUE_TIMESTAMP = -1L;
 
     @JsonCreator
     public static Value create(@JsonProperty("contents") byte[] contents,
                                @JsonProperty("timestamp") long timestamp) {
-        if (contents == null) {
-            contents = PtBytes.EMPTY_BYTE_ARRAY;
-        }
-        return new Value(contents, timestamp);
+        return new Value(MoreObjects.firstNonNull(contents, PtBytes.EMPTY_BYTE_ARRAY), timestamp);
     }
 
     public static Value createWithCopyOfData(byte[] contents, long timestamp) {
@@ -68,68 +67,43 @@ public long getTimestamp() {
     private final long timestamp;
 
     private Value(byte[] contents, long timestamp) {
-        Preconditions.checkArgument((timestamp >= 0 && timestamp < Long.MAX_VALUE) || (timestamp == INVALID_VALUE_TIMESTAMP), "timestamp out of bounds");
+        Preconditions.checkArgument(
+                (timestamp >= 0 && timestamp < Long.MAX_VALUE) || (timestamp == INVALID_VALUE_TIMESTAMP),
+                "timestamp out of bounds");
         this.contents = contents;
         this.timestamp = timestamp;
     }
 
-    public static final Function<Value, Long> GET_TIMESTAMP = new Function<Value, Long>() {
-        @Override
-        public Long apply(Value from) {
-            return from.getTimestamp();
-        }
-    };
+    public static final Function<Value, Long> GET_TIMESTAMP = Value::getTimestamp;
 
-    public static final Function<Value, byte[]> GET_VALUE = new Function<Value, byte[]>() {
-        @Override
-        public byte[] apply(Value from) {
-            return from.getContents();
-        }
-    };
+    public static final Function<Value, byte[]> GET_VALUE = Value::getContents;
 
-    public static final Predicate<byte[]> IS_EMPTY = new Predicate<byte[]>() {
-        @Override
-        public boolean apply(byte[] input) {
-            return input.length == 0;
-        }
-    };
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + Arrays.hashCode(contents);
-        result = prime * result + (int) (timestamp ^ (timestamp >>> 32));
-        return result;
-    }
+    public static final Predicate<byte[]> IS_EMPTY = input -> input.length == 0;
 
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        Value other = (Value)obj;
-        if (!Arrays.equals(contents, other.contents)) {
-            return false;
-        }
-        if (timestamp != other.timestamp) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-        return true;
+        Value value = (Value) obj;
+        return timestamp == value.timestamp
+                && Arrays.equals(contents, value.contents);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(Arrays.hashCode(contents), timestamp);
     }
 
     @Override
     public String toString() {
         byte[] prefix = Arrays.copyOf(contents, Math.min(10, contents.length));
-        return "Value [contents=" + PtBytes.encodeHexString(prefix) +
-                ", contentsLength=" + contents.length +
-                ", timestamp=" + timestamp + "]";
+        return "Value [contents=" + PtBytes.encodeHexString(prefix)
+                + ", contentsLength=" + contents.length
+                + ", timestamp=" + timestamp + "]";
     }
 
 
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/persist/api/Persister.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/persist/api/Persister.java
index 21c9fe452b4..f68a7d57c10 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/persist/api/Persister.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/persist/api/Persister.java
@@ -21,6 +21,6 @@
  * {@link Persister}s are required to have a no arg constructor.
  */
 public interface Persister<T> extends Hydrator<T> {
-    byte[] persistToBytes(T t);
+    byte[] persistToBytes(T objectToPersist);
     Class<T> getPersistingClassType();
 }
diff --git a/atlasdb-spi/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java
similarity index 81%
rename from atlasdb-spi/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java
rename to atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java
index 06748663765..658a983b53c 100644
--- a/atlasdb-spi/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/AtlasDbFactory.java
@@ -1,12 +1,12 @@
 /**
- * Copyright 2015 Palantir Technologies
- *
+ * Copyright 2016 Palantir Technologies
+ * ​
  * Licensed under the BSD-3 License (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * ​
  * http://opensource.org/licenses/BSD-3-Clause
- *
+ * ​
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,13 +15,15 @@
  */
 package com.palantir.atlasdb.spi;
 
+import com.google.common.base.Optional;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.timestamp.TimestampService;
 
 public interface AtlasDbFactory {
     String getType();
 
-    KeyValueService createRawKeyValueService(KeyValueServiceConfig config);
+    KeyValueService createRawKeyValueService(KeyValueServiceConfig config, Optional<LeaderConfig> leaderConfig);
 
     TimestampService createTimestampService(KeyValueService rawKvs);
 
diff --git a/atlasdb-spi/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java
similarity index 97%
rename from atlasdb-spi/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java
rename to atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java
index d513db701d6..ca7857a5418 100644
--- a/atlasdb-spi/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/spi/KeyValueServiceConfig.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2015 Palantir Technologies
- *
+ * ​
  * Licensed under the BSD-3 License (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * ​
  * http://opensource.org/licenses/BSD-3-Clause
- *
+ * ​
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/AtlasDbConstraintCheckingMode.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/AtlasDbConstraintCheckingMode.java
index 966b01e7028..d6af1c0c8b1 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/AtlasDbConstraintCheckingMode.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/AtlasDbConstraintCheckingMode.java
@@ -16,25 +16,25 @@
 package com.palantir.atlasdb.transaction.api;
 
 public enum AtlasDbConstraintCheckingMode {
-    FULL_CONSTRAINT_CHECKING_THROWS_EXCEPTIONS(ShouldThrowException.YES),
-    FULL_CONSTRAINT_CHECKING_LOGS_EXCEPTIONS(ShouldThrowException.NO),
-    PERFORMANCE_OPTIMAL_CONSTRAINT_CHECKING_THROWS_EXCEPTIONS(ShouldThrowException.YES),
-    PERFORMANCE_OPTIMAL_CONSTRAINT_CHECKING_LOGS_EXCEPTIONS(ShouldThrowException.NO),
-    NO_CONSTRAINT_CHECKING(ShouldThrowException.NO);
+    FULL_CONSTRAINT_CHECKING_THROWS_EXCEPTIONS(ShouldThrow.YES),
+    FULL_CONSTRAINT_CHECKING_LOGS_EXCEPTIONS(ShouldThrow.NO),
+    PERFORMANCE_OPTIMAL_CONSTRAINT_CHECKING_THROWS_EXCEPTIONS(ShouldThrow.YES),
+    PERFORMANCE_OPTIMAL_CONSTRAINT_CHECKING_LOGS_EXCEPTIONS(ShouldThrow.NO),
+    NO_CONSTRAINT_CHECKING(ShouldThrow.NO);
 
-    private static enum ShouldThrowException {
+    private enum ShouldThrow {
         YES,
         NO
     }
 
-    private final ShouldThrowException shouldThrowException;
+    private final ShouldThrow shouldThrowException;
 
-    private AtlasDbConstraintCheckingMode(ShouldThrowException shouldThrowException) {
+    AtlasDbConstraintCheckingMode(ShouldThrow shouldThrowException) {
         this.shouldThrowException = shouldThrowException;
     }
 
     public boolean shouldThrowException() {
-        return shouldThrowException == ShouldThrowException.YES;
+        return shouldThrowException == ShouldThrow.YES;
     }
 
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java
index 127bd0ee087..f57012eabdc 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckable.java
@@ -25,21 +25,19 @@ public interface ConstraintCheckable {
      * This method checks row, table, and foreign-key constraints on the values given in writes.
      * This method may require additional reads from the database, dependong on the value of
      * constraintCheckingMode. This is intended to be used to check constraints on writes.
-     * @param writes
-     * @param transaction
-     * @param constraintCheckingMode
-     * @return
      */
-    public List<String> findConstraintFailures(Map<Cell,byte[]> writes, ConstraintCheckingTransaction transaction, AtlasDbConstraintCheckingMode constraintCheckingMode);
+    List<String> findConstraintFailures(
+            Map<Cell, byte[]> writes,
+            ConstraintCheckingTransaction transaction,
+            AtlasDbConstraintCheckingMode constraintCheckingMode);
 
     /**
      * Calling this method will not cause any read calls from the database. It assumes that all necessary
      * information for constraint checking is given in writes. For dynamic tables, any constraint between
      * columns of a single row will probably require writes to have all columns for each given row. This
      * is intended to be used for garbage collection (where all values are being read).
-     * @param reads
-     * @param constraintCheckingMode
-     * @return
      */
-    public List<String> findConstraintFailuresNoRead(Map<Cell,byte[]> reads, AtlasDbConstraintCheckingMode constraintCheckingMode);
+    List<String> findConstraintFailuresNoRead(
+            Map<Cell, byte[]> reads,
+            AtlasDbConstraintCheckingMode constraintCheckingMode);
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java
index 01bbf961d9a..5c7f4de31e5 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/ConstraintCheckingTransaction.java
@@ -27,10 +27,10 @@ public interface ConstraintCheckingTransaction extends Transaction {
     /**
      * Returns the cell values in the key-value service, ignoring the cache of local writes.
      */
-    public Map<Cell, byte[]> getIgnoringLocalWrites(TableReference tableRef, Set<Cell> cells);
+    Map<Cell, byte[]> getIgnoringLocalWrites(TableReference tableRef, Set<Cell> cells);
 
     /**
      * Returns the row result values in the key-value service, ignoring the cache of local writes.
      */
-    public SortedMap<byte[], RowResult<byte[]>> getRowsIgnoringLocalWrites(TableReference tableRef, Iterable<byte[]> rows);
+    SortedMap<byte[], RowResult<byte[]>> getRowsIgnoringLocalWrites(TableReference tableRef, Iterable<byte[]> rows);
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RuntimeTransactionTask.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RuntimeTransactionTask.java
index 8595d34277d..6bd85e9bf34 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RuntimeTransactionTask.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/RuntimeTransactionTask.java
@@ -17,5 +17,5 @@
 
 public interface RuntimeTransactionTask<T> extends TransactionTask<T, RuntimeException> {
     @Override
-    T execute(Transaction t);
+    T execute(Transaction transaction);
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java
index 9c817383dc4..dd675f7633d 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/Transaction.java
@@ -20,6 +20,7 @@
 import java.util.SortedMap;
 
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
@@ -35,8 +36,16 @@
 public interface Transaction {
 
     @Idempotent
-    SortedMap<byte[], RowResult<byte[]>> getRows(TableReference tableRef, Iterable<byte[]> rows,
-                                                 ColumnSelection columnSelection);
+    SortedMap<byte[], RowResult<byte[]>> getRows(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnSelection columnSelection);
+
+    @Idempotent
+    Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection);
 
     @Idempotent
     Map<Cell, byte[]> get(TableReference tableRef, Set<Cell> cells);
@@ -60,7 +69,9 @@ SortedMap<byte[], RowResult<byte[]>> getRows(TableReference tableRef, Iterable<b
      * will default to 1 for the first page in each range.
      */
     @Idempotent
-    Iterable<BatchingVisitable<RowResult<byte[]>>> getRanges(TableReference tableRef, Iterable<RangeRequest> rangeRequests);
+    Iterable<BatchingVisitable<RowResult<byte[]>>> getRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests);
 
     /**
      * Puts values into the key-value store. If you put a null or the empty byte array, then
@@ -90,9 +101,8 @@ enum TransactionType {
 
         /**
          * Hard delete transactions are different from regular transactions because they
-         * must queue cells for "scrubbing" (i.e. not just write a value at the latest
-         * timestamp, but also clean up values at older timestamps) on every cell that's
-         * modified or deleted
+         * must queue cells for "scrubbing" on every cell that's modified or deleted.
+         * (i.e. not just write a value at the latest timestamp, but also clean up values at older timestamps)
          */
         HARD_DELETE,
 
@@ -100,9 +110,9 @@ enum TransactionType {
          * In addition to queuing cells for "scrubbing", we also:
          * - (a) Scrub earlier than we would have otherwise, even at the cost of possibly
          *       causing open transactions to abort, and
-         * - (b) Block until the scrub is complete
+         * - (b) Block until the scrub is complete.
          */
-        AGGRESSIVE_HARD_DELETE;
+        AGGRESSIVE_HARD_DELETE
     }
 
     /**
@@ -134,13 +144,18 @@ enum TransactionType {
     void commit(TransactionService transactionService) throws TransactionFailedException;
 
     /**
+     * Gets whether the transaction has been aborted.
+     *
      * @return <code>true</code> if <code>abort()</code> has been called, otherwise <code>false</code>
      */
     @Idempotent
     boolean isAborted();
 
     /**
-     * @return <code>true</code> if neither <code>commit()</code> or <code>abort()</code> have been called, otherwise <code>false</code>
+     * Gets whether the transaction has not been committed.
+     *
+     * @return <code>true</code> if neither <code>commit()</code> or <code>abort()</code> have been called,
+     *         otherwise <code>false</code>
      */
     @Idempotent
     boolean isUncommitted();
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionCommitFailedException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionCommitFailedException.java
index 74ea823b66f..ed963975561 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionCommitFailedException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionCommitFailedException.java
@@ -38,7 +38,7 @@ public TransactionCommitFailedException(String message) {
     }
 
     @Override
-    final public boolean canTransactionBeRetried() {
+    public final boolean canTransactionBeRetried() {
         return false;
     }
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java
index 5b9a1bd1629..c3c6a0b56b1 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionConflictException.java
@@ -26,13 +26,15 @@
 
 /**
  * Thrown if there is a conflict detected when a transaction is committed.
- * If two concurrent transactions make calls to {@link Transaction#put(com.palantir.atlasdb.keyvalue.api.TableReference, java.util.Map)} or
- * {@link Transaction#delete(com.palantir.atlasdb.keyvalue.api.TableReference, Set)} for the same <code>Cell</code>, then this is a write-write conflict.
+ * If two concurrent transactions make calls to
+ * {@link Transaction#put(com.palantir.atlasdb.keyvalue.api.TableReference, java.util.Map)} or
+ * {@link Transaction#delete(com.palantir.atlasdb.keyvalue.api.TableReference, Set)} for the same <code>Cell</code>,
+ * then this is a write-write conflict.
  * <p>
  * The error message should be detailed about what caused the failure and what other transaction
  * conflicted with this one.
  */
-public class TransactionConflictException extends TransactionFailedRetriableException {
+public final class TransactionConflictException extends TransactionFailedRetriableException {
     private static final long serialVersionUID = 1L;
 
     public static class CellConflict implements Serializable {
@@ -59,17 +61,13 @@ public CellConflict(Cell cell, String cellString, long theirStart, long theirCom
 
         @Override
         public String toString() {
-            return "CellConflict [cell=" + cellString + ", theirStart=" + theirStart + ", theirCommit=" +
-                theirCommit + "]";
+            return "CellConflict [cell=" + cellString
+                    + ", theirStart=" + theirStart
+                    + ", theirCommit=" + theirCommit + "]";
         }
 
         public static Function<CellConflict, Cell> getCellFunction() {
-            return new Function<TransactionConflictException.CellConflict, Cell>() {
-                @Override
-                public Cell apply(CellConflict input) {
-                    return input.cell;
-                }
-            };
+            return input -> input.cell;
         }
     }
 
@@ -78,7 +76,6 @@ public Cell apply(CellConflict input) {
 
     /**
      * These conflicts had a start timestamp before our start and a commit timestamp after our start.
-     * @return
      */
     public Collection<CellConflict> getSpanningWrites() {
         return spanningWrites;
@@ -92,11 +89,20 @@ public Collection<CellConflict> getDominatingWrites() {
         return dominatingWrites;
     }
 
-    public static TransactionConflictException create(TableReference tableRef, long timestamp,
-                                                      Collection<CellConflict> spanningWrites, Collection<CellConflict> dominatingWrites, long elapsedMillis) {
+    public static TransactionConflictException create(
+            TableReference tableRef,
+            long timestamp,
+            Collection<CellConflict> spanningWrites,
+            Collection<CellConflict> dominatingWrites,
+            long elapsedMillis) {
         StringBuilder sb = new StringBuilder();
-        sb.append("Transaction Conflict after " + elapsedMillis + " ms for table: "
-            + tableRef.getQualifiedName() + " with start timestamp: " + timestamp + "\n");
+        sb.append("Transaction Conflict after ")
+                .append(elapsedMillis)
+                .append(" ms for table: ")
+                .append(tableRef.getQualifiedName())
+                .append(" with start timestamp: ")
+                .append(timestamp)
+                .append('\n');
         if (!spanningWrites.isEmpty()) {
             sb.append("Another transaction wrote values before our start timestamp and committed after. Cells:\n");
             formatConflicts(spanningWrites, sb);
@@ -104,8 +110,8 @@ public static TransactionConflictException create(TableReference tableRef, long
         }
 
         if (!dominatingWrites.isEmpty()) {
-            sb.append("Another transaction wrote and committed between our start and end ts. " +
-                "It is possible we are a long running transaction. Cells:\n");
+            sb.append("Another transaction wrote and committed between our start and end ts.")
+                    .append(" It is possible we are a long running transaction. Cells:\n");
             formatConflicts(dominatingWrites, sb);
             sb.append('\n');
         }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionFailedRetriableException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionFailedRetriableException.java
index 2b5de3d87fc..c43ee52ef4c 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionFailedRetriableException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionFailedRetriableException.java
@@ -34,8 +34,7 @@ public TransactionFailedRetriableException(String message) {
     }
 
     @Override
-    final public boolean canTransactionBeRetried() {
+    public final boolean canTransactionBeRetried() {
         return true;
     }
-
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionLockTimeoutException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionLockTimeoutException.java
index 3d466fdc2c5..5fec5ae5042 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionLockTimeoutException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionLockTimeoutException.java
@@ -16,7 +16,7 @@
 package com.palantir.atlasdb.transaction.api;
 
 /**
- * The locks to the lock server have timed out
+ * The locks to the lock server have timed out.
  *
  * @author carrino
  */
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java
index de2521cf892..91d515976bc 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionManager.java
@@ -43,7 +43,8 @@ public interface TransactionManager {
     <T, E extends Exception> T runTaskWithRetry(TransactionTask<T, E> task) throws E;
 
     /**
-     * {@link #runTaskWithRetry(TransactionTask)} should be preferred over {@link #runTaskThrowOnConflict(TransactionTask)}
+     * {@link #runTaskWithRetry(TransactionTask)} should be preferred over
+     * {@link #runTaskThrowOnConflict(TransactionTask)}.
      * This method should be used unless {@link #runTaskWithRetry(TransactionTask)} cannot be used becuase the arguments
      * passed are not immutable and will be modified by the transaction so doing automatic retry is unsafe.
      *
@@ -62,7 +63,8 @@ public interface TransactionManager {
      *
      * @throws TransactionConflictException if a write-write conflict occurs
      */
-    <T, E extends Exception> T runTaskThrowOnConflict(TransactionTask<T, E> task) throws E, TransactionFailedRetriableException;
+    <T, E extends Exception> T runTaskThrowOnConflict(TransactionTask<T, E> task)
+            throws E, TransactionFailedRetriableException;
 
     /**
      * Most atlasdb TransactionManagers will provide {@link Transaction} objects that have less than full
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionSerializableConflictException.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionSerializableConflictException.java
index 3d2e83df1ff..e79c74cfbb0 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionSerializableConflictException.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionSerializableConflictException.java
@@ -25,10 +25,13 @@ public TransactionSerializableConflictException(String message) {
         super(message);
     }
 
-    public static TransactionSerializableConflictException create(TableReference tableRef, long timestamp, long elapsedMillis) {
-        String msg = String.format("There was a read-write conflict on table %s.  This means that this table was " +
-                "marked as Serializable and another transacton wrote a different value than this transaction read.  " +
-                "startTs: %d  elapsedMillis: %d", tableRef.getQualifiedName(), timestamp, elapsedMillis);
+    public static TransactionSerializableConflictException create(
+            TableReference tableRef,
+            long timestamp,
+            long elapsedMillis) {
+        String msg = String.format("There was a read-write conflict on table %s.  This means that this table was "
+                + "marked as Serializable and another transacton wrote a different value than this transaction read.  "
+                + "startTs: %d  elapsedMillis: %d", tableRef.getQualifiedName(), timestamp, elapsedMillis);
         return new TransactionSerializableConflictException(msg);
     }
 
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionTask.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionTask.java
index df7c6551e88..8edadeba961 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionTask.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/api/TransactionTask.java
@@ -25,5 +25,5 @@
  * it will have no work to do, because the list was cleared.
  */
 public interface TransactionTask<T, E extends Exception> {
-    T execute(Transaction t) throws E;
+    T execute(Transaction transaction) throws E;
 }
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java
index f2f71792f8c..70c5430317f 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/transaction/service/TransactionService.java
@@ -22,12 +22,12 @@
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 
 /**
- * Transaction service is used by the atlas protocol to determine is a given transction has been
+ * Transaction service is used by the atlas protocol to determine is a given transaction has been
  * committed or aborted.
  *
  * A given startTimestamp will only ever have one non-null value.  This means that anything
  * returned from this service can be aggressively cached.  Caching negative look ups should not be
- * done for performance reasons.  If a null value is returned, that startTimestamp will liekly be
+ * done for performance reasons.  If a null value is returned, that startTimestamp will likely be
  * rolled back and set to TransactionConstants.FAILED_COMMIT_TS (-1).
  *
  * @author carrino
@@ -39,10 +39,10 @@ public interface TransactionService {
     Map<Long, Long> get(Iterable<Long> startTimestamps);
 
     /**
-     * This operation is guarenteed to be atomic and only set the value if it hasn't already been
+     * This operation is guaranteed to be atomic and only set the value if it hasn't already been
      * set.
      * @throws KeyAlreadyExistsException If this value was already set, but {@link #get(long)} should
-     * be called to check what the value was set to.  This may throw spurriously due to retry.
+     * be called to check what the value was set to.  This may throw spuriously due to retry.
      * @throws RuntimeException If a runtime exception is thrown, this operation may or may
      * not have ran.
      */
diff --git a/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java b/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java
index b335c54c37d..272a73bfe89 100644
--- a/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java
+++ b/atlasdb-api/src/main/java/com/palantir/atlasdb/versions/AtlasDbVersion.java
@@ -19,8 +19,8 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 
-import com.google.common.base.Charsets;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.io.CharStreams;
@@ -44,7 +44,10 @@ public static String ensureVersionReported() {
     }
 
     public static String ensureVersionReported(PrintStream writer) {
-        if (!versionPrinted && Boolean.parseBoolean(System.getProperty(REPORT_VERSION_PROPERTY, REPORT_VERSION_DEFAULT))) {
+        boolean shouldReportVersion = Boolean.parseBoolean(System.getProperty(
+                REPORT_VERSION_PROPERTY,
+                REPORT_VERSION_DEFAULT));
+        if (!versionPrinted && shouldReportVersion) {
             writer.println("AtlasDB Version: " + version.get());
             versionPrinted = true;
         }
@@ -56,7 +59,7 @@ public static String readVersion() {
             if (is == null) {
                 return VERSION_UNKNOWN_STRING;
             }
-            return CharStreams.toString(new InputStreamReader(is, Charsets.UTF_8)).trim();
+            return CharStreams.toString(new InputStreamReader(is, StandardCharsets.UTF_8)).trim();
         } catch (IOException e) {
             return VERSION_UNKNOWN_STRING;
         }
diff --git a/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java b/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java
new file mode 100644
index 00000000000..5196af93f32
--- /dev/null
+++ b/atlasdb-api/src/test/java/com/palantir/atlasdb/config/LeaderConfigTest.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ * <p>
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://opensource.org/licenses/BSD-3-Clause
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.config;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.Collections;
+
+import org.junit.Test;
+
+public class LeaderConfigTest {
+    @Test
+    public void shouldBeTheLockLeaderIfLocalServerMatchesLockLeader() {
+        ImmutableLeaderConfig config = ImmutableLeaderConfig.builder()
+                .localServer("me")
+                .addLeaders("not me", "me")
+                .quorumSize(2)
+                .lockCreator("me")
+                .build();
+
+        assertThat(config.whoIsTheLockLeader(), is(LockLeader.I_AM_THE_LOCK_LEADER));
+    }
+
+    @Test
+    public void shouldNotBeTheLockLeaderIfLocalServerDoesNotMatchLockLeader() {
+        ImmutableLeaderConfig config = ImmutableLeaderConfig.builder()
+                .localServer("me")
+                .addLeaders("not me", "me")
+                .quorumSize(2)
+                .lockCreator("not me")
+                .build();
+
+        assertThat(config.whoIsTheLockLeader(), is(LockLeader.SOMEONE_ELSE_IS_THE_LOCK_LEADER));
+    }
+
+    @Test
+    public void lockLeaderDefaultsToBeTheFirstSortedLeader() {
+        ImmutableLeaderConfig config = ImmutableLeaderConfig.builder()
+                .localServer("me")
+                .addLeaders("not me", "me")
+                .quorumSize(2)
+                .build();
+
+        assertThat(config.lockCreator(), is("me"));
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void cannotCreateALeaderConfigWithNoLeaders() {
+        ImmutableLeaderConfig.builder()
+                .localServer("me")
+                .leaders(Collections.emptySet())
+                .quorumSize(0)
+                .build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void cannotCreateALeaderConfigWithQuorumSizeNotBeingAMajorityOfTheLeaders() {
+        ImmutableLeaderConfig.builder()
+                .localServer("me")
+                .addLeaders("not me", "me")
+                .quorumSize(1)
+                .build();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void cannotCreateALeaderConfigWithQuorumSizeLargerThanTheAmountOfLeaders() {
+        ImmutableLeaderConfig.builder()
+                .localServer("me")
+                .addLeaders("not me", "me")
+                .quorumSize(3)
+                .build();
+    }
+}
diff --git a/atlasdb-cassandra-multinode-tests/build.gradle b/atlasdb-cassandra-multinode-tests/build.gradle
new file mode 100644
index 00000000000..1238c10cd85
--- /dev/null
+++ b/atlasdb-cassandra-multinode-tests/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'org.inferred.processors'
+
+apply from: "../gradle/shared.gradle"
+
+dependencies {
+    testCompile project(":atlasdb-cassandra")
+    testCompile project(":atlasdb-tests-shared")
+    testCompile project(":atlasdb-ete-test-utils")
+
+    testCompile 'org.apache.cassandra:cassandra-all:' + libVersions.cassandra
+    testCompile 'com.datastax.cassandra:cassandra-driver-core:' + libVersions.cassandra_driver_core
+
+    testCompile 'com.palantir.docker.compose:docker-compose-rule:' + libVersions.dockerComposeRule
+    testCompile group: 'com.google.code.findbugs', name: 'annotations', version: libVersions.findbugsAnnotations
+}
+
+test {
+    include '**/CassandraSchemaLockTest.class'
+    dependsOn ':atlasdb-ete-test-utils:buildCassandraImage'
+}
diff --git a/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java
new file mode 100644
index 00000000000..d55b9741a9f
--- /dev/null
+++ b/atlasdb-cassandra-multinode-tests/src/test/java/com/palantir/cassandra/multinode/CassandraSchemaLockTest.java
@@ -0,0 +1,204 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.cassandra.multinode;
+
+import static org.hamcrest.Matchers.everyItem;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.hamcrest.Description;
+import org.hamcrest.FeatureMatcher;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeDiagnosingMatcher;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.Duration;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
+import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig;
+import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.config.ImmutableLeaderConfig;
+import com.palantir.atlasdb.config.LeaderConfig;
+import com.palantir.atlasdb.ete.Gradle;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
+import com.palantir.docker.compose.DockerComposeRule;
+import com.palantir.docker.compose.connection.Container;
+import com.palantir.docker.compose.connection.DockerPort;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+public class CassandraSchemaLockTest {
+    private static final String LOCAL_SERVER_ADDRESS = "http://localhost:3828";
+    private static final int THRIFT_PORT_NUMBER_1 = 9160;
+    private static final int THRIFT_PORT_NUMBER_2 = 9161;
+    private static final int THRIFT_PORT_NUMBER_3 = 9162;
+    private static final int THREAD_COUNT = 4;
+
+    private static final String CONTAINER_LOGS_DIRECTORY = "container-logs";
+    private static final DockerComposeRule CASSANDRA_DOCKER_SETUP = DockerComposeRule.builder()
+            .file("src/test/resources/docker-compose-multinode.yml")
+            .waitingForService("cassandra1", Container::areAllPortsOpen)
+            .waitingForService("cassandra2", Container::areAllPortsOpen)
+            .waitingForService("cassandra3", Container::areAllPortsOpen)
+            .saveLogsTo(CONTAINER_LOGS_DIRECTORY)
+            .build();
+
+    private static final Gradle GRADLE_PREPARE_TASK =
+            Gradle.ensureTaskHasRun(":atlasdb-ete-test-utils:buildCassandraImage");
+    @ClassRule
+    public static final RuleChain CASSANDRA_DOCKER_SET_UP = RuleChain
+            .outerRule(GRADLE_PREPARE_TASK)
+            .around(CASSANDRA_DOCKER_SETUP);
+
+    private static final CassandraKeyValueServiceConfig KVS_CONFIG = ImmutableCassandraKeyValueServiceConfig.builder()
+            .addServers(getCassandraThriftAddressFromPort(THRIFT_PORT_NUMBER_1))
+            .addServers(getCassandraThriftAddressFromPort(THRIFT_PORT_NUMBER_2))
+            .addServers(getCassandraThriftAddressFromPort(THRIFT_PORT_NUMBER_3))
+            .keyspace("atlasdb")
+            .replicationFactor(1)
+            .credentials(ImmutableCassandraCredentialsConfig.builder()
+                    .username("cassandra")
+                    .password("cassandra")
+                    .build())
+            .build();
+
+    private static final Optional<LeaderConfig> leaderConfig = Optional.of(ImmutableLeaderConfig.builder()
+            .quorumSize(1)
+            .localServer(LOCAL_SERVER_ADDRESS)
+            .leaders(ImmutableSet.of(LOCAL_SERVER_ADDRESS))
+            .build());
+
+    private static final CassandraKeyValueServiceConfigManager CONFIG_MANAGER = CassandraKeyValueServiceConfigManager
+            .createSimpleManager(KVS_CONFIG);
+
+    private final ExecutorService executorService = Executors.newFixedThreadPool(THREAD_COUNT);
+
+    @BeforeClass
+    public static void waitUntilCassandraIsUp() throws IOException, InterruptedException {
+        Awaitility.await()
+                .atMost(Duration.TWO_MINUTES)
+                .pollInterval(Duration.ONE_SECOND)
+                .until(canCreateKeyValueService());
+    }
+
+    @Test
+    public void shouldCreateTablesConsistentlyWithMultipleCassandraNodes() throws Exception {
+        TableReference table1 = TableReference.createFromFullyQualifiedName("ns.table1");
+
+        try {
+            CyclicBarrier barrier = new CyclicBarrier(THREAD_COUNT);
+            for (int i = 0; i < THREAD_COUNT; i++) {
+                async(() -> {
+                    CassandraKeyValueService keyValueService =
+                            CassandraKeyValueService.create(CONFIG_MANAGER, Optional.absent());
+                    barrier.await();
+                    keyValueService.createTable(table1, AtlasDbConstants.GENERIC_TABLE_METADATA);
+                    return null;
+                });
+            }
+        } finally {
+            executorService.shutdown();
+            assertTrue(executorService.awaitTermination(4, TimeUnit.MINUTES));
+        }
+        assertThat(new File(CONTAINER_LOGS_DIRECTORY),
+                containsFiles(everyItem(doesNotContainTheColumnFamilyIdMismatchError())));
+    }
+
+    @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
+    private void async(Callable callable) {
+        executorService.submit(callable);
+    }
+
+    private static Matcher<File> containsFiles(Matcher<Iterable<File>> fileMatcher) {
+        return new FeatureMatcher<File, List<File>>(
+                fileMatcher,
+                "Directory with files such that",
+                "Directory contains") {
+            @Override
+            protected List<File> featureValueOf(File actual) {
+                return ImmutableList.copyOf(actual.listFiles());
+            }
+        };
+    }
+
+    private static Matcher<File> doesNotContainTheColumnFamilyIdMismatchError() {
+        return new TypeSafeDiagnosingMatcher<File>() {
+            @Override
+            protected boolean matchesSafely(File file, Description mismatchDescription) {
+                try {
+                    List<String> badLines = Files.lines(Paths.get(file.getAbsolutePath()))
+                            .filter(line -> line.contains("Column family ID mismatch"))
+                            .collect(Collectors.toList());
+
+                    mismatchDescription
+                            .appendText("file called " + file.getAbsolutePath() + " which contains lines")
+                            .appendValueList("\n", "\n", "", badLines);
+
+                    return badLines.isEmpty();
+                } catch (IOException e) {
+                    throw Throwables.propagate(e);
+                }
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("a file with no column family ID mismatch errors");
+            }
+        };
+    }
+
+    private static Callable<Boolean> canCreateKeyValueService() {
+        return () -> {
+            try {
+                CassandraKeyValueService.create(
+                        CassandraKeyValueServiceConfigManager.createSimpleManager(KVS_CONFIG),
+                        leaderConfig);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        };
+    }
+
+    private static InetSocketAddress getCassandraThriftAddressFromPort(int port) {
+        DockerPort dockerPort = CASSANDRA_DOCKER_SETUP.hostNetworkedPort(port);
+        String hostname = dockerPort.getIp();
+        return new InetSocketAddress(hostname, dockerPort.getExternalPort());
+    }
+}
diff --git a/atlasdb-cassandra-multinode-tests/src/test/resources/docker-compose-multinode.yml b/atlasdb-cassandra-multinode-tests/src/test/resources/docker-compose-multinode.yml
new file mode 100644
index 00000000000..3df81c1bed0
--- /dev/null
+++ b/atlasdb-cassandra-multinode-tests/src/test/resources/docker-compose-multinode.yml
@@ -0,0 +1,27 @@
+version: '2'
+
+services:
+  cassandra1:
+     image: com.palantir.docker/atlas-cassandra:2.2-v0.1
+     ports:
+       - 9160:9160
+
+  cassandra2:
+    image: com.palantir.docker/atlas-cassandra:2.2-v0.1
+    ports:
+      - 9161:9160
+    depends_on:
+      - cassandra1
+    environment:
+      - CASSANDRA_SEEDS=cassandra1
+      - LOCAL_JMX=no
+
+  cassandra3:
+    image: com.palantir.docker/atlas-cassandra:2.2-v0.1
+    ports:
+      - 9162:9160
+    depends_on:
+      - cassandra1
+    environment:
+      - CASSANDRA_SEEDS=cassandra1,cassandra2
+      - LOCAL_JMX=no
diff --git a/atlasdb-cassandra-tests/build.gradle b/atlasdb-cassandra-tests/build.gradle
index 8932e8bfc4f..766c590e34b 100644
--- a/atlasdb-cassandra-tests/build.gradle
+++ b/atlasdb-cassandra-tests/build.gradle
@@ -6,6 +6,7 @@ apply from: "../gradle/shared.gradle"
 dependencies {
   testCompile project(":atlasdb-cassandra")
   testCompile project(":atlasdb-tests-shared")
+  testCompile project(":atlasdb-ete-test-utils")
 
   testCompile 'org.apache.cassandra:cassandra-all:' + libVersions.cassandra
   testCompile 'com.datastax.cassandra:cassandra-driver-core:' + libVersions.cassandra_driver_core
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueServiceSweeperTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueServiceSweeperTest.java
index 86434930ea7..6c08903ce4b 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueServiceSweeperTest.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueServiceSweeperTest.java
@@ -16,8 +16,8 @@
 package com.palantir.atlasdb.keyvalue.cassandra;
 
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
-import com.palantir.atlasdb.cleaner.AbstractSweeperTest;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.sweep.AbstractSweeperTest;
 
 public class CQLKeyValueServiceSweeperTest extends AbstractSweeperTest {
     @Override
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersionTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersionTest.java
new file mode 100644
index 00000000000..4e30bff6db6
--- /dev/null
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersionTest.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+import org.junit.Test;
+
+public class CassandraApiVersionTest {
+    @Test public void
+    version_19_36_0_does_not_support_cas() {
+        CassandraApiVersion version = new CassandraApiVersion("19.36.0");
+        assertThat(version.supportsCheckAndSet(), is(false));
+    }
+
+    @Test public void
+    version_19_37_0_supports_cas() {
+        CassandraApiVersion version = new CassandraApiVersion("19.37.0");
+        assertThat(version.supportsCheckAndSet(), is(true));
+    }
+
+    @Test public void
+    version_19_38_0_supports_cas() {
+        CassandraApiVersion version = new CassandraApiVersion("19.38.0");
+        assertThat(version.supportsCheckAndSet(), is(true));
+    }
+
+    @Test public void
+    version_20_1_0_supports_cas() {
+        CassandraApiVersion version = new CassandraApiVersion("20.1.0");
+        assertThat(version.supportsCheckAndSet(), is(true));
+    }
+
+    @Test public void
+    version_18_40_0_does_not_support_cas() {
+        CassandraApiVersion version = new CassandraApiVersion("18.40.0");
+        assertThat(version.supportsCheckAndSet(), is(false));
+    }
+
+    @Test public void
+    version_20_40_1_supports_cas() {
+        CassandraApiVersion version = new CassandraApiVersion("20.40.1");
+        assertThat(version.supportsCheckAndSet(), is(true));
+    }
+
+    @Test(expected=UnsupportedOperationException.class) public void
+    invalid_version_strings_throw_an_error() {
+        new CassandraApiVersion("20_4.1");
+    }
+
+}
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java
index 60360eb8bc6..d1184ef0394 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolTest.java
@@ -21,11 +21,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.TreeMap;
+import java.util.NavigableMap;
+import java.util.NoSuchElementException;
 
 import org.apache.cassandra.thrift.Cassandra;
 import org.apache.cassandra.thrift.TimedOutException;
 import org.apache.cassandra.thrift.TokenRange;
+import org.apache.cassandra.thrift.UnavailableException;
 import org.apache.thrift.transport.TTransportException;
 import org.hamcrest.Matchers;
 import org.junit.After;
@@ -41,7 +43,7 @@
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
-import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPool.LightweightOPPToken;
+import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPool.LightweightOppToken;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraClientPool.WeightedHosts;
 import com.palantir.common.base.FunctionCheckedException;
 
@@ -63,7 +65,8 @@ public void setUp() {
                                 .fetchBatchCount(1000)
                                 .safetyDisabled(true)
                                 .autoRefreshNodes(true)
-                                .build()));
+                                .build()),
+                CassandraTestSuite.LEADER_CONFIG);
         kv.initializeFromFreshInstance();
         kv.dropTable(AtlasDbConstants.TIMESTAMP_TABLE);
     }
@@ -73,16 +76,15 @@ public void tearDown() {
         kv.teardown();
     }
 
-
     // This is a dumb test in the current test suite that has just one local Cassandra node.
     // Pretty legit test if run manually or if we go back to multi-node tests
     @Test
     public void testTokenMapping() {
         CassandraClientPool clientPool = kv.clientPool;
-        Map<Range<LightweightOPPToken>, List<InetSocketAddress>> mapOfRanges = kv.clientPool.tokenMap.asMapOfRanges();
+        Map<Range<LightweightOppToken>, List<InetSocketAddress>> mapOfRanges = kv.clientPool.tokenMap.asMapOfRanges();
 
-        for (Entry<Range<LightweightOPPToken>, List<InetSocketAddress>> entry : mapOfRanges.entrySet()) {
-            Range<LightweightOPPToken> tokenRange = entry.getKey();
+        for (Entry<Range<LightweightOppToken>, List<InetSocketAddress>> entry : mapOfRanges.entrySet()) {
+            Range<LightweightOppToken> tokenRange = entry.getKey();
             List<InetSocketAddress> hosts = entry.getValue();
 
             clientPool.getRandomHostForKey("A".getBytes());
@@ -134,6 +136,13 @@ public void testIsRetriableException() {
         Assert.assertTrue(CassandraClientPool.isRetriableException(new TTransportException(new SocketTimeoutException())));
     }
 
+    @Test
+    public void testIsRetriableWithBackoffException() {
+        Assert.assertTrue(CassandraClientPool.isRetriableWithBackoffException(new NoSuchElementException()));
+        Assert.assertTrue(CassandraClientPool.isRetriableWithBackoffException(new UnavailableException()));
+        Assert.assertTrue(CassandraClientPool.isRetriableWithBackoffException(new TTransportException(new UnavailableException())));
+    }
+
     @Test
     public void testWeightedHostsWithUniformActivity() {
         Map<InetSocketAddress, CassandraClientPoolingContainer> pools = ImmutableMap.of(
@@ -141,7 +150,7 @@ public void testWeightedHostsWithUniformActivity() {
                 new InetSocketAddress(1), createMockClientPoolingContainerWithUtilization(10),
                 new InetSocketAddress(2), createMockClientPoolingContainerWithUtilization(10));
 
-        TreeMap<Integer, InetSocketAddress> result = CassandraClientPool.WeightedHosts.create(pools).hosts;
+        NavigableMap<Integer, InetSocketAddress> result = CassandraClientPool.WeightedHosts.create(pools).hosts;
 
         int expectedWeight = result.firstEntry().getKey();
         int prevKey = 0;
@@ -160,7 +169,7 @@ public void testWeightedHostsWithLowActivityPool() {
                 new InetSocketAddress(1), createMockClientPoolingContainerWithUtilization(10),
                 lowActivityHost, createMockClientPoolingContainerWithUtilization(0));
 
-        TreeMap<Integer, InetSocketAddress> result = CassandraClientPool.WeightedHosts.create(pools).hosts;
+        NavigableMap<Integer, InetSocketAddress> result = CassandraClientPool.WeightedHosts.create(pools).hosts;
 
         int largestWeight = result.firstEntry().getKey();
         InetSocketAddress hostWithLargestWeight = result.firstEntry().getValue();
@@ -184,7 +193,7 @@ public void testWeightedHostsWithMaxActivityPool() {
                 new InetSocketAddress(1), createMockClientPoolingContainerWithUtilization(5),
                 highActivityHost, createMockClientPoolingContainerWithUtilization(20));
 
-        TreeMap<Integer, InetSocketAddress> result = CassandraClientPool.WeightedHosts.create(pools).hosts;
+        NavigableMap<Integer, InetSocketAddress> result = CassandraClientPool.WeightedHosts.create(pools).hosts;
 
         int smallestWeight = result.firstEntry().getKey();
         InetSocketAddress hostWithSmallestWeight = result.firstEntry().getValue();
@@ -207,7 +216,7 @@ public void testWeightedHostsWithNonZeroWeights() {
                 new InetSocketAddress(1), createMockClientPoolingContainerWithUtilization(10),
                 new InetSocketAddress(2), createMockClientPoolingContainerWithUtilization(15));
 
-        TreeMap<Integer, InetSocketAddress> result = CassandraClientPool.WeightedHosts.create(pools).hosts;
+        NavigableMap<Integer, InetSocketAddress> result = CassandraClientPool.WeightedHosts.create(pools).hosts;
 
         int prevKey = 0;
         for (Map.Entry<Integer, InetSocketAddress> entry : result.entrySet()) {
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionTest.java
index 7474bb81f5b..e6ceff560e5 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionTest.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConnectionTest.java
@@ -17,21 +17,22 @@
 
 import static org.junit.Assert.fail;
 
-import java.net.InetSocketAddress;
-
 import org.apache.cassandra.thrift.InvalidRequestException;
 import org.junit.Test;
 
 import com.google.common.base.Optional;
+import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.config.ImmutableLeaderConfig;
+import com.palantir.atlasdb.config.LeaderConfig;
 
 public class CassandraConnectionTest {
 
     private static final CassandraKeyValueServiceConfig NO_CREDS_CKVS_CONFIG = ImmutableCassandraKeyValueServiceConfig
             .builder()
-            .addServers(new InetSocketAddress("localhost", 9160))
+            .addServers(CassandraTestSuite.CASSANDRA_THRIFT_ADDRESS)
             .poolSize(20)
             .keyspace("atlasdb")
             .credentials(Optional.absent())
@@ -43,12 +44,18 @@ public class CassandraConnectionTest {
             .safetyDisabled(false)
             .autoRefreshNodes(false)
             .build();
-            
-    
+
+    private static final Optional<LeaderConfig> LEADER_CONFIG = Optional.of(ImmutableLeaderConfig
+            .builder()
+            .quorumSize(1)
+            .localServer("localhost")
+            .leaders(Sets.newHashSet("localhost"))
+            .build());
+
     @Test
     public void testAuthProvided() {
         CassandraKeyValueService kv = CassandraKeyValueService.create(
-                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG));
+                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG), LEADER_CONFIG);
         kv.teardown();
         assert true; // getting here implies authentication succeeded
     }
@@ -57,7 +64,7 @@ public void testAuthProvided() {
     public void testAuthMissing() {
         try {
             CassandraKeyValueService.create(
-                CassandraKeyValueServiceConfigManager.createSimpleManager(NO_CREDS_CKVS_CONFIG));
+                    CassandraKeyValueServiceConfigManager.createSimpleManager(NO_CREDS_CKVS_CONFIG), LEADER_CONFIG);
             fail();
         } catch (RuntimeException e) {
             boolean threwIRE = false;
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraDbLockTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraDbLockTest.java
deleted file mode 100644
index 859f4bd0ef3..00000000000
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraDbLockTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2015 Palantir Technologies
- *
- * Licensed under the BSD-3 License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://opensource.org/licenses/BSD-3-Clause
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.palantir.atlasdb.keyvalue.cassandra;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class CassandraDbLockTest extends AbstractCassandraLockTest {
-    @Before
-    @Override
-    public void setUp() {
-        super.setUp();
-
-        kvs.supportsCAS = true;
-        slowTimeoutKvs.supportsCAS = true;
-    }
-
-    @Test (expected = IllegalStateException.class)
-    public void testBadUnlockFails() {
-        kvs.schemaMutationUnlock(GLOBAL_DDL_LOCK_NEVER_ALLOCATED_VALUE);
-    }
-
-    @Test
-    public void testIdsAreRequestUnique() {
-        long id = kvs.waitForSchemaMutationLock();
-        kvs.schemaMutationUnlock(id);
-        long newId = kvs.waitForSchemaMutationLock();
-        kvs.schemaMutationUnlock(newId);
-        Assert.assertNotEquals(id, newId);
-    }
-
-    // has a different message than the other one
-    @Test
-    public void testLocksTimeout() throws InterruptedException, ExecutionException, TimeoutException {
-        long id = kvs.waitForSchemaMutationLock();
-        try {
-            Future future = async(() -> {
-                kvs.schemaMutationUnlock(kvs.waitForSchemaMutationLock());
-            });
-            exception.expect(ExecutionException.class);
-            exception.expectMessage("We have timed out waiting on the current schema mutation lock holder.");
-            exception.expectMessage("support");
-            future.get(10, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            throw e;
-        } finally {
-            kvs.schemaMutationUnlock(id);
-        }
-    }
-}
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java
new file mode 100644
index 00000000000..86722019d94
--- /dev/null
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceConfigTest.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.net.InetSocketAddress;
+import java.nio.file.Paths;
+
+import org.junit.Test;
+
+import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
+import com.palantir.remoting.ssl.SslConfiguration;
+
+public class CassandraKeyValueServiceConfigTest {
+    private static final InetSocketAddress SERVER_ADDRESS = InetSocketAddress.createUnresolved("localhost", 9160);
+    private static final SslConfiguration SSL_CONFIGURATION = SslConfiguration.of(Paths.get("./trustStore.jks"));
+
+    private static final ImmutableCassandraKeyValueServiceConfig CASSANDRA_CONFIG = ImmutableCassandraKeyValueServiceConfig.builder()
+            .addServers(SERVER_ADDRESS)
+            .replicationFactor(1)
+            .keyspace("atlasdb")
+            .build();
+
+
+    @Test
+    public void usingSslIfSslParamPresentAndTrue() {
+        assertTrue(CASSANDRA_CONFIG.withSsl(true).usingSsl());
+    }
+
+    @Test
+    public void notUsingSslIfSslParamPresentAndFalse() {
+        assertFalse(CASSANDRA_CONFIG.withSsl(false).usingSsl());
+    }
+
+    @Test
+    public void notUsingSslIfSslParamFalseAndSslConfigurationPresent() {
+        assertFalse(CASSANDRA_CONFIG.withSsl(false).withSslConfiguration(SSL_CONFIGURATION).usingSsl());
+    }
+
+    @Test
+    public void usingSslIfSslParamNotPresentAndSslConfigurationPresent() {
+        assertTrue(CASSANDRA_CONFIG.withSslConfiguration(SSL_CONFIGURATION).usingSsl());
+    }
+
+    @Test
+    public void notUsingSslIfSslParamNotPresentAndSslConfigurationNotPresent() {
+        assertFalse(CASSANDRA_CONFIG.usingSsl());
+    }
+}
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSerializableTransactionTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSerializableTransactionTest.java
index ef1b37fb832..f39acbade8f 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSerializableTransactionTest.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSerializableTransactionTest.java
@@ -25,7 +25,7 @@ public class CassandraKeyValueServiceSerializableTransactionTest extends
     @Override
     protected KeyValueService getKeyValueService() {
         return CassandraKeyValueService.create(
-                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG));
+                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG), CassandraTestSuite.LEADER_CONFIG);
     }
 
     @Override
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweeperTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweeperTest.java
index 16f529f31c8..e995ef7c294 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweeperTest.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceSweeperTest.java
@@ -16,13 +16,13 @@
 package com.palantir.atlasdb.keyvalue.cassandra;
 
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
-import com.palantir.atlasdb.cleaner.AbstractSweeperTest;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.sweep.AbstractSweeperTest;
 
 public class CassandraKeyValueServiceSweeperTest extends AbstractSweeperTest {
     @Override
     protected KeyValueService getKeyValueService() {
         return CassandraKeyValueService.create(
-                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG));
+                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG), CassandraTestSuite.LEADER_CONFIG);
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/AbstractCassandraLockTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationTest.java
similarity index 59%
rename from atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/AbstractCassandraLockTest.java
rename to atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationTest.java
index 188173cc2dd..49ea066e474 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/AbstractCassandraLockTest.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTableCreationTest.java
@@ -17,90 +17,45 @@
 
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.stream.IntStream;
 
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 
-abstract public class AbstractCassandraLockTest {
-    protected static final long GLOBAL_DDL_LOCK_NEVER_ALLOCATED_VALUE = Long.MAX_VALUE - 1;
+public class CassandraKeyValueServiceTableCreationTest {
+    public static final TableReference GOOD_TABLE = TableReference.createFromFullyQualifiedName("foo.bar");
+    public static final TableReference BAD_TABLE = TableReference.createFromFullyQualifiedName("foo.b@r");
+
     protected CassandraKeyValueService kvs;
     protected CassandraKeyValueService slowTimeoutKvs;
-    private final ExecutorService executorService = Executors.newFixedThreadPool(4);
-    public static final TableReference BAD_TABLE = TableReference.createFromFullyQualifiedName("foo.b@r");
-    public static final TableReference GOOD_TABLE = TableReference.createFromFullyQualifiedName("foo.bar");
 
     @Before
     public void setUp() {
         ImmutableCassandraKeyValueServiceConfig quickTimeoutConfig = CassandraTestSuite.CASSANDRA_KVS_CONFIG
                 .withSchemaMutationTimeoutMillis(500);
         kvs = CassandraKeyValueService.create(
-                CassandraKeyValueServiceConfigManager.createSimpleManager(quickTimeoutConfig));
+                CassandraKeyValueServiceConfigManager.createSimpleManager(quickTimeoutConfig), CassandraTestSuite.LEADER_CONFIG);
 
         ImmutableCassandraKeyValueServiceConfig slowTimeoutConfig = CassandraTestSuite.CASSANDRA_KVS_CONFIG
                 .withSchemaMutationTimeoutMillis(60 * 1000);
         slowTimeoutKvs = CassandraKeyValueService.create(
-                CassandraKeyValueServiceConfigManager.createSimpleManager(slowTimeoutConfig));
+                CassandraKeyValueServiceConfigManager.createSimpleManager(slowTimeoutConfig), CassandraTestSuite.LEADER_CONFIG);
 
         kvs.dropTable(AtlasDbConstants.TIMESTAMP_TABLE);
     }
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @After
     public void tearDown() {
         kvs.teardown();
     }
 
-    @Test
-    public void testLockAndUnlockWithoutContention() {
-        long ourId = kvs.waitForSchemaMutationLock();
-        kvs.schemaMutationUnlock(ourId);
-    }
-
-    @Test
-    public void testOnlyOneLockCanBeLockedAtATime() throws InterruptedException, ExecutionException, TimeoutException {
-        long firstLock = kvs.waitForSchemaMutationLock();
-
-        Future tryToAcquireSecondLock = async(() -> kvs.waitForSchemaMutationLock());
-
-        Thread.sleep(3 * 1000);
-        assertThatFutureDidNotSucceedYet(tryToAcquireSecondLock);
-
-        tryToAcquireSecondLock.cancel(true);
-        kvs.schemaMutationUnlock(firstLock);
-    }
-
-    @Test
-    public void testUnlockIsSuccessful() throws InterruptedException, TimeoutException, ExecutionException {
-        long id = kvs.waitForSchemaMutationLock();
-        Future future = async(() -> {
-            long newId = kvs.waitForSchemaMutationLock();
-            kvs.schemaMutationUnlock(newId);
-        });
-        Thread.sleep(100);
-        Assert.assertFalse(future.isDone());
-        kvs.schemaMutationUnlock(id);
-        future.get(3, TimeUnit.SECONDS);
-    }
-
     @Test (timeout = 10 * 1000)
     public void testTableCreationCanOccurAfterError() {
         try {
@@ -132,21 +87,6 @@ public void testCreatingMultipleTablesAtOnce() {
         slowTimeoutKvs.dropTable(GOOD_TABLE);
     }
 
-    protected Future async(Runnable callable) {
-        return executorService.submit(callable);
-    }
-
-    private void assertThatFutureDidNotSucceedYet(Future future) throws InterruptedException {
-        if (future.isDone()) {
-            try {
-                future.get();
-                throw new AssertionError("Future task should have failed but finished successfully");
-            } catch (ExecutionException e) {
-                // if execution is done, we expect it to have failed
-            }
-        }
-    }
-
     @Test
     public void describeVersionBehavesCorrectly() throws Exception {
         kvs.clientPool.runWithRetry(CassandraVerifier.underlyingCassandraClusterSupportsCASOperations);
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTest.java
index 01888c48745..6f12543c497 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTest.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTest.java
@@ -16,29 +16,70 @@
 
 package com.palantir.atlasdb.keyvalue.cassandra;
 
+import static org.mockito.Matchers.startsWith;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
+import org.apache.thrift.TException;
+import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
+import org.slf4j.Logger;
 
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.impl.AbstractAtlasDbKeyValueServiceTest;
 
-public class CassandraKeyValueServiceTest {
-
+public class CassandraKeyValueServiceTest extends AbstractAtlasDbKeyValueServiceTest {
     private KeyValueService keyValueService;
+    private ExecutorService executorService;
+    private Logger logger = mock(Logger.class);
 
     @Before
     public void setupKVS() {
-        keyValueService = CassandraKeyValueService.create(
-                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG));
+        keyValueService = getKeyValueService();
+        executorService = Executors.newFixedThreadPool(4);
+    }
+
+    @After
+    public void cleanUp() {
+        executorService.shutdown();
+    }
+
+    @Override
+    protected KeyValueService getKeyValueService() {
+        return CassandraKeyValueService.create(
+                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG), CassandraTestSuite.LEADER_CONFIG, logger);
+    }
+
+    @Override
+    protected boolean reverseRangesSupported() {
+        return false;
+    }
+
+    @Override
+    @Ignore
+    public void testGetRangeWithHistory() {
+        //
+    }
+
+    @Override
+    @Ignore
+    public void testGetAllTableNames() {
+        //
     }
 
     @Test
-    public void testCreateTableCaseInsensitive() {
+    public void testCreateTableCaseInsensitive() throws TException {
         TableReference table1 = TableReference.createFromFullyQualifiedName("ns.tAbLe");
         TableReference table2 = TableReference.createFromFullyQualifiedName("ns.table");
         TableReference table3 = TableReference.createFromFullyQualifiedName("ns.TABle");
@@ -51,4 +92,8 @@ public void testCreateTableCaseInsensitive() {
         Preconditions.checkArgument(!allTables.contains(table3));
     }
 
-}
+    @Test
+    public void shouldNotErrorForTimestampTableWhenCreatingCassandraKVS() throws Exception {
+        verify(logger, never()).error(startsWith("Found a table " + AtlasDbConstants.TIMESTAMP_TABLE));
+    }
+}
\ No newline at end of file
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionTest.java
index 18f5b0a211c..f5598b76489 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionTest.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServiceTransactionTest.java
@@ -24,7 +24,7 @@ public class CassandraKeyValueServiceTransactionTest extends AbstractTransaction
     @Override
     protected KeyValueService getKeyValueService() {
         return CassandraKeyValueService.create(
-                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG));
+                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG), CassandraTestSuite.LEADER_CONFIG);
     }
 
     @Override
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLegacyLockTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLegacyLockTest.java
deleted file mode 100644
index a0956e13aa1..00000000000
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraLegacyLockTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright 2015 Palantir Technologies
- *
- * Licensed under the BSD-3 License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://opensource.org/licenses/BSD-3-Clause
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.palantir.atlasdb.keyvalue.cassandra;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class CassandraLegacyLockTest extends AbstractCassandraLockTest {
-    @Override
-    @Before
-    public void setUp() {
-        super.setUp();
-
-        kvs.supportsCAS = false;
-        slowTimeoutKvs.supportsCAS = false;
-    }
-
-    // it has a different timeout message
-    @Test
-    public void testLocksTimeout() throws InterruptedException, ExecutionException, TimeoutException {
-        long id = kvs.waitForSchemaMutationLock();
-        try {
-            Future future = async(() -> {
-                kvs.schemaMutationUnlock(kvs.waitForSchemaMutationLock());
-            });
-            exception.expect(ExecutionException.class);
-            exception.expectMessage("unable to get a lock on Cassandra system schema mutations");
-            future.get(10, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            throw e;
-        } finally {
-            kvs.schemaMutationUnlock(id);
-        }
-    }
-
-}
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestSuite.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestSuite.java
index 01d30d63206..80b51896a87 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestSuite.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestSuite.java
@@ -21,16 +21,22 @@
 
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableSet;
 import com.jayway.awaitility.Awaitility;
 import com.jayway.awaitility.Duration;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraCredentialsConfig;
 import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
-import com.palantir.docker.compose.DockerComposition;
+import com.palantir.atlasdb.config.ImmutableLeaderConfig;
+import com.palantir.atlasdb.config.LeaderConfig;
+import com.palantir.atlasdb.ete.Gradle;
+import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.connection.DockerPort;
 import com.palantir.docker.compose.connection.waiting.HealthCheck;
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
@@ -38,30 +44,39 @@
 @RunWith(Suite.class)
 @SuiteClasses({
         CassandraConnectionTest.class,
+        CassandraKeyValueServiceTableCreationTest.class,
         CassandraKeyValueServiceSerializableTransactionTest.class,
         CassandraKeyValueServiceSweeperTest.class,
         CassandraTimestampTest.class,
         CassandraKeyValueServiceTest.class,
-        CassandraDbLockTest.class,
-        CassandraLegacyLockTest.class
+        SchemaMutationLockTest.class,
+        SchemaMutationLockTablesTest.class,
 })
 public class CassandraTestSuite {
 
     public static final int THRIFT_PORT_NUMBER = 9160;
-    @ClassRule
-    public static final DockerComposition composition = DockerComposition.of("src/test/resources/docker-compose.yml")
+    public static final DockerComposeRule docker = DockerComposeRule.builder()
+            .file("src/test/resources/docker-compose.yml")
             .waitingForHostNetworkedPort(THRIFT_PORT_NUMBER, toBeOpen())
             .saveLogsTo("container-logs")
             .build();
 
+    public static final Gradle GRADLE_PREPARE_TASK = Gradle.ensureTaskHasRun(":atlasdb-ete-test-utils:buildCassandraImage");
+
+    @ClassRule
+    public static final RuleChain CASSANDRA_DOCKER_SET_UP = RuleChain.outerRule(GRADLE_PREPARE_TASK).around(docker);
+
     static InetSocketAddress CASSANDRA_THRIFT_ADDRESS;
 
     static ImmutableCassandraKeyValueServiceConfig CASSANDRA_KVS_CONFIG;
 
+    static Optional<LeaderConfig> LEADER_CONFIG;
+
     @BeforeClass
     public static void waitUntilCassandraIsUp() throws IOException, InterruptedException {
-        DockerPort port = composition.hostNetworkedPort(THRIFT_PORT_NUMBER);
-        CASSANDRA_THRIFT_ADDRESS = new InetSocketAddress(port.getIp(), port.getExternalPort());
+        DockerPort port = docker.hostNetworkedPort(THRIFT_PORT_NUMBER);
+        String hostname = port.getIp();
+        CASSANDRA_THRIFT_ADDRESS = new InetSocketAddress(hostname, port.getExternalPort());
 
         CASSANDRA_KVS_CONFIG = ImmutableCassandraKeyValueServiceConfig.builder()
                 .addServers(CASSANDRA_THRIFT_ADDRESS)
@@ -80,6 +95,13 @@ public static void waitUntilCassandraIsUp() throws IOException, InterruptedExcep
                 .autoRefreshNodes(false)
                 .build();
 
+        LEADER_CONFIG = Optional.of(ImmutableLeaderConfig
+                .builder()
+                .quorumSize(1)
+                .localServer(hostname)
+                .leaders(ImmutableSet.of(hostname))
+                .build());
+
         Awaitility.await()
                 .atMost(Duration.ONE_MINUTE)
                 .pollInterval(Duration.ONE_SECOND)
@@ -91,7 +113,7 @@ private static Callable<Boolean> canCreateKeyValueService() {
             @Override
             public Boolean call() throws Exception {
                 try {
-                    CassandraKeyValueService.create(CassandraKeyValueServiceConfigManager.createSimpleManager(CASSANDRA_KVS_CONFIG));
+                    CassandraKeyValueService.create(CassandraKeyValueServiceConfigManager.createSimpleManager(CASSANDRA_KVS_CONFIG), LEADER_CONFIG);
                     return true;
                 } catch (Exception e) {
                     return false;
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java
index d61f3bcda23..0f348dfe448 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTestTools.java
@@ -19,6 +19,9 @@
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import org.joda.time.Duration;
@@ -56,4 +59,19 @@ private static Callable<Boolean> isPortListening(String host, int port) {
             }
         };
     }
+
+    static Future async(ExecutorService executorService, Runnable callable) {
+        return executorService.submit(callable);
+    }
+
+    static void assertThatFutureDidNotSucceedYet(Future future) throws InterruptedException {
+        if (future.isDone()) {
+            try {
+                future.get();
+                throw new AssertionError("Future task should have failed but finished successfully");
+            } catch (ExecutionException e) {
+                // if execution is done, we expect it to have failed
+            }
+        }
+    }
 }
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampTest.java
index 418be9ec327..e4b10ff9fda 100644
--- a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampTest.java
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampTest.java
@@ -31,7 +31,7 @@ public class CassandraTimestampTest {
     @Before
     public void setUp() {
         kv = CassandraKeyValueService.create(
-                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG));
+                CassandraKeyValueServiceConfigManager.createSimpleManager(CassandraTestSuite.CASSANDRA_KVS_CONFIG), CassandraTestSuite.LEADER_CONFIG);
         kv.initializeFromFreshInstance();
         kv.dropTable(AtlasDbConstants.TIMESTAMP_TABLE);
     }
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java
new file mode 100644
index 00000000000..5cf7a029597
--- /dev/null
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTablesTest.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+import org.junit.Test;
+
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+
+public class HiddenTablesTest {
+    private final HiddenTables hiddenTables = new HiddenTables();
+
+    @Test public void
+    shouldSayTimestampIsHidden() {
+        assertThat(hiddenTables.isHidden(AtlasDbConstants.TIMESTAMP_TABLE), is(true));
+    }
+
+    @Test public void
+    shouldSayMetadataIsHidden() {
+        assertThat(hiddenTables.isHidden(AtlasDbConstants.METADATA_TABLE), is(true));
+    }
+
+    @Test public void
+    shouldSayAnOldStyleLocksTableIsHidden() {
+        assertThat(hiddenTables.isHidden(TableReference.createUnsafe("_locks")), is(true));
+    }
+
+    @Test public void
+    shouldSayANewStyleLocksTableIsHidden() {
+        assertThat(hiddenTables.isHidden(TableReference.createUnsafe("_locks_aaaa_123")), is(true));
+    }
+
+    @Test public void
+    shouldSayANamespacedTableIsNotHidden() {
+        assertThat(hiddenTables.isHidden(TableReference.createFromFullyQualifiedName("namespace.table")), is(false));
+    }
+
+    @Test public void
+    shouldSayANonNamespacedVisibleTableIsNotHidden() {
+        assertThat(hiddenTables.isHidden(TableReference.createWithEmptyNamespace("table")), is(false));
+    }
+}
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLockTablesTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLockTablesTest.java
new file mode 100644
index 00000000000..c6e8a31baee
--- /dev/null
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLockTablesTest.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import static java.util.Collections.synchronizedList;
+import static java.util.stream.IntStream.range;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.startsWith;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.function.IntConsumer;
+
+import org.apache.thrift.TException;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+
+public class SchemaMutationLockTablesTest {
+    private SchemaMutationLockTables lockTables;
+    private CassandraKeyValueServiceConfig config;
+    private CassandraClientPool clientPool;
+
+    @Before
+    public void setupKVS() throws TException, InterruptedException {
+        config = CassandraTestSuite.CASSANDRA_KVS_CONFIG
+                .withKeyspace(UUID.randomUUID().toString().replace('-', '_')); // Hyphens not allowed in C* schema
+        clientPool = new CassandraClientPool(config);
+        clientPool.runOneTimeStartupChecks();
+        lockTables = new SchemaMutationLockTables(clientPool, config);
+    }
+
+    @Test
+    public void startsWithNoTables() throws TException {
+        assertThat(lockTables.getAllLockTables(), is(empty()));
+    }
+
+    @Test
+    public void tableShouldExistAfterCreation() throws Exception {
+        lockTables.createLockTable();
+        assertThat(lockTables.getAllLockTables(), hasSize(1));
+    }
+
+    @Test
+    public void multipleLockTablesExistAfterCreation() throws Exception {
+        lockTables.createLockTable();
+        lockTables.createLockTable();
+        assertThat(lockTables.getAllLockTables(), hasSize(2));
+    }
+
+    @Test
+    public void multipleSchemaMutationLockTablesObjectsShouldReturnSameLockTables() throws Exception {
+        SchemaMutationLockTables lockTables2 = new SchemaMutationLockTables(clientPool, config);
+        lockTables.createLockTable();
+        assertThat(lockTables.getAllLockTables(), is(lockTables2.getAllLockTables()));
+    }
+
+    @Test
+    public void shouldCreateLockTablesStartingWithCorrectPrefix() throws TException {
+        lockTables.createLockTable();
+
+        assertThat(Iterables.getOnlyElement(lockTables.getAllLockTables()).getTablename(), startsWith("_locks_"));
+    }
+
+    @Test
+    public void whenTablesAreCreatedConcurrentlyAtLeastOneThreadShouldSeeBothTables() {
+        CyclicBarrier barrier = new CyclicBarrier(2);
+
+        List<Set<TableReference>> lockTablesSeen = synchronizedList(new ArrayList<>());
+
+        range(0,2).parallel()
+                .forEach(ignoringExceptions( () -> {
+                    barrier.await();
+                    lockTables.createLockTable();
+                    lockTablesSeen.add(lockTables.getAllLockTables());
+                    return null;
+                }));
+
+        assertThat("Only one table was seen by both creation threads", lockTablesSeen, hasItem(hasSize(2)));
+    }
+
+    private IntConsumer ignoringExceptions(Callable function) {
+        return (i) -> {
+            try {
+                function.call();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        };
+    }
+}
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLockTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLockTest.java
new file mode 100644
index 00000000000..55f41c4b577
--- /dev/null
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLockTest.java
@@ -0,0 +1,133 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
+import com.palantir.atlasdb.cassandra.ImmutableCassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.config.LockLeader;
+import com.palantir.common.exception.PalantirRuntimeException;
+
+@RunWith(Parameterized.class)
+public class SchemaMutationLockTest {
+    public static final SchemaMutationLock.Action DO_NOTHING = () -> {};
+    protected SchemaMutationLock schemaMutationLock;
+    private final ExecutorService executorService = Executors.newFixedThreadPool(4);
+
+    @Parameterized.Parameter(value = 0)
+    public boolean casEnabled;
+
+    @Parameterized.Parameter(value = 1)
+    public String expectedTimeoutErrorMessage;
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(new Object[][] {
+                { true, "We have timed out waiting on the current schema mutation lock holder." },
+                { false, "unable to get a lock on Cassandra system schema mutations" }});
+    }
+
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    @Before
+    public void setUp() throws Exception {
+        setUpWithCasSupportSetTo(casEnabled);
+    }
+
+    protected void setUpWithCasSupportSetTo(boolean supportsCas) throws Exception {
+        ImmutableCassandraKeyValueServiceConfig quickTimeoutConfig = CassandraTestSuite.CASSANDRA_KVS_CONFIG
+                .withSchemaMutationTimeoutMillis(500);
+        CassandraKeyValueServiceConfigManager simpleManager = CassandraKeyValueServiceConfigManager.createSimpleManager(quickTimeoutConfig);
+        ConsistencyLevel writeConsistency = ConsistencyLevel.EACH_QUORUM;
+        CassandraClientPool clientPool = new CassandraClientPool(simpleManager.getConfig());
+
+        UniqueSchemaMutationLockTable lockTable = new UniqueSchemaMutationLockTable(new SchemaMutationLockTables(clientPool, quickTimeoutConfig), LockLeader.I_AM_THE_LOCK_LEADER);
+        schemaMutationLock = new SchemaMutationLock(supportsCas, simpleManager, clientPool, writeConsistency, lockTable);
+    }
+
+    @Test
+    public void testLockAndUnlockWithoutContention() {
+        schemaMutationLock.runWithLock(() -> {});
+    }
+
+    @Test
+    public void doesNotPerformAnActionIfTheLockIsAlreadyHeld() {
+        schemaMutationLock.runWithLock(() -> {
+            Future getLockAgain = CassandraTestTools.async(
+                    executorService,
+                    () -> schemaMutationLock.runWithLock(DO_NOTHING));
+
+            Thread.sleep(3*1000);
+
+            CassandraTestTools.assertThatFutureDidNotSucceedYet(getLockAgain);
+        });
+    }
+
+    @Test(timeout = 10 * 1000)
+    public void canRunAnotherActionOnceTheFirstHasBeenCompleted() {
+        AtomicInteger counter = new AtomicInteger();
+        SchemaMutationLock.Action increment = () -> counter.incrementAndGet();
+
+        schemaMutationLock.runWithLock(increment);
+        schemaMutationLock.runWithLock(increment);
+
+        assertThat(counter.get(), is(2));
+    }
+
+    @Test
+    public void shouldWrapCheckedExceptionsInARuntimeException() {
+        Exception error = new Exception();
+
+        expectedException.expect(PalantirRuntimeException.class);
+        expectedException.expectCause(is(error));
+
+        schemaMutationLock.runWithLock(() -> { throw error; });
+    }
+
+    @Test
+    public void testLocksTimeout() throws InterruptedException, ExecutionException, TimeoutException {
+        schemaMutationLock.runWithLock(() -> {
+            expectedException.expect(PalantirRuntimeException.class);
+            expectedException.expectMessage(expectedTimeoutErrorMessage);
+
+            Future async = CassandraTestTools.async(
+                    executorService,
+                    () -> schemaMutationLock.runWithLock(DO_NOTHING));
+            async.get(10, TimeUnit.SECONDS);
+        });
+    }
+}
diff --git a/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/UniqueSchemaMutationLockTableTest.java b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/UniqueSchemaMutationLockTableTest.java
new file mode 100644
index 00000000000..98c1f30724b
--- /dev/null
+++ b/atlasdb-cassandra-tests/src/test/java/com/palantir/atlasdb/keyvalue/cassandra/UniqueSchemaMutationLockTableTest.java
@@ -0,0 +1,152 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+
+import org.apache.thrift.TException;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.config.LockLeader;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+
+public class UniqueSchemaMutationLockTableTest {
+
+    private UniqueSchemaMutationLockTable uniqueLockTable;
+    private SchemaMutationLockTables lockTables;
+    private TableReference lockTable1 = TableReference.createWithEmptyNamespace(SchemaMutationLockTables.LOCK_TABLE_PREFIX + "_1");
+    private TableReference lockTable2 = TableReference.createWithEmptyNamespace(SchemaMutationLockTables.LOCK_TABLE_PREFIX + "_2");
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Before
+    public void setupKVS() throws TException, InterruptedException {
+        lockTables = mock(SchemaMutationLockTables.class);
+        uniqueLockTable = new UniqueSchemaMutationLockTable(lockTables, LockLeader.I_AM_THE_LOCK_LEADER);
+    }
+
+    @Test
+    public void shouldReturnALockTableIfNoneExist() throws TException {
+        when(lockTables.getAllLockTables()).thenReturn(Collections.EMPTY_SET, ImmutableSet.of(lockTable1));
+        when(lockTables.createLockTable()).thenReturn(lockTable1);
+
+        assertThat(uniqueLockTable.getOnlyTable(), is(lockTable1));
+    }
+
+    @Test
+    public void shouldReturnTheSameLockTableOnMultipleCalls() throws TException {
+        when(lockTables.getAllLockTables()).thenReturn(ImmutableSet.of(lockTable1));
+
+        assertThat(uniqueLockTable.getOnlyTable(), is(uniqueLockTable.getOnlyTable()));
+    }
+
+    @Test
+    public void shouldNotCreateALockTableIfOneAlreadyExists() throws Exception {
+        when(lockTables.getAllLockTables()).thenReturn(ImmutableSet.of(lockTable1));
+
+        uniqueLockTable.getOnlyTable();
+
+        verify(lockTables, never()).createLockTable();
+    }
+
+    @Test
+    public void shouldReturnTheLockTableIfItIsTheOnlyOne() throws TException {
+        when(lockTables.getAllLockTables()).thenReturn(ImmutableSet.of(lockTable1));
+
+        assertThat(uniqueLockTable.getOnlyTable(), is(lockTable1));
+    }
+
+    @Test
+    public void shouldThrowExceptionIfMultipleTablesExist() throws Exception {
+        when(lockTables.getAllLockTables()).thenReturn(ImmutableSet.of(lockTable1, lockTable2));
+
+        exception.expect(IllegalStateException.class);
+        exception.expectMessage("Multiple schema mutation lock tables have been created.\n");
+
+        try {
+            uniqueLockTable.getOnlyTable();
+        } finally {
+            verify(lockTables, never()).createLockTable();
+        }
+    }
+
+    @Test
+    public void shouldThrowExceptionIfMultipleTablesExistSuddenlyDueToConcurrency() throws Exception {
+        when(lockTables.getAllLockTables()).thenReturn(ImmutableSet.of(), ImmutableSet.of(lockTable1, lockTable2));
+
+        exception.expect(IllegalStateException.class);
+        exception.expectMessage("Multiple schema mutation lock tables have been created.\n");
+
+        try {
+            uniqueLockTable.getOnlyTable();
+        } finally {
+            verify(lockTables).createLockTable();
+        }
+    }
+
+    @Test
+    public void shouldNotCreateLockTableIfNotLockLeader() throws Exception {
+        when(lockTables.getAllLockTables()).thenReturn(ImmutableSet.of(), ImmutableSet.of(lockTable1));
+
+        uniqueLockTable = new UniqueSchemaMutationLockTable(lockTables, LockLeader.SOMEONE_ELSE_IS_THE_LOCK_LEADER);
+
+        uniqueLockTable.getOnlyTable();
+
+        verify(lockTables, never()).createLockTable();
+    }
+
+    @Test
+    public void shouldThrowAnExceptionIfMultipleLockTablesAreCreatedWhenWeAreNotTheLockTable() throws TException {
+        when(lockTables.getAllLockTables()).thenReturn(ImmutableSet.of(lockTable1, lockTable2));
+
+        uniqueLockTable = new UniqueSchemaMutationLockTable(lockTables, LockLeader.SOMEONE_ELSE_IS_THE_LOCK_LEADER);
+
+        exception.expect(IllegalStateException.class);
+        exception.expectMessage("Multiple schema mutation lock tables have been created.\n");
+
+        uniqueLockTable.getOnlyTable();
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void shouldWrapThriftExceptions() throws TException {
+        when(lockTables.createLockTable()).thenThrow(TException.class);
+
+        uniqueLockTable.getOnlyTable();
+    }
+
+    @Test
+    public void shouldWaitWhenNotTheLockLeader() throws TException {
+        when(lockTables.getAllLockTables()).thenReturn(ImmutableSet.of(), ImmutableSet.of(lockTable1));
+
+        uniqueLockTable = new UniqueSchemaMutationLockTable(lockTables, LockLeader.SOMEONE_ELSE_IS_THE_LOCK_LEADER);
+
+        assertThat(uniqueLockTable.getOnlyTable(), is(lockTable1));
+    }
+}
+
diff --git a/atlasdb-cassandra/build.gradle b/atlasdb-cassandra/build.gradle
index 3e42355e250..97f2b87d6cf 100644
--- a/atlasdb-cassandra/build.gradle
+++ b/atlasdb-cassandra/build.gradle
@@ -4,7 +4,8 @@ apply from: "../gradle/shared.gradle"
 
 dependencies {
   compile project(":atlasdb-client")
-  compile project(":atlasdb-spi")
+  compile project(":atlasdb-api")
+  compile project(":commons-api")
   compile project(':timestamp-impl')
 
   compile('org.apache.cassandra:cassandra-all:' + libVersions.cassandra) {
@@ -19,20 +20,30 @@ dependencies {
 
   compile 'org.apache.commons:commons-pool2:2.4.2'
 
-  processor 'org.immutables:value:2.0.21'
+  compile ('com.palantir.remoting:ssl-config:0.13.0') {
+    exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
+  }
+
+  compile group: 'com.google.code.findbugs', name: 'annotations', version: libVersions.findbugsAnnotations
+
+  processor 'org.immutables:value:' + libVersions.immutables
   processor 'com.google.auto.service:auto-service:1.0-rc2'
 }
 
 configurations.matching({ it.name in ['compile', 'runtime'] }).all {
     resolutionStrategy {
+        force 'ch.qos.logback:logback-classic:1.1.3'
         force 'com.fasterxml.jackson.core:jackson-databind:' + libVersions.jackson
         force 'com.fasterxml.jackson.core:jackson-core:' + libVersions.jackson
         force 'com.fasterxml.jackson.datatype:jackson-datatype-guava:' + libVersions.jackson
+        force 'com.google.code.findbugs:jsr305:' + libVersions.jsr305
         force 'com.googlecode.json-simple:json-simple:1.1.1'
+        force 'joda-time:joda-time:' + libVersions.joda_time
         force 'org.apache.thrift:libthrift:' + libVersions.libthrift
         force 'org.slf4j:slf4j-api:1.7.6'
         force 'org.xerial.snappy:snappy-java:' + libVersions.snappy
         force 'org.yaml:snakeyaml:1.12'
+        force 'javax.validation:validation-api:1.1.0.Final'
         force 'commons-codec:commons-codec:' + libVersions.commons_codec
     }
 }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java
index a1bc4893031..4c192632f38 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraAtlasDbFactory.java
@@ -16,7 +16,9 @@
 package com.palantir.atlasdb.cassandra;
 
 import com.google.auto.service.AutoService;
+import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraKeyValueService;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraTimestampBoundStore;
@@ -30,23 +32,32 @@
 public class CassandraAtlasDbFactory implements AtlasDbFactory {
 
     @Override
-    public KeyValueService createRawKeyValueService(KeyValueServiceConfig config) {
+    public KeyValueService createRawKeyValueService(
+            KeyValueServiceConfig config,
+            Optional<LeaderConfig> leaderConfig) {
         AtlasDbVersion.ensureVersionReported();
         Preconditions.checkArgument(config instanceof CassandraKeyValueServiceConfig,
-                "CassandraAtlasDbFactory expects a configuration of type CassandraKeyValueServiceConfig, found %s", config.getClass());
-        return createKv((CassandraKeyValueServiceConfig) config);
+                "CassandraAtlasDbFactory expects a configuration of type"
+                + " CassandraKeyValueServiceConfig, found %s", config.getClass());
+        return createKv((CassandraKeyValueServiceConfig) config, leaderConfig);
     }
 
-    private static CassandraKeyValueService createKv(CassandraKeyValueServiceConfig config) {
-        return CassandraKeyValueService.create(CassandraKeyValueServiceConfigManager.createSimpleManager(config));
+    private static CassandraKeyValueService createKv(
+            CassandraKeyValueServiceConfig config,
+            Optional<LeaderConfig> leaderConfig) {
+        return CassandraKeyValueService.create(
+                CassandraKeyValueServiceConfigManager.createSimpleManager(config),
+                leaderConfig);
     }
 
     @Override
     public TimestampService createTimestampService(KeyValueService rawKvs) {
         AtlasDbVersion.ensureVersionReported();
         Preconditions.checkArgument(rawKvs instanceof CassandraKeyValueService,
-                "TimestampService must be created from an instance of CassandraKeyValueService, found %s", rawKvs.getClass());
-        return PersistentTimestampService.create(CassandraTimestampBoundStore.create((CassandraKeyValueService) rawKvs));
+                "TimestampService must be created from an instance of"
+                + " CassandraKeyValueService, found %s", rawKvs.getClass());
+        return PersistentTimestampService.create(
+                CassandraTimestampBoundStore.create((CassandraKeyValueService) rawKvs));
     }
 
     @Override
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java
index 0815951c65f..08391832cdc 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraCredentialsConfig.java
@@ -24,9 +24,7 @@
 @JsonSerialize(as = ImmutableCassandraCredentialsConfig.class)
 @Value.Immutable
 public interface CassandraCredentialsConfig {
+    String username();
 
-    public String username();
-    
-    public String password();
-    
+    String password();
 }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java
index b6b8a43a882..d4d384866d4 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfig.java
@@ -21,6 +21,7 @@
 
 import org.immutables.value.Value;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -28,6 +29,7 @@
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+import com.palantir.remoting.ssl.SslConfiguration;
 
 @AutoService(KeyValueServiceConfig.class)
 @JsonDeserialize(as = ImmutableCassandraKeyValueServiceConfig.class)
@@ -59,7 +61,24 @@ public int unresponsiveHostBackoffTimeSeconds() {
 
     public abstract Optional<CassandraCredentialsConfig> credentials();
 
-    public abstract boolean ssl();
+    /**
+     * A boolean declaring whether or not to use ssl to communicate with cassandra.
+     * This configuration value is deprecated in favor of using sslConfiguration.  If
+     * true, read in trust and key store information from system properties unless
+     * the sslConfiguration object is specified.
+     *
+     * @deprecated Use {@link #sslConfiguration()} instead.
+     */
+    @Deprecated
+    public abstract Optional<Boolean> ssl();
+
+    /**
+     * An object for specifying ssl configuration details.  The lack of existence of this
+     * object implies ssl is not to be used to connect to cassandra.
+     *
+     * The existence of this object overrides any configuration made via the ssl config value.
+     */
+    public abstract Optional<SslConfiguration> sslConfiguration();
 
     public abstract int replicationFactor();
 
@@ -74,7 +93,9 @@ public int mutationBatchSizeBytes() {
     }
 
     @Value.Default
-    public int fetchBatchCount() { return 5000; }
+    public int fetchBatchCount() {
+        return 5000;
+    }
 
     @Value.Default
     public boolean safetyDisabled() {
@@ -87,7 +108,9 @@ public boolean autoRefreshNodes() {
     }
 
     @Value.Default
-    public boolean clusterMeetsNormalConsistencyGuarantees() { return true; }
+    public boolean clusterMeetsNormalConsistencyGuarantees() {
+        return true;
+    }
 
     /**
      * This is how long we will wait when we first open a socket to the cassandra server.
@@ -116,7 +139,9 @@ public int cqlPoolTimeoutMillis() {
     }
 
     @Value.Default
-    public int schemaMutationTimeoutMillis() { return 60 * 1000; }
+    public int schemaMutationTimeoutMillis() {
+        return 60 * 1000;
+    }
 
     @Value.Default
     public int rangesConcurrency() {
@@ -130,6 +155,12 @@ public final String type() {
         return TYPE;
     }
 
+    @JsonIgnore
+    @Value.Derived
+    public boolean usingSsl() {
+        return ssl().or(sslConfiguration().isPresent());
+    }
+
     @Value.Check
     protected final void check() {
         Preconditions.checkState(!servers().isEmpty(), "'servers' must have at least one entry");
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigManager.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigManager.java
index 7ab3fa7e5e1..58e613f2942 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigManager.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/cassandra/CassandraKeyValueServiceConfigManager.java
@@ -27,7 +27,7 @@
 import com.google.common.base.Suppliers;
 import com.palantir.common.concurrent.PTExecutors;
 
-public class CassandraKeyValueServiceConfigManager {
+public final class CassandraKeyValueServiceConfigManager {
     private static final Logger log = LoggerFactory.getLogger(CassandraKeyValueServiceConfigManager.class);
 
     private final Supplier<CassandraKeyValueServiceConfig> configSupplier;
@@ -41,21 +41,29 @@ public class CassandraKeyValueServiceConfigManager {
     private static final long DEFAULT_REFRESH_INTERVAL = 1000 * 10;
 
     public static CassandraKeyValueServiceConfigManager createSimpleManager(CassandraKeyValueServiceConfig config) {
-        CassandraKeyValueServiceConfigManager ret =
-                new CassandraKeyValueServiceConfigManager(Suppliers.ofInstance(config), null, DEFAULT_INIT_DELAY, DEFAULT_REFRESH_INTERVAL);
+        CassandraKeyValueServiceConfigManager ret = new CassandraKeyValueServiceConfigManager(
+                Suppliers.ofInstance(config),
+                null,
+                DEFAULT_INIT_DELAY,
+                DEFAULT_REFRESH_INTERVAL);
         ret.init();
         return ret;
     }
 
-    public static CassandraKeyValueServiceConfigManager create(Supplier<CassandraKeyValueServiceConfig> configSupplier) {
+    public static CassandraKeyValueServiceConfigManager create(
+            Supplier<CassandraKeyValueServiceConfig> configSupplier) {
         return create(configSupplier, DEFAULT_INIT_DELAY, DEFAULT_REFRESH_INTERVAL);
     }
 
-    public static CassandraKeyValueServiceConfigManager create(Supplier<CassandraKeyValueServiceConfig> configSupplier,
-                                                               long initDelay,
-                                                               long refreshInterval) {
-        CassandraKeyValueServiceConfigManager ret =
-                new CassandraKeyValueServiceConfigManager(configSupplier, PTExecutors.newScheduledThreadPool(1), initDelay, refreshInterval);
+    public static CassandraKeyValueServiceConfigManager create(
+            Supplier<CassandraKeyValueServiceConfig> configSupplier,
+            long initDelay,
+            long refreshInterval) {
+        CassandraKeyValueServiceConfigManager ret = new CassandraKeyValueServiceConfigManager(
+                configSupplier,
+                PTExecutors.newScheduledThreadPool(1),
+                initDelay,
+                refreshInterval);
         ret.init();
         return ret;
     }
@@ -68,10 +76,11 @@ public static CassandraKeyValueServiceConfigManager create(Supplier<CassandraKey
      * @param initDelay init delay on polling updates
      * @param refreshInterval refresh interval for polling updates
      */
-    private CassandraKeyValueServiceConfigManager(final Supplier<CassandraKeyValueServiceConfig> configSupplier,
-                                                  @Nullable ScheduledExecutorService refreshExecutor,
-                                                  long initDelay,
-                                                  long refreshInterval) {
+    private CassandraKeyValueServiceConfigManager(
+            Supplier<CassandraKeyValueServiceConfig> configSupplier,
+            @Nullable ScheduledExecutorService refreshExecutor,
+            long initDelay,
+            long refreshInterval) {
         this.configSupplier = configSupplier;
         this.refreshExecutor = refreshExecutor;
         this.config = configSupplier.get();
@@ -81,17 +90,15 @@ private CassandraKeyValueServiceConfigManager(final Supplier<CassandraKeyValueSe
 
     private void init() {
         if (refreshExecutor != null) {
-            refreshExecutor.scheduleWithFixedDelay(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        config = configSupplier.get();
-                    }  catch (Throwable t) {
-                        // If any execution of the task encounters an exception, subsequent executions are suppressed for
-                        // ScheduledExecutorService.scheduleWithFixedDelay() we're catching Throwable (e.g. OutOfMemoryError,
-                        // NPE, SocketException, Cassandra network error, etc.) to ensure the task doesn't get killed.
-                        log.error("CassandraKeyValueServiceConfigManager encountered {}", t.toString(), t);
-                    }
+            refreshExecutor.scheduleWithFixedDelay(() -> {
+                try {
+                    config = configSupplier.get();
+                }  catch (Throwable t) {
+                    // If any execution of the task encounters an exception, subsequent executions are suppressed for
+                    // ScheduledExecutorService.scheduleWithFixedDelay() we're catching Throwable (e.g.
+                    // OutOfMemoryError, NPE, SocketException, Cassandra network error, etc.) to ensure the task
+                    // doesn't get killed.
+                    log.error("CassandraKeyValueServiceConfigManager encountered {}", t.toString(), t);
                 }
             }, initDelay, refreshInterval, TimeUnit.MILLISECONDS);
         }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLExpiringKeyValueService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLExpiringKeyValueService.java
index 9a76d75468b..40d82634195 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLExpiringKeyValueService.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLExpiringKeyValueService.java
@@ -23,7 +23,6 @@
 
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.ResultSetFuture;
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSortedMap;
@@ -43,12 +42,13 @@
 import com.palantir.common.base.Throwables;
 
 
-public class CQLExpiringKeyValueService extends CQLKeyValueService implements ExpiringKeyValueService {
+public final class CQLExpiringKeyValueService extends CQLKeyValueService implements ExpiringKeyValueService {
 
     public static CQLExpiringKeyValueService create(CassandraKeyValueServiceConfigManager configManager) {
         Preconditions.checkState(!configManager.getConfig().servers().isEmpty(), "address list was empty");
 
-        Optional<CassandraJmxCompactionManager> compactionManager = CassandraJmxCompaction.createJmxCompactionManager(configManager);
+        Optional<CassandraJmxCompactionManager> compactionManager =
+                CassandraJmxCompaction.createJmxCompactionManager(configManager);
         CQLExpiringKeyValueService kvs = new CQLExpiringKeyValueService(configManager, compactionManager);
         kvs.initializeConnectionPool();
         kvs.performInitialSetup();
@@ -61,25 +61,39 @@ private CQLExpiringKeyValueService(CassandraKeyValueServiceConfigManager configM
     }
 
     @Override
-    public void put(final TableReference tableRef, final Map<Cell, byte[]> values, final long timestamp, final long time, final TimeUnit unit) {
+    public void put(TableReference tableRef, Map<Cell, byte[]> values, long timestamp, long time, TimeUnit unit) {
         try {
-            putInternal(tableRef, KeyValueServices.toConstantTimestampValues(values.entrySet(), timestamp), TransactionType.NONE, CassandraKeyValueServices.convertTtl(time, unit), false);
+            putInternal(
+                    tableRef,
+                    KeyValueServices.toConstantTimestampValues(values.entrySet(), timestamp),
+                    TransactionType.NONE,
+                    CassandraKeyValueServices.convertTtl(time, unit),
+                    false);
         } catch (Exception e) {
             throw Throwables.throwUncheckedException(e);
         }
     }
 
     @Override
-    public void putWithTimestamps(TableReference tableRef, Multimap<Cell, Value> values, final long time, final TimeUnit unit) {
+    public void putWithTimestamps(TableReference tableRef, Multimap<Cell, Value> values, long time, TimeUnit unit) {
         try {
-            putInternal(tableRef, values.entries(), TransactionType.NONE, CassandraKeyValueServices.convertTtl(time, unit), false);
+            putInternal(
+                    tableRef,
+                    values.entries(),
+                    TransactionType.NONE,
+                    CassandraKeyValueServices.convertTtl(time, unit),
+                    false);
         } catch (Exception e) {
             throw Throwables.throwUncheckedException(e);
         }
     }
 
     @Override
-    public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable, final long timestamp, final long time, final TimeUnit unit) throws KeyAlreadyExistsException {
+    public void multiPut(
+            Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable,
+            long timestamp,
+            long time,
+            TimeUnit unit) throws KeyAlreadyExistsException {
         Map<ResultSetFuture, TableReference> resultSetFutures = Maps.newHashMap();
         for (Entry<TableReference, ? extends Map<Cell, byte[]>> e : valuesByTable.entrySet()) {
             final TableReference table = e.getKey();
@@ -87,17 +101,22 @@ public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTa
             NavigableMap<Cell, byte[]> sortedMap = ImmutableSortedMap.copyOf(e.getValue());
 
 
-            Iterable<List<Entry<Cell, byte[]>>> partitions = partitionByCountAndBytes(sortedMap.entrySet(),
-                    getMultiPutBatchCount(), getMultiPutBatchSizeBytes(), table, CQLKeyValueServices.MULTIPUT_ENTRY_SIZING_FUNCTION);
+            Iterable<List<Entry<Cell, byte[]>>> partitions = partitionByCountAndBytes(
+                    sortedMap.entrySet(),
+                    getMultiPutBatchCount(),
+                    getMultiPutBatchSizeBytes(),
+                    table,
+                    CQLKeyValueServices.MULTIPUT_ENTRY_SIZING_FUNCTION);
 
 
             for (final List<Entry<Cell, byte[]>> p : partitions) {
-                List<Entry<Cell, Value>> partition = Lists.transform(p, new Function<Entry<Cell, byte[]>, Entry<Cell, Value>>() {
-                    @Override
-                    public Entry<Cell, Value> apply(Entry<Cell, byte[]> input) {
-                        return Maps.immutableEntry(input.getKey(), Value.create(input.getValue(), timestamp));
-                    }});
-                resultSetFutures.put(getPutPartitionResultSetFuture(table, partition, TransactionType.NONE,  CassandraKeyValueServices.convertTtl(time, unit)), table);
+                List<Entry<Cell, Value>> partition = Lists.transform(p,
+                        input -> Maps.immutableEntry(input.getKey(), Value.create(input.getValue(), timestamp)));
+                resultSetFutures.put(getPutPartitionResultSetFuture(
+                        table,
+                        partition,
+                        TransactionType.NONE,
+                        CassandraKeyValueServices.convertTtl(time, unit)), table);
             }
         }
 
@@ -109,7 +128,12 @@ public Entry<Cell, Value> apply(Entry<Cell, byte[]> input) {
             } catch (Throwable t) {
                 throw Throwables.throwUncheckedException(t);
             }
-            cqlKeyValueServices.logTracedQuery(getPutQuery(result.getValue(), CassandraKeyValueServices.convertTtl(time, unit)), resultSet, session, cqlStatementCache.NORMAL_QUERY);
+            cqlKeyValueServices.logTracedQuery(getPutQuery(
+                    result.getValue(),
+                    CassandraKeyValueServices.convertTtl(time, unit)),
+                    resultSet,
+                    session,
+                    cqlStatementCache.normalQuery);
         }
     }
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueService.java
index b1923cdbf3d..8c6178b4fe1 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueService.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueService.java
@@ -19,7 +19,6 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -30,8 +29,11 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
 
-import org.apache.commons.lang.Validate;
+import javax.net.ssl.SSLContext;
+
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,6 +51,7 @@
 import com.datastax.driver.core.ResultSet;
 import com.datastax.driver.core.ResultSetFuture;
 import com.datastax.driver.core.Row;
+import com.datastax.driver.core.SSLOptions;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.SocketOptions;
 import com.datastax.driver.core.exceptions.InvalidQueryException;
@@ -108,6 +111,7 @@
 import com.palantir.common.base.ClosableIterators;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.visitor.Visitor;
+import com.palantir.remoting.ssl.SslSocketFactories;
 import com.palantir.util.paging.AbstractPagingIterable;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
@@ -115,8 +119,10 @@
 public class CQLKeyValueService extends AbstractKeyValueService {
     private static final Logger log = LoggerFactory.getLogger(CQLKeyValueService.class);
 
-    private Cluster cluster, longRunningQueryCluster;
-    Session session, longRunningQuerySession;
+    private Cluster cluster;
+    private Cluster longRunningQueryCluster;
+    Session session;
+    Session longRunningQuerySession;
 
     CQLStatementCache cqlStatementCache;
     protected CQLKeyValueServices cqlKeyValueServices;
@@ -131,7 +137,8 @@ public class CQLKeyValueService extends AbstractKeyValueService {
     private boolean limitBatchSizesToServerDefaults = false;
 
     public static CQLKeyValueService create(CassandraKeyValueServiceConfigManager configManager) {
-        Optional<CassandraJmxCompactionManager> compactionManager = CassandraJmxCompaction.createJmxCompactionManager(configManager);
+        Optional<CassandraJmxCompactionManager> compactionManager =
+                CassandraJmxCompaction.createJmxCompactionManager(configManager);
         final CQLKeyValueService ret = new CQLKeyValueService(configManager, compactionManager);
         ret.initializeConnectionPool();
         ret.performInitialSetup();
@@ -153,7 +160,11 @@ protected void initializeConnectionPool() {
         clusterBuilder.withClusterName("atlas_cassandra_cluster_" + config.keyspace()); // for JMX metrics
         clusterBuilder.withCompression(Compression.LZ4);
 
-        if (config.ssl()) {
+        if (config.sslConfiguration().isPresent()) {
+            SSLContext sslContext = SslSocketFactories.createSslContext(config.sslConfiguration().get());
+            SSLOptions sslOptions = new SSLOptions(sslContext, SSLOptions.DEFAULT_SSL_CIPHER_SUITES);
+            clusterBuilder.withSSL(sslOptions);
+        } else if (config.ssl().isPresent() && config.ssl().get()) {
             clusterBuilder.withSSL();
         }
 
@@ -170,8 +181,10 @@ protected void initializeConnectionPool() {
 
         // Refuse to talk to nodes twice as (latency-wise) slow as the best one, over a timescale of 100ms,
         // and every 10s try to re-evaluate ignored nodes performance by giving them queries again.
-        // Note we are being purposely datacenter-irreverent here, instead relying on latency alone to approximate what DCAwareRR would do;
-        // this is because DCs for Atlas are always quite latency-close and should be used this way, not as if we have some cross-country backup DC.
+        // Note we are being purposely datacenter-irreverent here, instead relying on latency alone
+        // to approximate what DCAwareRR would do;
+        // this is because DCs for Atlas are always quite latency-close and should be used this way,
+        // not as if we have some cross-country backup DC.
         LoadBalancingPolicy policy = LatencyAwarePolicy.builder(new RoundRobinPolicy()).build();
 
         // If user wants, do not automatically add in new nodes to pool (useful during DC migrations / rebuilds)
@@ -180,7 +193,8 @@ protected void initializeConnectionPool() {
         }
 
         // also try and select coordinators who own the data we're talking about to avoid an extra hop,
-        // but also shuffle which replica we talk to for a load balancing that comes at the expense of less effective caching
+        // but also shuffle which replica we talk to for a load balancing that comes at the expense
+        // of less effective caching
         policy = new TokenAwarePolicy(policy, true);
 
         clusterBuilder.withLoadBalancingPolicy(policy);
@@ -199,7 +213,8 @@ protected void initializeConnectionPool() {
                 throw e;
             }
         } catch (IllegalStateException e) {
-            if (e.getMessage().contains("requested compression is not available")) { // god dammit datastax what did I do to _you_
+            // god dammit datastax what did I do to _you_
+            if (e.getMessage().contains("requested compression is not available")) {
                 clusterBuilder.withCompression(Compression.NONE);
                 cluster = clusterBuilder.build();
                 metadata = cluster.getMetadata();
@@ -210,7 +225,8 @@ protected void initializeConnectionPool() {
 
         session = cluster.connect();
 
-        clusterBuilder.withSocketOptions(new SocketOptions().setReadTimeoutMillis(CassandraConstants.LONG_RUNNING_QUERY_SOCKET_TIMEOUT_MILLIS));
+        clusterBuilder.withSocketOptions(new SocketOptions().setReadTimeoutMillis(
+                CassandraConstants.LONG_RUNNING_QUERY_SOCKET_TIMEOUT_MILLIS));
         longRunningQueryCluster = clusterBuilder.build();
         longRunningQuerySession = longRunningQueryCluster.connect();
 
@@ -245,7 +261,7 @@ public void close() {
         session.close();
         cluster.close();
         cqlKeyValueServices.shutdown();
-        if(compactionManager.isPresent()) {
+        if (compactionManager.isPresent()) {
             compactionManager.get().close();
         }
         longRunningQuerySession.close();
@@ -276,17 +292,19 @@ public boolean apply(Peer peer) {
 
         // node we're querying doesn't count itself as a peer
         if (peers.size() > 0 && !allNodesHaveSaneNumberOfVnodes) {
-            throw new IllegalStateException("All nodes in cluster must have sane number of vnodes (or cluster must consist of a single node).");
+            throw new IllegalStateException("All nodes in cluster must have sane number of vnodes"
+                    + " (or cluster must consist of a single node).");
         }
 
         Set<String> dcsInCluster = Sets.newHashSet();
-        for (Peer peer: peers) {
-            dcsInCluster.add(peer.data_center);
-                if (peer.data_center == null) {
-                    throw new IllegalStateException("Cluster should not mix datacenter-aware and non-datacenter-aware nodes.");
-                }
+        for (Peer peer : peers) {
+            dcsInCluster.add(peer.dataCenter);
+            if (peer.dataCenter == null) {
+                throw new IllegalStateException("Cluster should not mix datacenter-aware"
+                        + " and non-datacenter-aware nodes.");
             }
-            dcsInCluster.add(getLocalDataCenter());
+        }
+        dcsInCluster.add(getLocalDataCenter());
 
         if (metadata.getKeyspace(config.keyspace()) == null) { // keyspace previously didn't exist; we need to set it up
             createKeyspace(config.keyspace(), dcsInCluster);
@@ -298,7 +316,7 @@ public boolean apply(Peer peer) {
 
     private String getLocalDataCenter() {
         Local local = CQLKeyValueServices.getLocal(session);
-        return local.data_center;
+        return local.dataCenter;
     }
 
     @Override
@@ -355,15 +373,16 @@ private Map<Cell, Value> getRowsAllColsInternal(final TableReference tableRef,
                     throw Throwables.throwUncheckedException(t);
                 }
                 for (Row row : resultSet.all()) {
-                    Cell c = Cell.create(CQLKeyValueServices.getRowName(row), CQLKeyValueServices.getColName(row));
+                    Cell cell = Cell.create(CQLKeyValueServices.getRowName(row), CQLKeyValueServices.getColName(row));
                     if ((CQLKeyValueServices.getTs(row) < startTs)
-                            && (!result.containsKey(c) || (result.get(c).getTimestamp() < CQLKeyValueServices.getTs(row)))) {
+                            && (!result.containsKey(cell)
+                                    || (result.get(cell).getTimestamp() < CQLKeyValueServices.getTs(row)))) {
                         result.put(
                                 Cell.create(CQLKeyValueServices.getRowName(row), CQLKeyValueServices.getColName(row)),
                                 Value.create(CQLKeyValueServices.getValue(row), CQLKeyValueServices.getTs(row)));
                     }
                 }
-                cqlKeyValueServices.logTracedQuery(getRowsQuery, resultSet, session, cqlStatementCache.NORMAL_QUERY);
+                cqlKeyValueServices.logTracedQuery(getRowsQuery, resultSet, session, cqlStatementCache.normalQuery);
             }
         }
         if (rowCount > fetchBatchCount) {
@@ -407,19 +426,22 @@ private void loadWithTs(final TableReference tableRef,
                             final Set<Cell> cells,
                             final long startTs,
                             boolean loadAllTs,
-                            final Visitor<Multimap<Cell, Value>> v,
+                            final Visitor<Multimap<Cell, Value>> visitor,
                             final ConsistencyLevel consistency) throws Exception {
-        final String loadWithTsQuery = "SELECT * FROM " + getFullTableName(tableRef) + " "
-                + "WHERE " + CassandraConstants.ROW_NAME + " = ? AND " + CassandraConstants.COL_NAME_COL + " = ? AND " + CassandraConstants.TS_COL
-                + " > ?" + (!loadAllTs ? " LIMIT 1" : "");
-        final CassandraKeyValueServiceConfig config = configManager.getConfig();
+        String loadWithTsQuery = "SELECT * FROM " + getFullTableName(tableRef)
+                + " WHERE " + CassandraConstants.ROW_NAME + " = ?"
+                + " AND " + CassandraConstants.COL_NAME_COL + " = ?"
+                + " AND " + CassandraConstants.TS_COL + " > ?"
+                + (!loadAllTs ? " LIMIT 1" : "");
+        CassandraKeyValueServiceConfig config = configManager.getConfig();
         if (cells.size() > config.fetchBatchCount()) {
             log.warn("A call to " + tableRef
                     + " is performing a multiget " + cells.size()
                     + " cells; this may indicate overly-large batching on a higher level.\n"
                     + CassandraKeyValueServices.getFilteredStackTrace("com.palantir"));
         }
-        final PreparedStatement preparedStatement = getPreparedStatement(tableRef, loadWithTsQuery, session).setConsistencyLevel(consistency);
+        PreparedStatement preparedStatement = getPreparedStatement(tableRef, loadWithTsQuery, session)
+                .setConsistencyLevel(consistency);
         List<ResultSetFuture> resultSetFutures = Lists.newArrayListWithCapacity(cells.size());
 
         for (Cell cell : cells) {
@@ -432,7 +454,7 @@ private void loadWithTs(final TableReference tableRef,
         }
 
         for (ResultSetFuture rsf : resultSetFutures) {
-            visitResults(rsf.getUninterruptibly(), v, loadWithTsQuery, loadAllTs);
+            visitResults(rsf.getUninterruptibly(), visitor, loadWithTsQuery, loadAllTs);
         }
     }
 
@@ -441,7 +463,11 @@ private Map<byte[], List<Cell>> partitionCellsByPrimaryKey(Collection<Cell> cell
         return Multimaps.asMap(Multimaps.index(cells, Cells.getRowFunction()));
     }
 
-    private void visitResults(ResultSet resultSet, Visitor<Multimap<Cell, Value>> v, String query, boolean loadAllTs) {
+    private void visitResults(
+            ResultSet resultSet,
+            Visitor<Multimap<Cell, Value>> visitor,
+            String query,
+            boolean loadAllTs) {
         List<Row> rows = resultSet.all();
         Multimap<Cell, Value> res;
         if (loadAllTs) {
@@ -453,8 +479,8 @@ private void visitResults(ResultSet resultSet, Visitor<Multimap<Cell, Value>> v,
             res.put(Cell.create(CQLKeyValueServices.getRowName(row), CQLKeyValueServices.getColName(row)),
                     Value.create(CQLKeyValueServices.getValue(row), CQLKeyValueServices.getTs(row)));
         }
-        cqlKeyValueServices.logTracedQuery(query, resultSet, session, cqlStatementCache.NORMAL_QUERY);
-        v.visit(res);
+        cqlKeyValueServices.logTracedQuery(query, resultSet, session, cqlStatementCache.normalQuery);
+        visitor.visit(res);
     }
 
     @Override
@@ -469,7 +495,7 @@ public Map<Cell, Long> getLatestTimestamps(final TableReference tableRef,
 
     private Map<Cell, Long> getLatestTimestampsInternal(final TableReference tableRef,
                                                         Map<Cell, Long> timestampByCell) throws Exception {
-        final CassandraKeyValueServiceConfig config = configManager.getConfig();
+        CassandraKeyValueServiceConfig config = configManager.getConfig();
         int fetchBatchCount = config.fetchBatchCount();
         Iterable<List<Cell>> partitions = Iterables.partition(
                 timestampByCell.keySet(),
@@ -477,9 +503,14 @@ private Map<Cell, Long> getLatestTimestampsInternal(final TableReference tableRe
         int numPartitions = (timestampByCell.size() / fetchBatchCount)
                 + (timestampByCell.size() % fetchBatchCount > 0 ? 1 : 0);
         List<Future<Map<Cell, Long>>> futures = Lists.newArrayListWithCapacity(numPartitions);
-        final String loadOnlyTsQuery = "SELECT " + CassandraConstants.ROW_NAME + ", " + CassandraConstants.COL_NAME_COL + ", " + CassandraConstants.TS_COL
-                + " FROM " + getFullTableName(tableRef) + " " + "WHERE " + CassandraConstants.ROW_NAME + " = ? AND "
-                + CassandraConstants.COL_NAME_COL + " = ? LIMIT 1";
+        String loadOnlyTsQuery = "SELECT "
+                + CassandraConstants.ROW_NAME + ", "
+                + CassandraConstants.COL_NAME_COL + ", "
+                + CassandraConstants.TS_COL
+                + " FROM " + getFullTableName(tableRef)
+                + " WHERE " + CassandraConstants.ROW_NAME + " = ?"
+                + " AND " + CassandraConstants.COL_NAME_COL + " = ?"
+                + " LIMIT 1";
         if (timestampByCell.size() > fetchBatchCount) {
             log.warn("Re-batching in getLatestTimestamps a call to " + tableRef
                     + " that attempted to multiget " + timestampByCell.size()
@@ -505,9 +536,16 @@ public Map<Cell, Long> call() throws Exception {
                     for (ResultSetFuture resultSetFuture : resultSetFutures) {
                         ResultSet resultSet = resultSetFuture.getUninterruptibly();
                         for (Row row : resultSet.all()) {
-                            res.put(Cell.create(CQLKeyValueServices.getRowName(row), CQLKeyValueServices.getColName(row)), CQLKeyValueServices.getTs(row));
+                            res.put(Cell.create(
+                                    CQLKeyValueServices.getRowName(row),
+                                    CQLKeyValueServices.getColName(row)),
+                                    CQLKeyValueServices.getTs(row));
                         }
-                        cqlKeyValueServices.logTracedQuery(loadOnlyTsQuery, resultSet, session, cqlStatementCache.NORMAL_QUERY);
+                        cqlKeyValueServices.logTracedQuery(
+                                loadOnlyTsQuery,
+                                resultSet,
+                                session,
+                                cqlStatementCache.normalQuery);
                     }
                     return res;
                 }
@@ -554,7 +592,8 @@ protected int getMultiPutBatchCount() {
     }
 
     @Override
-    public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable, final long timestamp) throws KeyAlreadyExistsException {
+    public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable, long timestamp)
+            throws KeyAlreadyExistsException {
         Map<ResultSetFuture, TableReference> resultSetFutures = Maps.newHashMap();
         for (Entry<TableReference, ? extends Map<Cell, byte[]>> e : valuesByTable.entrySet()) {
             final TableReference table = e.getKey();
@@ -562,16 +601,17 @@ public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTa
             NavigableMap<Cell, byte[]> sortedMap = ImmutableSortedMap.copyOf(e.getValue());
 
 
-            Iterable<List<Entry<Cell, byte[]>>> partitions = partitionByCountAndBytes(sortedMap.entrySet(),
-                    getMultiPutBatchCount(), getMultiPutBatchSizeBytes(), table, CQLKeyValueServices.MULTIPUT_ENTRY_SIZING_FUNCTION);
+            Iterable<List<Entry<Cell, byte[]>>> partitions = partitionByCountAndBytes(
+                    sortedMap.entrySet(),
+                    getMultiPutBatchCount(),
+                    getMultiPutBatchSizeBytes(),
+                    table,
+                    CQLKeyValueServices.MULTIPUT_ENTRY_SIZING_FUNCTION);
 
 
             for (final List<Entry<Cell, byte[]>> p : partitions) {
-                List<Entry<Cell, Value>> partition = Lists.transform(p, new Function<Entry<Cell, byte[]>, Entry<Cell, Value>>() {
-                    @Override
-                    public Entry<Cell, Value> apply(Entry<Cell, byte[]> input) {
-                        return Maps.immutableEntry(input.getKey(), Value.create(input.getValue(), timestamp));
-                    }});
+                List<Entry<Cell, Value>> partition = Lists.transform(p,
+                        input -> Maps.immutableEntry(input.getKey(), Value.create(input.getValue(), timestamp)));
                 resultSetFutures.put(getPutPartitionResultSetFuture(table, partition, TransactionType.NONE), table);
             }
         }
@@ -584,21 +624,32 @@ public Entry<Cell, Value> apply(Entry<Cell, byte[]> input) {
             } catch (Throwable t) {
                 throw Throwables.throwUncheckedException(t);
             }
-            cqlKeyValueServices.logTracedQuery(getPutQuery(result.getValue(), CassandraConstants.NO_TTL), resultSet, session, cqlStatementCache.NORMAL_QUERY);
+            cqlKeyValueServices.logTracedQuery(
+                    getPutQuery(result.getValue(), CassandraConstants.NO_TTL),
+                    resultSet,
+                    session,
+                    cqlStatementCache.normalQuery);
         }
     }
 
-    private void putInternal(final TableReference tableRef, final Iterable<Map.Entry<Cell, Value>> values, TransactionType transactionType)
-            throws Exception {
+    private void putInternal(
+            TableReference tableRef,
+            Iterable<Map.Entry<Cell, Value>> values,
+            TransactionType transactionType) throws Exception {
         putInternal(tableRef, values, transactionType, CassandraConstants.NO_TTL, false);
     }
 
-    protected void putInternal(final TableReference tableRef, final Iterable<Map.Entry<Cell, Value>> values, TransactionType transactionType, final int ttl, boolean recursive)
-            throws Exception {
+    protected void putInternal(
+            TableReference tableRef,
+            Iterable<Map.Entry<Cell, Value>> values,
+            TransactionType transactionType,
+            int ttl,
+            boolean recursive) throws Exception {
         List<ResultSetFuture> resultSetFutures = Lists.newArrayList();
         int mutationBatchCount = configManager.getConfig().mutationBatchCount();
-        long mutationBatchSizeBytes = limitBatchSizesToServerDefaults?
-                CQLKeyValueServices.UNCONFIGURED_DEFAULT_BATCH_SIZE_BYTES : configManager.getConfig().mutationBatchSizeBytes();
+        long mutationBatchSizeBytes = limitBatchSizesToServerDefaults
+                ? CQLKeyValueServices.UNCONFIGURED_DEFAULT_BATCH_SIZE_BYTES
+                : configManager.getConfig().mutationBatchSizeBytes();
         for (List<Entry<Cell, Value>> partition : partitionByCountAndBytes(
                 values,
                 mutationBatchCount,
@@ -614,13 +665,15 @@ protected void putInternal(final TableReference tableRef, final Iterable<Map.Ent
             try {
                 resultSet = resultSetFuture.getUninterruptibly();
                 resultSet.all();
-                cqlKeyValueServices.logTracedQuery(putQuery, resultSet, session, cqlStatementCache.NORMAL_QUERY);
+                cqlKeyValueServices.logTracedQuery(putQuery, resultSet, session, cqlStatementCache.normalQuery);
                 if (!resultSet.wasApplied()) {
                     throw new KeyAlreadyExistsException("This transaction row already exists: " + putQuery);
                 }
             } catch (InvalidQueryException e) {
                 if (e.getMessage().contains("Batch too large") && !recursive) {
-                    log.error("Attempted a put to " + tableRef + " that the Cassandra server deemed to be too large to accept. Batch sizes on the Atlas-side have been artificially lowered to the Cassandra default maximum batch sizes.");
+                    log.error("Attempted a put to " + tableRef + " that the Cassandra server"
+                            + " deemed to be too large to accept. Batch sizes on the Atlas-side"
+                            + " have been artificially lowered to the Cassandra default maximum batch sizes.");
                     limitBatchSizesToServerDefaults = true;
                     try {
                         putInternal(tableRef, values, transactionType, ttl, true);
@@ -640,8 +693,13 @@ private String getPutQueryForPossibleTransaction(TableReference tableRef, Transa
         return getPutQueryForPossibleTransaction(tableRef, transactionType, CassandraConstants.NO_TTL);
     }
 
-    private String getPutQueryForPossibleTransaction(TableReference tableRef, TransactionType transactionType, int ttl) {
-        return transactionType.equals(TransactionType.LIGHTWEIGHT_TRANSACTION_REQUIRED)? getPutUnlessExistsQuery(tableRef, ttl) : getPutQuery(tableRef, ttl);
+    private String getPutQueryForPossibleTransaction(
+            TableReference tableRef,
+            TransactionType transactionType,
+            int ttl) {
+        return transactionType.equals(TransactionType.LIGHTWEIGHT_TRANSACTION_REQUIRED)
+                ? getPutUnlessExistsQuery(tableRef, ttl)
+                : getPutQuery(tableRef, ttl);
     }
 
     private String getPutUnlessExistsQuery(TableReference tableRef, int ttl) {
@@ -653,7 +711,12 @@ private String getPutUnlessExistsQuery(TableReference tableRef, int ttl) {
     }
 
     protected String getPutQuery(TableReference tableName, int ttl) {
-        String putQuery = "INSERT INTO " + getFullTableName(tableName) + " (" + CassandraConstants.ROW_NAME + ", " + CassandraConstants.COL_NAME_COL + ", " + CassandraConstants.TS_COL + ", " + CassandraConstants.VALUE_COL + ") VALUES (?, ?, ?, ?)";
+        String putQuery = "INSERT INTO " + getFullTableName(tableName)
+                + " (" + CassandraConstants.ROW_NAME + ", "
+                + CassandraConstants.COL_NAME_COL + ", "
+                + CassandraConstants.TS_COL + ", "
+                + CassandraConstants.VALUE_COL + ")"
+                + " VALUES (?, ?, ?, ?)";
         if (ttl >= 0) {
             putQuery += " USING TTL " + ttl;
         }
@@ -670,7 +733,10 @@ protected ResultSetFuture getPutPartitionResultSetFuture(TableReference tableRef
                                                              List<Entry<Cell, Value>> partition,
                                                              TransactionType transactionType,
                                                              int ttl) {
-        PreparedStatement preparedStatement = getPreparedStatement(tableRef, getPutQueryForPossibleTransaction(tableRef, transactionType, ttl), session);
+        PreparedStatement preparedStatement = getPreparedStatement(
+                tableRef,
+                getPutQueryForPossibleTransaction(tableRef, transactionType, ttl),
+                session);
         preparedStatement.setConsistencyLevel(writeConsistency);
 
         // Be mindful when using the atomicity semantics of UNLOGGED batch statements.
@@ -706,31 +772,40 @@ public void truncateTables(final Set<TableReference> tablesToTruncate) {
 
         for (TableReference tableRef : tablesToTruncate) {
             BoundStatement truncateStatement =
-                    getPreparedStatement(tableRef, String.format(truncateQuery, getFullTableName(tableRef)), longRunningQuerySession)
+                    getPreparedStatement(
+                            tableRef,
+                            String.format(truncateQuery, getFullTableName(tableRef)),
+                            longRunningQuerySession)
                             .setConsistencyLevel(ConsistencyLevel.ALL)
                             .bind();
 
             try {
                 ResultSet resultSet = longRunningQuerySession.execute(truncateStatement);
-                cqlKeyValueServices.logTracedQuery(truncateQuery, resultSet, session, cqlStatementCache.NORMAL_QUERY);
+                cqlKeyValueServices.logTracedQuery(truncateQuery, resultSet, session, cqlStatementCache.normalQuery);
             } catch (com.datastax.driver.core.exceptions.UnavailableException e) {
-                throw new InsufficientConsistencyException("Truncating tables requires all Cassandra nodes to be up and available.", e);
+                throw new InsufficientConsistencyException("Truncating tables requires all Cassandra"
+                        + " nodes to be up and available.", e);
             }
         }
 
-        CQLKeyValueServices.waitForSchemaVersionsToCoalesce("truncateTables(" + tablesToTruncate.size() + " tables)", this);
+        CQLKeyValueServices.waitForSchemaVersionsToCoalesce(
+                "truncateTables(" + tablesToTruncate.size() + " tables)",
+                this);
     }
 
     @Override
     public void delete(final TableReference tableRef, final Multimap<Cell, Long> keys) {
         int cellCount = 0;
-        final String deleteQuery = "DELETE FROM " + getFullTableName(tableRef) + " WHERE "
-                + CassandraConstants.ROW_NAME + " = ? AND " + CassandraConstants.COL_NAME_COL + " = ? AND " + CassandraConstants.TS_COL + " = ?";
-        final CassandraKeyValueServiceConfig config = configManager.getConfig();
+        String deleteQuery = "DELETE FROM " + getFullTableName(tableRef)
+                + " WHERE " + CassandraConstants.ROW_NAME + " = ?"
+                + " AND " + CassandraConstants.COL_NAME_COL + " = ?"
+                + " AND " + CassandraConstants.TS_COL + " = ?";
+        CassandraKeyValueServiceConfig config = configManager.getConfig();
         int fetchBatchCount = config.fetchBatchCount();
         for (final List<Cell> batch : Iterables.partition(keys.keySet(), fetchBatchCount)) {
             cellCount += batch.size();
-            PreparedStatement deleteStatement = getPreparedStatement(tableRef, deleteQuery, longRunningQuerySession).setConsistencyLevel(deleteConsistency);
+            PreparedStatement deleteStatement = getPreparedStatement(tableRef, deleteQuery, longRunningQuerySession)
+                    .setConsistencyLevel(deleteConsistency);
             List<ResultSetFuture> resultSetFutures = Lists.newArrayList();
             for (Cell key : batch) {
                 for (long ts : Ordering.natural().immutableSortedCopy(keys.get(key))) {
@@ -750,7 +825,7 @@ public void delete(final TableReference tableRef, final Multimap<Cell, Long> key
                 } catch (Throwable t) {
                     throw Throwables.throwUncheckedException(t);
                 }
-                cqlKeyValueServices.logTracedQuery(deleteQuery, resultSet, session, cqlStatementCache.NORMAL_QUERY);
+                cqlKeyValueServices.logTracedQuery(deleteQuery, resultSet, session, cqlStatementCache.normalQuery);
             }
         }
         if (cellCount > fetchBatchCount) {
@@ -764,9 +839,10 @@ public void delete(final TableReference tableRef, final Multimap<Cell, Long> key
     // TODO: after cassandra change: handle multiRanges
     @Override
     @Idempotent
-    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(TableReference tableRef,
-                                                                                                           Iterable<RangeRequest> rangeRequests,
-                                                                                                           long timestamp) {
+    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests,
+            long timestamp) {
         int concurrency = configManager.getConfig().rangesConcurrency();
         return KeyValueServices.getFirstBatchForRangesUsingGetRangeConcurrent(
                 executor,
@@ -818,11 +894,12 @@ public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(TableReferenc
                 HistoryExtractor.SUPPLIER);
     }
 
-    public <T, U> ClosableIterator<RowResult<U>> getRangeWithPageCreator(final TableReference tableRef,
-                                                                         final RangeRequest rangeRequest,
-                                                                         final long timestamp,
-                                                                         final com.datastax.driver.core.ConsistencyLevel consistency,
-                                                                         final Supplier<ResultsExtractor<T, U>> resultsExtractor) {
+    public <T, U> ClosableIterator<RowResult<U>> getRangeWithPageCreator(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp,
+            com.datastax.driver.core.ConsistencyLevel consistency,
+            Supplier<ResultsExtractor<T, U>> resultsExtractor) {
         if (rangeRequest.isReverse()) {
             throw new UnsupportedOperationException();
         }
@@ -830,7 +907,9 @@ public <T, U> ClosableIterator<RowResult<U>> getRangeWithPageCreator(final Table
             return ClosableIterators.wrap(ImmutableList.<RowResult<U>>of().iterator());
         }
         final int batchHint = rangeRequest.getBatchHint() == null ? 100 : rangeRequest.getBatchHint();
-        final ColumnSelection selection = rangeRequest.getColumnNames().isEmpty() ? ColumnSelection.all() : ColumnSelection.create(rangeRequest.getColumnNames());
+        final ColumnSelection selection = rangeRequest.getColumnNames().isEmpty()
+                ? ColumnSelection.all()
+                : ColumnSelection.create(rangeRequest.getColumnNames());
         final byte[] endExclusive = rangeRequest.getEndExclusive();
         final StringBuilder bindQuery = new StringBuilder();
         bindQuery.append("SELECT * FROM " + getFullTableName(tableRef) + " WHERE token("
@@ -841,73 +920,78 @@ public <T, U> ClosableIterator<RowResult<U>> getRangeWithPageCreator(final Table
         bindQuery.append("LIMIT " + batchHint);
         final String getLastRowQuery = "SELECT * FROM " + getFullTableName(tableRef) + " WHERE "
                 + CassandraConstants.ROW_NAME + " = ?";
-        return ClosableIterators.wrap(new AbstractPagingIterable<RowResult<U>, TokenBackedBasicResultsPage<RowResult<U>, byte[]>>() {
-            @Override
-            protected TokenBackedBasicResultsPage<RowResult<U>, byte[]> getFirstPage()
-                    throws Exception {
-                return getPage(rangeRequest.getStartInclusive());
-            }
-
-            @Override
-            protected TokenBackedBasicResultsPage<RowResult<U>, byte[]> getNextPage(TokenBackedBasicResultsPage<RowResult<U>, byte[]> previous)
-                    throws Exception {
-                return getPage(previous.getTokenForNextPage());
-            }
-
-            TokenBackedBasicResultsPage<RowResult<U>, byte[]> getPage(final byte[] startKey)
-                    throws Exception {
-                BoundStatement boundStatement = getPreparedStatement(tableRef, bindQuery.toString(), session)
-                        .setConsistencyLevel(consistency)
-                        .bind();
+        return ClosableIterators.wrap(
+                new AbstractPagingIterable<RowResult<U>, TokenBackedBasicResultsPage<RowResult<U>, byte[]>>() {
+                    @Override
+                    protected TokenBackedBasicResultsPage<RowResult<U>, byte[]> getFirstPage()
+                            throws Exception {
+                        return getPage(rangeRequest.getStartInclusive());
+                    }
 
-                boundStatement.setBytes(0, ByteBuffer.wrap(startKey));
-                if (endExclusive.length > 0) {
-                    boundStatement.setBytes(1, ByteBuffer.wrap(endExclusive));
-                }
-                ResultSet resultSet = session.execute(boundStatement);
-                List<Row> rows = Lists.newArrayList(resultSet.all());
-                cqlKeyValueServices.logTracedQuery(bindQuery.toString(), resultSet, session, cqlStatementCache.NORMAL_QUERY);
-                byte[] maxRow = null;
-                ResultsExtractor<T, U> extractor = resultsExtractor.get();
-                for (Row row : rows) {
-                    byte[] rowName = CQLKeyValueServices.getRowName(row);
-                    if (maxRow == null) {
-                        maxRow = rowName;
-                    } else {
-                        maxRow = PtBytes.BYTES_COMPARATOR.max(maxRow, rowName);
+                    @Override
+                    protected TokenBackedBasicResultsPage<RowResult<U>, byte[]> getNextPage(
+                            TokenBackedBasicResultsPage<RowResult<U>, byte[]> previous)
+                            throws Exception {
+                        return getPage(previous.getTokenForNextPage());
                     }
-                }
-                if (maxRow == null) {
-                    return new SimpleTokenBackedResultsPage<RowResult<U>, byte[]>(
-                            endExclusive,
-                            ImmutableList.<RowResult<U>> of(),
-                            false);
-                }
-                // get the rest of the last row
-                BoundStatement boundLastRow = getPreparedStatement(tableRef, getLastRowQuery, session).bind();
 
-                boundLastRow.setBytes(CassandraConstants.ROW_NAME, ByteBuffer.wrap(maxRow));
-                try {
-                    resultSet = session.execute(boundLastRow);
-                } catch (com.datastax.driver.core.exceptions.UnavailableException e) {
-                    throw new InsufficientConsistencyException("This operation requires all Cassandra nodes to be up and available.", e);
-                }
-                rows.addAll(resultSet.all());
-                cqlKeyValueServices.logTracedQuery(getLastRowQuery, resultSet, session, cqlStatementCache.NORMAL_QUERY);
-                for (Row row : rows) {
-                    extractor.internalExtractResult(
-                            timestamp,
-                            selection,
-                            CQLKeyValueServices.getRowName(row),
-                            CQLKeyValueServices.getColName(row),
-                            CQLKeyValueServices.getValue(row),
-                            CQLKeyValueServices.getTs(row));
-                }
-                SortedMap<byte[], SortedMap<byte[], U>> resultsByRow = Cells.breakCellsUpByRow(extractor.asMap());
-                return ResultsExtractor.getRowResults(endExclusive, maxRow, resultsByRow);
-            }
+                    TokenBackedBasicResultsPage<RowResult<U>, byte[]> getPage(final byte[] startKey)
+                            throws Exception {
+                        BoundStatement boundStatement = getPreparedStatement(tableRef, bindQuery.toString(), session)
+                                .setConsistencyLevel(consistency)
+                                .bind();
 
-        }.iterator());
+                        boundStatement.setBytes(0, ByteBuffer.wrap(startKey));
+                        if (endExclusive.length > 0) {
+                            boundStatement.setBytes(1, ByteBuffer.wrap(endExclusive));
+                        }
+                        ResultSet resultSet = session.execute(boundStatement);
+                        List<Row> rows = Lists.newArrayList(resultSet.all());
+                        cqlKeyValueServices.logTracedQuery(
+                                bindQuery.toString(), resultSet, session, cqlStatementCache.normalQuery);
+                        byte[] maxRow = null;
+                        ResultsExtractor<T, U> extractor = resultsExtractor.get();
+                        for (Row row : rows) {
+                            byte[] rowName = CQLKeyValueServices.getRowName(row);
+                            if (maxRow == null) {
+                                maxRow = rowName;
+                            } else {
+                                maxRow = PtBytes.BYTES_COMPARATOR.max(maxRow, rowName);
+                            }
+                        }
+                        if (maxRow == null) {
+                            return new SimpleTokenBackedResultsPage<>(
+                                    endExclusive,
+                                    ImmutableList.of(),
+                                    false);
+                        }
+                        // get the rest of the last row
+                        BoundStatement boundLastRow = getPreparedStatement(tableRef, getLastRowQuery, session).bind();
+
+                        boundLastRow.setBytes(CassandraConstants.ROW_NAME, ByteBuffer.wrap(maxRow));
+                        try {
+                            resultSet = session.execute(boundLastRow);
+                        } catch (com.datastax.driver.core.exceptions.UnavailableException e) {
+                            throw new InsufficientConsistencyException("This operation requires all Cassandra"
+                                    + " nodes to be up and available.", e);
+                        }
+                        rows.addAll(resultSet.all());
+                        cqlKeyValueServices.logTracedQuery(
+                                getLastRowQuery, resultSet, session, cqlStatementCache.normalQuery);
+                        for (Row row : rows) {
+                            extractor.internalExtractResult(
+                                    timestamp,
+                                    selection,
+                                    CQLKeyValueServices.getRowName(row),
+                                    CQLKeyValueServices.getColName(row),
+                                    CQLKeyValueServices.getValue(row),
+                                    CQLKeyValueServices.getTs(row));
+                        }
+                        SortedMap<byte[], SortedMap<byte[], U>> resultsByRow =
+                                Cells.breakCellsUpByRow(extractor.asMap());
+                        return ResultsExtractor.getRowResults(endExclusive, maxRow, resultsByRow);
+                    }
+            }.iterator());
     }
 
     @Override
@@ -921,46 +1005,40 @@ public void dropTables(final Set<TableReference> tablesToDrop) {
 
         for (TableReference tableRef : tablesToDrop) {
             BoundStatement dropStatement =
-                    getPreparedStatement(tableRef, String.format(dropQuery, getFullTableName(tableRef)), longRunningQuerySession)
+                    getPreparedStatement(
+                            tableRef,
+                            String.format(dropQuery, getFullTableName(tableRef)),
+                            longRunningQuerySession)
                             .setConsistencyLevel(ConsistencyLevel.ALL)
                             .bind();
             try {
                 ResultSet resultSet = longRunningQuerySession.execute(dropStatement);
-                cqlKeyValueServices.logTracedQuery(dropQuery, resultSet, session, cqlStatementCache.NORMAL_QUERY);
+                cqlKeyValueServices.logTracedQuery(dropQuery, resultSet, session, cqlStatementCache.normalQuery);
             } catch (com.datastax.driver.core.exceptions.UnavailableException e) {
-                throw new InsufficientConsistencyException("Dropping tables requires all Cassandra nodes to be up and available.", e);
+                throw new InsufficientConsistencyException("Dropping tables requires all Cassandra"
+                        + " nodes to be up and available.", e);
             }
         }
 
         CQLKeyValueServices.waitForSchemaVersionsToCoalesce("dropTables(" + tablesToDrop.size() + " tables)", this);
 
         put(AtlasDbConstants.METADATA_TABLE, Maps.toMap(
-                        Lists.transform(Lists.newArrayList(tablesToDrop), new Function<TableReference, Cell>() {
-                            @Override
-                            public Cell apply(TableReference tableRef) {
-                                return CQLKeyValueServices.getMetadataCell(tableRef);
-                            }}),
+                        Lists.transform(Lists.newArrayList(tablesToDrop), CQLKeyValueServices::getMetadataCell),
                         Functions.constant(PtBytes.EMPTY_BYTE_ARRAY)),
                 System.currentTimeMillis());
     }
 
     private void createKeyspace(String keyspaceName, Set<String> dcsInCluster) {
-        String create_keyspace = "create keyspace if not exists %s with replication = %s and durable_writes = true";
+        String createKeyspace = "create keyspace if not exists %s with replication = %s and durable_writes = true";
         final CassandraKeyValueServiceConfig config = configManager.getConfig();
-        String replication;
-        replication = "{ 'class' : 'NetworkTopologyStrategy', ";
-        for (Iterator<String> iter = dcsInCluster.iterator(); iter.hasNext(); ) {
-            String datacenter = iter.next();
-            replication += "'" + datacenter + "' : " + config.replicationFactor();
-            if (iter.hasNext()) {
-                replication += ", ";
-            }
-        }
-        replication += "} ";
+
+        String replication = dcsInCluster.stream()
+                .map(datacenter -> "'" + datacenter + "' : " + config.replicationFactor())
+                .collect(Collectors.joining(", ", "{ 'class' : 'NetworkTopologyStrategy', ", "} "));
 
         longRunningQuerySession.execute(
                 getPreparedStatement(CassandraConstants.NO_TABLE,
-                        String.format(create_keyspace, keyspaceName, replication),
+                        String.format(createKeyspace, keyspaceName, replication),
                         longRunningQuerySession)
                         .setConsistencyLevel(ConsistencyLevel.ALL)
                         .bind());
@@ -976,29 +1054,32 @@ public void createTable(final TableReference tableRef, byte[] tableMetadata) {
     @Override
     public void createTables(final Map<TableReference, byte[]> tableRefsToTableMetadata) {
         final CassandraKeyValueServiceConfig config = configManager.getConfig();
-        Collection<com.datastax.driver.core.TableMetadata> tables = cluster.getMetadata().getKeyspace(config.keyspace()).getTables();
-        Set<TableReference> existingTables = Sets.newHashSet(Iterables.transform(tables, new Function<com.datastax.driver.core.TableMetadata, TableReference>() {
-            @Override
-            public TableReference apply(com.datastax.driver.core.TableMetadata input) {
-                return TableReference.createUnsafe(input.getName());
-            }
-        }));
-
-        if (!existingTables.contains(AtlasDbConstants.METADATA_TABLE)) { // ScrubberStore likes to call createTable before our setup gets called...
-            cqlKeyValueServices.createTableWithSettings(AtlasDbConstants.METADATA_TABLE, AtlasDbConstants.EMPTY_TABLE_METADATA, this);
+        Collection<com.datastax.driver.core.TableMetadata> tables = cluster.getMetadata()
+                .getKeyspace(config.keyspace()).getTables();
+        Set<TableReference> existingTables = Sets.newHashSet(Iterables.transform(tables,
+                input -> TableReference.createUnsafe(input.getName())));
+
+        // ScrubberStore likes to call createTable before our setup gets called...
+        if (!existingTables.contains(AtlasDbConstants.METADATA_TABLE)) {
+            cqlKeyValueServices.createTableWithSettings(
+                    AtlasDbConstants.METADATA_TABLE,
+                    AtlasDbConstants.EMPTY_TABLE_METADATA,
+                    this);
         }
 
-        Sets.SetView<TableReference> tablesToCreate = Sets.difference(tableRefsToTableMetadata.keySet(), existingTables);
+        Set<TableReference> tablesToCreate = Sets.difference(tableRefsToTableMetadata.keySet(), existingTables);
         for (TableReference tableRef : tablesToCreate) {
             try {
                 cqlKeyValueServices.createTableWithSettings(tableRef, tableRefsToTableMetadata.get(tableRef), this);
             } catch (com.datastax.driver.core.exceptions.UnavailableException e) {
-                throw new InsufficientConsistencyException("Creating tables requires all Cassandra nodes to be up and available.", e);
+                throw new InsufficientConsistencyException("Creating tables requires all Cassandra"
+                        + " nodes to be up and available.", e);
             }
         }
 
         if (!tablesToCreate.isEmpty()) {
-            CQLKeyValueServices.waitForSchemaVersionsToCoalesce("createTables(" + tableRefsToTableMetadata.size() + " tables)", this);
+            CQLKeyValueServices.waitForSchemaVersionsToCoalesce("createTables(" + tableRefsToTableMetadata.size()
+                    + " tables)", this);
         }
 
         internalPutMetadataForTables(tableRefsToTableMetadata, false);
@@ -1007,34 +1088,28 @@ public TableReference apply(com.datastax.driver.core.TableMetadata input) {
     @Override
     public Set<TableReference> getAllTableNames() {
         final CassandraKeyValueServiceConfig config = configManager.getConfig();
-        List<Row> rows = session.execute(cqlStatementCache.NORMAL_QUERY.getUnchecked(
+        List<Row> rows = session.execute(cqlStatementCache.normalQuery.getUnchecked(
                 "SELECT columnfamily_name FROM system.schema_columnfamilies WHERE keyspace_name = ?")
                 .bind(config.keyspace()))
                 .all();
 
-        Set<TableReference> existingTables = Sets.newHashSet(Iterables.transform(rows, new Function<Row, TableReference>(){
-            @Override
-            public TableReference apply(Row row) {
-                return fromInternalTableName(row.getString("columnfamily_name"));
-            }}));
+        Set<TableReference> existingTables = Sets.newHashSet(Iterables.transform(rows,
+                row -> fromInternalTableName(row.getString("columnfamily_name"))));
 
-        return Sets.filter(existingTables, new Predicate<TableReference>() {
-            @Override
-            public boolean apply(TableReference tableRef) {
-                return !tableRef.getQualifiedName().startsWith("_") || tableRef.getQualifiedName().startsWith(AtlasDbConstants.NAMESPACE_PREFIX);
-            }
-        });
+        return Sets.filter(existingTables, tableRef ->
+                !tableRef.getQualifiedName().startsWith("_")
+                        || tableRef.getQualifiedName().startsWith(AtlasDbConstants.NAMESPACE_PREFIX));
     }
 
     @Override
     public byte[] getMetadataForTable(TableReference tableRef) {
         Cell cell = CQLKeyValueServices.getMetadataCell(tableRef);
-        Value v = get(AtlasDbConstants.METADATA_TABLE, ImmutableMap.of(cell, Long.MAX_VALUE)).get(
+        Value value = get(AtlasDbConstants.METADATA_TABLE, ImmutableMap.of(cell, Long.MAX_VALUE)).get(
                 cell);
-        if (v == null) {
+        if (value == null) {
             return new byte[0];
         } else {
-            return v.getContents();
+            return value.getContents();
         }
     }
 
@@ -1048,7 +1123,9 @@ public void putMetadataForTables(final Map<TableReference, byte[]> tableRefToMet
         internalPutMetadataForTables(tableRefToMetadata, true);
     }
 
-    private void internalPutMetadataForTables(final Map<TableReference, byte[]> tableNameToMetadata, boolean possiblyNeedToPerformSettingsChanges) {
+    private void internalPutMetadataForTables(
+            Map<TableReference, byte[]> tableNameToMetadata,
+            boolean possiblyNeedToPerformSettingsChanges) {
         Map<Cell, byte[]> cellToMetadata = Maps.newHashMap();
         for (Entry<TableReference, byte[]> tableEntry : tableNameToMetadata.entrySet()) {
             byte[] existingMetadata = getMetadataForTable(tableEntry.getKey());
@@ -1062,7 +1139,8 @@ private void internalPutMetadataForTables(final Map<TableReference, byte[]> tabl
         if (!cellToMetadata.isEmpty()) {
             put(AtlasDbConstants.METADATA_TABLE, cellToMetadata, System.currentTimeMillis());
             if (possiblyNeedToPerformSettingsChanges) {
-                CQLKeyValueServices.waitForSchemaVersionsToCoalesce("putMetadataForTables(" + tableNameToMetadata.size() +" tables)", this);
+                CQLKeyValueServices.waitForSchemaVersionsToCoalesce(
+                        "putMetadataForTables(" + tableNameToMetadata.size() + " tables)", this);
             }
         }
     }
@@ -1089,7 +1167,8 @@ public Multimap<Cell, Long> getAllTimestamps(TableReference tableRef, Set<Cell>
         try {
             loadWithTs(tableRef, cells, ts, true, collector, deleteConsistency);
         } catch (com.datastax.driver.core.exceptions.UnavailableException e) {
-            throw new InsufficientConsistencyException("Get all timestamps requires all Cassandra nodes to be up and available.", e);
+            throw new InsufficientConsistencyException("Get all timestamps requires all Cassandra"
+                    + " nodes to be up and available.", e);
         } catch (Throwable t) {
             throw Throwables.throwUncheckedException(t);
         }
@@ -1115,11 +1194,14 @@ String getFullTableName(TableReference tableRef) {
 
     @Override
     public void compactInternally(TableReference tableRef) {
-        Preconditions.checkArgument(!Strings.isNullOrEmpty(tableRef.getQualifiedName()), "tableName:[%s] should not be null or empty", tableRef);
+        Preconditions.checkArgument(!Strings.isNullOrEmpty(tableRef.getQualifiedName()),
+                "tableName:[%s] should not be null or empty", tableRef);
         CassandraKeyValueServiceConfig config = configManager.getConfig();
         if (!compactionManager.isPresent()) {
-            log.error("No compaction client was configured, but compact was called. If you actually want to clear deleted data immediately " +
-                    "from Cassandra, lower your gc_grace_seconds setting and run `nodetool compact {} {}`.", config.keyspace(), tableRef);
+            log.error("No compaction client was configured, but compact was called."
+                    + " If you actually want to clear deleted data immediately"
+                    + " from Cassandra, lower your gc_grace_seconds setting and"
+                    + " run `nodetool compact {} {}`.", config.keyspace(), tableRef);
             return;
         }
 
@@ -1134,17 +1216,22 @@ public void compactInternally(TableReference tableRef) {
         } catch (InterruptedException e) {
             log.error("Compaction for {}.{} was interrupted.", config.keyspace(), tableRef);
         } finally {
-            alterTableForCompaction(tableRef, CassandraConstants.GC_GRACE_SECONDS, CassandraConstants.TOMBSTONE_THRESHOLD_RATIO);
+            alterTableForCompaction(
+                    tableRef,
+                    CassandraConstants.GC_GRACE_SECONDS,
+                    CassandraConstants.TOMBSTONE_THRESHOLD_RATIO);
             CQLKeyValueServices.waitForSchemaVersionsToCoalesce("setting up tables post-compaction", this);
         }
     }
 
     private void alterTableForCompaction(TableReference tableRef, int gcGraceSeconds, float tombstoneThreshold) {
-        log.trace("Altering table {} to have gc_grace_seconds={} and tombstone_threshold=%.2f", tableRef, gcGraceSeconds, tombstoneThreshold);
+        log.trace("Altering table {} to have gc_grace_seconds={} and tombstone_threshold=%.2f",
+                tableRef, gcGraceSeconds, tombstoneThreshold);
         String alterTableQuery =
                 "ALTER TABLE " + getFullTableName(tableRef)
                         + " WITH gc_grace_seconds = " + gcGraceSeconds
-                        + " and compaction = {'class':'org.apache.cassandra.db.compaction.LeveledCompactionStrategy', 'tombstone_threshold':"
+                        + " and compaction = {'class':'" + CassandraConstants.LEVELED_COMPACTION_STRATEGY
+                        + "', 'tombstone_threshold':"
                         + tombstoneThreshold + "};";
 
         BoundStatement alterTable = getPreparedStatement(tableRef, alterTableQuery, longRunningQuerySession)
@@ -1154,11 +1241,12 @@ private void alterTableForCompaction(TableReference tableRef, int gcGraceSeconds
         try {
             resultSet = longRunningQuerySession.execute(alterTable);
         } catch (UnavailableException e) {
-            throw new InsufficientConsistencyException("Alter table requires all Cassandra nodes to be up and available.", e);
+            throw new InsufficientConsistencyException("Alter table requires all Cassandra"
+                    + " nodes to be up and available.", e);
         } catch (Exception e) {
             throw Throwables.throwUncheckedException(e);
         }
-        cqlKeyValueServices.logTracedQuery(alterTableQuery, resultSet, session, cqlStatementCache.NORMAL_QUERY);
+        cqlKeyValueServices.logTracedQuery(alterTableQuery, resultSet, session, cqlStatementCache.normalQuery);
     }
 
     PreparedStatement getPreparedStatement(TableReference tableRef, String query, Session sessionToBeUsed) {
@@ -1166,9 +1254,9 @@ PreparedStatement getPreparedStatement(TableReference tableRef, String query, Se
             PreparedStatement statement;
 
             if (sessionToBeUsed == longRunningQuerySession) {
-                statement =  cqlStatementCache.LONG_RUNNING_QUERY.get(query).enableTracing();
+                statement =  cqlStatementCache.longRunningQuery.get(query).enableTracing();
             } else {
-                statement = cqlStatementCache.NORMAL_QUERY.get(query).enableTracing();
+                statement = cqlStatementCache.normalQuery.get(query).enableTracing();
             }
 
             if (shouldTraceQuery(tableRef)) {
@@ -1183,4 +1271,4 @@ PreparedStatement getPreparedStatement(TableReference tableRef, String query, Se
             throw Throwables.throwUncheckedException(e.getCause());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueServices.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueServices.java
index 2ee3d143531..844f99d9217 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueServices.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLKeyValueServices.java
@@ -16,6 +16,8 @@
 package com.palantir.atlasdb.keyvalue.cassandra;
 
 import java.net.InetAddress;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -55,33 +57,26 @@
 import com.palantir.common.concurrent.PTExecutors;
 import com.palantir.common.visitor.Visitor;
 
-public class CQLKeyValueServices {
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+public final class CQLKeyValueServices {
     private static final Logger log = LoggerFactory.getLogger(CQLKeyValueService.class); // not a typo
 
-    static final int UNCONFIGURED_DEFAULT_BATCH_SIZE_BYTES = 50 * 1024; // this is used as a fallback when the user is using small server-side limiting of batches
-    static final Function<Entry<Cell, Value>, Long> PUT_ENTRY_SIZING_FUNCTION = new Function<Entry<Cell, Value>, Long>() {
-        @Override
-        public Long apply(Entry<Cell, Value> input) {
-            return input.getValue().getContents().length + CassandraConstants.TS_SIZE
+    // this is used as a fallback when the user is using small server-side limiting of batches
+    static final int UNCONFIGURED_DEFAULT_BATCH_SIZE_BYTES = 50 * 1024;
+    static final Function<Entry<Cell, Value>, Long> PUT_ENTRY_SIZING_FUNCTION = input ->
+            input.getValue().getContents().length
+                    + CassandraConstants.TS_SIZE
                     + Cells.getApproxSizeOfCell(input.getKey());
-        }
-    };
 
-    static final Function<Entry<Cell, byte[]>, Long> MULTIPUT_ENTRY_SIZING_FUNCTION = new Function<Entry<Cell, byte[]>, Long>() {
-        @Override
-        public Long apply(Entry<Cell, byte[]> entry) {
-            long totalSize = 0;
-            totalSize += entry.getValue().length;
-            totalSize += Cells.getApproxSizeOfCell(entry.getKey());
-            return totalSize;
-        }
-    };
+    static final Function<Entry<Cell, byte[]>, Long> MULTIPUT_ENTRY_SIZING_FUNCTION = entry ->
+            entry.getValue().length + Cells.getApproxSizeOfCell(entry.getKey());
 
     public void shutdown() {
         traceRetrievalExec.shutdown();
     }
 
-    static enum TransactionType {
+    enum TransactionType {
         NONE,
         LIGHTWEIGHT_TRANSACTION_REQUIRED
     }
@@ -91,7 +86,12 @@ static enum TransactionType {
     private static final int MAX_TRIES = 20;
     private static final long TRACE_RETRIEVAL_MS_BETWEEN_TRIES = 500;
 
-    public void logTracedQuery(final String tracedQuery, ResultSet resultSet, final Session session,  final LoadingCache<String, PreparedStatement> statementCache) {
+    @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
+    public void logTracedQuery(
+            String tracedQuery,
+            ResultSet resultSet,
+            Session session,
+            LoadingCache<String, PreparedStatement> statementCache) {
         if (log.isInfoEnabled()) {
 
             List<ExecutionInfo> allExecutionInfo = Lists.newArrayList(resultSet.getAllExecutionInfo());
@@ -118,9 +118,9 @@ public Void call() throws Exception {
                             Row sessionRow = sessionFuture.getUninterruptibly().one();
 
                             if (sessionRow != null && !sessionRow.isNull("duration")) {
-                                ResultSetFuture eventFuture = session.executeAsync(
-                                        statementCache.getUnchecked(
-                                                "SELECT * FROM system_traces.events WHERE session_id = ?").bind(traceId));
+                                ResultSetFuture eventFuture = session.executeAsync(statementCache.getUnchecked(
+                                        "SELECT * FROM system_traces.events WHERE session_id = ?")
+                                        .bind(traceId));
                                 List<Row> eventRows = eventFuture.getUninterruptibly().all();
 
                                 sb.append(" requestType: ").append(sessionRow.getString("request"));
@@ -160,30 +160,31 @@ public Void call() throws Exception {
         }
     }
 
+    @SuppressFBWarnings("URF_UNREAD_FIELD")
     static class Peer {
         InetAddress peer;
-        String data_center;
+        String dataCenter;
         String rack;
-        String release_version;
-        InetAddress rpc_address;
-        UUID schema_version;
+        String releaseVersion;
+        InetAddress rpcAddress;
+        UUID schemaVersion;
         Set<String> tokens;
     }
 
     public static Set<Peer> getPeers(Session session) {
-        PreparedStatement selectPeerInfo = session.prepare(
-                "select peer, data_center, rack, release_version, rpc_address, schema_version, tokens from system.peers;");
+        PreparedStatement selectPeerInfo = session.prepare("select peer, data_center, rack,"
+                + " release_version, rpc_address, schema_version, tokens from system.peers;");
 
         Set<Peer> peers = Sets.newHashSet();
 
-        for (Row row: session.execute(selectPeerInfo.bind()).all()) {
+        for (Row row : session.execute(selectPeerInfo.bind()).all()) {
             Peer peer = new Peer();
             peer.peer = row.getInet("peer");
-            peer.data_center = row.getString("data_center");
+            peer.dataCenter = row.getString("data_center");
             peer.rack = row.getString("rack");
-            peer.release_version = row.getString("release_version");
-            peer.rpc_address = row.getInet("rpc_address");
-            peer.schema_version = row.getUUID("schema_version");
+            peer.releaseVersion = row.getString("release_version");
+            peer.rpcAddress = row.getInet("rpc_address");
+            peer.schemaVersion = row.getUUID("schema_version");
             peer.tokens = row.getSet("tokens", String.class);
             peers.add(peer);
         }
@@ -191,8 +192,9 @@ public static Set<Peer> getPeers(Session session) {
         return peers;
     }
 
+    @SuppressFBWarnings("URF_UNREAD_FIELD")
     static class Local {
-        String data_center;
+        String dataCenter;
         String rack;
     }
 
@@ -201,13 +203,18 @@ public static Local getLocal(Session session) {
                 "select data_center, rack from system.local;");
         Row localRow = session.execute(selectLocalInfo.bind()).one();
         Local local = new Local();
-        local.data_center = localRow.getString("data_center");
+        local.dataCenter = localRow.getString("data_center");
         local.rack = localRow.getString("rack");
         return local;
     }
 
-    public static void waitForSchemaVersionsToCoalesce(String encapsulatingOperationDescription, CQLKeyValueService kvs) {
-        PreparedStatement peerInfoQuery = kvs.getPreparedStatement(CassandraConstants.NO_TABLE, "select peer, schema_version from system.peers;", kvs.session);
+    public static void waitForSchemaVersionsToCoalesce(
+            String encapsulatingOperationDescription,
+            CQLKeyValueService kvs) {
+        PreparedStatement peerInfoQuery = kvs.getPreparedStatement(
+                CassandraConstants.NO_TABLE,
+                "select peer, schema_version from system.peers;",
+                kvs.session);
         peerInfoQuery.setConsistencyLevel(ConsistencyLevel.ALL);
 
         Multimap<UUID, InetAddress> peerInfo = ArrayListMultimap.create();
@@ -223,21 +230,23 @@ public static void waitForSchemaVersionsToCoalesce(String encapsulatingOperation
                 return;
             }
             sleepTime = Math.min(sleepTime * 2, 5000);
-        } while (System.currentTimeMillis() < start + CassandraConstants.SECONDS_WAIT_FOR_VERSIONS*1000);
+        }
+        while (System.currentTimeMillis() < start + CassandraConstants.SECONDS_WAIT_FOR_VERSIONS * 1000);
 
         StringBuilder sb = new StringBuilder();
-        sb.append(String.format("Cassandra cluster cannot come to agreement on schema versions, during operation: %s.", encapsulatingOperationDescription));
+        sb.append(String.format("Cassandra cluster cannot come to agreement on schema versions,"
+                + " during operation: %s.", encapsulatingOperationDescription));
 
-        for ( Entry<UUID, Collection<InetAddress>> versionToPeer : peerInfo.asMap().entrySet()) {
+        for (Entry<UUID, Collection<InetAddress>> versionToPeer : peerInfo.asMap().entrySet()) {
             sb.append(String.format("%nAt schema version %s:", versionToPeer.getKey()));
-            for (InetAddress peer: versionToPeer.getValue()) {
+            for (InetAddress peer : versionToPeer.getValue()) {
                 sb.append(String.format("%n\tNode: %s", peer));
             }
         }
-        sb.append("\nFind the nodes above that diverge from the majority schema " +
-                "(or have schema 'UNKNOWN', which likely means they are down/unresponsive) " +
-                "and examine their logs to determine the issue. Fixing the underlying issue and restarting Cassandra " +
-                "should resolve the problem. You can quick-check this with 'nodetool describecluster'.");
+        sb.append("\nFind the nodes above that diverge from the majority schema"
+                + " (or have schema 'UNKNOWN', which likely means they are down/unresponsive)"
+                + " and examine their logs to determine the issue. Fixing the underlying issue and restarting Cassandra"
+                + " should resolve the problem. You can quick-check this with 'nodetool describecluster'.");
         throw new IllegalStateException(sb.toString());
     }
 
@@ -284,7 +293,8 @@ void createTableWithSettings(TableReference tableRef, byte[] rawMetadata, CQLKey
             chunkLength = explicitCompressionBlockSizeKB;
         }
 
-        queryBuilder.append("CREATE TABLE IF NOT EXISTS " + kvs.getFullTableName(tableRef) + " ( " // full table name (ks.cf)
+        queryBuilder.append("CREATE TABLE IF NOT EXISTS "
+                + kvs.getFullTableName(tableRef) + " ( " // full table name (ks.cf)
                 + CassandraConstants.ROW_NAME + " blob, "
                 + CassandraConstants.COL_NAME_COL + " blob, "
                 + CassandraConstants.TS_COL + " bigint, "
@@ -297,9 +307,11 @@ void createTableWithSettings(TableReference tableRef, byte[] rawMetadata, CQLKey
         queryBuilder.append("AND " + "bloom_filter_fp_chance = " + falsePositiveChance + " ");
         queryBuilder.append("AND caching = '{\"keys\":\"ALL\", \"rows_per_partition\":\"ALL\"}' ");
         if (appendHeavyAndReadLight) {
-            queryBuilder.append("AND compaction = { 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'} ");
+            queryBuilder.append("AND compaction = { 'class': '"
+                    + CassandraConstants.SIZE_TIERED_COMPACTION_STRATEGY + "'} ");
         } else {
-            queryBuilder.append("AND compaction = {'sstable_size_in_mb': '80', 'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'} ");
+            queryBuilder.append("AND compaction = {'sstable_size_in_mb': '80', 'class': '"
+                    + CassandraConstants.LEVELED_COMPACTION_STRATEGY + "'} ");
         }
         queryBuilder.append("AND compression = {'chunk_length_kb': '" + chunkLength + "', "
                 + "'sstable_compression': '" + CassandraConstants.DEFAULT_COMPRESSION_TYPE + "'}");
@@ -313,7 +325,7 @@ void createTableWithSettings(TableReference tableRef, byte[] rawMetadata, CQLKey
                         .bind();
         try {
             ResultSet resultSet = kvs.longRunningQuerySession.execute(createTableStatement);
-            logTracedQuery(queryBuilder.toString(), resultSet, kvs.session, kvs.cqlStatementCache.NORMAL_QUERY);
+            logTracedQuery(queryBuilder.toString(), resultSet, kvs.session, kvs.cqlStatementCache.normalQuery);
         } catch (Throwable t) {
             throw Throwables.throwUncheckedException(t);
         }
@@ -350,9 +362,10 @@ static void setSettingsForTable(TableReference tableRef, byte[] rawMetadata, CQL
         sb.append("AND caching = '{\"keys\":\"ALL\", \"rows_per_partition\":\"ALL\"}' ");
 
         if (appendHeavyAndReadLight) {
-            sb.append("AND compaction = { 'class': 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy'} ");
+            sb.append("AND compaction = { 'class': '" + CassandraConstants.SIZE_TIERED_COMPACTION_STRATEGY + "'} ");
         } else {
-            sb.append("AND compaction = {'sstable_size_in_mb': '80', 'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'} ");
+            sb.append("AND compaction = {'sstable_size_in_mb': '80', 'class': '"
+                    + CassandraConstants.LEVELED_COMPACTION_STRATEGY + "'} ");
         }
         sb.append("AND compression = {'chunk_length_kb': '" + chunkLength + "', "
                 + "'sstable_compression': '" + CassandraConstants.DEFAULT_COMPRESSION_TYPE + "'}");
@@ -369,7 +382,7 @@ static void setSettingsForTable(TableReference tableRef, byte[] rawMetadata, CQL
     }
 
 
-    static interface ThreadSafeCQLResultVisitor extends Visitor<Multimap<Cell, Value>> {
+    interface ThreadSafeCQLResultVisitor extends Visitor<Multimap<Cell, Value>> {
         // marker
     }
 
@@ -378,7 +391,7 @@ static class StartTsResultsCollector implements ThreadSafeCQLResultVisitor {
         final ValueExtractor extractor = new ValueExtractor(collectedResults);
         final long startTs;
 
-        public StartTsResultsCollector(long startTs) {
+        StartTsResultsCollector(long startTs) {
             this.startTs = startTs;
         }
 
@@ -404,7 +417,10 @@ public synchronized void visit(Multimap<Cell, Value> results) {
         }
     }
 
+    @SuppressWarnings("checkstyle:RegexpSinglelineJava")
     static Cell getMetadataCell(TableReference tableRef) {
-        return Cell.create(tableRef.getQualifiedName().getBytes(), "m".getBytes());
+        return Cell.create(
+                tableRef.getQualifiedName().getBytes(Charset.defaultCharset()),
+                "m".getBytes(StandardCharsets.UTF_8));
     }
 }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLStatementCache.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLStatementCache.java
index 60c69458025..611ec6d5225 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLStatementCache.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CQLStatementCache.java
@@ -22,14 +22,15 @@
 import com.google.common.cache.LoadingCache;
 
 public class CQLStatementCache {
-    Session session, longRunningQuerySession;
+    final Session session;
+    final Session longRunningQuerySession;
 
     CQLStatementCache(Session session, Session longRunningQuerySession) {
         this.session = session;
         this.longRunningQuerySession = longRunningQuerySession;
     }
 
-    final LoadingCache<String, PreparedStatement> NORMAL_QUERY = CacheBuilder.newBuilder()
+    final LoadingCache<String, PreparedStatement> normalQuery = CacheBuilder.newBuilder()
             .build(new CacheLoader<String, PreparedStatement>() {
                 @Override
                 public PreparedStatement load(String query) {
@@ -38,7 +39,7 @@ public PreparedStatement load(String query) {
             });
 
 
-    final LoadingCache<String, PreparedStatement> LONG_RUNNING_QUERY = CacheBuilder.newBuilder()
+    final LoadingCache<String, PreparedStatement> longRunningQuery = CacheBuilder.newBuilder()
             .build(new CacheLoader<String, PreparedStatement>() {
                 @Override
                 public PreparedStatement load(String query) {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java
new file mode 100644
index 00000000000..6297d2f0985
--- /dev/null
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraApiVersion.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import java.util.Arrays;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CassandraApiVersion {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CassandraApiVersion.class);
+
+    private final String versionString;
+    private final int majorVersion;
+    private final int minorVersion;
+
+    public CassandraApiVersion(String versionString) {
+        this.versionString = versionString;
+        String[] components = versionString.split("\\.");
+        if (components.length != 3) {
+            throw new UnsupportedOperationException(String.format(
+                    "Illegal version of Thrift protocol detected; expected format '#.#.#', got '%s'",
+                    Arrays.toString(components)));
+        }
+        majorVersion = Integer.parseInt(components[0]);
+        minorVersion = Integer.parseInt(components[1]);
+    }
+
+    // This corresponds to the version change in
+    // https://github.com/apache/cassandra/commit/8b0e1868e8cf8
+    public boolean supportsCheckAndSet() {
+        boolean supportsCheckAndSet = majorVersion > 19 || (majorVersion == 19 && minorVersion >= 37);
+
+        String supportMessage = supportsCheckAndSet ? "supports check and set." : "does not support check and set.";
+
+        LOGGER.info("Your cassandra api version ({}) " + supportMessage, versionString);
+
+        return supportsCheckAndSet;
+    }
+}
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java
index f3d3da20c90..2f57efffcee 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientFactory.java
@@ -24,9 +24,7 @@
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.apache.cassandra.thrift.AuthenticationException;
 import org.apache.cassandra.thrift.AuthenticationRequest;
-import org.apache.cassandra.thrift.AuthorizationException;
 import org.apache.cassandra.thrift.Cassandra;
 import org.apache.cassandra.thrift.Cassandra.Client;
 import org.apache.commons.pool2.BasePooledObjectFactory;
@@ -42,12 +40,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Optional;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.cassandra.CassandraCredentialsConfig;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.remoting.ssl.SslSocketFactories;
 
 public class CassandraClientFactory extends BasePooledObjectFactory<Client> {
     private static final Logger log = LoggerFactory.getLogger(CassandraClientFactory.class);
@@ -65,33 +64,20 @@ public SSLSocketFactory load(InetSocketAddress host) throws Exception {
             });
 
     private final InetSocketAddress addr;
-    private final String keyspace;
-    private final Optional<CassandraCredentialsConfig> creds;
-    private final boolean isSsl;
-    private final int socketTimeoutMillis;
-    private final int socketQueryTimeoutMillis;
-
-    public CassandraClientFactory(InetSocketAddress addr,
-                                  String keyspace,
-                                  Optional<CassandraCredentialsConfig> creds,
-                                  boolean isSsl,
-                                  int socketTimeoutMillis,
-                                  int socketQueryTimeoutMillis) {
+    private final CassandraKeyValueServiceConfig config;
+
+    public CassandraClientFactory(InetSocketAddress addr, CassandraKeyValueServiceConfig config) {
         this.addr = addr;
-        this.keyspace = keyspace;
-        this.creds = creds;
-        this.isSsl = isSsl;
-        this.socketTimeoutMillis = socketTimeoutMillis;
-        this.socketQueryTimeoutMillis = socketQueryTimeoutMillis;
+        this.config = config;
     }
 
     @Override
     public Client create() throws Exception {
         try {
-            return getClient(addr, keyspace, creds, isSsl, socketTimeoutMillis, socketQueryTimeoutMillis);
+            return getClient(addr, config);
         } catch (Exception e) {
-            String message = String.format("Failed to construct client for %s/%s", addr, keyspace);
-            if (isSsl) {
+            String message = String.format("Failed to construct client for %s/%s", addr, config.keyspace());
+            if (config.usingSsl()) {
                 message += " over SSL";
             }
             throw new ClientCreationFailedException(message, e);
@@ -99,16 +85,15 @@ public Client create() throws Exception {
     }
 
     private static Cassandra.Client getClient(InetSocketAddress addr,
-                                              String keyspace,
-                                              Optional<CassandraCredentialsConfig> creds,
-                                              boolean isSsl,
-                                              int socketTimeoutMillis,
-                                              int socketQueryTimeoutMillis) throws Exception {
-        Client ret = getClientInternal(addr, creds, isSsl, socketTimeoutMillis, socketQueryTimeoutMillis);;
+                                              CassandraKeyValueServiceConfig config) throws Exception {
+        Client ret = getClientInternal(addr, config);
         try {
-            ret.set_keyspace(keyspace);
-            log.debug("Created new client for {}/{} {} {}", addr, keyspace, (isSsl ? "over SSL" : ""),
-                    creds.isPresent() ? " as user " + creds.get().username() : "");
+            ret.set_keyspace(config.keyspace());
+            log.debug("Created new client for {}/{}{}{}",
+                    addr,
+                    config.keyspace(),
+                    config.usingSsl() ? " over SSL" : "",
+                    config.credentials().isPresent() ? " as user " + config.credentials().get().username() : "");
             return ret;
         } catch (Exception e) {
             ret.getOutputProtocol().getTransport().close();
@@ -116,43 +101,49 @@ private static Cassandra.Client getClient(InetSocketAddress addr,
         }
     }
 
-    static Cassandra.Client getClientInternal(InetSocketAddress addr,
-                                                     Optional<CassandraCredentialsConfig> creds,
-                                                     boolean isSsl,
-                                                     int socketTimeoutMillis,
-                                                     int socketQueryTimeoutMillis) throws TException {
-        TSocket tSocket = new TSocket(addr.getHostString(), addr.getPort(), socketTimeoutMillis);
-        tSocket.open();
+    static Cassandra.Client getClientInternal(InetSocketAddress addr, CassandraKeyValueServiceConfig config)
+            throws TException {
+        TSocket thriftSocket = new TSocket(addr.getHostString(), addr.getPort(), config.socketTimeoutMillis());
+        thriftSocket.open();
         try {
-            tSocket.getSocket().setKeepAlive(true);
-            tSocket.getSocket().setSoTimeout(socketQueryTimeoutMillis);
+            thriftSocket.getSocket().setKeepAlive(true);
+            thriftSocket.getSocket().setSoTimeout(config.socketQueryTimeoutMillis());
         } catch (SocketException e) {
             log.error("Couldn't set socket keep alive for {}", addr);
         }
 
-        if (isSsl) {
+        if (config.usingSsl()) {
             boolean success = false;
             try {
-                SSLSocketFactory factory = sslSocketFactories.getUnchecked(addr);
-                SSLSocket socket = (SSLSocket) factory.createSocket(tSocket.getSocket(), addr.getHostString(), addr.getPort(), true);
-                tSocket = new TSocket(socket);
+                final SSLSocketFactory factory;
+                if (config.sslConfiguration().isPresent()) {
+                    factory = SslSocketFactories.createSslSocketFactory(config.sslConfiguration().get());
+                } else {
+                    factory = sslSocketFactories.getUnchecked(addr);
+                }
+                SSLSocket socket = (SSLSocket) factory.createSocket(
+                        thriftSocket.getSocket(),
+                        addr.getHostString(),
+                        addr.getPort(),
+                        true);
+                thriftSocket = new TSocket(socket);
                 success = true;
             } catch (IOException e) {
                 throw new TTransportException(e);
             } finally {
                 if (!success) {
-                    tSocket.close();
+                    thriftSocket.close();
                 }
             }
         }
-        TTransport tFramedTransport =
-                new TFramedTransport(tSocket, CassandraConstants.CLIENT_MAX_THRIFT_FRAME_SIZE_BYTES);
-        TProtocol protocol = new TBinaryProtocol(tFramedTransport);
+        TTransport thriftFramedTransport =
+                new TFramedTransport(thriftSocket, CassandraConstants.CLIENT_MAX_THRIFT_FRAME_SIZE_BYTES);
+        TProtocol protocol = new TBinaryProtocol(thriftFramedTransport);
         Cassandra.Client client = new Cassandra.Client(protocol);
 
-        if (creds.isPresent()) {
+        if (config.credentials().isPresent()) {
             try {
-                login(client, creds.get());
+                login(client, config.credentials().get());
             } catch (TException e) {
                 client.getOutputProtocol().getTransport().close();
                 log.error("Exception thrown attempting to authenticate with config provided credentials", e);
@@ -163,9 +154,7 @@ static Cassandra.Client getClientInternal(InetSocketAddress addr,
         return client;
     }
 
-    private static void login(Client client, CassandraCredentialsConfig config) throws AuthenticationException,
-                                                                                       AuthorizationException,
-                                                                                       TException {
+    private static void login(Client client, CassandraCredentialsConfig config) throws TException {
         Map<String, String> credsMap = Maps.newHashMap();
         credsMap.put("username", config.username());
         credsMap.put("password", config.password());
@@ -191,7 +180,7 @@ public void destroyObject(PooledObject<Client> client) {
     static class ClientCreationFailedException extends RuntimeException {
         private static final long serialVersionUID = 1L;
 
-        public ClientCreationFailedException(String message, Exception cause) {
+        ClientCreationFailedException(String message, Exception cause) {
             super(message, cause);
         }
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java
index 8a63c992f58..fe964a572b0 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPool.java
@@ -18,11 +18,12 @@
 import java.net.InetSocketAddress;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
-import java.util.Collection;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.NavigableMap;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.TreeMap;
@@ -31,22 +32,15 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.cassandra.thrift.Cassandra;
-import org.apache.cassandra.thrift.Cassandra.Client;
-import org.apache.cassandra.thrift.CfDef;
-import org.apache.cassandra.thrift.InvalidRequestException;
-import org.apache.cassandra.thrift.KsDef;
 import org.apache.cassandra.thrift.NotFoundException;
-import org.apache.cassandra.thrift.SchemaDisagreementException;
 import org.apache.cassandra.thrift.TimedOutException;
 import org.apache.cassandra.thrift.TokenRange;
 import org.apache.cassandra.thrift.UnavailableException;
-import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
@@ -82,7 +76,8 @@
  *
  *   *entirely new features
  *
- *   By our old system, this would be a RefreshingRetriableTokenAwareHealthCheckingManyHostCassandraClientPoolingContainerManager;
+ *   By our old system, this would be a
+ *   RefreshingRetriableTokenAwareHealthCheckingManyHostCassandraClientPoolingContainerManager;
  *   ... this is one of the reasons why there is a new system.
  **/
 public class CassandraClientPool {
@@ -94,24 +89,41 @@ public class CassandraClientPool {
     private static final int MAX_TRIES_SAME_HOST = 3;
     private static final int MAX_TRIES_TOTAL = 6;
 
-    volatile RangeMap<LightweightOPPToken, List<InetSocketAddress>> tokenMap = ImmutableRangeMap.of();
+    volatile RangeMap<LightweightOppToken, List<InetSocketAddress>> tokenMap = ImmutableRangeMap.of();
     Map<InetSocketAddress, Long> blacklistedHosts = Maps.newConcurrentMap();
     Map<InetSocketAddress, CassandraClientPoolingContainer> currentPools = Maps.newConcurrentMap();
     final CassandraKeyValueServiceConfig config;
     final ScheduledThreadPoolExecutor refreshDaemon;
 
-    public static class LightweightOPPToken implements Comparable<LightweightOPPToken> {
+    public static class LightweightOppToken implements Comparable<LightweightOppToken> {
         final byte[] bytes;
 
-        public LightweightOPPToken(byte[] bytes) {
+        public LightweightOppToken(byte[] bytes) {
             this.bytes = bytes;
         }
 
         @Override
-        public int compareTo(LightweightOPPToken other) {
+        public int compareTo(LightweightOppToken other) {
             return UnsignedBytes.lexicographicalComparator().compare(this.bytes, other.bytes);
         }
 
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+            LightweightOppToken that = (LightweightOppToken) obj;
+            return Arrays.equals(bytes, that.bytes);
+        }
+
+        @Override
+        public int hashCode() {
+            return Arrays.hashCode(bytes);
+        }
+
         @Override
         public String toString() {
             return BaseEncoding.base16().encode(bytes);
@@ -120,17 +132,19 @@ public String toString() {
 
     public CassandraClientPool(CassandraKeyValueServiceConfig config) {
         this.config = config;
-        config.servers().forEach((server) -> currentPools.put(server, new CassandraClientPoolingContainer(server, config)));
-
-        refreshDaemon = PTExecutors.newScheduledThreadPool(1, new ThreadFactoryBuilder().setDaemon(true).setNameFormat("CassandraClientPoolRefresh-%d").build());
-        refreshDaemon.scheduleWithFixedDelay(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    refreshPool();
-                } catch (Throwable t) {
-                    log.error("Failed to refresh Cassandra KVS pool. Extended periods of being unable to refresh will cause perf degradation.", t);
-                }
+        config.servers().forEach(server ->
+                currentPools.put(server, new CassandraClientPoolingContainer(server, config)));
+
+        refreshDaemon = PTExecutors.newScheduledThreadPool(1, new ThreadFactoryBuilder()
+                .setDaemon(true)
+                .setNameFormat("CassandraClientPoolRefresh-%d")
+                .build());
+        refreshDaemon.scheduleWithFixedDelay(() -> {
+            try {
+                refreshPool();
+            } catch (Throwable t) {
+                log.error("Failed to refresh Cassandra KVS pool."
+                        + " Extended periods of being unable to refresh will cause perf degradation.", t);
             }
         }, config.poolRefreshIntervalSeconds(), config.poolRefreshIntervalSeconds(), TimeUnit.SECONDS);
 
@@ -139,7 +153,8 @@ public void run() {
 
     public void shutdown() {
         refreshDaemon.shutdown();
-        currentPools.forEach((address, cassandraClientPoolingContainer) -> cassandraClientPoolingContainer.shutdownPooling());
+        currentPools.forEach((address, cassandraClientPoolingContainer) ->
+                cassandraClientPoolingContainer.shutdownPooling());
     }
 
     private synchronized void refreshPool() {
@@ -187,7 +202,8 @@ private void removePool(InetSocketAddress removedServerAddress) {
         try {
             currentPools.get(removedServerAddress).shutdownPooling();
         } catch (Exception e) {
-            log.warn("While removing a host ({}) from the pool, we were unable to gently cleanup resources.", removedServerAddress, e);
+            log.warn("While removing a host ({}) from the pool, we were unable to gently cleanup resources.",
+                    removedServerAddress, e);
         }
         currentPools.remove(removedServerAddress);
     }
@@ -205,8 +221,8 @@ private void debugLogStateOfPool() {
                 currentState.append(
                         String.format("\tPOOL STATUS: Pooled host %s has %s out of %s connections checked out.%n",
                                 entry.getKey(),
-                                activeCheckouts > 0? Integer.toString(activeCheckouts) : "(unknown)",
-                                totalAllowed > 0? Integer.toString(totalAllowed) : "(not bounded)"));
+                                activeCheckouts > 0 ? Integer.toString(activeCheckouts) : "(unknown)",
+                                totalAllowed > 0 ? Integer.toString(totalAllowed) : "(not bounded)"));
             }
             log.debug(currentState.toString());
         }
@@ -220,7 +236,8 @@ private void checkAndUpdateBlacklist() {
                 InetSocketAddress host = blacklistedEntry.getKey();
                 if (isHostHealthy(host)) {
                     blacklistedHosts.remove(host);
-                    log.error("Added host {} back into the pool after a waiting period and successful health check.", host);
+                    log.error("Added host {} back into the pool after a waiting period and successful health check.",
+                            host);
                 }
             }
         }
@@ -238,7 +255,8 @@ private boolean isHostHealthy(InetSocketAddress host) {
             testingContainer.runWithPooledResource(validatePartitioner);
             return true;
         } catch (Exception e) {
-            log.error("We tried to add {} back into the pool, but got an exception that caused to us distrust this host further.", host, e);
+            log.error("We tried to add {} back into the pool, but got an exception"
+                    + " that caused to us distrust this host further.", host, e);
             return false;
         }
     }
@@ -248,7 +266,8 @@ private CassandraClientPoolingContainer getRandomGoodHost() {
 
         Set<InetSocketAddress> livingHosts = Sets.difference(pools.keySet(), blacklistedHosts.keySet());
         if (livingHosts.isEmpty()) {
-            log.error("There are no known live hosts in the connection pool. We're choosing one at random in a last-ditch attempt at forward progress.");
+            log.error("There are no known live hosts in the connection pool. We're choosing"
+                    + " one at random in a last-ditch attempt at forward progress.");
             livingHosts = pools.keySet();
         }
 
@@ -256,22 +275,22 @@ private CassandraClientPoolingContainer getRandomGoodHost() {
     }
 
     public InetSocketAddress getRandomHostForKey(byte[] key) {
-        List<InetSocketAddress> hostsForKey = tokenMap.get(new LightweightOPPToken(key));
+        List<InetSocketAddress> hostsForKey = tokenMap.get(new LightweightOppToken(key));
         SetView<InetSocketAddress> liveOwnerHosts;
 
         if (hostsForKey == null) {
-            log.debug(
-                    "We attempted to route your query to a cassandra host that already contains the relevant data. " +
-                    "However, the mapping of which host contains which data is not available yet. We will choose a random host instead.");
+            log.debug("We attempted to route your query to a cassandra host that already contains the relevant data."
+                    + " However, the mapping of which host contains which data is not available yet."
+                    + " We will choose a random host instead.");
             return getRandomGoodHost().getHost();
         } else {
             liveOwnerHosts = Sets.difference(ImmutableSet.copyOf(hostsForKey), blacklistedHosts.keySet());
         }
 
         if (liveOwnerHosts.isEmpty()) {
-            log.warn("Perf / cluster stability issue. Token aware query routing has failed because there are no known " +
-                    "live hosts that claim ownership of the given range. Falling back to choosing a random live node. " +
-                    "Current state logged at DEBUG");
+            log.warn("Perf / cluster stability issue. Token aware query routing has failed because there are no known "
+                    + "live hosts that claim ownership of the given range. Falling back to choosing a random live node."
+                    + " Current state logged at DEBUG");
             log.debug("Current ring view is: {} and our current host blacklist is {}", tokenMap, blacklistedHosts);
             return getRandomGoodHost().getHost();
         } else {
@@ -279,7 +298,8 @@ public InetSocketAddress getRandomHostForKey(byte[] key) {
         }
     }
 
-    private static InetSocketAddress getRandomHostByActiveConnections(Map<InetSocketAddress, CassandraClientPoolingContainer> pools) {
+    private static InetSocketAddress getRandomHostByActiveConnections(
+            Map<InetSocketAddress, CassandraClientPoolingContainer> pools) {
         return WeightedHosts.create(pools).getRandomHost();
     }
 
@@ -291,8 +311,10 @@ public void runOneTimeStartupChecks() {
             throw new RuntimeException(e);
         }
 
-        Map<InetSocketAddress, Exception> completelyUnresponsiveHosts = Maps.newHashMap(), aliveButInvalidPartitionerHosts = Maps.newHashMap();
-        boolean thisHostResponded, atLeastOneHostResponded = false, atLeastOneHostSaidWeHaveALockTable = false;
+        Map<InetSocketAddress, Exception> completelyUnresponsiveHosts = Maps.newHashMap();
+        Map<InetSocketAddress, Exception> aliveButInvalidPartitionerHosts = Maps.newHashMap();
+        boolean thisHostResponded = false;
+        boolean atLeastOneHostResponded = false;
         for (InetSocketAddress host : currentPools.keySet()) {
             thisHostResponded = false;
             try {
@@ -304,37 +326,34 @@ public void runOneTimeStartupChecks() {
                 addToBlacklist(host);
             }
 
-
             if (thisHostResponded) {
                 try {
                     runOnHost(host, validatePartitioner);
                 } catch (Exception e) {
                     aliveButInvalidPartitionerHosts.put(host, e);
                 }
-
-                try {
-                    runOnHost(host, createInternalLockTable);
-                    atLeastOneHostSaidWeHaveALockTable = true;
-                } catch (Exception e) {
-                    // don't fail here, want to give the user all the errors at once at the end
-                }
             }
         }
 
         StringBuilder errorBuilderForEntireCluster = new StringBuilder();
         if (completelyUnresponsiveHosts.size() > 0) {
-            errorBuilderForEntireCluster.append("Performing routine startup checks, determined that the following hosts are unreachable for the following reasons: \n");
+            errorBuilderForEntireCluster.append("Performing routine startup checks,")
+                    .append(" determined that the following hosts are unreachable for the following reasons: \n");
             completelyUnresponsiveHosts.forEach((host, exception) ->
-                    errorBuilderForEntireCluster.append(String.format("\tHost: %s was marked unreachable via exception: %s%n", host.toString(), exception.toString())));
+                    errorBuilderForEntireCluster.append(String.format("\tHost: %s was marked unreachable"
+                            + " via exception: %s%n", host.toString(), exception.toString())));
         }
 
         if (aliveButInvalidPartitionerHosts.size() > 0) {
-            errorBuilderForEntireCluster.append("Performing routine startup checks, determined that the following hosts were alive but are configured with an invalid partitioner: \n");
+            errorBuilderForEntireCluster.append("Performing routine startup checks,")
+                    .append("determined that the following hosts were alive but are configured")
+                    .append("with an invalid partitioner: \n");
             aliveButInvalidPartitionerHosts.forEach((host, exception) ->
-                    errorBuilderForEntireCluster.append(String.format("\tHost: %s was marked as invalid partitioner via exception: %s%n", host.toString(), exception.toString())));
+                    errorBuilderForEntireCluster.append(String.format("\tHost: %s was marked as invalid partitioner"
+                            + " via exception: %s%n", host.toString(), exception.toString())));
         }
 
-        if (atLeastOneHostResponded && atLeastOneHostSaidWeHaveALockTable && aliveButInvalidPartitionerHosts.size() == 0) {
+        if (atLeastOneHostResponded && aliveButInvalidPartitionerHosts.size() == 0) {
             return;
         } else {
             throw new RuntimeException(errorBuilderForEntireCluster.toString());
@@ -350,48 +369,29 @@ protected static String internalTableName(TableReference tableRef) {
         return tableName.replaceFirst("\\.", "__");
     }
 
-    // for tables internal / implementation specific to this KVS; these also don't get metadata in metadata table, nor do they show up in getTablenames, nor does this use concurrency control
-    private void createTableInternal(Client client, TableReference tableRef) throws InvalidRequestException, SchemaDisagreementException, TException, NotFoundException {
-        if (tableAlreadyExists(client, internalTableName(tableRef))) {
-            return;
-        }
-        CfDef cf = CassandraConstants.getStandardCfDef(config.keyspace(), internalTableName(tableRef));
-        client.system_add_column_family(cf);
-        CassandraKeyValueServices.waitForSchemaVersions(client, tableRef.getQualifiedName(), config.schemaMutationTimeoutMillis());
-        return;
-    }
-
-    private boolean tableAlreadyExists(Client client, String caseInsensitiveTableName) throws TException {
-        KsDef ks = client.describe_keyspace(config.keyspace());
-        for (CfDef cf : ks.getCf_defs()) {
-            if (cf.getName().equalsIgnoreCase(caseInsensitiveTableName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     private void refreshTokenRanges() {
         try {
-            ImmutableRangeMap.Builder<LightweightOPPToken, List<InetSocketAddress>> newTokenRing = ImmutableRangeMap.builder();
+            ImmutableRangeMap.Builder<LightweightOppToken, List<InetSocketAddress>> newTokenRing =
+                    ImmutableRangeMap.builder();
 
             // grab latest token ring view from a random node in the cluster
             List<TokenRange> tokenRanges = getRandomGoodHost().runWithPooledResource(describeRing);
 
-            if (tokenRanges.size() == 1) { // RangeMap needs a little help with weird 1-node, 1-vnode, this-entire-feature-is-useless case
+            // RangeMap needs a little help with weird 1-node, 1-vnode, this-entire-feature-is-useless case
+            if (tokenRanges.size() == 1) {
                 String onlyEndpoint = Iterables.getOnlyElement(Iterables.getOnlyElement(tokenRanges).getEndpoints());
-                InetSocketAddress onlyHost = new InetSocketAddress(onlyEndpoint, CassandraConstants.DEFAULT_THRIFT_PORT);
+                InetSocketAddress onlyHost = new InetSocketAddress(
+                        onlyEndpoint,
+                        CassandraConstants.DEFAULT_THRIFT_PORT);
                 newTokenRing.put(Range.all(), ImmutableList.of(onlyHost));
             } else { // normal case, large cluster with many vnodes
                 for (TokenRange tokenRange : tokenRanges) {
-                    List<InetSocketAddress> hosts = Lists.transform(tokenRange.getEndpoints(), new Function<String, InetSocketAddress>() {
-                        @Override
-                        public InetSocketAddress apply(String endpoint) {
-                            return new InetSocketAddress(endpoint, CassandraConstants.DEFAULT_THRIFT_PORT);
-                        }
-                    });
-                    LightweightOPPToken startToken = new LightweightOPPToken(BaseEncoding.base16().decode(tokenRange.getStart_token().toUpperCase()));
-                    LightweightOPPToken endToken = new LightweightOPPToken(BaseEncoding.base16().decode(tokenRange.getEnd_token().toUpperCase()));
+                    List<InetSocketAddress> hosts = Lists.transform(tokenRange.getEndpoints(),
+                            endpoint -> new InetSocketAddress(endpoint, CassandraConstants.DEFAULT_THRIFT_PORT));
+                    LightweightOppToken startToken = new LightweightOppToken(
+                            BaseEncoding.base16().decode(tokenRange.getStart_token().toUpperCase()));
+                    LightweightOppToken endToken = new LightweightOppToken(
+                            BaseEncoding.base16().decode(tokenRange.getEnd_token().toUpperCase()));
                     if (startToken.compareTo(endToken) <= 0) {
                         newTokenRing.put(Range.openClosed(startToken, endToken), hosts);
                     } else {
@@ -407,67 +407,84 @@ public InetSocketAddress apply(String endpoint) {
         }
     }
 
-    private FunctionCheckedException<Cassandra.Client, List<TokenRange>, Exception> describeRing = new FunctionCheckedException<Cassandra.Client, List<TokenRange>, Exception>() {
-        @Override
-        public List<TokenRange> apply (Cassandra.Client client) throws Exception {
-            return client.describe_ring(config.keyspace());
-        }};
+    private FunctionCheckedException<Cassandra.Client, List<TokenRange>, Exception> describeRing =
+            new FunctionCheckedException<Cassandra.Client, List<TokenRange>, Exception>() {
+                @Override
+                public List<TokenRange> apply(Cassandra.Client client) throws Exception {
+                    return client.describe_ring(config.keyspace());
+                }
+            };
 
-    public <V, K extends Exception> V runWithRetry(FunctionCheckedException<Cassandra.Client, V, K> f) throws K {
-       return runWithRetryOnHost(getRandomGoodHost().getHost(), f);
+    public <V, K extends Exception> V runWithRetry(FunctionCheckedException<Cassandra.Client, V, K> fn) throws K {
+        return runWithRetryOnHost(getRandomGoodHost().getHost(), fn);
     }
 
-    public <V, K extends Exception> V runWithRetryOnHost(InetSocketAddress specifiedHost, FunctionCheckedException<Cassandra.Client, V, K> f) throws K {
+    public <V, K extends Exception> V runWithRetryOnHost(
+            InetSocketAddress specifiedHost,
+            FunctionCheckedException<Cassandra.Client, V, K> fn) throws K {
         int numTries = 0;
+        boolean shouldRetryOnDifferentHost = false;
         while (true) {
             CassandraClientPoolingContainer hostPool = currentPools.get(specifiedHost);
 
-            if (blacklistedHosts.containsKey(specifiedHost) || hostPool == null) {
-                log.warn("Randomly redirected a query intended for host {} because it was not currently a live member of the pool.", specifiedHost);
+            if (blacklistedHosts.containsKey(specifiedHost) || hostPool == null || shouldRetryOnDifferentHost) {
+                log.warn("Randomly redirected a query intended for host {}.", specifiedHost);
                 hostPool = getRandomGoodHost();
             }
 
             try {
-                return hostPool.runWithPooledResource(f);
+                return hostPool.runWithPooledResource(fn);
             } catch (Exception e) {
                 numTries++;
                 this.<K>handleException(numTries, hostPool.getHost(), e);
+                if (isRetriableWithBackoffException(e)) {
+                    log.warn("Retrying with backoff a query intended for host {}.", hostPool.getHost(), e);
+                    try {
+                        Thread.sleep(numTries * 1000);
+                    } catch (InterruptedException i) {
+                        throw new RuntimeException(i);
+                    }
+                    if (numTries >= MAX_TRIES_SAME_HOST) {
+                        shouldRetryOnDifferentHost = true;
+                    }
+                }
             }
         }
     }
 
-    public <V, K extends Exception> V run(FunctionCheckedException<Cassandra.Client, V, K> f) throws K {
-        return runOnHost(getRandomGoodHost().getHost(), f);
+    public <V, K extends Exception> V run(FunctionCheckedException<Cassandra.Client, V, K> fn) throws K {
+        return runOnHost(getRandomGoodHost().getHost(), fn);
     }
 
     private <V, K extends Exception> V runOnHost(InetSocketAddress specifiedHost,
-                                                 FunctionCheckedException<Cassandra.Client, V, K> f) throws K {
+                                                 FunctionCheckedException<Cassandra.Client, V, K> fn) throws K {
         CassandraClientPoolingContainer hostPool = currentPools.get(specifiedHost);
-        return hostPool.runWithPooledResource(f);
+        return hostPool.runWithPooledResource(fn);
     }
 
-        @SuppressWarnings("unchecked")
-    private <K extends Exception> void handleException(int numTries, InetSocketAddress host, Exception e) throws K {
-        if (isRetriableException(e)) {
+    @SuppressWarnings("unchecked")
+    private <K extends Exception> void handleException(int numTries, InetSocketAddress host, Exception ex) throws K {
+        if (isRetriableException(ex) || isRetriableWithBackoffException(ex)) {
             if (numTries >= MAX_TRIES_TOTAL) {
-                if (e instanceof TTransportException
-                        && e.getCause() != null
-                        && (e.getCause().getClass() == SocketException.class)) {
-                    String msg = "Error writing to Cassandra socket. Likely cause: Exceeded maximum thrift frame size; unlikely cause: network issues.";
-                    log.error("Tried to connect to cassandra " + numTries + " times. " + msg, e);
-                    e = new TTransportException(((TTransportException) e).getType(), msg, e);
+                if (ex instanceof TTransportException
+                        && ex.getCause() != null
+                        && (ex.getCause().getClass() == SocketException.class)) {
+                    String msg = "Error writing to Cassandra socket. Likely cause:"
+                            + " Exceeded maximum thrift frame size; unlikely cause: network issues.";
+                    log.error("Tried to connect to cassandra " + numTries + " times. " + msg, ex);
+                    throw (K) new TTransportException(((TTransportException) ex).getType(), msg, ex);
                 } else {
-                    log.error("Tried to connect to cassandra " + numTries + " times.", e);
+                    log.error("Tried to connect to cassandra " + numTries + " times.", ex);
+                    throw (K) ex;
                 }
-                throw (K) e;
             } else {
-                log.warn("Error occurred talking to cassandra. Attempt {} of {}.", numTries, MAX_TRIES_TOTAL, e);
-                if (isConnectionException(e) && numTries >= MAX_TRIES_SAME_HOST) {
+                log.warn("Error occurred talking to cassandra. Attempt {} of {}.", numTries, MAX_TRIES_TOTAL, ex);
+                if (isConnectionException(ex) && numTries >= MAX_TRIES_SAME_HOST) {
                     addToBlacklist(host);
                 }
             }
         } else {
-            throw (K) e;
+            throw (K) ex;
         }
     }
 
@@ -480,8 +497,7 @@ private void sanityCheckRingConsistency() {
         for (InetSocketAddress host : currentPools.keySet()) {
             Cassandra.Client client = null;
             try {
-                client = CassandraClientFactory.getClientInternal(host, config.credentials(),
-                        config.ssl(), config.socketTimeoutMillis(), config.socketQueryTimeoutMillis());
+                client = CassandraClientFactory.getClientInternal(host, config);
                 try {
                     client.describe_keyspace(config.keyspace());
                 } catch (NotFoundException e) {
@@ -497,7 +513,8 @@ private void sanityCheckRingConsistency() {
             }
 
             if (tokenRangesToHost.isEmpty()) {
-                log.warn("Failed to get ring info for entire Cassandra cluster ({}); ring could not be checked for consistency.", config.keyspace());
+                log.warn("Failed to get ring info for entire Cassandra cluster ({});"
+                        + " ring could not be checked for consistency.", config.keyspace());
                 return;
             }
 
@@ -505,76 +522,78 @@ private void sanityCheckRingConsistency() {
                 return;
             }
 
-            RuntimeException e = new IllegalStateException("Hosts have differing ring descriptions.  This can lead to inconsistent reads and lost data. ");
-            log.error("QA-86204 " + e.getMessage() + tokenRangesToHost, e);
+            RuntimeException ex = new IllegalStateException("Hosts have differing ring descriptions."
+                    + " This can lead to inconsistent reads and lost data. ");
+            log.error("QA-86204 " + ex.getMessage() + tokenRangesToHost, ex);
 
 
             // provide some easier to grok logging for the two most common cases
             if (tokenRangesToHost.size() > 2) {
-                for (Map.Entry<Set<TokenRange>, Collection<InetSocketAddress>> entry : tokenRangesToHost.asMap().entrySet()) {
-                    if (entry.getValue().size() == 1) {
-                        log.error("Host: " + entry.getValue().iterator().next() +
-                                " disagrees with the other nodes about the ring state.");
-                    }
-                }
+                tokenRangesToHost.asMap().entrySet().stream()
+                        .filter(entry -> entry.getValue().size() == 1)
+                        .forEach(entry -> log.error("Host: "
+                                + Iterables.getFirst(entry.getValue(), null)
+                                + " disagrees with the other nodes about the ring state."));
             }
             if (tokenRangesToHost.keySet().size() == 2) {
                 ImmutableList<Set<TokenRange>> sets = ImmutableList.copyOf(tokenRangesToHost.keySet());
                 Set<TokenRange> set1 = sets.get(0);
                 Set<TokenRange> set2 = sets.get(1);
-                log.error("Hosts are split.  group1: " + tokenRangesToHost.get(set1) +
-                        " group2: " + tokenRangesToHost.get(set2));
+                log.error("Hosts are split."
+                        + " group1: " + tokenRangesToHost.get(set1)
+                        + " group2: " + tokenRangesToHost.get(set2));
             }
 
-            CassandraVerifier.logErrorOrThrow(e.getMessage(), config.safetyDisabled());
+            CassandraVerifier.logErrorOrThrow(ex.getMessage(), config.safetyDisabled());
         }
     }
 
     @VisibleForTesting
-    static boolean isConnectionException(Throwable t) {
-        return t != null
-                && (t instanceof SocketTimeoutException
-                || t instanceof ClientCreationFailedException
-                || t instanceof UnavailableException
-                || t instanceof NoSuchElementException
-                || isConnectionException(t.getCause()));
+    static boolean isConnectionException(Throwable ex) {
+        return ex != null
+                && (ex instanceof SocketTimeoutException
+                || ex instanceof ClientCreationFailedException
+                || isConnectionException(ex.getCause()));
     }
 
     @VisibleForTesting
-    static boolean isRetriableException(Throwable t) {
-        return t != null
-                && (t instanceof TTransportException
-                || t instanceof TimedOutException
-                || t instanceof InsufficientConsistencyException
-                || isConnectionException(t)
-                || isRetriableException(t.getCause()));
+    static boolean isRetriableException(Throwable ex) {
+        return ex != null
+                && (ex instanceof TTransportException
+                || ex instanceof TimedOutException
+                || ex instanceof InsufficientConsistencyException
+                || isConnectionException(ex)
+                || isRetriableException(ex.getCause()));
     }
 
-    final FunctionCheckedException<Cassandra.Client, Void, Exception> validatePartitioner = new FunctionCheckedException<Cassandra.Client, Void, Exception>() {
-        @Override
-        public Void apply(Cassandra.Client client) throws Exception {
-            CassandraVerifier.validatePartitioner(client, config);
-            return null;
-        }
-    };
+    @VisibleForTesting
+    static boolean isRetriableWithBackoffException(Throwable ex) {
+        return ex != null
+                // pool for this node is fully in use
+                && (ex instanceof NoSuchElementException
+                // remote cassandra node couldn't talk to enough other remote cassandra nodes to answer
+                || ex instanceof UnavailableException
+                || isRetriableWithBackoffException(ex.getCause()));
+    }
 
-    final FunctionCheckedException<Cassandra.Client, Void, Exception> createInternalLockTable = new FunctionCheckedException<Cassandra.Client, Void, Exception>() {
-        @Override
-        public Void apply(Cassandra.Client client) throws Exception {
-            createTableInternal(client, CassandraConstants.LOCK_TABLE);
-            return null;
-        }
-    };
+    final FunctionCheckedException<Cassandra.Client, Void, Exception> validatePartitioner =
+            new FunctionCheckedException<Cassandra.Client, Void, Exception>() {
+                @Override
+                public Void apply(Cassandra.Client client) throws Exception {
+                    CassandraVerifier.validatePartitioner(client, config);
+                    return null;
+                }
+            };
 
     /**
      * Weights hosts inversely by the number of active connections. {@link #getRandomHost()} should then be used to
      * pick a random host
      */
     @VisibleForTesting
-    static class WeightedHosts {
-        final TreeMap<Integer, InetSocketAddress> hosts;
+    static final class WeightedHosts {
+        final NavigableMap<Integer, InetSocketAddress> hosts;
 
-        private WeightedHosts(TreeMap<Integer, InetSocketAddress> hosts) {
+        private WeightedHosts(NavigableMap<Integer, InetSocketAddress> hosts) {
             this.hosts = hosts;
         }
 
@@ -592,7 +611,7 @@ static WeightedHosts create(Map<InetSocketAddress, CassandraClientPoolingContain
          * Every weight is guaranteed to be non-zero in size. That is, every key is guaranteed to be at least one larger
          * than the previous key.
          */
-        private static TreeMap<Integer, InetSocketAddress> buildHostsWeightedByActiveConnections(
+        private static NavigableMap<Integer, InetSocketAddress> buildHostsWeightedByActiveConnections(
                 Map<InetSocketAddress, CassandraClientPoolingContainer> pools) {
 
             Map<InetSocketAddress, Integer> activeConnectionsByHost = new HashMap<>(pools.size());
@@ -604,7 +623,7 @@ private static TreeMap<Integer, InetSocketAddress> buildHostsWeightedByActiveCon
             }
 
             int lowerBoundInclusive = 0;
-            TreeMap<Integer, InetSocketAddress> weightedHosts = new TreeMap<>();
+            NavigableMap<Integer, InetSocketAddress> weightedHosts = new TreeMap<>();
             for (Entry<InetSocketAddress, Integer> entry : activeConnectionsByHost.entrySet()) {
                 // We want the weight to be inversely proportional to the number of active connections so that we pick
                 // less-active hosts. We add 1 to make sure that all ranges are non-empty
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java
index 0e3e3502393..cca1b0b6df1 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraClientPoolingContainer.java
@@ -17,9 +17,10 @@
 
 import java.lang.reflect.Field;
 import java.net.InetSocketAddress;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
 import java.util.NoSuchElementException;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -70,15 +71,15 @@ protected int getPoolSize() {
     }
 
     @Override
-    public <V, K extends Exception> V runWithPooledResource(FunctionCheckedException<Client, V, K> f)
+    public <V, K extends Exception> V runWithPooledResource(FunctionCheckedException<Client, V, K> fn)
             throws K {
         final String origName = Thread.currentThread().getName();
         Thread.currentThread().setName(origName
                 + " calling cassandra host " + host
-                + " started at " + new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(new Date())
+                + " started at " + DateTimeFormatter.ISO_INSTANT.format(Instant.now())
                 + " - " + count.getAndIncrement());
         try {
-            return runWithGoodResource(f);
+            return runWithGoodResource(fn);
         } catch (Throwable t) {
             log.warn("Error occurred talking to host '{}': {}", host, t.toString());
             throw t;
@@ -87,14 +88,20 @@ public <V, K extends Exception> V runWithPooledResource(FunctionCheckedException
         }
     }
 
+    @Override
+    public <V> V runWithPooledResource(Function<Client, V> fn) {
+        throw new UnsupportedOperationException("you should use FunctionCheckedException<?, ?, Exception> "
+                + "to ensure the TTransportException type is propagated correctly.");
+    }
+
     @SuppressWarnings("unchecked")
-    private <V, K extends Exception> V runWithGoodResource(FunctionCheckedException<Client, V, K> f)
+    private <V, K extends Exception> V runWithGoodResource(FunctionCheckedException<Client, V, K> fn)
             throws K {
         boolean shouldReuse = true;
         Client resource = null;
         try {
             resource = clientPool.borrowObject();
-            return f.apply(resource);
+            return fn.apply(resource);
         } catch (Exception e) {
             if (isInvalidClientConnection(e)) {
                 log.warn("Not reusing resource {} due to {}", resource, e.toString(), e);
@@ -124,13 +131,14 @@ private static void eagerlyCleanupReadBuffersFromIdleConnection(Client idleClien
         try {
             TTransport transport = idleClient.getInputProtocol().getTransport();
             if (transport instanceof TFramedTransport) {
-                Field readBuffer_ = ((TFramedTransport) transport).getClass().getDeclaredField("readBuffer_");
-                readBuffer_.setAccessible(true);
-                TMemoryInputTransport tMemoryInputTransport = (TMemoryInputTransport) readBuffer_.get(transport);
-                byte[] underlyingBuffer = tMemoryInputTransport.getBuffer();
+                Field readBuffer = ((TFramedTransport) transport).getClass().getDeclaredField("readBuffer_");
+                readBuffer.setAccessible(true);
+                TMemoryInputTransport memoryInputTransport = (TMemoryInputTransport) readBuffer.get(transport);
+                byte[] underlyingBuffer = memoryInputTransport.getBuffer();
                 if (underlyingBuffer != null) {
-                    log.debug("During {} check-in, cleaned up a read buffer of {} bytes", idleClient, underlyingBuffer.length);
-                    tMemoryInputTransport.clear();
+                    log.debug("During {} check-in, cleaned up a read buffer of {} bytes",
+                            idleClient, underlyingBuffer.length);
+                    memoryInputTransport.clear();
                 }
             }
         } catch (Exception e) {
@@ -138,10 +146,10 @@ private static void eagerlyCleanupReadBuffersFromIdleConnection(Client idleClien
         }
     }
 
-    private static boolean isInvalidClientConnection(Exception e) {
-        return e instanceof TTransportException
-                || e instanceof TProtocolException
-                || e instanceof NoSuchElementException;
+    private static boolean isInvalidClientConnection(Exception ex) {
+        return ex instanceof TTransportException
+                || ex instanceof TProtocolException
+                || ex instanceof NoSuchElementException;
     }
 
     private void invalidateQuietly(Client resource) {
@@ -153,12 +161,6 @@ private void invalidateQuietly(Client resource) {
         }
     }
 
-    @Override
-    public <V> V runWithPooledResource(Function<Client, V> f) {
-        throw new UnsupportedOperationException("you should use FunctionCheckedException<?, ?, Exception> "
-                + "to ensure the TTransportException type is propagated correctly.");
-    }
-
     @Override
     public void shutdownPooling() {
         clientPool.close();
@@ -169,32 +171,62 @@ public String toString() {
         return MoreObjects.toStringHelper(getClass())
                 .add("host", this.host)
                 .add("keyspace", config.keyspace())
-                .add("isSsl", config.ssl())
+                .add("usingSsl", config.usingSsl())
+                .add("sslConfiguration", config.sslConfiguration().isPresent()
+                        ? config.sslConfiguration().get()
+                        : "unspecified")
                 .add("socketTimeoutMillis", config.socketTimeoutMillis())
                 .add("socketQueryTimeoutMillis", config.socketQueryTimeoutMillis())
                 .toString();
     }
 
+    /**
+     * Pool size:
+     *    Always keep {@code config.poolSize()} (default 20) connections around, per host.
+     *    Allow bursting up to poolSize * 5 (default 100) connections per host under load.
+     *
+     * Borrowing from pool:
+     *    On borrow, check if the connection is actually open. If it is not,
+     *       immediately discard this connection from the pool, and try to take another.
+     *    Borrow attempts against a fully in-use pool immediately throw a NoSuchElementException.
+     *       {@code CassandraClientPool} when it sees this will:
+     *          Follow an exponential backoff as a method of back pressure.
+     *          Try 3 times against this host, and then give up and try against different hosts 3 additional times.
+     *
+     *
+     * In an asynchronous thread:
+     *    Every approximately 1 minute, examine approximately a third of the connections in pool.
+     *    Discard any connections in this third of the pool whose TCP connections are closed.
+     *    Discard any connections in this third of the pool that have been idle for more than 3 minutes,
+     *       while still keeping a minimum number of idle connections around for fast borrows.
+     *
+     */
     private GenericObjectPool<Client> createClientPool() {
-        CassandraClientFactory cassandraClientFactory =
-                new CassandraClientFactory(host,
-                        config.keyspace(),
-                        config.credentials(),
-                        config.ssl(),
-                        config.socketTimeoutMillis(),
-                        config.socketQueryTimeoutMillis());
+        CassandraClientFactory cassandraClientFactory = new CassandraClientFactory(host, config);
         GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+
         poolConfig.setMinIdle(config.poolSize());
-        poolConfig.setTestOnBorrow(true);
-        poolConfig.setBlockWhenExhausted(true);
-        // TODO: Should we make these configurable/are these intelligent values?
-        poolConfig.setMaxTotal(5 * config.poolSize());
         poolConfig.setMaxIdle(5 * config.poolSize());
-        poolConfig.setMinEvictableIdleTimeMillis(TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES));
-        poolConfig.setTimeBetweenEvictionRunsMillis(TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES));
-        poolConfig.setNumTestsPerEvictionRun(-1); // Test all idle objects for eviction
-        poolConfig.setJmxNamePrefix(host.getHostString());
+        poolConfig.setMaxTotal(5 * config.poolSize());
+
+        // immediately throw when we try and borrow from a full pool; dealt with at higher level
+        poolConfig.setBlockWhenExhausted(false);
         poolConfig.setMaxWaitMillis(config.socketTimeoutMillis());
-        return new GenericObjectPool<Client>(cassandraClientFactory, poolConfig);
+
+        // this test is free/just checks a boolean and does not block; borrow is still fast
+        poolConfig.setTestOnBorrow(true);
+
+        poolConfig.setMinEvictableIdleTimeMillis(TimeUnit.MILLISECONDS.convert(3, TimeUnit.MINUTES));
+        // the randomness here is to prevent all of the pools for all of the hosts
+        // evicting all at at once, which isn't great for C*.
+        poolConfig.setTimeBetweenEvictionRunsMillis(
+                TimeUnit.MILLISECONDS.convert(60 + ThreadLocalRandom.current().nextInt(10), TimeUnit.SECONDS));
+        // test one third of objects per eviction run  // (Apache Commons Pool has the worst API)
+        poolConfig.setNumTestsPerEvictionRun(-3);
+        poolConfig.setTestWhileIdle(true);
+
+        poolConfig.setJmxNamePrefix(host.getHostString());
+
+        return new GenericObjectPool<>(cassandraClientFactory, poolConfig);
     }
 }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java
index fb63c9c3e6a..f40d12a741e 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraConstants.java
@@ -26,10 +26,9 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
-import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 
-public class CassandraConstants {
+public final class CassandraConstants {
     static final int LONG_RUNNING_QUERY_SOCKET_TIMEOUT_MILLIS = 62000;
     public static final int DEFAULT_REPLICATION_FACTOR = 3;
     public static final int DEFAULT_THRIFT_PORT = 9160;
@@ -64,7 +63,9 @@ public class CassandraConstants {
     static final String DEFAULT_RACK = "rack1";
     static final String SIMPLE_RF_TEST_KEYSPACE = "__simple_rf_test_keyspace__";
     static final String REPLICATION_FACTOR_OPTION = "replication_factor";
-    static final int GC_GRACE_SECONDS = 4 * 24 * 60 * 60; // 4 days; Hinted-Handoffs MUST expire well within this period for delete correctness (I believe we will be expiring hints in half this period)
+    // 4 days; Hinted-Handoffs MUST expire well within this period for delete correctness
+    // (I believe we will be expiring hints in half this period)
+    static final int GC_GRACE_SECONDS = 4 * 24 * 60 * 60;
     static final float TOMBSTONE_THRESHOLD_RATIO = 0.2f;
 
     // JMX compaction related
@@ -85,19 +86,18 @@ public class CassandraConstants {
     public static final int NO_TTL = -1;
 
     static final String LEVELED_COMPACTION_STRATEGY = "org.apache.cassandra.db.compaction.LeveledCompactionStrategy";
-    static final String SIZE_TIERED_COMPACTION_STRATEGY = "org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy";
-
-    public static final TableReference LOCK_TABLE = TableReference.createWithEmptyNamespace("_locks");
-    public static final Set<TableReference> HIDDEN_TABLES = ImmutableSet.of(
-            AtlasDbConstants.TIMESTAMP_TABLE,
-            CassandraConstants.LOCK_TABLE,
-            AtlasDbConstants.METADATA_TABLE);
+    static final String SIZE_TIERED_COMPACTION_STRATEGY =
+            "org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy";
 
     public static final String GLOBAL_DDL_LOCK = "Global DDL lock";
     public static final String GLOBAL_DDL_LOCK_COLUMN_NAME = "id_with_lock";
     public static final long TIME_BETWEEN_LOCK_ATTEMPT_ROUNDS_MILLIS = 1000;
     public static final long GLOBAL_DDL_LOCK_CLEARED_VALUE = Long.MAX_VALUE;
 
+    private CassandraConstants() {
+        // Utility class
+    }
+
     // update CKVS.isMatchingCf if you update this method
     static CfDef getStandardCfDef(String keyspace, String internalTableName) {
         CfDef cf = new CfDef(keyspace, internalTableName);
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraExpiringKeyValueService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraExpiringKeyValueService.java
index c1a48c19607..a95b24d5e5e 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraExpiringKeyValueService.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraExpiringKeyValueService.java
@@ -24,13 +24,15 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import com.google.common.base.Function;
+import org.slf4j.LoggerFactory;
+
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.ExpiringKeyValueService;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
@@ -43,33 +45,42 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.common.collect.Maps2;
 
-public class CassandraExpiringKeyValueService extends CassandraKeyValueService implements ExpiringKeyValueService{
+public class CassandraExpiringKeyValueService extends CassandraKeyValueService implements ExpiringKeyValueService {
 
-    public static CassandraExpiringKeyValueService create(CassandraKeyValueServiceConfigManager configManager) {
+    public static CassandraExpiringKeyValueService create(
+            CassandraKeyValueServiceConfigManager configManager,
+            Optional<LeaderConfig> leaderConfig) {
         Preconditions.checkState(!configManager.getConfig().servers().isEmpty(), "address list was empty");
 
-        Optional<CassandraJmxCompactionManager> compactionManager = CassandraJmxCompaction.createJmxCompactionManager(configManager);
-        CassandraExpiringKeyValueService kvs = new CassandraExpiringKeyValueService(configManager, compactionManager);
+        Optional<CassandraJmxCompactionManager> compactionManager =
+                CassandraJmxCompaction.createJmxCompactionManager(configManager);
+        CassandraExpiringKeyValueService kvs =
+                new CassandraExpiringKeyValueService(configManager, compactionManager, leaderConfig);
         kvs.init();
         return kvs;
     }
 
-    protected CassandraExpiringKeyValueService(CassandraKeyValueServiceConfigManager configManager,
-                                               Optional<CassandraJmxCompactionManager> compactionManager) {
-        super(configManager, compactionManager);
+    protected CassandraExpiringKeyValueService(
+            CassandraKeyValueServiceConfigManager configManager,
+            Optional<CassandraJmxCompactionManager> compactionManager,
+            Optional<LeaderConfig> leaderConfig) {
+        super(LoggerFactory.getLogger(CassandraKeyValueService.class), configManager, compactionManager, leaderConfig);
     }
 
     @Override
-    public void put(final TableReference tableRef, final Map<Cell, byte[]> values, final long timestamp, final long time, final TimeUnit unit) {
+    public void put(TableReference tableRef, Map<Cell, byte[]> values, long timestamp, long time, TimeUnit unit) {
         try {
-            putInternal(tableRef, KeyValueServices.toConstantTimestampValues(values.entrySet(), timestamp), CassandraKeyValueServices.convertTtl(time, unit));
+            putInternal(
+                    tableRef,
+                    KeyValueServices.toConstantTimestampValues(values.entrySet(), timestamp),
+                    CassandraKeyValueServices.convertTtl(time, unit));
         } catch (Exception e) {
             throw Throwables.throwUncheckedException(e);
         }
     }
 
     @Override
-    public void putWithTimestamps(TableReference tableRef, Multimap<Cell, Value> values, final long time, final TimeUnit unit) {
+    public void putWithTimestamps(TableReference tableRef, Multimap<Cell, Value> values, long time, TimeUnit unit) {
         try {
             putInternal(tableRef, values.entries(), CassandraKeyValueServices.convertTtl(time, unit));
         } catch (Exception e) {
@@ -78,7 +89,11 @@ public void putWithTimestamps(TableReference tableRef, Multimap<Cell, Value> val
     }
 
     @Override
-    public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable, final long timestamp, final long time, final TimeUnit unit) throws KeyAlreadyExistsException {
+    public void multiPut(
+            Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable,
+            long timestamp,
+            long time,
+            TimeUnit unit) throws KeyAlreadyExistsException {
         List<Callable<Void>> callables = Lists.newArrayList();
         for (Entry<TableReference, ? extends Map<Cell, byte[]>> e : valuesByTable.entrySet()) {
             final TableReference table = e.getKey();
@@ -87,25 +102,14 @@ public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTa
 
 
             Iterable<List<Entry<Cell, byte[]>>> partitions = partitionByCountAndBytes(sortedMap.entrySet(),
-                    getMultiPutBatchCount(), getMultiPutBatchSizeBytes(), table, new Function<Entry<Cell, byte[]>, Long>(){
-
-                @Override
-                public Long apply(Entry<Cell, byte[]> entry) {
-                    long totalSize = 0;
-                    totalSize += entry.getValue().length;
-                    totalSize += Cells.getApproxSizeOfCell(entry.getKey());
-                    return totalSize;
-                }});
-
+                    getMultiPutBatchCount(), getMultiPutBatchSizeBytes(), table, entry ->
+                            entry.getValue().length + Cells.getApproxSizeOfCell(entry.getKey()));
 
             for (final List<Entry<Cell, byte[]>> p : partitions) {
-                callables.add(new Callable<Void>() {
-                    @Override
-                    public Void call() {
-                        Thread.currentThread().setName("Atlas expiry multiPut of " + p.size() + " cells into " + table);
-                        put(table, Maps2.fromEntries(p), timestamp, time, unit);
-                        return null;
-                    }
+                callables.add(() -> {
+                    Thread.currentThread().setName("Atlas expiry multiPut of " + p.size() + " cells into " + table);
+                    put(table, Maps2.fromEntries(p), timestamp, time, unit);
+                    return null;
                 });
             }
         }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java
index f0021f955f1..227963e8ecf 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueService.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2015 Palantir Technologies
- *
+ * <p>
  * Licensed under the BSD-3 License (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * <p>
  * http://opensource.org/licenses/BSD-3-Clause
- *
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,9 +18,12 @@
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -28,13 +31,11 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 
 import org.apache.cassandra.thrift.CASResult;
-import org.apache.cassandra.thrift.Cassandra;
 import org.apache.cassandra.thrift.Cassandra.Client;
 import org.apache.cassandra.thrift.CfDef;
 import org.apache.cassandra.thrift.Column;
@@ -42,12 +43,10 @@
 import org.apache.cassandra.thrift.ColumnParent;
 import org.apache.cassandra.thrift.ConsistencyLevel;
 import org.apache.cassandra.thrift.Deletion;
-import org.apache.cassandra.thrift.InvalidRequestException;
 import org.apache.cassandra.thrift.KeyRange;
 import org.apache.cassandra.thrift.KeySlice;
 import org.apache.cassandra.thrift.KsDef;
 import org.apache.cassandra.thrift.Mutation;
-import org.apache.cassandra.thrift.NotFoundException;
 import org.apache.cassandra.thrift.SlicePredicate;
 import org.apache.cassandra.thrift.SliceRange;
 import org.apache.cassandra.thrift.UnavailableException;
@@ -71,6 +70,7 @@
 import com.google.common.collect.ImmutableMap.Builder;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -80,18 +80,21 @@
 import com.google.common.collect.SetMultimap;
 import com.google.common.collect.Sets;
 import com.google.common.collect.TreeMultimap;
-import com.google.common.primitives.Longs;
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
+import com.palantir.atlasdb.config.LeaderConfig;
+import com.palantir.atlasdb.config.LockLeader;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -103,6 +106,7 @@
 import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.Cells;
 import com.palantir.atlasdb.keyvalue.impl.KeyValueServices;
+import com.palantir.atlasdb.keyvalue.impl.LocalRowColumnRangeIterator;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence;
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.common.annotation.Idempotent;
@@ -110,15 +114,15 @@
 import com.palantir.common.base.ClosableIterators;
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.common.base.Throwables;
+import com.palantir.common.concurrent.ThreadNamingCallable;
 import com.palantir.common.exception.PalantirRuntimeException;
 import com.palantir.util.paging.AbstractPagingIterable;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
 
 /**
- *
- * each service can have one or many C* KVS.
- * For each C* KVS, it maintains a list of active nodes, and the client connections attached to each node
+ * Each service can have one or many C* KVS.
+ * For each C* KVS, it maintains a list of active nodes, and the client connections attached to each node:
  *
  * n1->c1, c2, c3
  * n2->c5, c4, c9
@@ -131,49 +135,87 @@
  */
 public class CassandraKeyValueService extends AbstractKeyValueService {
 
-    static final Logger log = LoggerFactory.getLogger(CassandraKeyValueService.class);
+    private final Logger log;
 
-    private static final Function<Entry<Cell, Value>, Long> ENTRY_SIZING_FUNCTION = new Function<Entry<Cell, Value>, Long>() {
-        @Override
-        public Long apply(Entry<Cell, Value> input) {
-            return input.getValue().getContents().length + 4L + Cells.getApproxSizeOfCell(input.getKey());
-        }
-    };
+    private static final Function<Entry<Cell, Value>, Long> ENTRY_SIZING_FUNCTION = input ->
+            input.getValue().getContents().length + 4L + Cells.getApproxSizeOfCell(input.getKey());
 
     private final CassandraKeyValueServiceConfigManager configManager;
     private final Optional<CassandraJmxCompactionManager> compactionManager;
     protected final CassandraClientPool clientPool;
+    private SchemaMutationLock schemaMutationLock;
+    private final Optional<LeaderConfig> leaderConfig;
+    private final HiddenTables hiddenTables;
 
-    protected boolean supportsCAS = false;
-    private final ReentrantLock schemaMutationLockForEarlierVersionsOfCassandra = new ReentrantLock(true);
+    private final UniqueSchemaMutationLockTable schemaMutationLockTable;
 
     private ConsistencyLevel readConsistency = ConsistencyLevel.LOCAL_QUORUM;
     private final ConsistencyLevel writeConsistency = ConsistencyLevel.EACH_QUORUM;
     private final ConsistencyLevel deleteConsistency = ConsistencyLevel.ALL;
 
-    public static CassandraKeyValueService create(CassandraKeyValueServiceConfigManager configManager) {
-        Optional<CassandraJmxCompactionManager> compactionManager = CassandraJmxCompaction.createJmxCompactionManager(configManager);
-        CassandraKeyValueService ret = new CassandraKeyValueService(configManager, compactionManager);
+    public static CassandraKeyValueService create(
+            CassandraKeyValueServiceConfigManager configManager,
+            Optional<LeaderConfig> leaderConfig) {
+        return create(configManager, leaderConfig, LoggerFactory.getLogger(CassandraKeyValueService.class));
+    }
+
+    public static CassandraKeyValueService create(
+            CassandraKeyValueServiceConfigManager configManager,
+            Optional<LeaderConfig> leaderConfig,
+            Logger log) {
+        Optional<CassandraJmxCompactionManager> compactionManager =
+                CassandraJmxCompaction.createJmxCompactionManager(configManager);
+        CassandraKeyValueService ret = new CassandraKeyValueService(
+                log,
+                configManager,
+                compactionManager,
+                leaderConfig);
         ret.init();
         return ret;
     }
 
-    protected CassandraKeyValueService(CassandraKeyValueServiceConfigManager configManager,
-                                       Optional<CassandraJmxCompactionManager> compactionManager) {
+    protected CassandraKeyValueService(Logger log,
+                                       CassandraKeyValueServiceConfigManager configManager,
+                                       Optional<CassandraJmxCompactionManager> compactionManager,
+                                       Optional<LeaderConfig> leaderConfig) {
         super(AbstractKeyValueService.createFixedThreadPool("Atlas Cassandra KVS",
                 configManager.getConfig().poolSize() * configManager.getConfig().servers().size()));
+        this.log = log;
         this.configManager = configManager;
         this.clientPool = new CassandraClientPool(configManager.getConfig());
         this.compactionManager = compactionManager;
+        this.leaderConfig = leaderConfig;
+        this.hiddenTables = new HiddenTables();
+
+        SchemaMutationLockTables lockTables = new SchemaMutationLockTables(clientPool, configManager.getConfig());
+        this.schemaMutationLockTable = new UniqueSchemaMutationLockTable(lockTables, whoIsTheLockCreator());
+    }
+
+    private LockLeader whoIsTheLockCreator() {
+        return leaderConfig
+                .transform((config) -> config.whoIsTheLockLeader())
+                .or(LockLeader.I_AM_THE_LOCK_LEADER);
     }
 
     protected void init() {
         clientPool.runOneTimeStartupChecks();
-        supportsCAS = clientPool.runWithRetry(CassandraVerifier.underlyingCassandraClusterSupportsCASOperations);
+
+        boolean supportsCas = clientPool.runWithRetry(
+                CassandraVerifier.underlyingCassandraClusterSupportsCASOperations);
+
+        schemaMutationLock = new SchemaMutationLock(
+                supportsCas,
+                configManager,
+                clientPool,
+                writeConsistency,
+                schemaMutationLockTable);
+
         createTable(AtlasDbConstants.METADATA_TABLE, AtlasDbConstants.EMPTY_TABLE_METADATA);
         lowerConsistencyWhenSafe();
         upgradeFromOlderInternalSchema();
-        CassandraKeyValueServices.failQuickInInitializationIfClusterAlreadyInInconsistentState(clientPool, configManager.getConfig());
+        CassandraKeyValueServices.failQuickInInitializationIfClusterAlreadyInInconsistentState(
+                clientPool,
+                configManager.getConfig());
     }
 
     @Override
@@ -186,27 +228,29 @@ private void upgradeFromOlderInternalSchema() {
             Map<TableReference, byte[]> metadataForTables = getMetadataForTables();
             Map<TableReference, byte[]> tablesToUpgrade = Maps.newHashMapWithExpectedSize(metadataForTables.size());
 
-            List<CfDef> knownCfs = clientPool.runWithRetry(new FunctionCheckedException<Cassandra.Client, List<CfDef>, TException>() {
-                @Override
-                public List<CfDef> apply(Client client) throws TException {
-                    return client.describe_keyspace(configManager.getConfig().keyspace()).getCf_defs();
-                }
-            });
+            List<CfDef> knownCfs = clientPool.runWithRetry(client ->
+                    client.describe_keyspace(configManager.getConfig().keyspace()).getCf_defs());
 
             for (CfDef clusterSideCf : knownCfs) {
                 TableReference tableRef = fromInternalTableName(clusterSideCf.getName());
                 if (metadataForTables.containsKey(tableRef)) {
                     byte[] clusterSideMetadata = metadataForTables.get(tableRef);
-                    CfDef clientSideCf = getCfForTable(fromInternalTableName(clusterSideCf.getName()), clusterSideMetadata);
-                    if (!CassandraKeyValueServices.isMatchingCf(clientSideCf, clusterSideCf)) { // mismatch; we have changed how we generate schema since we last persisted
+                    CfDef clientSideCf = getCfForTable(
+                            fromInternalTableName(clusterSideCf.getName()),
+                            clusterSideMetadata);
+                    if (!CassandraKeyValueServices.isMatchingCf(clientSideCf, clusterSideCf)) {
+                        // mismatch; we have changed how we generate schema since we last persisted
                         log.warn("Upgrading table {} to new internal Cassandra schema", tableRef);
                         tablesToUpgrade.put(tableRef, clusterSideMetadata);
                     }
-                } else if (!(tableRef.equals(AtlasDbConstants.METADATA_TABLE) || tableRef.equals(CassandraConstants.LOCK_TABLE))) { // only expected cases
-                    // Possible to get here from a race condition with another service starting up and performing schema upgrades concurrent with us doing this check
-                    log.error("Found a table " + tableRef.getQualifiedName() + " that did not have persisted Atlas metadata. "
-                            + "If you recently did a Palantir update, try waiting until schema upgrades are completed on all backend CLIs/services etc and restarting this service. "
-                            + "If this error re-occurs on subsequent attempted startups, please contact Palantir support.");
+                } else if (!hiddenTables.isHidden(tableRef)) {
+                    // Possible to get here from a race condition with another service starting up
+                    // and performing schema upgrades concurrent with us doing this check
+                    log.error("Found a table " + tableRef.getQualifiedName() + " that did not have persisted"
+                            + " AtlasDB metadata. If you recently did a Palantir update, try waiting until"
+                            + " schema upgrades are completed on all backend CLIs/services etc and restarting"
+                            + " this service. If this error re-occurs on subsequent attempted startups, please"
+                            + " contact Palantir support.");
                 }
             }
 
@@ -215,7 +259,8 @@ public List<CfDef> apply(Client client) throws TException {
                 putMetadataForTables(tablesToUpgrade);
             }
         } catch (TException e) {
-            log.error("Couldn't upgrade from an older internal Cassandra schema. New table-related settings may not have taken effect.");
+            log.error("Couldn't upgrade from an older internal Cassandra schema."
+                    + " New table-related settings may not have taken effect.");
         }
     }
 
@@ -225,55 +270,50 @@ private void lowerConsistencyWhenSafe() {
         CassandraKeyValueServiceConfig config = configManager.getConfig();
 
         try {
-            dcs = clientPool.runWithRetry(new FunctionCheckedException<Client, Set<String>, TException>() {
-                @Override
-                public Set<String> apply(Client client) throws TException {
-                    return CassandraVerifier.sanityCheckDatacenters(client, config.replicationFactor(), config.safetyDisabled());
-                }
-            });
-            KsDef ksDef = clientPool.runWithRetry(new FunctionCheckedException<Client, KsDef, TException>() {
-                @Override
-                public KsDef apply(Client client) throws TException {
-                    return client.describe_keyspace(config.keyspace());
-                }
-            });
+            dcs = clientPool.runWithRetry(client ->
+                    CassandraVerifier.sanityCheckDatacenters(
+                            client,
+                            config.replicationFactor(),
+                            config.safetyDisabled()));
+            KsDef ksDef = clientPool.runWithRetry(client ->
+                    client.describe_keyspace(config.keyspace()));
             strategyOptions = Maps.newHashMap(ksDef.getStrategy_options());
 
             if (dcs.size() == 1) {
                 String dc = dcs.iterator().next();
                 if (strategyOptions.get(dc) != null) {
-                    int currentRF = Integer.parseInt(strategyOptions.get(dc));
-                    if (currentRF == config.replicationFactor()) {
-                        if (currentRF == 2 && config.clusterMeetsNormalConsistencyGuarantees()) {
+                    int currentRf = Integer.parseInt(strategyOptions.get(dc));
+                    if (currentRf == config.replicationFactor()) {
+                        if (currentRf == 2 && config.clusterMeetsNormalConsistencyGuarantees()) {
                             log.info("Setting Read Consistency to ONE, as cluster has only one datacenter at RF2.");
                             readConsistency = ConsistencyLevel.ONE;
                         }
                     }
                 }
             }
-        } catch (InvalidRequestException e) {
-            return;
         } catch (TException e) {
             return;
         }
     }
 
     @Override
-    public Map<Cell, Value> getRows(final TableReference tableRef, final Iterable<byte[]> rows, ColumnSelection selection, final long startTs) {
+    public Map<Cell, Value> getRows(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnSelection selection,
+            long startTs) {
         if (!selection.allColumnsSelected()) {
             return getRowsForSpecificColumns(tableRef, rows, selection, startTs);
         }
 
-        Set<Entry<InetSocketAddress, List<byte[]>>> rowsByHost =
-                partitionByHost(rows, Functions.<byte[]>identity()).entrySet();
+        Set<Entry<InetSocketAddress, List<byte[]>>> rowsByHost = partitionByHost(rows, Functions.identity()).entrySet();
         List<Callable<Map<Cell, Value>>> tasks = Lists.newArrayListWithCapacity(rowsByHost.size());
         for (final Map.Entry<InetSocketAddress, List<byte[]>> hostAndRows : rowsByHost) {
-            tasks.add(new Callable<Map<Cell, Value>>() {
-                @Override
-                public Map<Cell, Value> call() {
-                    return getRowsForSingleHost(hostAndRows.getKey(), tableRef, hostAndRows.getValue(), startTs);
-                }
-            });
+            tasks.add(ThreadNamingCallable.wrapWithThreadName(
+                    () -> getRowsForSingleHost(hostAndRows.getKey(), tableRef, hostAndRows.getValue(), startTs),
+                    "Atlas getRows " + hostAndRows.getValue().size()
+                            + " rows from " + tableRef + " on " + hostAndRows.getKey(),
+                    ThreadNamingCallable.Type.PREPEND));
         }
         List<Map<Cell, Value>> perHostResults = runAllTasksCancelOnFailure(tasks);
         Map<Cell, Value> result = Maps.newHashMapWithExpectedSize(Iterables.size(rows));
@@ -293,35 +333,45 @@ private Map<Cell, Value> getRowsForSingleHost(final InetSocketAddress host,
             int fetchBatchCount = configManager.getConfig().fetchBatchCount();
             for (final List<byte[]> batch : Lists.partition(rows, fetchBatchCount)) {
                 rowCount += batch.size();
-                result.putAll(clientPool.runWithRetryOnHost(host, new FunctionCheckedException<Client, Map<Cell, Value>, Exception>() {
-                    @Override
-                    public Map<Cell, Value> apply(Client client) throws Exception {
-                        // We want to get all the columns in the row so set start and end to empty.
-                        SliceRange slice = new SliceRange(ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY), ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY), false, Integer.MAX_VALUE);
-                        SlicePredicate pred = new SlicePredicate();
-                        pred.setSlice_range(slice);
-
-                        List<ByteBuffer> rowNames = Lists.newArrayListWithCapacity(batch.size());
-                        for (byte[] r : batch) {
-                            rowNames.add(ByteBuffer.wrap(r));
-                        }
+                result.putAll(clientPool.runWithRetryOnHost(host,
+                        new FunctionCheckedException<Client, Map<Cell, Value>, Exception>() {
+                            @Override
+                            public Map<Cell, Value> apply(Client client) throws Exception {
+                                // We want to get all the columns in the row so set start and end to empty.
+                                SliceRange slice = new SliceRange(
+                                        ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY),
+                                        ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY),
+                                        false,
+                                        Integer.MAX_VALUE);
+                                SlicePredicate pred = new SlicePredicate();
+                                pred.setSlice_range(slice);
 
-                        ColumnParent colFam = new ColumnParent(internalTableName(tableRef));
-                        Map<ByteBuffer, List<ColumnOrSuperColumn>> results = multigetInternal(client, tableRef, rowNames, colFam, pred, readConsistency);
-                        Map<Cell, Value> ret = Maps.newHashMap();
-                        new ValueExtractor(ret).extractResults(results, startTs, ColumnSelection.all());
-                        return ret;
-                    }
+                                List<ByteBuffer> rowNames = wrap(rows);
+
+                                ColumnParent colFam = new ColumnParent(internalTableName(tableRef));
+                                Map<ByteBuffer, List<ColumnOrSuperColumn>> results = multigetInternal(
+                                        client,
+                                        tableRef,
+                                        rowNames,
+                                        colFam,
+                                        pred,
+                                        readConsistency);
+                                Map<Cell, Value> ret = Maps.newHashMap();
+                                new ValueExtractor(ret).extractResults(results, startTs, ColumnSelection.all());
+                                return ret;
+                            }
 
-                    @Override
-                    public String toString() {
-                        return "multiget_slice(" + tableRef.getQualifiedName() + ", " + batch.size() + " rows" + ")";
-                    }
-                }));
+                            @Override
+                            public String toString() {
+                                return "multiget_slice(" + tableRef.getQualifiedName() + ", "
+                                        + batch.size() + " rows" + ")";
+                            }
+                        }));
             }
             if (rowCount > fetchBatchCount) {
-                log.warn("Rebatched in getRows a call to " + tableRef.getQualifiedName() + " that attempted to multiget "
-                        + rowCount + " rows; this may indicate overly-large batching on a higher level.\n"
+                log.warn("Rebatched in getRows a call to " + tableRef.getQualifiedName()
+                        + " that attempted to multiget " + rowCount
+                        + " rows; this may indicate overly-large batching on a higher level.\n"
                         + CassandraKeyValueServices.getFilteredStackTrace("com.palantir"));
             }
             return ImmutableMap.copyOf(result);
@@ -330,6 +380,14 @@ public String toString() {
         }
     }
 
+    private List<ByteBuffer> wrap(List<byte[]> arrays) {
+        List<ByteBuffer> byteBuffers = Lists.newArrayListWithCapacity(arrays.size());
+        for (byte[] r : arrays) {
+            byteBuffers.add(ByteBuffer.wrap(r));
+        }
+        return byteBuffers;
+    }
+
     private Map<Cell, Value> getRowsForSpecificColumns(final TableReference tableRef,
                                                        final Iterable<byte[]> rows,
                                                        ColumnSelection selection,
@@ -344,13 +402,9 @@ private Map<Cell, Value> getRowsForSpecificColumns(final TableReference tableRef
             }
         }
 
-        try {
-            StartTsResultsCollector collector = new StartTsResultsCollector(startTs);
-            loadWithTs(tableRef, cells, startTs, false, collector, readConsistency);
-            return collector.collectedResults;
-        } catch (Exception e) {
-            throw Throwables.throwUncheckedException(e);
-        }
+        StartTsResultsCollector collector = new StartTsResultsCollector(startTs);
+        loadWithTs(tableRef, cells, startTs, false, collector, readConsistency);
+        return collector.collectedResults;
     }
 
     @Override
@@ -386,18 +440,34 @@ private void loadWithTs(TableReference tableRef,
                             Set<Cell> cells,
                             long startTs,
                             boolean loadAllTs,
-                            ThreadSafeResultVisitor v,
-                            ConsistencyLevel consistency) throws Exception {
+                            ThreadSafeResultVisitor visitor,
+                            ConsistencyLevel consistency) {
+        Map<InetSocketAddress, List<Cell>> hostsAndCells =  partitionByHost(cells, Cells.getRowFunction());
+        int totalPartitions = hostsAndCells.keySet().size();
+
+        if (log.isTraceEnabled()) {
+            log.trace("Loading {} cells from {} {}starting at timestamp {}, partitioned across {} nodes.",
+                    cells.size(), tableRef, loadAllTs ? "for all timestamps " : "", startTs, totalPartitions);
+        }
+
         List<Callable<Void>> tasks = Lists.newArrayList();
-        for (Map.Entry<InetSocketAddress, List<Cell>> hostAndCells : partitionByHost(cells,
-                                                                               Cells.getRowFunction()).entrySet()) {
+        for (Map.Entry<InetSocketAddress, List<Cell>> hostAndCells : hostsAndCells.entrySet()) {
+            if (log.isTraceEnabled()) {
+                log.trace("Requesting {} cells from {} {}starting at timestamp {} on {}",
+                        hostsAndCells.values().size(),
+                        tableRef,
+                        loadAllTs ? "for all timestamps " : "",
+                        startTs,
+                        hostAndCells.getKey());
+            }
+
             tasks.addAll(getLoadWithTsTasksForSingleHost(hostAndCells.getKey(),
-                                                         tableRef,
-                                                         hostAndCells.getValue(),
-                                                         startTs,
-                                                         loadAllTs,
-                                                         v,
-                                                         consistency));
+                    tableRef,
+                    hostAndCells.getValue(),
+                    startTs,
+                    loadAllTs,
+                    visitor,
+                    consistency));
         }
         runAllTasksCancelOnFailure(tasks);
     }
@@ -405,61 +475,302 @@ private void loadWithTs(TableReference tableRef,
     // TODO: after cassandra api change: handle different column select per row
     private List<Callable<Void>> getLoadWithTsTasksForSingleHost(final InetSocketAddress host,
                                                                  final TableReference tableRef,
-                                                                 Collection<Cell> cells,
+                                                                 final Collection<Cell> cells,
                                                                  final long startTs,
                                                                  final boolean loadAllTs,
-                                                                 final ThreadSafeResultVisitor v,
-                                                                 final ConsistencyLevel consistency) throws Exception {
+                                                                 final ThreadSafeResultVisitor visitor,
+                                                                 final ConsistencyLevel consistency) {
         final ColumnParent colFam = new ColumnParent(internalTableName(tableRef));
-        TreeMultimap<byte[], Cell> cellsByCol =
+        Multimap<byte[], Cell> cellsByCol =
                 TreeMultimap.create(UnsignedBytes.lexicographicalComparator(), Ordering.natural());
         for (Cell cell : cells) {
             cellsByCol.put(cell.getColumnName(), cell);
         }
         List<Callable<Void>> tasks = Lists.newArrayList();
         int fetchBatchCount = configManager.getConfig().fetchBatchCount();
-        for (final byte[] col : cellsByCol.keySet()) {
-            if (cellsByCol.get(col).size() > fetchBatchCount) {
+        for (Entry<byte[], Collection<Cell>> entry : Multimaps.asMap(cellsByCol).entrySet()) {
+            final byte[] col = entry.getKey();
+            Collection<Cell> columnCells = entry.getValue();
+            if (columnCells.size() > fetchBatchCount) {
                 log.warn("Re-batching in getLoadWithTsTasksForSingleHost a call to {} for table {} that attempted to "
                                 + "multiget {} rows; this may indicate overly-large batching on a higher level.\n{}",
                         host,
                         tableRef,
-                        cellsByCol.get(col).size(),
+                        columnCells.size(),
                         CassandraKeyValueServices.getFilteredStackTrace("com.palantir"));
             }
-            for (final List<Cell> partition : Lists.partition(ImmutableList.copyOf(cellsByCol.get(col)), fetchBatchCount)) {
-                tasks.add(new Callable<Void>() {
-                    @Override
-                    public Void call() throws Exception {
-                        return clientPool.runWithRetryOnHost(host, new FunctionCheckedException<Client, Void, Exception>() {
+            for (final List<Cell> partition : Lists.partition(ImmutableList.copyOf(columnCells), fetchBatchCount)) {
+                Callable<Void> multiGetCallable = () -> clientPool.runWithRetryOnHost(host,
+                        new FunctionCheckedException<Client, Void, Exception>() {
                             @Override
                             public Void apply(Client client) throws Exception {
                                 ByteBuffer start = CassandraKeyValueServices.makeCompositeBuffer(col, startTs - 1);
                                 ByteBuffer end = CassandraKeyValueServices.makeCompositeBuffer(col, -1);
                                 SliceRange slice = new SliceRange(start, end, false, loadAllTs ? Integer.MAX_VALUE : 1);
-                                SlicePredicate pred = new SlicePredicate();
-                                pred.setSlice_range(slice);
+                                SlicePredicate predicate = new SlicePredicate();
+                                predicate.setSlice_range(slice);
 
                                 List<ByteBuffer> rowNames = Lists.newArrayListWithCapacity(partition.size());
                                 for (Cell c : partition) {
                                     rowNames.add(ByteBuffer.wrap(c.getRowName()));
                                 }
-                                Map<ByteBuffer, List<ColumnOrSuperColumn>> results = multigetInternal(client, tableRef, rowNames, colFam, pred, consistency);
-                                v.visit(results);
+
+                                if (log.isTraceEnabled()) {
+                                    log.trace("Requesting {} cells from {} {}starting at timestamp {} on {}",
+                                            partition.size(),
+                                            tableRef,
+                                            loadAllTs ? "for all timestamps " : "",
+                                            startTs,
+                                            host);
+                                }
+
+                                Map<ByteBuffer, List<ColumnOrSuperColumn>> results =
+                                        multigetInternal(client, tableRef, rowNames, colFam, predicate, consistency);
+                                visitor.visit(results);
                                 return null;
                             }
 
                             @Override
                             public String toString() {
                                 return "multiget_slice(" + host + ", " + colFam + ", "
-                                        + partition.size() + " rows" + ")";
+                                        + partition.size() + " cells" + ")";
                             }
+
                         });
+                tasks.add(ThreadNamingCallable.wrapWithThreadName(
+                        multiGetCallable,
+                        "Atlas loadWithTs " + partition.size() + " cells from " + tableRef + " on " + host,
+                        ThreadNamingCallable.Type.PREPEND));
+            }
+        }
+        return tasks;
+    }
+
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef,
+                                                                  Iterable<byte[]> rows,
+                                                                  ColumnRangeSelection columnRangeSelection,
+                                                                  long timestamp) {
+        Set<Entry<InetSocketAddress, List<byte[]>>> rowsByHost =
+                partitionByHost(rows, Functions.<byte[]>identity()).entrySet();
+        List<Callable<Map<byte[], RowColumnRangeIterator>>> tasks = Lists.newArrayListWithCapacity(rowsByHost.size());
+        for (final Map.Entry<InetSocketAddress, List<byte[]>> hostAndRows : rowsByHost) {
+            tasks.add(ThreadNamingCallable.wrapWithThreadName(() ->
+                    getRowsColumnRangeIteratorForSingleHost(hostAndRows.getKey(), tableRef,
+                            hostAndRows.getValue(), columnRangeSelection, timestamp),
+                    "Atlas getRowsColumnRange " + hostAndRows.getValue().size()
+                            + " rows from " + tableRef + " on " + hostAndRows.getKey(),
+                    ThreadNamingCallable.Type.PREPEND));
+        }
+        List<Map<byte[], RowColumnRangeIterator>> perHostResults = runAllTasksCancelOnFailure(tasks);
+        Map<byte[], RowColumnRangeIterator> result = Maps.newHashMapWithExpectedSize(Iterables.size(rows));
+        for (Map<byte[], RowColumnRangeIterator> perHostResult : perHostResults) {
+            result.putAll(perHostResult);
+        }
+        return result;
+    }
+
+    private Map<byte[], RowColumnRangeIterator> getRowsColumnRangeIteratorForSingleHost(
+            InetSocketAddress host,
+            TableReference tableRef,
+            List<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long startTs) {
+        try {
+            RowColumnRangeExtractor.RowColumnRangeResult firstPage =
+                    getRowsColumnRangeForSingleHost(host, tableRef, rows, columnRangeSelection, startTs);
+
+            Map<byte[], LinkedHashMap<Cell, Value>> results = firstPage.getResults();
+            Map<byte[], Column> rowsToLastCompositeColumns = firstPage.getRowsToLastCompositeColumns();
+            Map<byte[], byte[]> incompleteRowsToNextColumns = Maps.newHashMap();
+            for (Entry<byte[], Column> e : rowsToLastCompositeColumns.entrySet()) {
+                byte[] row = e.getKey();
+                byte[] col = CassandraKeyValueServices.decomposeName(e.getValue()).getLhSide();
+                // If we read a version of the cell before our start timestamp, it will be the most recent version
+                // readable to us and we can continue to the next column. Otherwise we have to continue reading
+                // this column.
+                Map<Cell, Value> rowResult = results.get(row);
+                boolean completedCell = (rowResult != null) && rowResult.containsKey(Cell.create(row, col));
+                boolean endOfRange = isEndOfColumnRange(
+                        completedCell,
+                        col,
+                        firstPage.getRowsToRawColumnCount().get(row),
+                        columnRangeSelection);
+                if (!endOfRange) {
+                    byte[] nextCol = getNextColumnRangeColumn(completedCell, col);
+                    incompleteRowsToNextColumns.put(row, nextCol);
+                }
+            }
+
+            Map<byte[], RowColumnRangeIterator> ret = Maps.newHashMapWithExpectedSize(rows.size());
+            for (byte[] row : rowsToLastCompositeColumns.keySet()) {
+                Iterator<Entry<Cell, Value>> resultIterator;
+                Map<Cell, Value> result = results.get(row);
+                if (result != null) {
+                    resultIterator = result.entrySet().iterator();
+                } else {
+                    resultIterator = Collections.emptyIterator();
+                }
+                byte[] nextCol = incompleteRowsToNextColumns.get(row);
+                if (nextCol == null) {
+                    ret.put(row, new LocalRowColumnRangeIterator(resultIterator));
+                } else {
+                    ColumnRangeSelection newColumnRange = new ColumnRangeSelection(nextCol,
+                            columnRangeSelection.getEndCol(), columnRangeSelection.getBatchHint());
+                    ret.put(row, new LocalRowColumnRangeIterator(Iterators.concat(
+                            resultIterator,
+                            getRowColumnRange(host, tableRef, row, newColumnRange, startTs))));
+                }
+            }
+            // We saw no Cassandra results at all for these rows, so the entire column range is empty for these rows.
+            for (byte[] row : firstPage.getEmptyRows()) {
+                ret.put(row, new LocalRowColumnRangeIterator(Collections.emptyIterator()));
+            }
+            return ret;
+        } catch (Exception e) {
+            throw Throwables.throwUncheckedException(e);
+        }
+    }
+
+    private RowColumnRangeExtractor.RowColumnRangeResult getRowsColumnRangeForSingleHost(InetSocketAddress host,
+                                                             TableReference tableRef,
+                                                             List<byte[]> rows,
+                                                             ColumnRangeSelection columnRangeSelection,
+                                                             long startTs) {
+        try {
+            return clientPool.runWithRetryOnHost(host,
+                    new FunctionCheckedException<Client, RowColumnRangeExtractor.RowColumnRangeResult, Exception>() {
+                        @Override
+                        public RowColumnRangeExtractor.RowColumnRangeResult apply(Client client) throws Exception {
+                            ByteBuffer start = columnRangeSelection.getStartCol().length == 0
+                                    ? ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY)
+                                    : CassandraKeyValueServices.makeCompositeBuffer(
+                                            columnRangeSelection.getStartCol(),
+                                            startTs - 1);
+                            ByteBuffer end = columnRangeSelection.getEndCol().length == 0
+                                    ? ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY)
+                                    : CassandraKeyValueServices.makeCompositeBuffer(
+                                            RangeRequests.previousLexicographicName(columnRangeSelection.getEndCol()),
+                                            -1);
+                            SliceRange slice = new SliceRange(start, end, false, columnRangeSelection.getBatchHint());
+                            SlicePredicate pred = new SlicePredicate();
+                            pred.setSlice_range(slice);
+
+                            ColumnParent colFam = new ColumnParent(internalTableName(tableRef));
+                            Map<ByteBuffer, List<ColumnOrSuperColumn>> results =
+                                    multigetInternal(client, tableRef, wrap(rows), colFam, pred, readConsistency);
+
+                            RowColumnRangeExtractor extractor = new RowColumnRangeExtractor();
+                            extractor.extractResults(results, startTs);
+
+                            return extractor.getRowColumnRangeResult();
+                        }
+
+                        @Override
+                        public String toString() {
+                            return "multiget_slice(" + tableRef.getQualifiedName() + ", "
+                                    + rows.size() + " rows, " + columnRangeSelection.getBatchHint() + " max columns)";
+                        }
+                    });
+        } catch (Exception e) {
+            throw Throwables.throwUncheckedException(e);
+        }
+    }
+
+    private Iterator<Entry<Cell, Value>> getRowColumnRange(
+            InetSocketAddress host,
+            TableReference tableRef,
+            byte[] row,
+            ColumnRangeSelection columnRangeSelection,
+            long startTs) {
+        return ClosableIterators.wrap(new AbstractPagingIterable<
+                Entry<Cell, Value>,
+                TokenBackedBasicResultsPage<Entry<Cell, Value>, byte[]>>() {
+            @Override
+            protected TokenBackedBasicResultsPage<Entry<Cell, Value>, byte[]> getFirstPage() throws Exception {
+                return page(columnRangeSelection.getStartCol());
+            }
+
+            @Override
+            protected TokenBackedBasicResultsPage<Entry<Cell, Value>, byte[]> getNextPage(
+                    TokenBackedBasicResultsPage<Entry<Cell, Value>,
+                            byte[]> previous) throws Exception {
+                return page(previous.getTokenForNextPage());
+            }
+
+            TokenBackedBasicResultsPage<Entry<Cell, Value>, byte[]> page(final byte[] startCol) throws Exception {
+                return clientPool.runWithRetryOnHost(host, new FunctionCheckedException<
+                        Client,
+                        TokenBackedBasicResultsPage<Entry<Cell, Value>, byte[]>,
+                        Exception>() {
+                    @Override
+                    public TokenBackedBasicResultsPage<Entry<Cell, Value>, byte[]> apply(Client client)
+                            throws Exception {
+                        ByteBuffer start = startCol.length == 0
+                                ? ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY)
+                                : CassandraKeyValueServices.makeCompositeBuffer(startCol, startTs - 1);
+                        ByteBuffer end = columnRangeSelection.getEndCol().length == 0
+                                ? ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY)
+                                : CassandraKeyValueServices.makeCompositeBuffer(
+                                        RangeRequests.previousLexicographicName(columnRangeSelection.getEndCol()),
+                                        -1);
+                        SliceRange slice = new SliceRange(start, end, false, columnRangeSelection.getBatchHint());
+                        SlicePredicate pred = new SlicePredicate();
+                        pred.setSlice_range(slice);
+
+                        ByteBuffer rowByteBuffer = ByteBuffer.wrap(row);
+
+                        ColumnParent colFam = new ColumnParent(internalTableName(tableRef));
+                        Map<ByteBuffer, List<ColumnOrSuperColumn>> results = multigetInternal(client, tableRef,
+                                ImmutableList.of(rowByteBuffer), colFam, pred, readConsistency);
+
+                        if (results.isEmpty()) {
+                            return SimpleTokenBackedResultsPage.create(startCol, ImmutableList.of(), false);
+                        }
+                        Map<Cell, Value> ret = Maps.newHashMap();
+                        new ValueExtractor(ret).extractResults(results, startTs, ColumnSelection.all());
+                        List<ColumnOrSuperColumn> values = Iterables.getOnlyElement(results.values());
+                        if (values.isEmpty()) {
+                            return SimpleTokenBackedResultsPage.create(startCol, ImmutableList.of(), false);
+                        }
+                        ColumnOrSuperColumn lastColumn = values.get(values.size() - 1);
+                        byte[] lastCol = CassandraKeyValueServices.decomposeName(lastColumn.getColumn()).getLhSide();
+                        // Same idea as the getRows case to handle seeing only newer entries of a column
+                        boolean completedCell = ret.get(Cell.create(row, lastCol)) != null;
+                        if (isEndOfColumnRange(completedCell, lastCol, values.size(), columnRangeSelection)) {
+                            return SimpleTokenBackedResultsPage.create(lastCol, ret.entrySet(), false);
+                        }
+                        byte[] nextCol = getNextColumnRangeColumn(completedCell, lastCol);
+                        return SimpleTokenBackedResultsPage.create(nextCol, ret.entrySet(), true);
+                    }
+
+                    @Override
+                    public String toString() {
+                        return "multiget_slice(" + tableRef.getQualifiedName()
+                                + ", single row, " + columnRangeSelection.getBatchHint() + " batch hint)";
                     }
                 });
             }
+
+        }.iterator());
+    }
+
+    private boolean isEndOfColumnRange(boolean completedCell, byte[] lastCol, int numRawResults,
+                                       ColumnRangeSelection columnRangeSelection) {
+        return (numRawResults < columnRangeSelection.getBatchHint())
+                || (completedCell
+                        && (RangeRequests.isLastRowName(lastCol)
+                                || Arrays.equals(
+                                        RangeRequests.nextLexicographicName(lastCol),
+                                        columnRangeSelection.getEndCol())));
+    }
+
+    private byte[] getNextColumnRangeColumn(boolean completedCell, byte[] lastCol) {
+        if (!completedCell) {
+            return lastCol;
+        } else {
+            return RangeRequests.nextLexicographicName(lastCol);
         }
-        return tasks;
     }
 
     @Override
@@ -502,13 +813,14 @@ protected void putInternal(final TableReference tableRef,
         Map<InetSocketAddress, Map<Cell, Value>> cellsByHost = partitionMapByHost(values);
         List<Callable<Void>> tasks = Lists.newArrayListWithCapacity(cellsByHost.size());
         for (final Map.Entry<InetSocketAddress, Map<Cell, Value>> entry : cellsByHost.entrySet()) {
-            tasks.add(new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    putForSingleHostInternal(entry.getKey(), tableRef, entry.getValue().entrySet(), ttl);
-                    return null;
-                }
-            });
+            tasks.add(
+                    ThreadNamingCallable.wrapWithThreadName(() -> {
+                        putForSingleHostInternal(entry.getKey(), tableRef, entry.getValue().entrySet(), ttl);
+                        return null;
+                    },
+                    "Atlas putInternal " + entry.getValue().size() + " cell values to "
+                            + tableRef + " on " + entry.getKey(),
+                    ThreadNamingCallable.Type.PREPEND));
         }
         runAllTasksCancelOnFailure(tasks);
     }
@@ -532,24 +844,24 @@ public Void apply(Client client) throws Exception {
 
                         ColumnOrSuperColumn colOrSup = new ColumnOrSuperColumn();
                         colOrSup.setColumn(col);
-                        Mutation m = new Mutation();
-                        m.setColumn_or_supercolumn(colOrSup);
+                        Mutation mutation = new Mutation();
+                        mutation.setColumn_or_supercolumn(colOrSup);
 
                         ByteBuffer rowName = ByteBuffer.wrap(cell.getRowName());
 
                         Map<String, List<Mutation>> rowPuts = map.get(rowName);
                         if (rowPuts == null) {
-                            rowPuts = Maps.<String, List<Mutation>>newHashMap();
+                            rowPuts = Maps.newHashMap();
                             map.put(rowName, rowPuts);
                         }
 
                         List<Mutation> tableMutations = rowPuts.get(internalTableName(tableRef));
                         if (tableMutations == null) {
-                            tableMutations = Lists.<Mutation>newArrayList();
+                            tableMutations = Lists.newArrayList();
                             rowPuts.put(internalTableName(tableRef), tableMutations);
                         }
 
-                        tableMutations.add(m);
+                        tableMutations.add(mutation);
                     }
                     batchMutateInternal(client, tableRef, map, writeConsistency);
                 }
@@ -558,14 +870,16 @@ public Void apply(Client client) throws Exception {
 
             @Override
             public String toString() {
-                return "batch_mutate(" + host + ", " + tableRef.getQualifiedName() + ", " + Iterables.size(values) + " values, " + ttl + " ttl sec)";
+                return "batch_mutate(" + host + ", " + tableRef.getQualifiedName() + ", "
+                        + Iterables.size(values) + " values, " + ttl + " ttl sec)";
             }
         });
     }
 
     // Overridden to batch more intelligently than the default implementation.
     @Override
-    public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable, final long timestamp) throws KeyAlreadyExistsException {
+    public void multiPut(Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable, long timestamp)
+            throws KeyAlreadyExistsException {
         List<TableCellAndValue> flattened = Lists.newArrayList();
         for (Map.Entry<TableReference, ? extends Map<Cell, byte[]>> tableAndValues : valuesByTable.entrySet()) {
             for (Map.Entry<Cell, byte[]> entry : tableAndValues.getValue().entrySet()) {
@@ -594,20 +908,13 @@ private List<Callable<Void>> getMultiPutTasksForSingleHost(final InetSocketAddre
         List<Callable<Void>> tasks = Lists.newArrayList();
         for (final List<TableCellAndValue> batch : partitioned) {
             final Set<TableReference> tableRefs = extractTableNames(batch);
-            tasks.add(new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    String originalName = Thread.currentThread().getName();
-                    Thread.currentThread()
-                            .setName("Atlas multiPut of " + batch.size() + " cells into " + tableRefs + " on " + host);
-                    try {
+            tasks.add(
+                    ThreadNamingCallable.wrapWithThreadName(() -> {
                         multiPutForSingleHostInternal(host, tableRefs, batch, timestamp);
                         return null;
-                    } finally {
-                        Thread.currentThread().setName(originalName);
-                    }
-                }
-            });
+                    },
+                    "Atlas multiPut of " + batch.size() + " cells into " + tableRefs + " on " + host,
+                    ThreadNamingCallable.Type.PREPEND));
         }
         return tasks;
     }
@@ -644,12 +951,15 @@ private Map<ByteBuffer, Map<String, List<Mutation>>> convertToMutations(List<Tab
         Map<ByteBuffer, Map<String, List<Mutation>>> map = Maps.newHashMap();
         for (TableCellAndValue tableCellAndValue : batch) {
             Cell cell = tableCellAndValue.cell;
-            Column col = createColumn(cell, Value.create(tableCellAndValue.value, timestamp), CassandraConstants.NO_TTL);
+            Column col = createColumn(
+                    cell,
+                    Value.create(tableCellAndValue.value, timestamp),
+                    CassandraConstants.NO_TTL);
 
             ColumnOrSuperColumn colOrSup = new ColumnOrSuperColumn();
             colOrSup.setColumn(col);
-            Mutation m = new Mutation();
-            m.setColumn_or_supercolumn(colOrSup);
+            Mutation mutation = new Mutation();
+            mutation.setColumn_or_supercolumn(colOrSup);
 
             ByteBuffer rowName = ByteBuffer.wrap(cell.getRowName());
 
@@ -665,7 +975,7 @@ private Map<ByteBuffer, Map<String, List<Mutation>>> convertToMutations(List<Tab
                 rowPuts.put(internalTableName(tableCellAndValue.tableRef), tableMutations);
             }
 
-            tableMutations.add(m);
+            tableMutations.add(mutation);
         }
         return map;
     }
@@ -697,23 +1007,14 @@ private void batchMutateInternal(Client client,
         batchMutateInternal(client, ImmutableSet.of(tableRef), map, consistency);
     }
 
-    private void batchMutateInternal(Client client,
-                                     Set<TableReference> tableRefs,
-                                     Map<ByteBuffer, Map<String, List<Mutation>>> map,
-                                     ConsistencyLevel consistency) throws TException {
-        if (shouldTraceQuery(tableRefs)) {
-            ByteBuffer recv_trace = client.trace_next_query();
-            Stopwatch stopwatch = Stopwatch.createStarted();
-            client.batch_mutate(map, consistency);
-            long duration = stopwatch.elapsed(TimeUnit.MILLISECONDS);
-            if (duration > getMinimumDurationToTraceMillis()) {
-                log.error("Traced a call to " + tableRefs + " that took " + duration + " ms."
-                        + " It will appear in system_traces with UUID="
-                        + CassandraKeyValueServices.convertCassandraByteBufferUUIDtoString(recv_trace));
-            }
-        } else {
+    private void batchMutateInternal(final Client client,
+                                     final Set<TableReference> tableRefs,
+                                     final Map<ByteBuffer, Map<String, List<Mutation>>> map,
+                                     final ConsistencyLevel consistency) throws TException {
+        run(client, tableRefs, () -> {
             client.batch_mutate(map, consistency);
-        }
+            return true;
+        });
     }
 
     private boolean shouldTraceQuery(Set<TableReference> tableRefs) {
@@ -725,27 +1026,29 @@ private boolean shouldTraceQuery(Set<TableReference> tableRefs) {
         return false;
     }
 
-    private Map<ByteBuffer, List<ColumnOrSuperColumn>> multigetInternal(Client client,
-                                                                        TableReference tableRef,
-                                                                        List<ByteBuffer> rowNames,
-                                                                        ColumnParent colFam,
-                                                                        SlicePredicate pred,
-                                                                        ConsistencyLevel consistency) throws TException {
-        Map<ByteBuffer, List<ColumnOrSuperColumn>> results;
-        if (shouldTraceQuery(tableRef)) {
-            ByteBuffer recv_trace = client.trace_next_query();
-            Stopwatch stopwatch = Stopwatch.createStarted();
-            results = client.multiget_slice(rowNames, colFam, pred, consistency);
-            long duration = stopwatch.elapsed(TimeUnit.MILLISECONDS);
-            if (duration > getMinimumDurationToTraceMillis()) {
-                log.error("Traced a call to " + tableRef.getQualifiedName() + " that took " + duration + " ms."
-                        + " It will appear in system_traces with UUID="
-                        + CassandraKeyValueServices.convertCassandraByteBufferUUIDtoString(recv_trace));
-            }
-        } else {
-            results = client.multiget_slice(rowNames, colFam, pred, consistency);
+    private void logFailedCall(Set<TableReference> tableRefs) {
+        log.error("A call to table(s) {} failed with an exception.",
+                tableRefs.stream().map(TableReference::getQualifiedName).collect(Collectors.joining(", ")));
+    }
+
+    private void logTraceResults(long duration, Set<TableReference> tableRefs, ByteBuffer recvTrace, boolean failed) {
+        if (failed || duration > getMinimumDurationToTraceMillis()) {
+            log.error("Traced a call to {} that {}took {} ms. It will appear in system_traces with UUID={}",
+                    tableRefs.stream().map(TableReference::getQualifiedName).collect(Collectors.joining(", ")),
+                    failed ? "failed and " : "",
+                    duration,
+                    CassandraKeyValueServices.convertCassandraByteBufferUuidToString(recvTrace));
         }
-        return results;
+    }
+
+    private Map<ByteBuffer, List<ColumnOrSuperColumn>> multigetInternal(
+            Client client,
+            TableReference tableRef,
+            List<ByteBuffer> rowNames,
+            ColumnParent colFam,
+            SlicePredicate pred,
+            ConsistencyLevel consistency) throws TException {
+        return run(client, tableRef, () -> client.multiget_slice(rowNames, colFam, pred, consistency));
     }
 
     @Override
@@ -761,18 +1064,7 @@ public void truncateTables(final Set<TableReference> tablesToTruncate) {
                     @Override
                     public Void apply(Client client) throws Exception {
                         for (TableReference tableRef : tablesToTruncate) {
-                            if (shouldTraceQuery(tableRef)) {
-                                ByteBuffer recv_trace = client.trace_next_query();
-                                Stopwatch stopwatch = Stopwatch.createStarted();
-                                truncateInternal(client, tableRef);
-                                long duration = stopwatch.elapsed(TimeUnit.MILLISECONDS);
-                                if (duration > getMinimumDurationToTraceMillis()) {
-                                    log.error("Traced a call to " + tableRef.getQualifiedName() + " that took " + duration + " ms."
-                                            + " It will appear in system_traces with UUID=" + CassandraKeyValueServices.convertCassandraByteBufferUUIDtoString(recv_trace));
-                                }
-                            } else {
-                                truncateInternal(client, tableRef);
-                            }
+                            truncateInternal(client, tableRef);
                         }
                         return null;
                     }
@@ -783,7 +1075,8 @@ public String toString() {
                     }
                 });
             } catch (UnavailableException e) {
-                throw new PalantirRuntimeException("Creating tables requires all Cassandra nodes to be up and available.");
+                throw new PalantirRuntimeException("Creating tables requires all Cassandra nodes"
+                        + " to be up and available.");
             } catch (Exception e) {
                 throw Throwables.throwUncheckedException(e);
             }
@@ -794,15 +1087,21 @@ private void truncateInternal(Client client, TableReference tableRef) throws TEx
         for (int tries = 1; tries <= CassandraConstants.MAX_TRUNCATION_ATTEMPTS; tries++) {
             boolean successful = true;
             try {
-                client.truncate(internalTableName(tableRef));
+                run(client, tableRef, () -> {
+                    client.truncate(internalTableName(tableRef));
+                    return true;
+                });
             } catch (TException e) {
-                log.error("Cluster was unavailable while we attempted a truncate for table " + tableRef.getQualifiedName() + "; we will try " + (CassandraConstants.MAX_TRUNCATION_ATTEMPTS - tries) + " additional time(s). (" + e.getMessage() + ")");
+                log.error("Cluster was unavailable while we attempted a truncate for table "
+                        + tableRef.getQualifiedName() + "; we will try "
+                        + (CassandraConstants.MAX_TRUNCATION_ATTEMPTS - tries) + " additional time(s).", e);
                 if (CassandraConstants.MAX_TRUNCATION_ATTEMPTS - tries == 0) {
                     throw e;
                 }
                 successful = false;
                 try {
-                    Thread.sleep(new Random().nextInt((1 << (CassandraConstants.MAX_TRUNCATION_ATTEMPTS - tries)) - 1) * 1000);
+                    Thread.sleep(new Random()
+                            .nextInt((1 << (CassandraConstants.MAX_TRUNCATION_ATTEMPTS - tries)) - 1) * 1000);
                 } catch (InterruptedException e1) {
                     Thread.currentThread().interrupt();
                 }
@@ -841,14 +1140,16 @@ public Void apply(Client client) throws Exception {
                                 maps.put(mapIndex, Maps.<ByteBuffer, Map<String, List<Mutation>>>newHashMap());
                             }
                             Map<ByteBuffer, Map<String, List<Mutation>>> map = maps.get(mapIndex);
-                            ByteBuffer colName = CassandraKeyValueServices.makeCompositeBuffer(cellVersions.getKey().getColumnName(), ts);
+                            ByteBuffer colName = CassandraKeyValueServices.makeCompositeBuffer(
+                                    cellVersions.getKey().getColumnName(),
+                                    ts);
                             SlicePredicate pred = new SlicePredicate();
                             pred.setColumn_names(Arrays.asList(colName));
                             Deletion del = new Deletion();
                             del.setPredicate(pred);
                             del.setTimestamp(Long.MAX_VALUE);
-                            Mutation m = new Mutation();
-                            m.setDeletion(del);
+                            Mutation mutation = new Mutation();
+                            mutation.setDeletion(del);
                             ByteBuffer rowName = ByteBuffer.wrap(cellVersions.getKey().getRowName());
                             if (!map.containsKey(rowName)) {
                                 map.put(rowName, Maps.<String, List<Mutation>>newHashMap());
@@ -857,7 +1158,7 @@ public Void apply(Client client) throws Exception {
                             if (!rowPuts.containsKey(internalTableName(tableRef))) {
                                 rowPuts.put(internalTableName(tableRef), Lists.<Mutation>newArrayList());
                             }
-                            rowPuts.get(internalTableName(tableRef)).add(m);
+                            rowPuts.get(internalTableName(tableRef)).add(mutation);
                             mapIndex++;
                             numVersions += cellVersions.getValue().size();
                         }
@@ -872,7 +1173,8 @@ public Void apply(Client client) throws Exception {
 
                 @Override
                 public String toString() {
-                    return "delete_batch_mutate(" + host + ", " + tableRef.getQualifiedName() + ", " + numVersions + " total versions of " + cellVersionsMap.size() + " keys)";
+                    return "delete_batch_mutate(" + host + ", " + tableRef.getQualifiedName() + ", "
+                            + numVersions + " total versions of " + cellVersionsMap.size() + " keys)";
                 }
             });
         } catch (Exception e) {
@@ -888,26 +1190,34 @@ private CfDef getCfForTable(TableReference tableRef, byte[] rawMetadata) {
 
         boolean negativeLookups = false;
         double falsePositiveChance = CassandraConstants.DEFAULT_LEVELED_COMPACTION_BLOOM_FILTER_FP_CHANCE;
-        int explicitCompressionBlockSizeKB = 0;
+        int explicitCompressionBlockSizeKb = 0;
         boolean appendHeavyAndReadLight = false;
         TableMetadataPersistence.CachePriority cachePriority = TableMetadataPersistence.CachePriority.WARM;
 
         if (!CassandraKeyValueServices.isEmptyOrInvalidMetadata(rawMetadata)) {
             TableMetadata tableMetadata = TableMetadata.BYTES_HYDRATOR.hydrateFromBytes(rawMetadata);
             negativeLookups = tableMetadata.hasNegativeLookups();
-            explicitCompressionBlockSizeKB = tableMetadata.getExplicitCompressionBlockSizeKB();
+            explicitCompressionBlockSizeKb = tableMetadata.getExplicitCompressionBlockSizeKB();
             appendHeavyAndReadLight = tableMetadata.isAppendHeavyAndReadLight();
             cachePriority = tableMetadata.getCachePriority();
         }
 
-        if (explicitCompressionBlockSizeKB != 0) {
-            compressionOptions.put(CassandraConstants.CFDEF_COMPRESSION_TYPE_KEY, CassandraConstants.DEFAULT_COMPRESSION_TYPE);
-            compressionOptions.put(CassandraConstants.CFDEF_COMPRESSION_CHUNK_LENGTH_KEY, Integer.toString(explicitCompressionBlockSizeKB));
+        if (explicitCompressionBlockSizeKb != 0) {
+            compressionOptions.put(
+                    CassandraConstants.CFDEF_COMPRESSION_TYPE_KEY,
+                    CassandraConstants.DEFAULT_COMPRESSION_TYPE);
+            compressionOptions.put(
+                    CassandraConstants.CFDEF_COMPRESSION_CHUNK_LENGTH_KEY,
+                    Integer.toString(explicitCompressionBlockSizeKb));
         } else {
             // We don't really need compression here nor anticipate it will garner us any gains
             // (which is why we're doing such a small chunk size), but this is how we can get "free" CRC checking.
-            compressionOptions.put(CassandraConstants.CFDEF_COMPRESSION_TYPE_KEY, CassandraConstants.DEFAULT_COMPRESSION_TYPE);
-            compressionOptions.put(CassandraConstants.CFDEF_COMPRESSION_CHUNK_LENGTH_KEY, Integer.toString(AtlasDbConstants.MINIMUM_COMPRESSION_BLOCK_SIZE_KB));
+            compressionOptions.put(
+                    CassandraConstants.CFDEF_COMPRESSION_TYPE_KEY,
+                    CassandraConstants.DEFAULT_COMPRESSION_TYPE);
+            compressionOptions.put(
+                    CassandraConstants.CFDEF_COMPRESSION_CHUNK_LENGTH_KEY,
+                    Integer.toString(AtlasDbConstants.MINIMUM_COMPRESSION_BLOCK_SIZE_KB));
         }
 
         if (negativeLookups) {
@@ -916,7 +1226,8 @@ private CfDef getCfForTable(TableReference tableRef, byte[] rawMetadata) {
 
         if (appendHeavyAndReadLight) {
             cf.setCompaction_strategy(CassandraConstants.SIZE_TIERED_COMPACTION_STRATEGY);
-            cf.setCompaction_strategy_optionsIsSet(false); // clear out the now nonsensical "keep it at 80MB per sstable" option from LCS
+            // clear out the now nonsensical "keep it at 80MB per sstable" option from LCS
+            cf.setCompaction_strategy_optionsIsSet(false);
             if (!negativeLookups) {
                 falsePositiveChance = CassandraConstants.DEFAULT_SIZE_TIERED_COMPACTION_BLOOM_FILTER_FP_CHANCE;
             } else {
@@ -935,6 +1246,9 @@ private CfDef getCfForTable(TableReference tableRef, byte[] rawMetadata) {
                 break;
             case HOTTEST:
                 cf.setPopulate_io_cache_on_flushIsSet(true);
+                break;
+            default:
+                throw new PalantirRuntimeException("Unknown cache priority: " + cachePriority);
         }
 
         cf.setBloom_filter_fp_chance(falsePositiveChance);
@@ -945,9 +1259,10 @@ private CfDef getCfForTable(TableReference tableRef, byte[] rawMetadata) {
     //TODO: after cassandra change: handle multiRanges
     @Override
     @Idempotent
-    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(TableReference tableRef,
-                                                                                                           Iterable<RangeRequest> rangeRequests,
-                                                                                                           long timestamp) {
+    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests,
+            long timestamp) {
         int concurrency = configManager.getConfig().rangesConcurrency();
         return KeyValueServices.getFirstBatchForRangesUsingGetRangeConcurrent(
                 executor, this, tableRef, rangeRequests, timestamp, concurrency);
@@ -958,27 +1273,47 @@ public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>
     // TODO: after cassandra change: handle column filtering
     @Override
     @Idempotent
-    public ClosableIterator<RowResult<Value>> getRange(TableReference tableRef, final RangeRequest rangeRequest, final long timestamp) {
+    public ClosableIterator<RowResult<Value>> getRange(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp) {
         return getRangeWithPageCreator(tableRef, rangeRequest, timestamp, readConsistency, ValueExtractor.SUPPLIER);
     }
 
     @Override
     @Idempotent
-    public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(TableReference tableRef, RangeRequest rangeRequest, long timestamp) {
-        return getRangeWithPageCreator(tableRef, rangeRequest, timestamp, deleteConsistency, TimestampExtractor.SUPPLIER);
+    public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp) {
+        return getRangeWithPageCreator(
+                tableRef,
+                rangeRequest,
+                timestamp,
+                deleteConsistency,
+                TimestampExtractor.SUPPLIER);
     }
 
     @Override
     @Idempotent
-    public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(TableReference tableRef, RangeRequest rangeRequest, long timestamp) {
-        return getRangeWithPageCreator(tableRef, rangeRequest, timestamp, deleteConsistency, HistoryExtractor.SUPPLIER);
-    }
-
-    public <T, U> ClosableIterator<RowResult<U>> getRangeWithPageCreator(final TableReference tableRef,
-                                                                         final RangeRequest rangeRequest,
-                                                                         final long timestamp,
-                                                                         final ConsistencyLevel consistency,
-                                                                         final Supplier<ResultsExtractor<T, U>> resultsExtractor) {
+    public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp) {
+        return getRangeWithPageCreator(
+                tableRef,
+                rangeRequest,
+                timestamp,
+                deleteConsistency,
+                HistoryExtractor.SUPPLIER);
+    }
+
+    public <T, U> ClosableIterator<RowResult<U>> getRangeWithPageCreator(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp,
+            ConsistencyLevel consistency,
+            Supplier<ResultsExtractor<T, U>> resultsExtractor) {
         if (rangeRequest.isReverse()) {
             throw new UnsupportedOperationException();
         }
@@ -986,7 +1321,11 @@ public <T, U> ClosableIterator<RowResult<U>> getRangeWithPageCreator(final Table
             return ClosableIterators.wrap(ImmutableList.<RowResult<U>>of().iterator());
         }
         final int batchHint = rangeRequest.getBatchHint() == null ? 100 : rangeRequest.getBatchHint();
-        SliceRange slice = new SliceRange(ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY), ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY), false, Integer.MAX_VALUE);
+        SliceRange slice = new SliceRange(
+                ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY),
+                ByteBuffer.wrap(PtBytes.EMPTY_BYTE_ARRAY),
+                false,
+                Integer.MAX_VALUE);
         final SlicePredicate pred = new SlicePredicate();
         pred.setSlice_range(slice);
 
@@ -1001,15 +1340,20 @@ protected TokenBackedBasicResultsPage<RowResult<U>, byte[]> getFirstPage() throw
                     }
 
                     @Override
-                    protected TokenBackedBasicResultsPage<RowResult<U>, byte[]> getNextPage(TokenBackedBasicResultsPage<RowResult<U>, byte[]> previous) throws Exception {
+                    protected TokenBackedBasicResultsPage<RowResult<U>, byte[]> getNextPage(
+                            TokenBackedBasicResultsPage<RowResult<U>, byte[]> previous) throws Exception {
                         return page(previous.getTokenForNextPage());
                     }
 
                     TokenBackedBasicResultsPage<RowResult<U>, byte[]> page(final byte[] startKey) throws Exception {
                         InetSocketAddress host = clientPool.getRandomHostForKey(startKey);
-                        return clientPool.runWithRetryOnHost(host, new FunctionCheckedException<Client, TokenBackedBasicResultsPage<RowResult<U>, byte[]>, Exception>() {
+                        return clientPool.runWithRetryOnHost(host, new FunctionCheckedException<
+                                Client,
+                                TokenBackedBasicResultsPage<RowResult<U>, byte[]>,
+                                Exception>() {
                             @Override
-                            public TokenBackedBasicResultsPage<RowResult<U>, byte[]> apply(Client client) throws Exception {
+                            public TokenBackedBasicResultsPage<RowResult<U>, byte[]> apply(Client client)
+                                    throws Exception {
                                 final byte[] endExclusive = rangeRequest.getEndExclusive();
 
                                 KeyRange keyRange = new KeyRange(batchHint);
@@ -1024,29 +1368,21 @@ public TokenBackedBasicResultsPage<RowResult<U>, byte[]> apply(Client client) th
                                 List<KeySlice> firstPage;
 
                                 try {
-                                    if (shouldTraceQuery(tableRef)) {
-                                        ByteBuffer recv_trace = client.trace_next_query();
-                                        Stopwatch stopwatch = Stopwatch.createStarted();
-                                        firstPage = client.get_range_slices(colFam, pred, keyRange, consistency);
-                                        long duration = stopwatch.elapsed(TimeUnit.MILLISECONDS);
-                                        if (duration > getMinimumDurationToTraceMillis()) {
-                                            log.error("Traced a call to " + tableRef.getQualifiedName() + " that took " + duration + " ms."
-                                                    + " It will appear in system_traces with UUID=" + CassandraKeyValueServices.convertCassandraByteBufferUUIDtoString(recv_trace));
-                                        }
-                                    } else {
-                                        firstPage = client.get_range_slices(colFam, pred, keyRange, consistency);
-                                    }
+                                    firstPage = run(client, tableRef,
+                                            () -> client.get_range_slices(colFam, pred, keyRange, consistency));
                                 } catch (UnavailableException e) {
                                     if (consistency.equals(ConsistencyLevel.ALL)) {
-                                        throw new InsufficientConsistencyException("This operation requires all Cassandra nodes to be up and available.", e);
+                                        throw new InsufficientConsistencyException("This operation requires all"
+                                                + " Cassandra nodes to be up and available.", e);
                                     } else {
                                         throw e;
                                     }
                                 }
 
-                                Map<ByteBuffer, List<ColumnOrSuperColumn>> colsByKey = CassandraKeyValueServices.getColsByKey(firstPage);
-                                TokenBackedBasicResultsPage<RowResult<U>, byte[]> page =
-                                        resultsExtractor.get().getPageFromRangeResults(colsByKey, timestamp, selection, endExclusive);
+                                Map<ByteBuffer, List<ColumnOrSuperColumn>> colsByKey =
+                                        CassandraKeyValueServices.getColsByKey(firstPage);
+                                TokenBackedBasicResultsPage<RowResult<U>, byte[]> page = resultsExtractor.get()
+                                        .getPageFromRangeResults(colsByKey, timestamp, selection, endExclusive);
                                 if (page.moreResultsAvailable() && firstPage.size() < batchHint) {
                                     // If get_range_slices didn't return the full number of results, there's no
                                     // point to trying to get another page
@@ -1079,8 +1415,10 @@ public void dropTable(final TableReference tableRef) {
      */
     @Override
     public void dropTables(final Set<TableReference> tablesToDrop) {
-        long lockId = waitForSchemaMutationLock();
+        schemaMutationLock.runWithLock(() -> dropTablesWithLock(tablesToDrop));
+    }
 
+    private void dropTablesWithLock(final Set<TableReference> tablesToDrop) throws Exception {
         try {
             clientPool.runWithRetry(new FunctionCheckedException<Client, Void, Exception>() {
                 @Override
@@ -1099,19 +1437,18 @@ public Void apply(Client client) throws Exception {
                             client.system_drop_column_family(internalTableName(table));
                             putMetadataWithoutChangingSettings(table, PtBytes.EMPTY_BYTE_ARRAY);
                         } else {
-                            log.warn(String.format("Ignored call to drop a table (%s) that did not exist.", table));
+                            log.warn("Ignored call to drop a table ({}) that did not exist.", table);
                         }
                     }
-                    CassandraKeyValueServices.waitForSchemaVersions(client, "(all tables in a call to dropTables)", configManager.getConfig().schemaMutationTimeoutMillis());
+                    CassandraKeyValueServices.waitForSchemaVersions(
+                            client,
+                            "(all tables in a call to dropTables)",
+                            configManager.getConfig().schemaMutationTimeoutMillis());
                     return null;
                 }
             });
         } catch (UnavailableException e) {
             throw new PalantirRuntimeException("Dropping tables requires all Cassandra nodes to be up and available.");
-        } catch (Exception e) {
-            throw Throwables.throwUncheckedException(e);
-        } finally {
-            schemaMutationUnlock(lockId);
         }
     }
 
@@ -1120,7 +1457,6 @@ public void createTable(final TableReference tableRef, final byte[] tableMetadat
         createTables(ImmutableMap.of(tableRef, tableMetadata));
     }
 
-
     /**
      * Main gains here vs. createTable:
      *    - problems excepting, we will basically be serializing a rapid series of schema changes
@@ -1130,50 +1466,52 @@ public void createTable(final TableReference tableRef, final byte[] tableMetadat
      */
     @Override
     public void createTables(final Map<TableReference, byte[]> tableNamesToTableMetadata) {
-        long lockId = waitForSchemaMutationLock();
+        schemaMutationLock.runWithLock(() -> createTablesWithLock(tableNamesToTableMetadata));
+        internalPutMetadataForTables(tableNamesToTableMetadata, false);
+    }
 
+    private void createTablesWithLock(final Map<TableReference, byte[]> tableNamesToTableMetadata) throws Exception {
         try {
-            clientPool.runWithRetry(new FunctionCheckedException<Client, Void, Exception>() {
-                @Override
-                public Void apply(Client client) throws Exception {
-                    KsDef ks = client.describe_keyspace(configManager.getConfig().keyspace());
-                    Set<TableReference> tablesToCreate = tableNamesToTableMetadata.keySet();
-                    Set<TableReference> existingTablesLowerCased = Sets.newHashSet();
+            clientPool.runWithRetry((FunctionCheckedException<Client, Void, Exception>) client -> {
+                KsDef ks = client.describe_keyspace(configManager.getConfig().keyspace());
+                Set<TableReference> existingTablesLowerCased = Sets.newHashSet();
 
-                    for (CfDef cf : ks.getCf_defs()) {
-                        existingTablesLowerCased.add(fromInternalTableName(cf.getName().toLowerCase()));
-                    }
+                for (CfDef cf : ks.getCf_defs()) {
+                    existingTablesLowerCased.add(fromInternalTableName(cf.getName().toLowerCase()));
+                }
 
-                    for (TableReference table : tablesToCreate) {
-                        CassandraVerifier.sanityCheckTableName(table);
 
-                        TableReference tableRefLowerCased = TableReference.createUnsafe(table.getQualifiedName().toLowerCase());
-                        if (!existingTablesLowerCased.contains(tableRefLowerCased)) {
-                            client.system_add_column_family(getCfForTable(table, tableNamesToTableMetadata.get(table)));
-                        } else {
-                            log.warn(String.format("Ignored call to create a table (%s) that already existed (case insensitive).", table));
-                        }
-                    }
-                    if (!tablesToCreate.isEmpty()) {
-                        CassandraKeyValueServices.waitForSchemaVersions(client, "(all tables in a call to createTables)", configManager.getConfig().schemaMutationTimeoutMillis());
+                Set<Entry<TableReference, byte[]>> tablesToCreate = tableNamesToTableMetadata.entrySet();
+                for (Entry<TableReference, byte[]> tableAndMetadataPair : tablesToCreate) {
+                    TableReference table = tableAndMetadataPair.getKey();
+                    byte[] metadata = tableAndMetadataPair.getValue();
+
+                    CassandraVerifier.sanityCheckTableName(table);
+
+                    TableReference tableRefLowerCased = TableReference
+                            .createUnsafe(table.getQualifiedName().toLowerCase());
+                    if (!existingTablesLowerCased.contains(tableRefLowerCased)) {
+                        client.system_add_column_family(getCfForTable(table, metadata));
+                    } else {
+                        log.warn("Ignored call to create a table ({}) that already existed (case insensitive).", table);
                     }
-                    return null;
                 }
+                if (!tablesToCreate.isEmpty()) {
+                    CassandraKeyValueServices.waitForSchemaVersions(
+                            client,
+                            "(all tables in a call to createTables)",
+                            configManager.getConfig().schemaMutationTimeoutMillis());
+                }
+                return null;
             });
         } catch (UnavailableException e) {
             throw new PalantirRuntimeException("Creating tables requires all Cassandra nodes to be up and available.");
-        } catch (Exception e) {
-            throw Throwables.throwUncheckedException(e);
-        } finally {
-            schemaMutationUnlock(lockId);
         }
-
-        internalPutMetadataForTables(tableNamesToTableMetadata, false);
     }
 
     @Override
     public Set<TableReference> getAllTableNames() {
-        return Sets.difference(getAllTablenamesInternal(), CassandraConstants.HIDDEN_TABLES);
+        return Sets.filter(getAllTablenamesInternal(), tr -> !hiddenTables.isHidden(tr));
     }
 
     private Set<TableReference> getAllTablenamesInternal() {
@@ -1205,50 +1543,61 @@ public String toString() {
     @Override
     public byte[] getMetadataForTable(TableReference tableRef) {
         Cell cell = getMetadataCell(tableRef);
-        Value v = get(AtlasDbConstants.METADATA_TABLE, ImmutableMap.of(cell, Long.MAX_VALUE)).get(cell);
-        if (v == null) {
+        Value value = get(AtlasDbConstants.METADATA_TABLE, ImmutableMap.of(cell, Long.MAX_VALUE)).get(cell);
+        if (value == null) {
             return AtlasDbConstants.EMPTY_TABLE_METADATA;
         } else {
             if (!getAllTablenamesInternal().contains(tableRef)) {
-                log.error("While getting metadata, found a table, {}, with stored table metadata " +
-                        "but no corresponding existing table in the underlying KVS. " +
-                        "This is not necessarily a bug, but warrants further inquiry.", tableRef.getQualifiedName());
-                }
-            return v.getContents();
+                log.error("While getting metadata, found a table, {}, with stored table metadata "
+                        + "but no corresponding existing table in the underlying KVS. "
+                        + "This is not necessarily a bug, but warrants further inquiry.", tableRef.getQualifiedName());
+            }
+            return value.getContents();
         }
     }
 
     @Override
     public Map<TableReference, byte[]> getMetadataForTables() {
         Map<TableReference, byte[]> tableToMetadataContents = Maps.newHashMap();
-        ClosableIterator<RowResult<Value>> range = getRange(AtlasDbConstants.METADATA_TABLE, RangeRequest.all(), Long.MAX_VALUE);
-        try {
+        try (ClosableIterator<RowResult<Value>> range =
+                getRange(AtlasDbConstants.METADATA_TABLE, RangeRequest.all(), Long.MAX_VALUE)) {
             while (range.hasNext()) {
                 RowResult<Value> valueRow = range.next();
                 Iterable<Entry<Cell, Value>> cells = valueRow.getCells();
 
                 for (Entry<Cell, Value> entry : cells) {
                     Value value = entry.getValue();
-                    TableReference tableRef = TableReference.createUnsafe(new String(entry.getKey().getRowName()));
+                    TableReference tableRef = tableReferenceFromBytes(entry.getKey().getRowName());
                     byte[] contents;
                     if (value == null) {
                         contents = AtlasDbConstants.EMPTY_TABLE_METADATA;
                     } else {
                         contents = value.getContents();
                     }
-                    if (!CassandraConstants.HIDDEN_TABLES.contains(tableRef)) {
+                    if (!hiddenTables.isHidden(tableRef)) {
                         tableToMetadataContents.put(tableRef, contents);
                     }
                 }
             }
-        } finally {
-            range.close();
         }
         return tableToMetadataContents;
     }
 
-    private Cell getMetadataCell(TableReference tableRef) { // would have preferred an explicit charset, but thrift uses default internally
-        return Cell.create(tableRef.getQualifiedName().getBytes(Charset.defaultCharset()), "m".getBytes());
+    private static Cell getMetadataCell(TableReference tableRef) {
+        // would have preferred an explicit charset, but thrift uses default internally
+        return Cell.create(
+                tableReferenceToBytes(tableRef),
+                "m".getBytes(StandardCharsets.UTF_8));
+    }
+
+    @SuppressWarnings("checkstyle:RegexpSinglelineJava")
+    private static TableReference tableReferenceFromBytes(byte[] name) {
+        return TableReference.createUnsafe(new String(name, Charset.defaultCharset()));
+    }
+
+    @SuppressWarnings("checkstyle:RegexpSinglelineJava")
+    private static byte[] tableReferenceToBytes(TableReference tableRef) {
+        return tableRef.getQualifiedName().getBytes(Charset.defaultCharset());
     }
 
     @Override
@@ -1261,21 +1610,29 @@ public void putMetadataForTables(final Map<TableReference, byte[]> tableRefToMet
         internalPutMetadataForTables(tableRefToMetadata, true);
     }
 
-    private void internalPutMetadataForTables(final Map<TableReference, byte[]> unfilteredTableNameToMetadata, final boolean possiblyNeedToPerformSettingsChanges) {
-        Map<TableReference, byte[]> tableNameToMetadata = Maps.filterValues(unfilteredTableNameToMetadata, Predicates.not(Predicates.equalTo(AtlasDbConstants.EMPTY_TABLE_METADATA)));
+    @SuppressWarnings("checkstyle:RegexpSinglelineJava")
+    private void internalPutMetadataForTables(
+            Map<TableReference, byte[]> unfilteredTableNameToMetadata,
+            boolean possiblyNeedToPerformSettingsChanges) {
+        Map<TableReference, byte[]> tableNameToMetadata = Maps.filterValues(
+                unfilteredTableNameToMetadata,
+                Predicates.not(Predicates.equalTo(AtlasDbConstants.EMPTY_TABLE_METADATA)));
         if (tableNameToMetadata.isEmpty()) {
             return;
         }
 
-        final Map<Cell, byte[]> metadataRequestedForUpdate = Maps.newHashMapWithExpectedSize(tableNameToMetadata.size());
+        Map<Cell, byte[]> metadataRequestedForUpdate = Maps.newHashMapWithExpectedSize(tableNameToMetadata.size());
         for (Entry<TableReference, byte[]> tableEntry : tableNameToMetadata.entrySet()) {
             metadataRequestedForUpdate.put(getMetadataCell(tableEntry.getKey()), tableEntry.getValue());
         }
 
-        Map<Cell, Long> requestForLatestDbSideMetadata = Maps.transformValues(metadataRequestedForUpdate, Functions.constant(Long.MAX_VALUE));
+        Map<Cell, Long> requestForLatestDbSideMetadata = Maps.transformValues(
+                metadataRequestedForUpdate,
+                Functions.constant(Long.MAX_VALUE));
 
         // technically we're racing other services from here on, during an update period,
-        // but the penalty for not caring is just some superfluous schema mutations and a few dead rows in the metadata table.
+        // but the penalty for not caring is just some superfluous schema mutations and a
+        // few dead rows in the metadata table.
         Map<Cell, Value> persistedMetadata = get(AtlasDbConstants.METADATA_TABLE, requestForLatestDbSideMetadata);
         final Map<Cell, byte[]> newMetadata = Maps.newHashMap();
         final Collection<CfDef> updatedCfs = Lists.newArrayList();
@@ -1283,43 +1640,53 @@ private void internalPutMetadataForTables(final Map<TableReference, byte[]> unfi
             Value val = persistedMetadata.get(entry.getKey());
             if (val == null || !Arrays.equals(val.getContents(), entry.getValue())) {
                 newMetadata.put(entry.getKey(), entry.getValue());
-                updatedCfs.add(getCfForTable(TableReference.createUnsafe(new String(entry.getKey().getRowName())), entry.getValue()));
+                updatedCfs.add(getCfForTable(
+                        tableReferenceFromBytes(entry.getKey().getRowName()),
+                        entry.getValue()));
             }
         }
 
-        if (!newMetadata.isEmpty()) {
-            long lockId = 0;
-            if (possiblyNeedToPerformSettingsChanges) {
-                lockId = waitForSchemaMutationLock();
-            }
-            try {
-                clientPool.runWithRetry(new FunctionCheckedException<Client, Void, Exception>() {
-                    @Override
-                    public Void apply(Client client) throws Exception {
-                        if (possiblyNeedToPerformSettingsChanges) {
-                            for (CfDef cf : updatedCfs) {
-                                client.system_update_column_family(cf);
-                            }
+        if (newMetadata.isEmpty()) {
+            return;
+        }
 
-                            CassandraKeyValueServices.waitForSchemaVersions(client, "(all tables in a call to putMetadataForTables)", configManager.getConfig().schemaMutationTimeoutMillis());
-                        }
-                        // Done with actual schema mutation, push the metadata
-                        put(AtlasDbConstants.METADATA_TABLE, newMetadata, System.currentTimeMillis());
-                        return null;
-                    }
-                });
+        if (possiblyNeedToPerformSettingsChanges) {
+            schemaMutationLock.runWithLock(() ->
+                    putMetadataForTablesWithLock(possiblyNeedToPerformSettingsChanges, newMetadata, updatedCfs));
+        } else {
+            try {
+                putMetadataForTablesWithLock(possiblyNeedToPerformSettingsChanges, newMetadata, updatedCfs);
             } catch (Exception e) {
                 throw Throwables.throwUncheckedException(e);
-            } finally {
-                if (possiblyNeedToPerformSettingsChanges) {
-                    schemaMutationUnlock(lockId);
-                }
             }
         }
     }
 
+    private void putMetadataForTablesWithLock(
+            boolean possiblyNeedToPerformSettingsChanges,
+            Map<Cell, byte[]> newMetadata,
+            Collection<CfDef> updatedCfs) throws Exception {
+        clientPool.runWithRetry(client -> {
+            if (possiblyNeedToPerformSettingsChanges) {
+                for (CfDef cf : updatedCfs) {
+                    client.system_update_column_family(cf);
+                }
+
+                CassandraKeyValueServices.waitForSchemaVersions(
+                        client,
+                        "(all tables in a call to putMetadataForTables)",
+                        configManager.getConfig().schemaMutationTimeoutMillis());
+            }
+            // Done with actual schema mutation, push the metadata
+            put(AtlasDbConstants.METADATA_TABLE, newMetadata, System.currentTimeMillis());
+            return null;
+        });
+    }
+
     private void putMetadataWithoutChangingSettings(final TableReference tableRef, final byte[] meta) {
-        put(AtlasDbConstants.METADATA_TABLE, ImmutableMap.of(getMetadataCell(tableRef), meta), System.currentTimeMillis());
+        put(AtlasDbConstants.METADATA_TABLE, ImmutableMap.of(
+                getMetadataCell(tableRef), meta),
+                System.currentTimeMillis());
     }
 
     @Override
@@ -1349,19 +1716,14 @@ public Entry<Cell, Value> apply(Cell cell) {
     @Override
     public Multimap<Cell, Long> getAllTimestamps(TableReference tableRef, Set<Cell> cells, long ts) {
         AllTimestampsCollector collector = new AllTimestampsCollector();
-        try {
-            loadWithTs(tableRef, cells, ts, true, collector, deleteConsistency);
-        } catch (UnavailableException e) {
-            throw new InsufficientConsistencyException("Get all timestamps requires all Cassandra nodes to be up and available.", e);
-        } catch (Exception e) {
-            throw Throwables.throwUncheckedException(e);
-        }
+        loadWithTs(tableRef, cells, ts, true, collector, deleteConsistency);
         return collector.collectedResults;
     }
 
     @Override
     public void putUnlessExists(final TableReference tableRef, final Map<Cell, byte[]> values)
             throws KeyAlreadyExistsException {
+        String tableName = internalTableName(tableRef);
         try {
             clientPool.runWithRetry(new FunctionCheckedException<Client, Void, Exception>() {
                 @Override
@@ -1370,39 +1732,23 @@ public Void apply(Client client) throws Exception {
                         ByteBuffer rowName = ByteBuffer.wrap(e.getKey().getRowName());
                         byte[] contents = e.getValue();
                         long timestamp = AtlasDbConstants.TRANSACTION_TS;
-                        byte[] colName = CassandraKeyValueServices.makeCompositeBuffer(e.getKey().getColumnName(), timestamp).array();
+                        byte[] colName = CassandraKeyValueServices
+                                .makeCompositeBuffer(e.getKey().getColumnName(), timestamp)
+                                .array();
                         Column col = new Column();
                         col.setName(colName);
                         col.setValue(contents);
                         col.setTimestamp(timestamp);
-                        CASResult casResult;
-                        if (shouldTraceQuery(tableRef)) {
-                            ByteBuffer recv_trace = client.trace_next_query();
-                            Stopwatch stopwatch = Stopwatch.createStarted();
-                            casResult = client.cas(
-                                    rowName,
-                                    tableRef.getQualifiedName(),
-                                    ImmutableList.<Column>of(),
-                                    ImmutableList.of(col),
-                                    ConsistencyLevel.SERIAL,
-                                    writeConsistency);
-                            long duration = stopwatch.elapsed(TimeUnit.MILLISECONDS);
-                            if (duration > getMinimumDurationToTraceMillis()) {
-                                log.error("Traced a call to " + tableRef + " that took " + duration + " ms."
-                                        + " It will appear in system_traces with UUID="
-                                        + CassandraKeyValueServices.convertCassandraByteBufferUUIDtoString(recv_trace));
-                            }
-                        } else {
-                            casResult = client.cas(
-                                    rowName,
-                                    tableRef.getQualifiedName(),
-                                    ImmutableList.<Column>of(),
-                                    ImmutableList.of(col),
-                                    ConsistencyLevel.SERIAL,
-                                    writeConsistency);
-                        }
+                        CASResult casResult = run(client, tableRef, () -> client.cas(
+                                rowName,
+                                tableName,
+                                ImmutableList.of(),
+                                ImmutableList.of(col),
+                                ConsistencyLevel.SERIAL,
+                                writeConsistency));
                         if (!casResult.isSuccess()) {
-                            throw new KeyAlreadyExistsException("This transaction row already exists.", ImmutableList.of(e.getKey()));
+                            throw new KeyAlreadyExistsException("This transaction row already exists.",
+                                    ImmutableList.of(e.getKey()));
                         }
                     }
                     return null;
@@ -1413,153 +1759,53 @@ public Void apply(Client client) throws Exception {
         }
     }
 
-    /**
-     * Each locker generates a random ID per operation and uses a CAS operation as a DB-side lock.
-     *
-     * There are two special ID values used for book-keeping
-     * - one representing the lock being cleared
-     * - one representing a remote ID that is guaranteed to never be generated
-     * This is required because Cassandra CAS does not treat setting to null / empty as a delete,
-     * (though there is a to-do in their code to possibly add this)
-     * though it accepts an empty expected column to mean that non-existance was expected
-     * (see putUnlessExists for example, which has the luck of not having to ever deal with deleted values)
-     *
-     * I can't hold this against them though, because Atlas has a semi-similar problem with empty byte[] values meaning deleted internally.
-     *
-     * @return an ID to be passed into a subsequent unlock call
-     */
-    public long waitForSchemaMutationLock() {
-        final long perOperationNodeIdentifier = ThreadLocalRandom.current().nextLong(Long.MAX_VALUE - 2);
+    private interface Action<V> {
+        V run() throws TException;
+    }
 
-        try {
-            if (!supportsCAS) {
-                TimeoutException timeoutException = new TimeoutException("AtlasDB was unable to get a lock on Cassandra system schema mutations for your cluster. Likely cause: Service(s) performing heavy schema mutations in parallel, or extremely heavy Cassandra cluster load.");
-                try {
-                    if (!schemaMutationLockForEarlierVersionsOfCassandra.tryLock(configManager.getConfig().schemaMutationTimeoutMillis(), TimeUnit.MILLISECONDS)) {
-                        throw timeoutException;
-                    }
-                } catch (InterruptedException e) {
-                    throw timeoutException;
-                }
-                return 0;
+    private <V> V run(Client client, Set<TableReference> tableRefs, Action<V> action) throws TException {
+        if (shouldTraceQuery(tableRefs)) {
+            return trace(action, client, tableRefs);
+        } else {
+            try {
+                return action.run();
+            } catch (TException e) {
+                logFailedCall(tableRefs);
+                throw e;
             }
-
-            clientPool.runWithRetry(new FunctionCheckedException<Client, Void, Exception>() {
-                @Override
-                public Void apply(Client client) throws Exception {
-                    Cell globalDdlLockCell = Cell.create(CassandraConstants.GLOBAL_DDL_LOCK.getBytes(), CassandraConstants.GLOBAL_DDL_LOCK_COLUMN_NAME.getBytes());
-                    ByteBuffer rowName = ByteBuffer.wrap(globalDdlLockCell.getRowName());
-                    Column ourUpdate = lockColumnWithValue(Longs.toByteArray(perOperationNodeIdentifier));
-
-                    List<Column> expected = ImmutableList.of(lockColumnWithValue(Longs.toByteArray(CassandraConstants.GLOBAL_DDL_LOCK_CLEARED_VALUE)));
-
-                    CASResult casResult = writeLockWithCAS(client, rowName, expected, ourUpdate);
-
-                    int timesAttempted = 0;
-
-                    Stopwatch stopwatch = Stopwatch.createStarted();
-                    while (!casResult.isSuccess()) { // could have a timeout controlling this level, confusing for users to set both timeouts though
-
-                        if (casResult.getCurrent_valuesSize() == 0) { // never has been an existing lock
-                            // special case, no one has ever made a lock ever before
-                            // this becomes analogous to putUnlessExists now
-                            expected = ImmutableList.<Column>of();
-                        } else {
-                            Column existingValue = Iterables.getOnlyElement(casResult.getCurrent_values(), null);
-                            if (existingValue == null) {
-                                throw new IllegalStateException("Something is wrong with underlying locks. Consult support for guidance on manually examining and clearing locks from " + CassandraConstants.LOCK_TABLE + " table.");
-                            }
-                            expected = ImmutableList.of(lockColumnWithValue(Longs.toByteArray(CassandraConstants.GLOBAL_DDL_LOCK_CLEARED_VALUE)));
-                        }
-
-                        if (stopwatch.elapsed(TimeUnit.MILLISECONDS) > configManager.getConfig().schemaMutationTimeoutMillis() * 4) { // possibly dead remote locker
-                            throw new TimeoutException(String.format("We have timed out waiting on the current schema mutation lock holder.  " +
-                                    "We have tried to grab the lock for %d milliseconds unsuccessfully.  Please try restarting the AtlasDB client." +
-                                    "If this occurs repeatedly it may indicate that the current lock holder has died without releasing the lock " +
-                                    "and will require manual intervention. This will require restarting all atlasDB clients and then using cqlsh " +
-                                    "to truncate the _locks table. Please contact support for help with this in important situations.", stopwatch.elapsed(TimeUnit.MILLISECONDS)));
-                        }
-
-
-                        long timeToSleep = CassandraConstants.TIME_BETWEEN_LOCK_ATTEMPT_ROUNDS_MILLIS * (long) Math.pow(2, timesAttempted++);
-
-                        Thread.sleep(timeToSleep);
-
-                        casResult = writeLockWithCAS(client, rowName, expected, ourUpdate);
-                    }
-
-                    // we won the lock!
-                    return null;
-                }
-            });
-        } catch (Exception e) {
-            throw Throwables.throwUncheckedException(e);
         }
-
-        return perOperationNodeIdentifier;
     }
 
-    private CASResult writeLockWithCAS(Client client, ByteBuffer rowName, List<Column> expectedValue, Column ourLockUpdate) throws TException {
-        return client.cas(
-                rowName, // key
-                CassandraConstants.LOCK_TABLE.getQualifiedName(),
-                expectedValue, // expected value currently holding
-                ImmutableList.of(ourLockUpdate), // update with our request id
-                ConsistencyLevel.SERIAL,
-                writeConsistency
-        );
+    private <V> V run(Client client, TableReference tableRef, Action<V> action) throws TException {
+        return run(client, ImmutableSet.of(tableRef), action);
     }
 
-    private Column lockColumnWithValue(byte[] value) {
-        return new Column()
-                .setName(CassandraKeyValueServices.makeCompositeBuffer(CassandraConstants.GLOBAL_DDL_LOCK_COLUMN_NAME.getBytes(), AtlasDbConstants.TRANSACTION_TS).array())
-                .setValue(value) // expected previous
-                .setTimestamp(AtlasDbConstants.TRANSACTION_TS);
-    }
-
-    public void schemaMutationUnlock(long perOperationNodeIdentifier) {
-        if (!supportsCAS) {
-            schemaMutationLockForEarlierVersionsOfCassandra.unlock();
-            return;
-        }
-
+    private <V> V trace(Action<V> action, Client client, Set<TableReference> tableRefs) throws TException {
+        ByteBuffer traceId = client.trace_next_query();
+        Stopwatch stopwatch = Stopwatch.createStarted();
+        boolean failed = false;
         try {
-            clientPool.runWithRetry(new FunctionCheckedException<Client, Void, Exception>() {
-                @Override
-                public Void apply(Client client) throws Exception {
-                    Cell globalDdlLockCell = Cell.create(CassandraConstants.GLOBAL_DDL_LOCK.getBytes(), CassandraConstants.GLOBAL_DDL_LOCK_COLUMN_NAME.getBytes());
-                    ByteBuffer rowName = ByteBuffer.wrap(globalDdlLockCell.getRowName());
-
-                    List<Column> ourExpectedLock = ImmutableList.of(lockColumnWithValue(Longs.toByteArray(perOperationNodeIdentifier)));
-                    Column clearedLock = lockColumnWithValue(Longs.toByteArray(CassandraConstants.GLOBAL_DDL_LOCK_CLEARED_VALUE));
-                    CASResult casResult = writeLockWithCAS(client, rowName, ourExpectedLock, clearedLock);
-
-                    if (!casResult.isSuccess()) {
-                        String remoteLock = "(unknown)";
-                        if (casResult.getCurrent_valuesSize() == 1) {
-                            Column column = Iterables.getOnlyElement(casResult.getCurrent_values(), null);
-                            if (column != null) {
-                                long remoteId = Longs.fromByteArray(column.getValue());
-                                remoteLock = (remoteId == CassandraConstants.GLOBAL_DDL_LOCK_CLEARED_VALUE) ? "(Cleared Value)" : Long.toString(remoteId);
-                            }
-                        }
-                        throw new IllegalStateException(String.format("Another process cleared our schema mutation lock from underneath us. Our ID, which we expected, was %s, the value we saw in the database was instead %s.", Long.toString(perOperationNodeIdentifier), remoteLock));
-                    }
-                    return null;
-                }
-            });
-        } catch (Exception e) {
-            throw Throwables.throwUncheckedException(e);
+            return action.run();
+        } catch (TException e) {
+            failed = true;
+            logFailedCall(tableRefs);
+            throw e;
+        } finally {
+            long duration = stopwatch.elapsed(TimeUnit.MILLISECONDS);
+            logTraceResults(duration, tableRefs, traceId, failed);
         }
     }
 
     @Override
     public void compactInternally(TableReference tableRef) {
-        Preconditions.checkArgument(!Strings.isNullOrEmpty(tableRef.getQualifiedName()), "tableRef:[%s] should not be null or empty.", tableRef);
+        Preconditions.checkArgument(!Strings.isNullOrEmpty(tableRef.getQualifiedName()),
+                "tableRef:[%s] should not be null or empty.", tableRef);
         CassandraKeyValueServiceConfig config = configManager.getConfig();
         if (!compactionManager.isPresent()) {
-            log.error("No compaction client was configured, but compact was called. If you actually want to clear deleted data immediately " +
-                    "from Cassandra, lower your gc_grace_seconds setting and run `nodetool compact {} {}`.", config.keyspace(), tableRef);
+            log.error("No compaction client was configured, but compact was called."
+                    + " If you actually want to clear deleted data immediately"
+                    + " from Cassandra, lower your gc_grace_seconds setting and"
+                    + " run `nodetool compact {} {}`.", config.keyspace(), tableRef);
             return;
         }
         long timeoutInSeconds = config.jmx().get().compactionTimeoutSeconds();
@@ -1573,36 +1819,59 @@ public void compactInternally(TableReference tableRef) {
         } catch (InterruptedException e) {
             log.error("Compaction for {}.{} was interrupted.", keyspace, tableRef);
         } finally {
-            alterGcAndTombstone(keyspace, tableRef, CassandraConstants.GC_GRACE_SECONDS, CassandraConstants.TOMBSTONE_THRESHOLD_RATIO);
-        }
-    }
-
-    private void alterGcAndTombstone(final String keyspace, final TableReference tableRef, final int gcGraceSeconds, final float tombstoneThresholdRatio) {
-        Preconditions.checkArgument(!Strings.isNullOrEmpty(keyspace), "keyspace:[%s] should not be null or empty.", keyspace);
-        Preconditions.checkArgument(!Strings.isNullOrEmpty(tableRef.getQualifiedName()), "tableRef:[%s] should not be null or empty.", tableRef);
-        Preconditions.checkArgument(gcGraceSeconds >= 0, "gc_grace_seconds:[%s] should not be negative.", gcGraceSeconds);
+            alterGcAndTombstone(
+                    keyspace,
+                    tableRef,
+                    CassandraConstants.GC_GRACE_SECONDS,
+                    CassandraConstants.TOMBSTONE_THRESHOLD_RATIO);
+        }
+    }
+
+    private void alterGcAndTombstone(
+            String keyspace,
+            TableReference tableRef,
+            int gcGraceSeconds,
+            float tombstoneThresholdRatio) {
+        Preconditions.checkArgument(!Strings.isNullOrEmpty(keyspace),
+                "keyspace:[%s] should not be null or empty.", keyspace);
+        Preconditions.checkArgument(!Strings.isNullOrEmpty(tableRef.getQualifiedName()),
+                "tableRef:[%s] should not be null or empty.", tableRef);
+        Preconditions.checkArgument(gcGraceSeconds >= 0,
+                "gc_grace_seconds:[%s] should not be negative.", gcGraceSeconds);
         Preconditions.checkArgument(tombstoneThresholdRatio >= 0.0f && tombstoneThresholdRatio <= 1.0f,
                 "tombstone_threshold_ratio:[%s] should be between [0.0, 1.0]", tombstoneThresholdRatio);
 
-        long lockId = waitForSchemaMutationLock();
+        schemaMutationLock.runWithLock(() ->
+                alterGcAndTombstoneWithLock(keyspace, tableRef, gcGraceSeconds, tombstoneThresholdRatio));
+    }
+
+    private void alterGcAndTombstoneWithLock(
+            String keyspace,
+            TableReference tableRef,
+            int gcGraceSeconds,
+            float tombstoneThresholdRatio) {
         try {
-            clientPool.runWithRetry(new FunctionCheckedException<Client, Void, Exception>() {
-                @Override
-                public Void apply(Client client) throws NotFoundException, InvalidRequestException, TException {
-                    KsDef ks = client.describe_keyspace(keyspace);
-                    List<CfDef> cfs = ks.getCf_defs();
-                    for (CfDef cf : cfs) {
-                        if (cf.getName().equalsIgnoreCase(internalTableName(tableRef))) {
-                            cf.setGc_grace_seconds(gcGraceSeconds);
-                            cf.setCompaction_strategy_options(ImmutableMap.of("tombstone_threshold", String.valueOf(tombstoneThresholdRatio)));
-                            client.system_update_column_family(cf);
-                            CassandraKeyValueServices.waitForSchemaVersions(client, tableRef.getQualifiedName(), configManager.getConfig().schemaMutationTimeoutMillis());
-                            log.trace("gc_grace_seconds is set to {} for {}.{}", gcGraceSeconds, keyspace, tableRef);
-                            log.trace("tombstone_threshold_ratio is set to {} for {}.{}", tombstoneThresholdRatio, keyspace, tableRef);
-                        }
+            clientPool.runWithRetry((FunctionCheckedException<Client, Void, Exception>) client -> {
+                KsDef ks = client.describe_keyspace(keyspace);
+                List<CfDef> cfs = ks.getCf_defs();
+                for (CfDef cf : cfs) {
+                    if (cf.getName().equalsIgnoreCase(internalTableName(tableRef))) {
+                        cf.setGc_grace_seconds(gcGraceSeconds);
+                        cf.setCompaction_strategy_options(ImmutableMap.of(
+                                "tombstone_threshold",
+                                String.valueOf(tombstoneThresholdRatio)));
+                        client.system_update_column_family(cf);
+                        CassandraKeyValueServices.waitForSchemaVersions(
+                                client,
+                                tableRef.getQualifiedName(),
+                                configManager.getConfig().schemaMutationTimeoutMillis());
+                        log.trace("gc_grace_seconds is set to {} for {}.{}",
+                                gcGraceSeconds, keyspace, tableRef);
+                        log.trace("tombstone_threshold_ratio is set to {} for {}.{}",
+                                tombstoneThresholdRatio, keyspace, tableRef);
                     }
-                    return null;
                 }
+                return null;
             });
         } catch (Exception e) {
             log.error("Exception encountered while setting gc_grace_seconds:{} and tombstone_threshold:{} for {}.{}",
@@ -1611,8 +1880,6 @@ public Void apply(Client client) throws NotFoundException, InvalidRequestExcepti
                     keyspace,
                     tableRef,
                     e);
-        } finally {
-            schemaMutationUnlock(lockId);
         }
     }
 
@@ -1635,7 +1902,9 @@ public byte[] apply(Entry<Cell, V> entry) {
         return cellsByHost;
     }
 
-    private <V> Map<InetSocketAddress, List<V>> partitionByHost(Iterable<V> iterable, Function<V, byte[]> keyExtractor) {
+    private <V> Map<InetSocketAddress, List<V>> partitionByHost(
+            Iterable<V> iterable,
+            Function<V, byte[]> keyExtractor) {
         // Ensure that the same key goes to the same partition. This is important when writing multiple columns
         // to the same row, since this is a normally a single write in cassandra, whereas splitting the columns
         // into different requests results in multiple writes.
@@ -1685,27 +1954,17 @@ private <V> List<V> runAllTasksCancelOnFailure(List<Callable<V>> tasks) {
     }
 
     private static class TableCellAndValue {
+        public static final Function<TableCellAndValue, byte[]> EXTRACT_ROW_NAME_FUNCTION =
+                input -> input.cell.getRowName();
+
+        public static final Function<TableCellAndValue, Long> SIZING_FUNCTION =
+                input -> input.value.length + Cells.getApproxSizeOfCell(input.cell);
+
         private final TableReference tableRef;
         private final Cell cell;
         private final byte[] value;
 
-        public static Function<TableCellAndValue, byte[]> EXTRACT_ROW_NAME_FUNCTION =
-                new Function<TableCellAndValue, byte[]>() {
-                    @Override
-                    public byte[] apply(TableCellAndValue input) {
-                        return input.cell.getRowName();
-                    }
-                };
-
-        public static Function<TableCellAndValue, Long> SIZING_FUNCTION =
-                new Function<CassandraKeyValueService.TableCellAndValue, Long>() {
-                    @Override
-                    public Long apply(TableCellAndValue input) {
-                        return input.value.length + Cells.getApproxSizeOfCell(input.cell);
-                    }
-                };
-
-        public TableCellAndValue(TableReference tableRef, Cell cell, byte[] value) {
+        TableCellAndValue(TableReference tableRef, Cell cell, byte[] value) {
             this.tableRef = tableRef;
             this.cell = cell;
             this.value = value;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java
index b2a17644068..eaec64751e2 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraKeyValueServices.java
@@ -25,13 +25,11 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.cassandra.thrift.Cassandra;
-import org.apache.cassandra.thrift.Cassandra.Client;
 import org.apache.cassandra.thrift.CfDef;
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.ColumnOrSuperColumn;
-import org.apache.cassandra.thrift.InvalidRequestException;
 import org.apache.cassandra.thrift.KeySlice;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,17 +45,22 @@
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.common.annotation.Output;
-import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.visitor.Visitor;
 import com.palantir.util.Pair;
 
-public class CassandraKeyValueServices {
+public final class CassandraKeyValueServices {
     private static final Logger log = LoggerFactory.getLogger(CassandraKeyValueService.class); // did this on purpose
 
-    private static long INITIAL_SLEEP_TIME = 100;
-    private static long MAX_SLEEP_TIME = 5000;
-    static void waitForSchemaVersions(Cassandra.Client client, String tableName, int schemaTimeoutMillis) throws InvalidRequestException, TException {
+    private static final long INITIAL_SLEEP_TIME = 100;
+    private static final long MAX_SLEEP_TIME = 5000;
+
+    private CassandraKeyValueServices() {
+        // Utility class
+    }
+
+    static void waitForSchemaVersions(Cassandra.Client client, String tableName, int schemaTimeoutMillis)
+            throws TException {
         long start = System.currentTimeMillis();
         long sleepTime = INITIAL_SLEEP_TIME;
         Map<String, List<String>> versions;
@@ -72,39 +75,53 @@ static void waitForSchemaVersions(Cassandra.Client client, String tableName, int
                 throw Throwables.throwUncheckedException(e);
             }
             sleepTime = Math.min(sleepTime * 2, MAX_SLEEP_TIME);
-        } while (System.currentTimeMillis() < start + schemaTimeoutMillis);
+        }
+        while (System.currentTimeMillis() < start + schemaTimeoutMillis);
+
         StringBuilder sb = new StringBuilder();
-        sb.append(String.format("Cassandra cluster cannot come to agreement on schema versions, after attempting to modify table %s.", tableName));
-        for ( Entry<String, List<String>> version : versions.entrySet()) {
+        sb.append(String.format("Cassandra cluster cannot come to agreement on schema versions,"
+                + " after attempting to modify table %s.", tableName));
+        for (Entry<String, List<String>> version : versions.entrySet()) {
             sb.append(String.format("%nAt schema version %s:", version.getKey()));
-            for (String node: version.getValue()) {
+            for (String node : version.getValue()) {
                 sb.append(String.format("%n\tNode: %s", node));
             }
         }
-        sb.append("\nFind the nodes above that diverge from the majority schema " +
-                "(or have schema 'UNKNOWN', which likely means they are down/unresponsive) " +
-                "and examine their logs to determine the issue. Fixing the underlying issue and restarting Cassandra " +
-                "should resolve the problem. You can quick-check this with 'nodetool describecluster'.");
+        sb.append("\nFind the nodes above that diverge from the majority schema")
+                .append(" (or have schema 'UNKNOWN', which likely means they are down/unresponsive)")
+                .append(" and examine their logs to determine the issue.")
+                .append(" Fixing the underlying issue and restarting Cassandra")
+                .append(" should resolve the problem. You can quick-check this with 'nodetool describecluster'.");
         throw new IllegalStateException(sb.toString());
     }
 
     /**
-     * This is a request from pbrown / FDEs; basically it's a pain to do DB surgery to get out of failed patch upgrades, the majority of which requires schema mutations; they would find it preferable to stop before starting the actual patch upgrade / setting APPLYING state.
+     * This is a request from pbrown / FDEs; basically it's a pain to do DB surgery to get out
+     * of failed patch upgrades, the majority of which requires schema mutations; they would find
+     * it preferable to stop before starting the actual patch upgrade / setting APPLYING state.
      */
-    static void failQuickInInitializationIfClusterAlreadyInInconsistentState(CassandraClientPool clientPool, CassandraKeyValueServiceConfig config) {
+    static void failQuickInInitializationIfClusterAlreadyInInconsistentState(
+            CassandraClientPool clientPool,
+            CassandraKeyValueServiceConfig config) {
         if (config.safetyDisabled()) {
-            log.error("Skipped checking the cassandra cluster during initialization, because safety checks are disabled. Please re-enable safety checks when you are outside of your unusual migration period.");
+            log.error("Skipped checking the cassandra cluster during initialization, because safety checks are"
+                    + " disabled. Please re-enable safety checks when you are outside of your unusual"
+                    + " migration period.");
             return;
         }
-        String errorMessage = "While checking the cassandra cluster during initialization, we noticed schema versions could not settle. Failing quickly to avoid getting into harder to fix states (i.e. partially applied patch upgrades, etc). " +
-                "This state is in rare cases the correct one to be in; for instance schema versions will be incapable of settling in a cluster of heterogenous Cassandra 1.2/2.0 nodes. If that is the case, disable safety checks in your Cassandra KVS preferences.";
+        String errorMessage = "While checking the cassandra cluster during initialization, we noticed schema versions"
+                + " could not settle. Failing quickly to avoid getting into harder to fix states (i.e. partially"
+                + " applied patch upgrades, etc). This state is in rare cases the correct one to be in; for"
+                + " instance schema versions will be incapable of settling in a cluster of heterogenous"
+                + " Cassandra 1.2/2.0 nodes. If that is the case, disable safety checks in your Cassandra"
+                + " KVS preferences.";
         try {
-            clientPool.run(new FunctionCheckedException<Cassandra.Client, Void, TException>() {
-                @Override
-                public Void apply(Client client) throws TException {
-                    waitForSchemaVersions(client, "(none, just an initialization check)", config.schemaMutationTimeoutMillis());
-                    return null;
-                }
+            clientPool.run(client -> {
+                waitForSchemaVersions(
+                        client,
+                        "(none, just an initialization check)",
+                        config.schemaMutationTimeoutMillis());
+                return null;
             });
         } catch (TException e) {
             throw new RuntimeException(errorMessage, e);
@@ -117,7 +134,9 @@ public Void apply(Client client) throws TException {
     static ByteBuffer makeCompositeBuffer(byte[] colName, long ts) {
         assert colName.length <= 1 << 16 : "Cannot use column names larger than 64KiB, was " + colName.length;
 
-        ByteBuffer buffer = ByteBuffer.allocate(6 /* misc */ + 8 /* timestamp */ + colName.length).order(ByteOrder.BIG_ENDIAN);
+        ByteBuffer buffer = ByteBuffer
+                .allocate(6 /* misc */ + 8 /* timestamp */ + colName.length)
+                .order(ByteOrder.BIG_ENDIAN);
 
         buffer.put((byte) ((colName.length >> 8) & 0xFF));
         buffer.put((byte) (colName.length & 0xFF));
@@ -134,8 +153,8 @@ static ByteBuffer makeCompositeBuffer(byte[] colName, long ts) {
         return buffer;
     }
 
-    static Pair<byte[], Long> decompose(ByteBuffer composite) {
-        composite = composite.slice().order(ByteOrder.BIG_ENDIAN);
+    static Pair<byte[], Long> decompose(ByteBuffer inputComposite) {
+        ByteBuffer composite = inputComposite.slice().order(ByteOrder.BIG_ENDIAN);
 
         short len = composite.getShort();
         byte[] colName = new byte[len];
@@ -148,7 +167,7 @@ static Pair<byte[], Long> decompose(ByteBuffer composite) {
         Validate.isTrue(shouldBe8 == 8);
         long ts = composite.getLong();
 
-        return Pair.create(colName, (~ts));
+        return Pair.create(colName, ~ts);
     }
 
     /**
@@ -188,7 +207,7 @@ static Map<ByteBuffer, List<ColumnOrSuperColumn>> getColsByKey(List<KeySlice> fi
     }
 
     // /Obviously/ this is long (internal cassandra timestamp) + long (internal cassandra clock sequence and node id)
-    static String convertCassandraByteBufferUUIDtoString(ByteBuffer uuid) {
+    static String convertCassandraByteBufferUuidToString(ByteBuffer uuid) {
         return new UUID(uuid.getLong(uuid.position()), uuid.getLong(uuid.position() + 8)).toString();
     }
 
@@ -205,8 +224,8 @@ static String buildErrorMessage(String prefix, Map<String, Throwable> errorsByHo
 
 
     static String getFilteredStackTrace(String filter) {
-        Exception e = new Exception();
-        StackTraceElement[] stackTrace = e.getStackTrace();
+        Exception ex = new Exception();
+        StackTraceElement[] stackTrace = ex.getStackTrace();
         StringBuilder sb = new StringBuilder();
         for (StackTraceElement element : stackTrace) {
             if (element.getClassName().contains(filter)) {
@@ -216,7 +235,7 @@ static String getFilteredStackTrace(String filter) {
         return sb.toString();
     }
 
-    static interface ThreadSafeResultVisitor extends Visitor<Map<ByteBuffer, List<ColumnOrSuperColumn>>> {
+    interface ThreadSafeResultVisitor extends Visitor<Map<ByteBuffer, List<ColumnOrSuperColumn>>> {
         // marker
     }
 
@@ -225,7 +244,7 @@ static class StartTsResultsCollector implements ThreadSafeResultVisitor {
         final ValueExtractor extractor = new ValueExtractor(collectedResults);
         final long startTs;
 
-        public StartTsResultsCollector(long startTs) {
+        StartTsResultsCollector(long startTs) {
             this.startTs = startTs;
         }
 
@@ -244,7 +263,7 @@ public synchronized void visit(Map<ByteBuffer, List<ColumnOrSuperColumn>> result
         }
     }
 
-    static private void extractTimestampResults(@Output Multimap<Cell, Long> ret,
+    private static void extractTimestampResults(@Output Multimap<Cell, Long> ret,
                                                 Map<ByteBuffer, List<ColumnOrSuperColumn>> results) {
         for (Entry<ByteBuffer, List<ColumnOrSuperColumn>> result : results.entrySet()) {
             byte[] row = CassandraKeyValueServices.getBytesFromByteBuffer(result.getKey());
@@ -255,32 +274,37 @@ static private void extractTimestampResults(@Output Multimap<Cell, Long> ret,
         }
     }
 
-    static protected int convertTtl(final long durationMillis, TimeUnit sourceTimeUnit) {
+    protected static int convertTtl(final long durationMillis, TimeUnit sourceTimeUnit) {
         long ttlSeconds = TimeUnit.SECONDS.convert(durationMillis, sourceTimeUnit);
-        Preconditions.checkArgument((ttlSeconds > 0 && ttlSeconds < Integer.MAX_VALUE), "Expiration time must be between 0 and ~68 years");
+        Preconditions.checkArgument(ttlSeconds > 0 && ttlSeconds < Integer.MAX_VALUE,
+                "Expiration time must be between 0 and ~68 years");
         return (int) ttlSeconds;
     }
 
     // because unfortunately .equals takes into account if fields with defaults are populated or not
-    // also because compression_options after serialization / deserialization comes back as blank for the ones we set 4K chunk on... ?!
-    public static final boolean isMatchingCf(CfDef clientSide, CfDef clusterSide) {
+    // also because compression_options after serialization / deserialization comes back as blank
+    // for the ones we set 4K chunk on... ?!
+    public static boolean isMatchingCf(CfDef clientSide, CfDef clusterSide) {
         String tableName = clientSide.name;
         if (!Objects.equal(clientSide.compaction_strategy_options, clusterSide.compaction_strategy_options)) {
-            log.debug("Found client/server disagreement on compaction strategy options for {}. (client = ({}), server = ({}))",
+            log.debug("Found client/server disagreement on compaction strategy options for {}."
+                    + " (client = ({}), server = ({}))",
                     tableName,
                     clientSide.compaction_strategy_options,
                     clusterSide.compaction_strategy_options);
             return false;
         }
         if (clientSide.gc_grace_seconds != clusterSide.gc_grace_seconds) {
-            log.debug("Found client/server disagreement on gc_grace_seconds for {}. (client = ({}), server = ({}))",
+            log.debug("Found client/server disagreement on gc_grace_seconds for {}."
+                    + " (client = ({}), server = ({}))",
                     tableName,
                     clientSide.gc_grace_seconds,
                     clusterSide.gc_grace_seconds);
             return false;
         }
         if (clientSide.bloom_filter_fp_chance != clusterSide.bloom_filter_fp_chance) {
-            log.debug("Found client/server disagreement on bloom filter false positive chance for {}. (client = ({}), server = ({}))",
+            log.debug("Found client/server disagreement on bloom filter false positive chance for {}."
+                    + " (client = ({}), server = ({}))",
                     tableName,
                     clientSide.bloom_filter_fp_chance,
                     clusterSide.bloom_filter_fp_chance);
@@ -288,21 +312,24 @@ public static final boolean isMatchingCf(CfDef clientSide, CfDef clusterSide) {
         }
         if (!(clientSide.compression_options.get(CassandraConstants.CFDEF_COMPRESSION_CHUNK_LENGTH_KEY).equals(
                 clusterSide.compression_options.get(CassandraConstants.CFDEF_COMPRESSION_CHUNK_LENGTH_KEY)))) {
-            log.debug("Found client/server disagreement on compression chunk length for {}. (client = ({}), server = ({}))",
+            log.debug("Found client/server disagreement on compression chunk length for {}."
+                    + " (client = ({}), server = ({}))",
                     tableName,
                     clientSide.compression_options.get(CassandraConstants.CFDEF_COMPRESSION_CHUNK_LENGTH_KEY),
                     clusterSide.compression_options.get(CassandraConstants.CFDEF_COMPRESSION_CHUNK_LENGTH_KEY));
             return false;
         }
         if (!Objects.equal(clientSide.compaction_strategy, clusterSide.compaction_strategy)) {
-            log.debug("Found client/server disagreement on compaction_strategy for {}. (client = ({}), server = ({}))",
+            log.debug("Found client/server disagreement on compaction_strategy for {}."
+                    + " (client = ({}), server = ({}))",
                     tableName,
                     clientSide.compaction_strategy,
                     clusterSide.compaction_strategy);
             return false;
         }
         if (clientSide.isSetPopulate_io_cache_on_flush() != clusterSide.isSetPopulate_io_cache_on_flush()) {
-            log.debug("Found client/server disagreement on populate_io_cache_on_flush for {}. (client = ({}), server = ({}))",
+            log.debug("Found client/server disagreement on populate_io_cache_on_flush for {}."
+                    + " (client = ({}), server = ({}))",
                     tableName,
                     clientSide.isSetPopulate_io_cache_on_flush(),
                     clusterSide.isSetPopulate_io_cache_on_flush());
@@ -313,7 +340,9 @@ public static final boolean isMatchingCf(CfDef clientSide, CfDef clusterSide) {
     }
 
     public static boolean isEmptyOrInvalidMetadata(byte[] metadata) {
-        if (metadata == null || Arrays.equals(metadata, AtlasDbConstants.EMPTY_TABLE_METADATA) || Arrays.equals(metadata, AtlasDbConstants.GENERIC_TABLE_METADATA)) {
+        if (metadata == null
+                || Arrays.equals(metadata, AtlasDbConstants.EMPTY_TABLE_METADATA)
+                || Arrays.equals(metadata, AtlasDbConstants.GENERIC_TABLE_METADATA)) {
             return true;
         }
         return false;
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java
index 58fbc8b02a3..96b6e47f6b9 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraTimestampBoundStore.java
@@ -52,10 +52,14 @@ public final class CassandraTimestampBoundStore implements TimestampBoundStore {
     private static final String ROW_AND_COLUMN_NAME = "ts";
 
     public static final TableMetadata TIMESTAMP_TABLE_METADATA = new TableMetadata(
-        NameMetadataDescription.create(ImmutableList.of(new NameComponentDescription("timestamp_name", ValueType.STRING))),
-        new ColumnMetadataDescription(ImmutableList.of(
-            new NamedColumnDescription(ROW_AND_COLUMN_NAME, "current_max_ts", ColumnValueDescription.forType(ValueType.FIXED_LONG)))),
-        ConflictHandler.IGNORE_ALL);
+            NameMetadataDescription.create(ImmutableList.of(
+                    new NameComponentDescription("timestamp_name", ValueType.STRING))),
+            new ColumnMetadataDescription(ImmutableList.of(
+                new NamedColumnDescription(
+                        ROW_AND_COLUMN_NAME,
+                        "current_max_ts",
+                        ColumnValueDescription.forType(ValueType.FIXED_LONG)))),
+            ConflictHandler.IGNORE_ALL);
 
     private static final long INITIAL_VALUE = 10000L;
 
@@ -71,7 +75,7 @@ public static TimestampBoundStore create(CassandraKeyValueService kvs) {
     }
 
     private CassandraTimestampBoundStore(CassandraClientPool clientPool) {
-        this.clientPool = Preconditions.checkNotNull(clientPool);
+        this.clientPool = Preconditions.checkNotNull(clientPool, "clientPool cannot be null");
     }
 
     @Override
@@ -119,7 +123,7 @@ private void cas(Client client, Long oldVal, long newVal) {
             result = client.cas(
                     getRowName(),
                     AtlasDbConstants.TIMESTAMP_TABLE.getQualifiedName(),
-                    oldVal == null ? ImmutableList.<Column> of() : ImmutableList.of(makeColumn(oldVal)),
+                    oldVal == null ? ImmutableList.of() : ImmutableList.of(makeColumn(oldVal)),
                     ImmutableList.of(makeColumn(newVal)),
                     ConsistencyLevel.SERIAL,
                     ConsistencyLevel.EACH_QUORUM);
@@ -129,12 +133,14 @@ private void cas(Client client, Long oldVal, long newVal) {
         }
         if (!result.isSuccess()) {
             String msg = "Timestamp limit changed underneath us (limit in memory: " + currentLimit
-                    + "). This may indicate that "
-                    + "another timestamp service is running against this cassandra keyspace!";
-            MultipleRunningTimestampServiceError e = new MultipleRunningTimestampServiceError(msg);
-            log.error(msg, e);
-            lastWriteException = e;
-            throw e;
+                    + "). This may indicate that another timestamp service is running against this cassandra keyspace."
+                    + " This is likely caused by multiple copies of a service running without a configured set of"
+                    + " leaders or a CLI being run with an embedded timestamp service against an already running"
+                    + " service.";
+            MultipleRunningTimestampServiceError err = new MultipleRunningTimestampServiceError(msg);
+            log.error(msg, err);
+            lastWriteException = err;
+            throw err;
         } else {
             lastWriteException = null;
             currentLimit = newVal;
@@ -150,7 +156,9 @@ private Column makeColumn(long ts) {
     }
 
     private static byte[] getColumnName() {
-        return CassandraKeyValueServices.makeCompositeBuffer(PtBytes.toBytes(ROW_AND_COLUMN_NAME), CASSANDRA_TIMESTAMP).array();
+        return CassandraKeyValueServices
+                .makeCompositeBuffer(PtBytes.toBytes(ROW_AND_COLUMN_NAME), CASSANDRA_TIMESTAMP)
+                .array();
     }
 
     private static ByteBuffer getRowName() {
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java
index a4a8e329322..cbc0ab1170c 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/CassandraVerifier.java
@@ -16,20 +16,18 @@
 package com.palantir.atlasdb.keyvalue.cassandra;
 
 import java.net.InetSocketAddress;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.cassandra.thrift.Cassandra;
 import org.apache.cassandra.thrift.Cassandra.Client;
-import org.apache.cassandra.thrift.CfDef;
 import org.apache.cassandra.thrift.EndpointDetails;
 import org.apache.cassandra.thrift.InvalidRequestException;
 import org.apache.cassandra.thrift.KsDef;
-import org.apache.cassandra.thrift.SchemaDisagreementException;
 import org.apache.cassandra.thrift.TokenRange;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,31 +47,35 @@
 import com.palantir.common.base.FunctionCheckedException;
 import com.palantir.common.collect.Maps2;
 
-
-public class CassandraVerifier {
+public final class CassandraVerifier {
     private static final Logger log = LoggerFactory.getLogger(CassandraVerifier.class);
 
-    static final FunctionCheckedException<Cassandra.Client, Void, Exception> healthCheck = new FunctionCheckedException<Cassandra.Client, Void, Exception>() {
-        @Override
-        public Void apply(Cassandra.Client client) throws Exception {
-            client.describe_version();
-            return null;
-        }
+    private CassandraVerifier() {
+        // Utility class
+    }
+
+    static final FunctionCheckedException<Cassandra.Client, Void, Exception> healthCheck = client -> {
+        client.describe_version();
+        return null;
     };
 
-    static Set<String> sanityCheckDatacenters(Cassandra.Client client, int desiredRf, boolean safetyDisabled) throws InvalidRequestException, TException {
+    static Set<String> sanityCheckDatacenters(Cassandra.Client client, int desiredRf, boolean safetyDisabled)
+            throws TException {
         Set<String> hosts = Sets.newHashSet();
         Multimap<String, String> dataCenterToRack = HashMultimap.create();
 
         List<String> existingKeyspaces = Lists.transform(client.describe_keyspaces(), KsDef::getName);
         if (!existingKeyspaces.contains(CassandraConstants.SIMPLE_RF_TEST_KEYSPACE)) {
             client.system_add_keyspace(
-                    new KsDef(CassandraConstants.SIMPLE_RF_TEST_KEYSPACE, CassandraConstants.SIMPLE_STRATEGY, ImmutableList.<CfDef>of())
-                    .setStrategy_options(ImmutableMap.of(CassandraConstants.REPLICATION_FACTOR_OPTION, "1")));
+                    new KsDef(
+                            CassandraConstants.SIMPLE_RF_TEST_KEYSPACE,
+                            CassandraConstants.SIMPLE_STRATEGY,
+                            ImmutableList.of())
+                            .setStrategy_options(ImmutableMap.of(CassandraConstants.REPLICATION_FACTOR_OPTION, "1")));
         }
         List<TokenRange> ring =  client.describe_ring(CassandraConstants.SIMPLE_RF_TEST_KEYSPACE);
 
-        for (TokenRange tokenRange: ring) {
+        for (TokenRange tokenRange : ring) {
             for (EndpointDetails details : tokenRange.getEndpoint_details()) {
                 dataCenterToRack.put(details.datacenter, details.rack);
                 hosts.add(details.host);
@@ -83,17 +85,19 @@ static Set<String> sanityCheckDatacenters(Cassandra.Client client, int desiredRf
         if (dataCenterToRack.size() == 1) {
             String dc = dataCenterToRack.keySet().iterator().next();
             String rack = dataCenterToRack.values().iterator().next();
-            if (dc.equals(CassandraConstants.DEFAULT_DC) && rack.equals(CassandraConstants.DEFAULT_RACK) && desiredRf > 1) {
+            if (dc.equals(CassandraConstants.DEFAULT_DC) && rack.equals(CassandraConstants.DEFAULT_RACK)
+                    && desiredRf > 1) {
                 // We don't allow greater than RF=1 because they didn't set up their network.
-                logErrorOrThrow("The cassandra cluster is not set up to be datacenter and rack aware.  " +
-                        "Please set this up before running with a replication factor higher than 1.", safetyDisabled);
+                logErrorOrThrow("The cassandra cluster is not set up to be datacenter and rack aware.  "
+                        + "Please set this up before running with a replication factor higher than 1.", safetyDisabled);
 
             }
             if (dataCenterToRack.values().size() < desiredRf && hosts.size() > desiredRf) {
-                logErrorOrThrow("The cassandra cluster only has one DC, " +
-                        "and is set up with less racks than the desired number of replicas, " +
-                        "and there are more hosts than the replication factor. " +
-                        "It is very likely that your rack configuration is incorrect and replicas would not be placed correctly for the failure tolerance you want.", safetyDisabled);
+                logErrorOrThrow("The cassandra cluster only has one DC, "
+                        + "and is set up with less racks than the desired number of replicas, "
+                        + "and there are more hosts than the replication factor. "
+                        + "It is very likely that your rack configuration is incorrect and replicas "
+                        + "would not be placed correctly for the failure tolerance you want.", safetyDisabled);
             }
         }
 
@@ -108,7 +112,8 @@ static void sanityCheckTableName(TableReference tableRef) {
     }
 
     static void logErrorOrThrow(String errorMessage, boolean safetyDisabled) {
-        String safetyMessage = " This would have normally resulted in Palantir exiting, however safety checks have been disabled.";
+        String safetyMessage = " This would have normally resulted in Palantir exiting,"
+                + " however safety checks have been disabled.";
         if (safetyDisabled) {
             log.error(errorMessage + safetyMessage);
         } else {
@@ -127,53 +132,96 @@ static void validatePartitioner(Cassandra.Client client, CassandraKeyValueServic
         }
     }
 
-    static void ensureKeyspaceExistsAndIsUpToDate(CassandraClientPool clientPool, CassandraKeyValueServiceConfig config) throws InvalidRequestException, TException, SchemaDisagreementException {
+    static void ensureKeyspaceExistsAndIsUpToDate(CassandraClientPool clientPool, CassandraKeyValueServiceConfig config)
+            throws TException {
         try {
             clientPool.run(new FunctionCheckedException<Cassandra.Client, Void, TException>() {
                 @Override
                 public Void apply(Cassandra.Client client) throws TException {
                     KsDef originalKsDef = client.describe_keyspace(config.keyspace());
                     KsDef modifiedKsDef = originalKsDef.deepCopy();
-                    CassandraVerifier.checkAndSetReplicationFactor(client, modifiedKsDef, false, config.replicationFactor(), config.safetyDisabled());
+                    CassandraVerifier.checkAndSetReplicationFactor(
+                            client,
+                            modifiedKsDef,
+                            false,
+                            config.replicationFactor(),
+                            config.safetyDisabled());
 
                     if (!modifiedKsDef.equals(originalKsDef)) {
-                        modifiedKsDef.setCf_defs(ImmutableList.<CfDef>of()); // Can't call system_update_keyspace to update replication factor if CfDefs are set
+                        // Can't call system_update_keyspace to update replication factor if CfDefs are set
+                        modifiedKsDef.setCf_defs(ImmutableList.of());
                         client.system_update_keyspace(modifiedKsDef);
-                        CassandraKeyValueServices.waitForSchemaVersions(client, "(updating the existing keyspace)", config.schemaMutationTimeoutMillis());
+                        CassandraKeyValueServices.waitForSchemaVersions(
+                                client,
+                                "(updating the existing keyspace)",
+                                config.schemaMutationTimeoutMillis());
                     }
 
                     return null;
                 }
             });
-        } catch (ClientCreationFailedException e) { // We can't use the pool yet because it does things like setting the keyspace of that connection for us
+        } catch (ClientCreationFailedException e) {
+            // We can't use the pool yet because it does things like setting the keyspace of that connection for us
             boolean someHostWasAbleToCreateTheKeyspace = false;
             for (InetSocketAddress host : config.servers()) { // try until we find a server that works
                 try {
-                    Client client = CassandraClientFactory.getClientInternal(host, config.credentials(),
-                            config.ssl(), config.socketTimeoutMillis(), config.socketQueryTimeoutMillis());
-                    KsDef ks = new KsDef(config.keyspace(), CassandraConstants.NETWORK_STRATEGY, ImmutableList.<CfDef>of());
-                    CassandraVerifier.checkAndSetReplicationFactor(client, ks, true, config.replicationFactor(), config.safetyDisabled());
+                    Client client = CassandraClientFactory.getClientInternal(host, config);
+                    KsDef ks = new KsDef(config.keyspace(), CassandraConstants.NETWORK_STRATEGY, ImmutableList.of());
+                    CassandraVerifier.checkAndSetReplicationFactor(
+                            client,
+                            ks,
+                            true,
+                            config.replicationFactor(),
+                            config.safetyDisabled());
                     ks.setDurable_writes(true);
+                    log.info("Creating keyspace: {}", config.keyspace());
                     client.system_add_keyspace(ks);
-                    CassandraKeyValueServices.waitForSchemaVersions(client, "(adding the initial empty keyspace)", config.schemaMutationTimeoutMillis());
+                    CassandraKeyValueServices.waitForSchemaVersions(
+                            client,
+                            "(adding the initial empty keyspace)",
+                            config.schemaMutationTimeoutMillis());
 
                     // if we got this far, we're done, no need to continue on other hosts
                     someHostWasAbleToCreateTheKeyspace = true;
                     break;
+                } catch (InvalidRequestException ire) {
+                    if (attemptedToCreateKeyspaceTwice(ire)) {
+                        log.info("Attempted to create keyspace {} on multiple hosts at once", config.keyspace());
+
+                        // if we got this far, we're done, no need to continue on other hosts
+                        someHostWasAbleToCreateTheKeyspace = true;
+                        break;
+                    } else {
+                        throw ire;
+                    }
                 } catch (Exception f) {
-                    log.error("Couldn't use host {} to create keyspace, it returned exception \"{}\" during the attempt.", host, f.toString(), f);
+                    log.error("Couldn't use host {} to create keyspace, it returned exception \"{}\" during"
+                            + " the attempt.", host, f.toString(), f);
                 }
             }
-            if (someHostWasAbleToCreateTheKeyspace) {
-                return;
-            } else {
+            if (!someHostWasAbleToCreateTheKeyspace) {
                 throw new TException("No host tried was able to create the keyspace requested.");
             }
         }
     }
 
-    static void checkAndSetReplicationFactor(Cassandra.Client client, KsDef ks, boolean freshInstance, int desiredRf, boolean safetyDisabled)
-            throws InvalidRequestException, SchemaDisagreementException, TException {
+    private static boolean attemptedToCreateKeyspaceTwice(InvalidRequestException ex) {
+        String exceptionString = ex.toString();
+        if (exceptionString.contains("case-insensitively unique")) {
+            String[] keyspaceNames = StringUtils.substringsBetween(exceptionString, "\"", "\"");
+            if (keyspaceNames.length == 2 && keyspaceNames[0].equals(keyspaceNames[1])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    static void checkAndSetReplicationFactor(
+            Cassandra.Client client,
+            KsDef ks,
+            boolean freshInstance,
+            int desiredRf,
+            boolean safetyDisabled) throws TException {
         if (freshInstance) {
             Set<String> dcs = CassandraVerifier.sanityCheckDatacenters(client, desiredRf, safetyDisabled);
             // If RF exceeds # hosts, then Cassandra will reject writes
@@ -183,13 +231,14 @@ static void checkAndSetReplicationFactor(Cassandra.Client client, KsDef ks, bool
 
         final Set<String> dcs;
         if (CassandraConstants.SIMPLE_STRATEGY.equals(ks.getStrategy_class())) {
-            int currentRF = Integer.parseInt(ks.getStrategy_options().get(CassandraConstants.REPLICATION_FACTOR_OPTION));
-            String errorMessage = "This cassandra cluster is running using the simple partitioning strategy.  " +
-                    "This partitioner is not rack aware and is not intended for use on prod.  " +
-                    "This will have to be fixed by manually configuring to the network partitioner " +
-                    "and running the appropriate repairs.  " +
-                    "Contact the AtlasDB team to perform these steps.";
-            if (currentRF != 1) {
+            int currentRf = Integer.parseInt(ks.getStrategy_options().get(
+                    CassandraConstants.REPLICATION_FACTOR_OPTION));
+            String errorMessage = "This cassandra cluster is running using the simple partitioning strategy."
+                    + " This partitioner is not rack aware and is not intended for use on prod."
+                    + " This will have to be fixed by manually configuring to the network partitioner"
+                    + " and running the appropriate repairs."
+                    + " Contact the AtlasDB team to perform these steps.";
+            if (currentRf != 1) {
                 logErrorOrThrow(errorMessage, safetyDisabled);
             }
             // Automatically convert RF=1 to look like network partitioner.
@@ -208,48 +257,33 @@ static void checkAndSetReplicationFactor(Cassandra.Client client, KsDef ks, bool
         Map<String, String> strategyOptions = Maps.newHashMap(ks.getStrategy_options());
         for (String dc : dcs) {
             if (strategyOptions.get(dc) == null) {
-                logErrorOrThrow("The datacenter for this cassandra cluster is invalid. " +
-                        " failed dc: " + dc +
-                        "  strategyOptions: " + strategyOptions, safetyDisabled);
+                logErrorOrThrow("The datacenter for this cassandra cluster is invalid. "
+                        + " failed dc: " + dc
+                        + "  strategyOptions: " + strategyOptions, safetyDisabled);
             }
         }
 
         String dc = dcs.iterator().next();
 
-        int currentRF = Integer.parseInt(strategyOptions.get(dc));
+        int currentRf = Integer.parseInt(strategyOptions.get(dc));
 
         // We need to worry about user not running repair and user skipping replication levels.
-        if (currentRF != desiredRf) {
-            throw new UnsupportedOperationException("Your current Cassandra keyspace (" + ks.getName() +
-                    ") has a replication factor not matching your Atlas Cassandra configuration. " +
-                    "Change them to match, but be mindful of what steps you'll need to " +
-                    "take to correctly repair or cleanup existing data in your cluster.");
+        if (currentRf != desiredRf) {
+            throw new UnsupportedOperationException("Your current Cassandra keyspace (" + ks.getName()
+                    + ") has a replication factor not matching your Atlas Cassandra configuration."
+                    + " Change them to match, but be mindful of what steps you'll need to"
+                    + " take to correctly repair or cleanup existing data in your cluster.");
         }
     }
 
-    final static FunctionCheckedException<Cassandra.Client, Boolean, UnsupportedOperationException> underlyingCassandraClusterSupportsCASOperations = new FunctionCheckedException<Client, Boolean, UnsupportedOperationException>() {
-        @Override
-        public Boolean apply(Client client) throws UnsupportedOperationException {
-            try {
-                String versionString = client.describe_version();
-                String[] components = versionString.split("\\.");
-                if (components.length != 3) {
-                    throw new UnsupportedOperationException(String.format("Illegal version of Thrift protocol detected; expected format '#.#.#', got '%s'", Arrays.toString(components)));
-                }
-                int majorVersion = Integer.parseInt(components[0]);
-                int minorVersion = Integer.parseInt(components[1]);
-                int patchVersion = Integer.parseInt(components[2]);
-
-                // see cassandra's 'interface/cassandra.thrift'
-                if (majorVersion >= 19 && minorVersion >= 37 && patchVersion >= 0) {
-                    return true;
-                } else {
-                    return false;
+    static final FunctionCheckedException<Cassandra.Client, Boolean, UnsupportedOperationException>
+            underlyingCassandraClusterSupportsCASOperations = client -> {
+                try {
+                    CassandraApiVersion serverVersion = new CassandraApiVersion(client.describe_version());
+                    return serverVersion.supportsCheckAndSet();
+                } catch (TException ex) {
+                    throw new UnsupportedOperationException("Couldn't determine underlying cassandra version;"
+                            + " received an exception while checking the thrift version.", ex);
                 }
-            } catch (TException e) {
-                throw new UnsupportedOperationException("Couldn't determine underlying cassandra version; received an exception while checking the thrift version.", e);
-            }
-        }
-    };
-
+            };
 }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java
new file mode 100644
index 00000000000..e317ad311be
--- /dev/null
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HiddenTables.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+
+public class HiddenTables {
+    private static final Set<TableReference> HIDDEN_TABLES = ImmutableSet.of(
+            AtlasDbConstants.TIMESTAMP_TABLE,
+            AtlasDbConstants.METADATA_TABLE);
+
+    public boolean isHidden(TableReference tableReference) {
+        return HIDDEN_TABLES.contains(tableReference)
+                || tableReference.getTablename().startsWith(SchemaMutationLockTables.LOCK_TABLE_PREFIX);
+    }
+}
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HistoryExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HistoryExtractor.java
index 4a4ed9511fe..53cb26ac37e 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HistoryExtractor.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/HistoryExtractor.java
@@ -36,7 +36,7 @@ public ResultsExtractor<SetMultimap<Cell, Value>, Set<Value>> get() {
         }
     };
 
-    public HistoryExtractor(SetMultimap<Cell, Value> collector) {
+    HistoryExtractor(SetMultimap<Cell, Value> collector) {
         super(collector);
     }
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ManyHostPoolingContainer.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ManyHostPoolingContainer.java
index f0934d8398d..34411fa2c25 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ManyHostPoolingContainer.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ManyHostPoolingContainer.java
@@ -22,8 +22,9 @@
 import com.palantir.common.pooling.PoolingContainer;
 
 public interface ManyHostPoolingContainer<T> extends PoolingContainer<T> {
-    <V, K extends Exception> V runWithPooledResourceOnHost(InetAddress host,
-                                                           FunctionCheckedException<T, V, K> f) throws K;
+    <V, K extends Exception> V runWithPooledResourceOnHost(
+            InetAddress host,
+            FunctionCheckedException<T, V, K> fn) throws K;
 
-    <V> V runWithPooledResourceOnHost(InetAddress host, Function<T, V> f);
+    <V> V runWithPooledResourceOnHost(InetAddress host, Function<T, V> fn);
 }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java
index 0b76bdefb33..5b687719800 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ResultsExtractor.java
@@ -38,13 +38,14 @@
 abstract class ResultsExtractor<T, U> {
     protected final T collector;
 
-    public ResultsExtractor(T collector) {
+    ResultsExtractor(T collector) {
         this.collector = collector;
     }
 
-    public final byte[] extractResults(Map<ByteBuffer, List<ColumnOrSuperColumn>> colsByKey,
-                                       long startTs,
-                                       ColumnSelection selection) {
+    public final byte[] extractResults(
+            Map<ByteBuffer, List<ColumnOrSuperColumn>> colsByKey,
+            long startTs,
+            ColumnSelection selection) {
         byte[] maxRow = null;
         for (Entry<ByteBuffer, List<ColumnOrSuperColumn>> colEntry : colsByKey.entrySet()) {
             byte[] row = CassandraKeyValueServices.getBytesFromByteBuffer(colEntry.getKey());
@@ -72,17 +73,19 @@ public TokenBackedBasicResultsPage<RowResult<U>, byte[]> getPageFromRangeResults
         return getRowResults(endExclusive, lastRow, resultsByRow);
     }
 
-    public static <T> TokenBackedBasicResultsPage<RowResult<T>, byte[]> getRowResults(final byte[] endExclusive,
-                                                                                      byte[] lastRow, SortedMap<byte[], SortedMap<byte[], T>> resultsByRow) {
+    public static <T> TokenBackedBasicResultsPage<RowResult<T>, byte[]> getRowResults(
+            byte[] endExclusive,
+            byte[] lastRow,
+            SortedMap<byte[], SortedMap<byte[], T>> resultsByRow) {
         SortedMap<byte[], RowResult<T>> ret = RowResults.viewOfSortedMap(resultsByRow);
         if (lastRow == null || RangeRequests.isLastRowName(lastRow)) {
-            return new SimpleTokenBackedResultsPage<RowResult<T>, byte[]>(endExclusive, ret.values(), false);
+            return new SimpleTokenBackedResultsPage<>(endExclusive, ret.values(), false);
         }
         byte[] nextStart = RangeRequests.nextLexicographicName(lastRow);
         if (Arrays.equals(nextStart, endExclusive)) {
-            return new SimpleTokenBackedResultsPage<RowResult<T>, byte[]>(endExclusive, ret.values(), false);
+            return new SimpleTokenBackedResultsPage<>(endExclusive, ret.values(), false);
         }
-        return new SimpleTokenBackedResultsPage<RowResult<T>, byte[]>(nextStart, ret.values(), true);
+        return new SimpleTokenBackedResultsPage<>(nextStart, ret.values(), true);
     }
 
     public abstract void internalExtractResult(long startTs,
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java
new file mode 100644
index 00000000000..58088233ce4
--- /dev/null
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/RowColumnRangeExtractor.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import java.nio.ByteBuffer;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ColumnOrSuperColumn;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.util.Pair;
+
+class RowColumnRangeExtractor {
+    static class RowColumnRangeResult {
+        private final Map<byte[], LinkedHashMap<Cell, Value>> results;
+        private final Map<byte[], Column> rowsToLastCompositeColumns;
+        private final Set<byte[]> emptyRows;
+        private final Map<byte[], Integer> rowsToRawColumnCount;
+
+        RowColumnRangeResult(
+                Map<byte[], LinkedHashMap<Cell, Value>> results,
+                Map<byte[], Column> rowsToLastCompositeColumns,
+                Set<byte[]> emptyRows,
+                Map<byte[], Integer> rowsToRawColumnCount) {
+            this.results = results;
+            this.rowsToLastCompositeColumns = rowsToLastCompositeColumns;
+            this.emptyRows = emptyRows;
+            this.rowsToRawColumnCount = rowsToRawColumnCount;
+        }
+
+        public Map<byte[], LinkedHashMap<Cell, Value>> getResults() {
+            return results;
+        }
+
+        public Map<byte[], Column> getRowsToLastCompositeColumns() {
+            return rowsToLastCompositeColumns;
+        }
+
+        public Set<byte[]> getEmptyRows() {
+            return emptyRows;
+        }
+
+        public Map<byte[], Integer> getRowsToRawColumnCount() {
+            return rowsToRawColumnCount;
+        }
+    }
+
+    private final Map<byte[], LinkedHashMap<Cell, Value>> collector = Maps.newHashMap();
+    private final Map<byte[], Column> rowsToLastCompositeColumns = Maps.newHashMap();
+    private final Map<byte[], Integer> rowsToRawColumnCount = Maps.newHashMap();
+    private final Set<byte[]> emptyRows = Sets.newHashSet();
+
+    public void extractResults(Map<ByteBuffer, List<ColumnOrSuperColumn>> colsByKey,
+                                                long startTs) {
+        for (Map.Entry<ByteBuffer, List<ColumnOrSuperColumn>> colEntry : colsByKey.entrySet()) {
+            byte[] row = CassandraKeyValueServices.getBytesFromByteBuffer(colEntry.getKey());
+            List<ColumnOrSuperColumn> columns = colEntry.getValue();
+            if (!columns.isEmpty()) {
+                rowsToLastCompositeColumns.put(row, columns.get(columns.size() - 1).column);
+            } else {
+                emptyRows.add(row);
+            }
+            rowsToRawColumnCount.put(row, columns.size());
+            for (ColumnOrSuperColumn c : colEntry.getValue()) {
+                Pair<byte[], Long> pair = CassandraKeyValueServices.decomposeName(c.column);
+                internalExtractResult(startTs, row, pair.lhSide, c.column.getValue(), pair.rhSide);
+            }
+        }
+    }
+
+    public void internalExtractResult(long startTs,
+                                      byte[] row,
+                                      byte[] col,
+                                      byte[] val,
+                                      long ts) {
+        if (ts < startTs) {
+            Cell cell = Cell.create(row, col);
+            if (!collector.containsKey(row)) {
+                collector.put(row, new LinkedHashMap<Cell, Value>());
+                collector.get(row).put(cell, Value.create(val, ts));
+            } else if (!collector.get(row).containsKey(cell)) {
+                collector.get(row).put(cell, Value.create(val, ts));
+            }
+        }
+    }
+
+    public RowColumnRangeResult getRowColumnRangeResult() {
+        return new RowColumnRangeResult(collector, rowsToLastCompositeColumns, emptyRows, rowsToRawColumnCount);
+    }
+}
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLock.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLock.java
new file mode 100644
index 00000000000..d6065f327c1
--- /dev/null
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLock.java
@@ -0,0 +1,249 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.apache.cassandra.thrift.CASResult;
+import org.apache.cassandra.thrift.Cassandra;
+import org.apache.cassandra.thrift.Column;
+import org.apache.cassandra.thrift.ConsistencyLevel;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.primitives.Longs;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.common.base.FunctionCheckedException;
+import com.palantir.common.base.Throwables;
+
+public class SchemaMutationLock {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SchemaMutationLock.class);
+
+    private final boolean supportsCas;
+    private final CassandraKeyValueServiceConfigManager configManager;
+    private final CassandraClientPool clientPool;
+    private final ConsistencyLevel writeConsistency;
+    private final UniqueSchemaMutationLockTable lockTable;
+    private final ReentrantLock schemaMutationLockForEarlierVersionsOfCassandra = new ReentrantLock(true);
+
+    public SchemaMutationLock(
+            boolean supportsCas,
+            CassandraKeyValueServiceConfigManager configManager,
+            CassandraClientPool clientPool,
+            ConsistencyLevel writeConsistency,
+            UniqueSchemaMutationLockTable lockTable) {
+        this.supportsCas = supportsCas;
+        this.configManager = configManager;
+        this.clientPool = clientPool;
+        this.writeConsistency = writeConsistency;
+        this.lockTable = lockTable;
+    }
+
+    public interface Action {
+        void execute() throws Exception;
+    }
+
+    public void runWithLock(Action action) {
+        long lockId = waitForSchemaMutationLock();
+
+        try {
+            action.execute();
+        } catch (Exception e) {
+            throw Throwables.throwUncheckedException(e);
+        } finally {
+            schemaMutationUnlock(lockId);
+        }
+    }
+
+    /**
+     * Each locker generates a random ID per operation and uses a CAS operation as a DB-side lock.
+     *
+     * There are two special ID values used for book-keeping
+     * - one representing the lock being cleared
+     * - one representing a remote ID that is guaranteed to never be generated
+     * This is required because Cassandra CAS does not treat setting to null / empty as a delete,
+     * (though there is a to-do in their code to possibly add this)
+     * though it accepts an empty expected column to mean that non-existance was expected
+     * (see putUnlessExists for example, which has the luck of not having to ever deal with deleted values)
+     *
+     * I can't hold this against them though, because Atlas has a semi-similar problem with empty byte[] values
+     * meaning deleted internally.
+     *
+     * @return an ID to be passed into a subsequent unlock call
+     */
+    private long waitForSchemaMutationLock() {
+        final long perOperationNodeIdentifier = ThreadLocalRandom.current().nextLong(Long.MAX_VALUE - 2);
+
+        try {
+            if (!supportsCas) {
+                LOGGER.info("Because your version of Cassandra does not support check and set,"
+                        + " we will use a java level lock to synchronise schema mutations."
+                        + " If this is a clustered service, this could lead to corruption.");
+                String message = "AtlasDB was unable to get a lock on Cassandra system schema mutations"
+                        + " for your cluster. Likely cause: Service(s) performing heavy schema mutations"
+                        + " in parallel, or extremely heavy Cassandra cluster load.";
+                try {
+                    if (!schemaMutationLockForEarlierVersionsOfCassandra.tryLock(
+                            configManager.getConfig().schemaMutationTimeoutMillis(),
+                            TimeUnit.MILLISECONDS)) {
+                        throw new TimeoutException(message);
+                    }
+                } catch (InterruptedException e) {
+                    throw new TimeoutException(message);
+                }
+                return 0;
+            }
+
+            clientPool.runWithRetry((FunctionCheckedException<Cassandra.Client, Void, Exception>) client -> {
+                Cell globalDdlLockCell = Cell.create(
+                        CassandraConstants.GLOBAL_DDL_LOCK.getBytes(),
+                        CassandraConstants.GLOBAL_DDL_LOCK_COLUMN_NAME.getBytes());
+                ByteBuffer rowName = ByteBuffer.wrap(globalDdlLockCell.getRowName());
+                Column ourUpdate = lockColumnWithValue(Longs.toByteArray(perOperationNodeIdentifier));
+
+                List<Column> expected = ImmutableList.of(lockColumnWithValue(Longs.toByteArray(
+                        CassandraConstants.GLOBAL_DDL_LOCK_CLEARED_VALUE)));
+
+                CASResult casResult = writeLockWithCas(client, rowName, expected, ourUpdate);
+
+                int timesAttempted = 0;
+
+                Stopwatch stopwatch = Stopwatch.createStarted();
+                // could have a timeout controlling this level, confusing for users to set both timeouts though
+                while (!casResult.isSuccess()) {
+                    if (casResult.getCurrent_valuesSize() == 0) { // never has been an existing lock
+                        // special case, no one has ever made a lock ever before
+                        // this becomes analogous to putUnlessExists now
+                        expected = ImmutableList.<Column>of();
+                    } else {
+                        Column existingValue = Iterables.getOnlyElement(casResult.getCurrent_values(), null);
+                        if (existingValue == null) {
+                            throw new IllegalStateException("Something is wrong with underlying locks."
+                                    + " Consult support for guidance on manually examining and clearing"
+                                    + " locks from " + lockTable.getOnlyTable() + " table.");
+                        }
+                        expected = ImmutableList.of(lockColumnWithValue(Longs.toByteArray(
+                                CassandraConstants.GLOBAL_DDL_LOCK_CLEARED_VALUE)));
+                    }
+
+                    int mutationTimeoutMillis = configManager.getConfig().schemaMutationTimeoutMillis();
+                    // possibly dead remote locker
+                    if (stopwatch.elapsed(TimeUnit.MILLISECONDS) > mutationTimeoutMillis * 4) {
+                        throw new TimeoutException(String.format("We have timed out waiting on the current"
+                                + " schema mutation lock holder. We have tried to grab the lock for %d milliseconds"
+                                + " unsuccessfully.  Please try restarting the AtlasDB client. If this occurs"
+                                + " repeatedly it may indicate that the current lock holder has died without"
+                                + " releasing the lock and will require manual intervention. This will require"
+                                + " restarting all atlasDB clients and then using cqlsh to truncate the _locks table."
+                                + " Please contact support for help with this in important situations.",
+                                stopwatch.elapsed(TimeUnit.MILLISECONDS)));
+                    }
+
+                    long timeToSleep = CassandraConstants.TIME_BETWEEN_LOCK_ATTEMPT_ROUNDS_MILLIS
+                            * (long) Math.pow(2, timesAttempted++);
+
+                    Thread.sleep(timeToSleep);
+
+                    casResult = writeLockWithCas(client, rowName, expected, ourUpdate);
+                }
+
+                // we won the lock!
+                return null;
+            });
+        } catch (Exception e) {
+            throw Throwables.throwUncheckedException(e);
+        }
+
+        return perOperationNodeIdentifier;
+    }
+
+    private void schemaMutationUnlock(long perOperationNodeIdentifier) {
+        if (!supportsCas) {
+            schemaMutationLockForEarlierVersionsOfCassandra.unlock();
+            return;
+        }
+
+        try {
+            clientPool.runWithRetry((FunctionCheckedException<Cassandra.Client, Void, Exception>) client -> {
+                Cell globalDdlLockCell = Cell.create(
+                        CassandraConstants.GLOBAL_DDL_LOCK.getBytes(),
+                        CassandraConstants.GLOBAL_DDL_LOCK_COLUMN_NAME.getBytes());
+                ByteBuffer rowName = ByteBuffer.wrap(globalDdlLockCell.getRowName());
+
+                List<Column> ourExpectedLock = ImmutableList.of(lockColumnWithValue(Longs.toByteArray(
+                        perOperationNodeIdentifier)));
+                Column clearedLock = lockColumnWithValue(Longs.toByteArray(
+                        CassandraConstants.GLOBAL_DDL_LOCK_CLEARED_VALUE));
+                CASResult casResult = writeLockWithCas(client, rowName, ourExpectedLock, clearedLock);
+
+                if (!casResult.isSuccess()) {
+                    String remoteLock = "(unknown)";
+                    if (casResult.getCurrent_valuesSize() == 1) {
+                        Column column = Iterables.getOnlyElement(casResult.getCurrent_values(), null);
+                        if (column != null) {
+                            long remoteId = Longs.fromByteArray(column.getValue());
+                            remoteLock = (remoteId == CassandraConstants.GLOBAL_DDL_LOCK_CLEARED_VALUE)
+                                    ? "(Cleared Value)"
+                                    : Long.toString(remoteId);
+                        }
+                    }
+                    throw new IllegalStateException(String.format("Another process cleared our schema mutation lock"
+                            + " from underneath us. Our ID, which we expected, was %s, the value we saw in the"
+                            + " database was instead %s.", Long.toString(perOperationNodeIdentifier), remoteLock));
+                }
+                return null;
+            });
+        } catch (Exception e) {
+            throw Throwables.throwUncheckedException(e);
+        }
+    }
+
+    private CASResult writeLockWithCas(
+            Cassandra.Client client,
+            ByteBuffer rowName,
+            List<Column> expectedLockValue,
+            Column newLockValue) throws TException {
+        return client.cas(
+                rowName,
+                lockTable.getOnlyTable().getQualifiedName(),
+                expectedLockValue,
+                ImmutableList.of(newLockValue),
+                ConsistencyLevel.SERIAL,
+                writeConsistency
+        );
+    }
+
+    private Column lockColumnWithValue(byte[] value) {
+        return new Column()
+                .setName(CassandraKeyValueServices.makeCompositeBuffer(
+                        CassandraConstants.GLOBAL_DDL_LOCK_COLUMN_NAME.getBytes(StandardCharsets.UTF_8),
+                        AtlasDbConstants.TRANSACTION_TS).array())
+                .setValue(value) // expected previous
+                .setTimestamp(AtlasDbConstants.TRANSACTION_TS);
+    }
+}
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLockTables.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLockTables.java
new file mode 100644
index 00000000000..6dff79d1a02
--- /dev/null
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/SchemaMutationLockTables.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.apache.cassandra.thrift.Cassandra;
+import org.apache.cassandra.thrift.CfDef;
+import org.apache.thrift.TException;
+
+import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+
+public class SchemaMutationLockTables {
+    public static final String LOCK_TABLE_PREFIX = "_locks";
+
+    private static final Predicate<String> IS_LOCK_TABLE = table -> table.startsWith(LOCK_TABLE_PREFIX);
+
+    private final CassandraClientPool clientPool;
+    private final CassandraKeyValueServiceConfig config;
+
+    public SchemaMutationLockTables(CassandraClientPool clientPool, CassandraKeyValueServiceConfig config) {
+        this.clientPool = clientPool;
+        this.config = config;
+    }
+
+    public Set<TableReference> getAllLockTables() throws TException {
+        return clientPool.run(this::getAllLockTablesInternal);
+    }
+
+    private Set<TableReference> getAllLockTablesInternal(Cassandra.Client client) throws TException {
+        return client.describe_keyspace(config.keyspace()).getCf_defs().stream()
+                .map(CfDef::getName)
+                .filter(IS_LOCK_TABLE)
+                .map(TableReference::createUnsafe)
+                .collect(Collectors.toSet());
+    }
+
+    public TableReference createLockTable() throws TException {
+        return clientPool.run(this::createLockTable);
+    }
+
+    private TableReference createLockTable(Cassandra.Client client) throws TException {
+        String lockTableName = LOCK_TABLE_PREFIX + "_" + getUniqueSuffix();
+        TableReference lockTable = TableReference.createWithEmptyNamespace(lockTableName);
+        createTableInternal(client, lockTable);
+        return lockTable;
+    }
+
+    private String getUniqueSuffix() {
+        // We replace '-' with '_' as hyphens are forbidden in Cassandra table names.
+        return UUID.randomUUID().toString().replace('-', '_');
+    }
+
+    private void createTableInternal(Cassandra.Client client, TableReference tableRef) throws TException {
+        CfDef cf = CassandraConstants.getStandardCfDef(
+                config.keyspace(),
+                CassandraKeyValueService.internalTableName(tableRef));
+        client.system_add_column_family(cf);
+        CassandraKeyValueServices.waitForSchemaVersions(
+                client,
+                tableRef.getQualifiedName(),
+                config.schemaMutationTimeoutMillis());
+    }
+}
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TimestampExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TimestampExtractor.java
index 04868a46bf2..b01359664c3 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TimestampExtractor.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/TimestampExtractor.java
@@ -35,7 +35,7 @@ public ResultsExtractor<SetMultimap<Cell, Long>, Set<Long>> get() {
         }
     };
 
-    public TimestampExtractor(SetMultimap<Cell, Long> collector) {
+    TimestampExtractor(SetMultimap<Cell, Long> collector) {
         super(collector);
     }
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/UniqueSchemaMutationLockTable.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/UniqueSchemaMutationLockTable.java
new file mode 100644
index 00000000000..0f322d76f54
--- /dev/null
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/UniqueSchemaMutationLockTable.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.atlasdb.keyvalue.cassandra;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.Set;
+
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.config.LockLeader;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.common.base.Throwables;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+public class UniqueSchemaMutationLockTable {
+    private static final Logger log = LoggerFactory.getLogger(UniqueSchemaMutationLockTable.class);
+    private final SchemaMutationLockTables schemaMutationLockTables;
+    private final LockLeader lockLeader;
+
+    public UniqueSchemaMutationLockTable(SchemaMutationLockTables schemaMutationLockTables, LockLeader lockLeader) {
+        this.schemaMutationLockTables = schemaMutationLockTables;
+        this.lockLeader = checkNotNull(lockLeader, "We must know if we are the lock leader");
+    }
+
+    public TableReference getOnlyTable() {
+        try {
+            switch (lockLeader) {
+                case I_AM_THE_LOCK_LEADER:
+                    return ensureLockTableExists();
+                case SOMEONE_ELSE_IS_THE_LOCK_LEADER:
+                    return waitForSomeoneElseToCreateLockTable();
+                default:
+                    throw new RuntimeException(
+                            "We encountered an unknown lock leader status, please contact the AtlasDB team");
+            }
+        } catch (TException e) {
+            throw Throwables.rewrapAndThrowUncheckedException(e);
+        }
+    }
+
+    @SuppressFBWarnings("SWL_SLEEP_WITH_LOCK_HELD")
+    private synchronized TableReference waitForSomeoneElseToCreateLockTable() throws TException {
+        while (schemaMutationLockTables.getAllLockTables().isEmpty()) {
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                log.error("Interrupted while waiting for lock table to be created", e);
+            }
+        }
+
+        return getSingleTable();
+    }
+
+    private synchronized TableReference ensureLockTableExists() throws TException {
+        Set<TableReference> tables = schemaMutationLockTables.getAllLockTables();
+
+        if (tables.isEmpty()) {
+            schemaMutationLockTables.createLockTable();
+        }
+
+        return getSingleTable();
+    }
+
+    private TableReference getSingleTable() throws TException {
+        Set<TableReference> lockTables = schemaMutationLockTables.getAllLockTables();
+
+        if (lockTables.size() > 1) {
+            throw new IllegalStateException("Multiple schema mutation lock tables have been created.\n"
+                    + "This happens when multiple nodes have themselves as lockLeader in the configuration.\n"
+                    + "Please ensure the lockLeader is the same for each node, stop all Atlas clients using this "
+                    + "keyspace, restart your cassandra cluster and delete all created schema mutation lock tables.\n"
+                    + "The tables that clashed were: " + lockTables);
+        }
+
+        return Iterables.getOnlyElement(lockTables);
+    }
+}
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java
index 24ca25df17c..880b2d0cba2 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/ValueExtractor.java
@@ -33,7 +33,7 @@ public ResultsExtractor<Map<Cell, Value>, Value> get() {
         }
     };
 
-    public ValueExtractor(Map<Cell, Value> collector) {
+    ValueExtractor(Map<Cell, Value> collector) {
         super(collector);
     }
 
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxBeanFactory.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxBeanFactory.java
index 20d398288d6..ac54db487e3 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxBeanFactory.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxBeanFactory.java
@@ -30,20 +30,18 @@ public class CassandraJmxBeanFactory {
     private final JMXConnector jmxConnector;
 
     public CassandraJmxBeanFactory(JMXConnector jmxConnector) {
-        this.jmxConnector = Preconditions.checkNotNull(jmxConnector);
+        this.jmxConnector = Preconditions.checkNotNull(jmxConnector, "jmxConnector cannot be null");
     }
 
     public <T> T create(String name, Class<T> interfaceClass) {
-        MBeanServerConnection mBeanServerConnection = null;
+        MBeanServerConnection jmxBeanServerConnection = null;
         ObjectName objectName = null;
         try {
-            mBeanServerConnection = jmxConnector.getMBeanServerConnection();
+            jmxBeanServerConnection = jmxConnector.getMBeanServerConnection();
             objectName = new ObjectName(name);
-        } catch (MalformedObjectNameException e) {
-            Throwables.propagate(e);
-        } catch (IOException e) {
+        } catch (MalformedObjectNameException | IOException e) {
             Throwables.propagate(e);
         }
-        return JMX.newMBeanProxy(mBeanServerConnection, objectName, interfaceClass);
+        return JMX.newMBeanProxy(jmxBeanServerConnection, objectName, interfaceClass);
     }
 }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompaction.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompaction.java
index 9939d5929b4..21321961758 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompaction.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompaction.java
@@ -39,16 +39,17 @@
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
 import com.palantir.atlasdb.keyvalue.cassandra.CassandraConstants;
 
-public class CassandraJmxCompaction {
+public final class CassandraJmxCompaction {
     private static final Logger log = LoggerFactory.getLogger(CassandraJmxCompaction.class);
     private final CassandraKeyValueServiceConfig config;
 
     private CassandraJmxCompaction(CassandraKeyValueServiceConfig config) {
-        this.config = Preconditions.checkNotNull(config);
+        this.config = Preconditions.checkNotNull(config, "config cannot be null");
     }
 
-    public static Optional<CassandraJmxCompactionManager> createJmxCompactionManager(CassandraKeyValueServiceConfigManager configManager) {
-        Preconditions.checkNotNull(configManager);
+    public static Optional<CassandraJmxCompactionManager> createJmxCompactionManager(
+            CassandraKeyValueServiceConfigManager configManager) {
+        Preconditions.checkNotNull(configManager, "configManager cannot be null");
         CassandraKeyValueServiceConfig config = configManager.getConfig();
         CassandraJmxCompaction jmxCompaction = new CassandraJmxCompaction(config);
 
@@ -90,29 +91,47 @@ private void setJmxSslProperty(CassandraJmxCompactionConfig jmxConfig) {
     }
 
     /**
-     * return an empty set if no client can be created
+     * Return an empty set if no client can be created.
      */
     private ImmutableSet<CassandraJmxCompactionClient> createCompactionClients(CassandraJmxCompactionConfig jmxConfig) {
         Set<CassandraJmxCompactionClient> clients = Sets.newHashSet();
         Set<InetSocketAddress> servers = config.servers();
         int jmxPort = jmxConfig.port();
         for (InetSocketAddress addr : servers) {
-            CassandraJmxCompactionClient client = createCompactionClient(addr.getHostString(), jmxPort, jmxConfig.username(), jmxConfig.password());
+            CassandraJmxCompactionClient client =
+                    createCompactionClient(addr.getHostString(), jmxPort, jmxConfig.username(), jmxConfig.password());
             clients.add(client);
         }
 
         return ImmutableSet.copyOf(clients);
     }
 
-    private CassandraJmxCompactionClient createCompactionClient(String host, int port, String username, String password) {
-        CassandraJmxConnectorFactory jmxConnectorFactory = new CassandraJmxConnectorFactory(host, port, username, password);
+    private CassandraJmxCompactionClient createCompactionClient(
+            String host,
+            int port,
+            String username,
+            String password) {
+        CassandraJmxConnectorFactory jmxConnectorFactory =
+                new CassandraJmxConnectorFactory(host, port, username, password);
         JMXConnector jmxConnector = jmxConnectorFactory.create();
 
         CassandraJmxBeanFactory jmxBeanFactory = new CassandraJmxBeanFactory(jmxConnector);
-        StorageServiceMBean storageServiceProxy = jmxBeanFactory.create(CassandraConstants.STORAGE_SERVICE_OBJECT_NAME, StorageServiceMBean.class);
-        HintedHandOffManagerMBean hintedHandoffProxy = jmxBeanFactory.create(CassandraConstants.HINTED_HANDOFF_MANAGER_OBJECT_NAME, HintedHandOffManagerMBean.class);
-        CompactionManagerMBean compactionManagerProxy = jmxBeanFactory.create(CassandraConstants.COMPACTION_MANAGER_OBJECT_NAME, CompactionManagerMBean.class);
-
-        return CassandraJmxCompactionClient.create(host, port, jmxConnector, storageServiceProxy, hintedHandoffProxy, compactionManagerProxy);
+        StorageServiceMBean storageServiceProxy = jmxBeanFactory.create(
+                CassandraConstants.STORAGE_SERVICE_OBJECT_NAME,
+                StorageServiceMBean.class);
+        HintedHandOffManagerMBean hintedHandoffProxy = jmxBeanFactory.create(
+                CassandraConstants.HINTED_HANDOFF_MANAGER_OBJECT_NAME,
+                HintedHandOffManagerMBean.class);
+        CompactionManagerMBean compactionManagerProxy = jmxBeanFactory.create(
+                CassandraConstants.COMPACTION_MANAGER_OBJECT_NAME,
+                CompactionManagerMBean.class);
+
+        return CassandraJmxCompactionClient.create(
+                host,
+                port,
+                jmxConnector,
+                storageServiceProxy,
+                hintedHandoffProxy,
+                compactionManagerProxy);
     }
 }
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompactionClient.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompactionClient.java
index ab9ae0724ee..001e21a5750 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompactionClient.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompactionClient.java
@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import javax.management.remote.JMXConnector;
@@ -28,7 +29,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Strings;
@@ -36,9 +36,9 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 
 /**
- * Maintains a JMX client for each node in C* cluster
+ * Maintains a JMX client for each node in C* cluster.
  */
-public class CassandraJmxCompactionClient {
+public final class CassandraJmxCompactionClient {
     private static final Logger log = LoggerFactory.getLogger(CassandraJmxCompactionClient.class);
     private final String host;
     private final int port;
@@ -57,10 +57,12 @@ private CassandraJmxCompactionClient(String host,
         Preconditions.checkArgument(port > 0);
         this.host = host;
         this.port = port;
-        this.jmxConnector = Preconditions.checkNotNull(jmxConnector);
-        this.storageServiceProxy = Preconditions.checkNotNull(storageServiceProxy);
-        this.hintedHandoffProxy = Preconditions.checkNotNull(hintedHandoffProxy);
-        this.compactionManagerProxy = Preconditions.checkNotNull(compactionManagerProxy);
+        this.jmxConnector = Preconditions.checkNotNull(jmxConnector, "jmxConnector cannot be null");
+        this.storageServiceProxy = Preconditions.checkNotNull(storageServiceProxy,
+                "storageServiceProxy cannot be null");
+        this.hintedHandoffProxy = Preconditions.checkNotNull(hintedHandoffProxy, "hintedHandoffProxy cannot be null");
+        this.compactionManagerProxy = Preconditions.checkNotNull(compactionManagerProxy,
+                "compactionManagerProxy cannot be null");
     }
 
     public static CassandraJmxCompactionClient create(String host,
@@ -69,7 +71,13 @@ public static CassandraJmxCompactionClient create(String host,
                                                       StorageServiceMBean storageServiceProxy,
                                                       HintedHandOffManagerMBean hintedHandoffProxy,
                                                       CompactionManagerMBean compactionManagerProxy) {
-        return new CassandraJmxCompactionClient(host, port, jmxConnector, storageServiceProxy, hintedHandoffProxy, compactionManagerProxy);
+        return new CassandraJmxCompactionClient(
+                host,
+                port,
+                jmxConnector,
+                storageServiceProxy,
+                hintedHandoffProxy,
+                compactionManagerProxy);
     }
 
     public void deleteLocalHints() {
@@ -98,7 +106,7 @@ public void forceTableFlush(String keyspace, TableReference tableRef) {
     public boolean forceTableCompaction(String keyspace, TableReference tableRef) {
         boolean status = tryTableCompactionInternal(keyspace, tableRef);
         int retries = 0;
-        while (status == false && retries < RETRY_TIMES) {
+        while (!status && retries < RETRY_TIMES) {
             retries++;
             log.info("Failed to compact, retrying in {} seconds for {} time(s)", RETRY_INTERVAL_IN_SECONDS, retries);
             try {
@@ -108,7 +116,7 @@ public boolean forceTableCompaction(String keyspace, TableReference tableRef) {
             }
             status = tryTableCompactionInternal(keyspace, tableRef);
         }
-        if (status == false) {
+        if (!status) {
             log.error("Failed to compact after {} retries.", RETRY_INTERVAL_IN_SECONDS);
         }
         return status;
@@ -149,19 +157,22 @@ public int getPort() {
         return port;
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(host, port);
-    }
-
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (!(obj instanceof CassandraJmxCompactionClient)) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-        CassandraJmxCompactionClient rhs = (CassandraJmxCompactionClient) obj;
-        return Objects.equal(this.host, rhs.host) && Objects.equal(this.port, rhs.port);
+        CassandraJmxCompactionClient that = (CassandraJmxCompactionClient) obj;
+        return port == that.port
+                && Objects.equals(host, that.host);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(host, port);
     }
 
     @Override
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompactionManager.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompactionManager.java
index f46c7f3397d..de4872c0163 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompactionManager.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/CassandraJmxCompactionManager.java
@@ -38,17 +38,19 @@
  * CassandraJmxCompactionManager manages all JMX compaction clients for C* cluster.
  * Each node in C* cluster will have one CassandraJmxCompactionClient connection.
  */
-public class CassandraJmxCompactionManager {
+public final class CassandraJmxCompactionManager {
     private static final Logger log = LoggerFactory.getLogger(CassandraJmxCompactionManager.class);
     private final ImmutableSet<CassandraJmxCompactionClient> clients;
     private final ExecutorService exec;
 
     private CassandraJmxCompactionManager(ImmutableSet<CassandraJmxCompactionClient> clients, ExecutorService exec) {
-        this.clients = Preconditions.checkNotNull(clients);
-        this.exec = Preconditions.checkNotNull(exec);
+        this.clients = Preconditions.checkNotNull(clients, "clients cannot be null");
+        this.exec = Preconditions.checkNotNull(exec, "exec cannot be null");
     }
 
-    public static CassandraJmxCompactionManager create(ImmutableSet<CassandraJmxCompactionClient> clients, ExecutorService exec) {
+    public static CassandraJmxCompactionManager create(
+            ImmutableSet<CassandraJmxCompactionClient> clients,
+            ExecutorService exec) {
         return new CassandraJmxCompactionManager(clients, exec);
     }
 
@@ -81,35 +83,37 @@ private boolean removeHintedHandoff(long timeoutInSeconds) throws InterruptedExc
             hintedHandoffDeletionTasks.add(new HintedHandOffDeletionTask(client));
         }
 
-        return executeInParallel(exec, hintedHandoffDeletionTasks, timeoutInSeconds);
+        return executeInParallel(hintedHandoffDeletionTasks, timeoutInSeconds);
     }
 
-    private boolean deleteTombstone(String keyspace, TableReference tableRef, long timeoutInSeconds) throws InterruptedException, TimeoutException {
+    private boolean deleteTombstone(String keyspace, TableReference tableRef, long timeoutInSeconds)
+            throws InterruptedException, TimeoutException {
         List<TombstoneCompactionTask> compactionTasks = Lists.newArrayListWithExpectedSize(clients.size());
         for (CassandraJmxCompactionClient client : clients) {
             compactionTasks.add(new TombstoneCompactionTask(client, keyspace, tableRef));
         }
 
-        return executeInParallel(exec, compactionTasks, timeoutInSeconds);
+        return executeInParallel(compactionTasks, timeoutInSeconds);
     }
 
-    private boolean executeInParallel(ExecutorService exec, List<? extends Callable<Void>> tasks, long timeoutInSeconds)
+    private boolean executeInParallel(List<? extends Callable<Void>> tasks, long timeoutInSeconds)
             throws InterruptedException, TimeoutException {
         Stopwatch stopWatch = Stopwatch.createStarted();
         List<Future<Void>> futures = exec.invokeAll(tasks, timeoutInSeconds, TimeUnit.SECONDS);
 
         for (Future<Void> f : futures) {
             if (f.isCancelled()) {
-                log.error("Task execution timeouts in {} seconds. Timeout seconds:{}.", stopWatch.stop().elapsed(TimeUnit.SECONDS), timeoutInSeconds);
-                throw new TimeoutException(String.format("Task execution timeouts in %d seconds. Timeout seconds:%d.",
+                log.error("Task execution timeouts in {} seconds. Timeout seconds: {}.",
+                        stopWatch.stop().elapsed(TimeUnit.SECONDS), timeoutInSeconds);
+                throw new TimeoutException(String.format("Task execution timeouts in %d seconds. Timeout seconds: %d.",
                         stopWatch.elapsed(TimeUnit.SECONDS), timeoutInSeconds));
             }
 
             try {
                 f.get();
             } catch (ExecutionException e) {
-                Throwable t = e.getCause();
-                if (t instanceof UndeclaredThrowableException) {
+                Throwable cause = e.getCause();
+                if (cause instanceof UndeclaredThrowableException) {
                     log.error("Major LCS compactions are only supported against C* 2.2+; "
                             + "you will need to manually re-arrange SSTables into L0 "
                             + "if you want all deleted data immediately removed from the cluster.");
@@ -133,7 +137,7 @@ public String getCompactionStatus() {
     }
 
     /**
-     * close all the JMX compaction connection
+     * Close all the JMX compaction connections.
      */
     public void close() {
         log.info("shutting down...");
diff --git a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/TombstoneCompactionTask.java b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/TombstoneCompactionTask.java
index 9d704589049..bdfcd06dbd1 100644
--- a/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/TombstoneCompactionTask.java
+++ b/atlasdb-cassandra/src/main/java/com/palantir/atlasdb/keyvalue/cassandra/jmx/TombstoneCompactionTask.java
@@ -34,7 +34,7 @@ public class TombstoneCompactionTask implements Callable<Void> {
         Preconditions.checkArgument(!Strings.isNullOrEmpty(keyspace));
         Preconditions.checkArgument(!Strings.isNullOrEmpty(tableRef.getQualifiedName()));
 
-        this.client = Preconditions.checkNotNull(client);
+        this.client = Preconditions.checkNotNull(client, "client cannot be null");
         this.keyspace = keyspace;
         this.tableRef = tableRef;
     }
diff --git a/atlasdb-cassandra/src/main/java/org/apache/cassandra/db/HintedHandOffManagerMBean.java b/atlasdb-cassandra/src/main/java/org/apache/cassandra/db/HintedHandOffManagerMBean.java
index 1205abc8bde..9ce6bda35fc 100644
--- a/atlasdb-cassandra/src/main/java/org/apache/cassandra/db/HintedHandOffManagerMBean.java
+++ b/atlasdb-cassandra/src/main/java/org/apache/cassandra/db/HintedHandOffManagerMBean.java
@@ -1,13 +1,11 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/**
+ * Copyright 2016 Palantir Technologies
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,28 +19,33 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-public interface HintedHandOffManagerMBean
-{
+public interface HintedHandOffManagerMBean {
     /**
      * Nuke all hints from this node to `ep`.
+     *
      * @param host String rep. of endpoint address to delete hints for, either ip address ("127.0.0.1") or hostname
      */
-    public void deleteHintsForEndpoint(final String host);
+    void deleteHintsForEndpoint(final String host);
 
     /**
-     *  Truncate all the hints
+     *  Truncate all the hints.
      */
-    public void truncateAllHints() throws ExecutionException, InterruptedException;
+    void truncateAllHints() throws ExecutionException, InterruptedException;
 
     /**
      * List all the endpoints that this node has hints for.
+     *
      * @return set of endpoints; as Strings
      */
-    public List<String> listEndpointsPendingHints();
+    List<String> listEndpointsPendingHints();
 
-    /** force hint delivery to an endpoint **/
-    public void scheduleHintDelivery(String host) throws UnknownHostException;
+    /**
+     * Force hint delivery to an endpoint.
+     */
+    void scheduleHintDelivery(String host) throws UnknownHostException;
 
-    /** pause hints delivery process **/
-    public void pauseHintsDelivery(boolean b);
-}
\ No newline at end of file
+    /**
+     * Pause hints delivery process.
+     */
+    void pauseHintsDelivery(boolean pauseHintsDelivery);
+}
diff --git a/atlasdb-cassandra/src/main/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java b/atlasdb-cassandra/src/main/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java
index 33df4326378..46bae18223f 100644
--- a/atlasdb-cassandra/src/main/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java
+++ b/atlasdb-cassandra/src/main/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java
@@ -1,13 +1,11 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/**
+ * Copyright 2016 Palantir Technologies
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -22,16 +20,21 @@
 
 import javax.management.openmbean.TabularData;
 
-public interface CompactionManagerMBean
-{
-    /** List of running compaction objects. */
-    public List<Map<String, String>> getCompactions();
+public interface CompactionManagerMBean {
+    /**
+     * List of running compaction objects.
+     */
+    List<Map<String, String>> getCompactions();
 
-    /** List of running compaction summary strings. */
-    public List<String> getCompactionSummary();
+    /**
+     * List of running compaction summary strings.
+     */
+    List<String> getCompactionSummary();
 
-    /** compaction history **/
-    public TabularData getCompactionHistory();
+    /**
+     * Get the compaction history.
+     */
+    TabularData getCompactionHistory();
 
     /**
      * Triggers the compaction of user specified sstables.
@@ -42,7 +45,7 @@ public interface CompactionManagerMBean
      * @param dataFiles a comma separated list of sstable file to compact.
      *                  must contain keyspace and columnfamily name in path(for 2.1+) or file name itself.
      */
-    public void forceUserDefinedCompaction(String dataFiles);
+    void forceUserDefinedCompaction(String dataFiles);
 
     /**
      * Stop all running compaction-like tasks having the provided {@code type}.
@@ -53,56 +56,59 @@ public interface CompactionManagerMBean
      *   - SCRUB
      *   - INDEX_BUILD
      */
-    public void stopCompaction(String type);
+    void stopCompaction(String type);
 
     /**
      * Stop an individual running compaction using the compactionId.
+     *
      * @param compactionId Compaction ID of compaction to stop. Such IDs can be found in
      *                     the compactions_in_progress table of the system keyspace.
      */
-    public void stopCompactionById(String compactionId);
+    void stopCompactionById(String compactionId);
 
     /**
-     * Returns core size of compaction thread pool
+     * Returns core size of compaction thread pool.
      */
-    public int getCoreCompactorThreads();
+    int getCoreCompactorThreads();
 
     /**
      * Allows user to resize maximum size of the compaction thread pool.
      * @param number New maximum of compaction threads
      */
-    public void setCoreCompactorThreads(int number);
+    void setCoreCompactorThreads(int number);
 
     /**
-     * Returns maximum size of compaction thread pool
+     * Returns maximum size of compaction thread pool.
      */
-    public int getMaximumCompactorThreads();
+    int getMaximumCompactorThreads();
 
     /**
      * Allows user to resize maximum size of the compaction thread pool.
+     *
      * @param number New maximum of compaction threads
      */
-    public void setMaximumCompactorThreads(int number);
+    void setMaximumCompactorThreads(int number);
 
     /**
-     * Returns core size of validation thread pool
+     * Returns core size of validation thread pool.
      */
-    public int getCoreValidationThreads();
+    int getCoreValidationThreads();
 
     /**
      * Allows user to resize maximum size of the compaction thread pool.
+     *
      * @param number New maximum of compaction threads
      */
-    public void setCoreValidationThreads(int number);
+    void setCoreValidationThreads(int number);
 
     /**
-     * Returns size of validator thread pool
+     * Returns size of validator thread pool.
      */
-    public int getMaximumValidatorThreads();
+    int getMaximumValidatorThreads();
 
     /**
      * Allows user to resize maximum size of the validator thread pool.
      * @param number New maximum of validator threads
      */
-    public void setMaximumValidatorThreads(int number);
-}
\ No newline at end of file
+    void setMaximumValidatorThreads(int number);
+}
diff --git a/atlasdb-cassandra/src/main/java/org/apache/cassandra/service/StorageServiceMBean.java b/atlasdb-cassandra/src/main/java/org/apache/cassandra/service/StorageServiceMBean.java
index 99e9d96df1a..68f4867fad7 100644
--- a/atlasdb-cassandra/src/main/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/atlasdb-cassandra/src/main/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -1,13 +1,11 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/**
+ * Copyright 2015 Palantir Technologies
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -30,15 +28,14 @@
 import javax.management.NotificationEmitter;
 import javax.management.openmbean.TabularData;
 
-public interface StorageServiceMBean extends NotificationEmitter
-{
+public interface StorageServiceMBean extends NotificationEmitter {
     /**
      * Retrieve the list of live nodes in the cluster, where "liveness" is
      * determined by the failure detector of the node being queried.
      *
      * @return set of IP addresses, as Strings
      */
-    public List<String> getLiveNodes();
+    List<String> getLiveNodes();
 
     /**
      * Retrieve the list of unreachable nodes in the cluster, as determined
@@ -46,35 +43,35 @@ public interface StorageServiceMBean extends NotificationEmitter
      *
      * @return set of IP addresses, as Strings
      */
-    public List<String> getUnreachableNodes();
+    List<String> getUnreachableNodes();
 
     /**
      * Retrieve the list of nodes currently bootstrapping into the ring.
      *
      * @return set of IP addresses, as Strings
      */
-    public List<String> getJoiningNodes();
+    List<String> getJoiningNodes();
 
     /**
      * Retrieve the list of nodes currently leaving the ring.
      *
      * @return set of IP addresses, as Strings
      */
-    public List<String> getLeavingNodes();
+    List<String> getLeavingNodes();
 
     /**
      * Retrieve the list of nodes currently moving in the ring.
      *
      * @return set of IP addresses, as Strings
      */
-    public List<String> getMovingNodes();
+    List<String> getMovingNodes();
 
     /**
      * Fetch string representations of the tokens for this node.
      *
      * @return a collection of tokens formatted as strings
      */
-    public List<String> getTokens();
+    List<String> getTokens();
 
     /**
      * Fetch string representations of the tokens for a specified node.
@@ -82,38 +79,42 @@ public interface StorageServiceMBean extends NotificationEmitter
      * @param endpoint string representation of an node
      * @return a collection of tokens formatted as strings
      */
-    public List<String> getTokens(String endpoint) throws UnknownHostException;
+    List<String> getTokens(String endpoint) throws UnknownHostException;
 
     /**
      * Fetch a string representation of the Cassandra version.
-     * @return A string representation of the Cassandra version.
+     *
+     * @return A string representation of the Cassandra version
      */
-    public String getReleaseVersion();
+    String getReleaseVersion();
 
     /**
      * Fetch a string representation of the current Schema version.
-     * @return A string representation of the Schema version.
+     *
+     * @return A string representation of the Schema version
      */
-    public String getSchemaVersion();
-
+    String getSchemaVersion();
 
     /**
-     * Get the list of all data file locations from conf
+     * Get the list of all data file locations from conf.
+     *
      * @return String array of all locations
      */
-    public String[] getAllDataFileLocations();
+    String[] getAllDataFileLocations();
 
     /**
-     * Get location of the commit log
+     * Get location of the commit log.
+     *
      * @return a string path
      */
-    public String getCommitLogLocation();
+    String getCommitLogLocation();
 
     /**
-     * Get location of the saved caches dir
+     * Get location of the saved caches dir.
+     *
      * @return a string path
      */
-    public String getSavedCachesLocation();
+    String getSavedCachesLocation();
 
     /**
      * Retrieve a map of range to end points that describe the ring topology
@@ -121,7 +122,7 @@ public interface StorageServiceMBean extends NotificationEmitter
      *
      * @return mapping of ranges to end points
      */
-    public Map<List<String>, List<String>> getRangeToEndpointMap(String keyspace);
+    Map<List<String>, List<String>> getRangeToEndpointMap(String keyspace);
 
     /**
      * Retrieve a map of range to rpc addresses that describe the ring topology
@@ -129,23 +130,24 @@ public interface StorageServiceMBean extends NotificationEmitter
      *
      * @return mapping of ranges to rpc addresses
      */
-    public Map<List<String>, List<String>> getRangeToRpcaddressMap(String keyspace);
+    Map<List<String>, List<String>> getRangeToRpcaddressMap(String keyspace);
 
     /**
-     * The same as {@code describeRing(String)} but converts TokenRange to the String for JMX compatibility
+     * The same as {@code describeRing(String)} but converts TokenRange to the String for JMX compatibility.
      *
      * @param keyspace The keyspace to fetch information about
      *
      * @return a List of TokenRange(s) converted to String for the given keyspace
      */
-    public List <String> describeRingJMX(String keyspace) throws IOException;
+    List<String> describeRingJMX(String keyspace) throws IOException;
 
     /**
-     * Retrieve a map of pending ranges to endpoints that describe the ring topology
+     * Retrieve a map of pending ranges to endpoints that describe the ring topology.
+     *
      * @param keyspace the keyspace to get the pending range map for.
      * @return a map of pending ranges to endpoints
      */
-    public Map<List<String>, List<String>> getPendingRangeToEndpointMap(String keyspace);
+    Map<List<String>, List<String>> getPendingRangeToEndpointMap(String keyspace);
 
     /**
      * Retrieve a map of tokens to endpoints, including the bootstrapping
@@ -153,38 +155,45 @@ public interface StorageServiceMBean extends NotificationEmitter
      *
      * @return a map of tokens to endpoints in ascending order
      */
-    public Map<String, String> getTokenToEndpointMap();
+    Map<String, String> getTokenToEndpointMap();
 
-    /** Retrieve this hosts unique ID */
-    public String getLocalHostId();
+    /**
+     *  Retrieve this hosts unique ID.
+     */
+    String getLocalHostId();
 
-    /** Retrieve the mapping of endpoint to host ID */
-    public Map<String, String> getHostIdMap();
+    /**
+     * Retrieve the mapping of endpoint to host ID.
+     */
+    Map<String, String> getHostIdMap();
 
-    /** Human-readable load value */
-    public String getLoadString();
+    /**
+     * Human-readable load value.
+     */
+    String getLoadString();
 
-    /** Human-readable load value.  Keys are IP addresses. */
-    public Map<String, String> getLoadMap();
+    /**
+     * Human-readable load value.  Keys are IP addresses.
+     */
+    Map<String, String> getLoadMap();
 
     /**
-     * Return the generation value for this node.
+     * Returns the generation value for this node.
      *
      * @return generation number
      */
-    public int getCurrentGenerationNumber();
+    int getCurrentGenerationNumber();
 
     /**
-     * This method returns the N endpoints that are responsible for storing the
-     * specified key i.e for replication.
+     * Returns the N endpoints that are responsible for storing the specified key i.e for replication.
      *
      * @param keyspaceName keyspace name
      * @param cf Column family name
      * @param key - key for which we need to find the endpoint return value -
      * the endpoint responsible for this key
      */
-    public List<InetAddress> getNaturalEndpoints(String keyspaceName, String cf, String key);
-    public List<InetAddress> getNaturalEndpoints(String keyspaceName, ByteBuffer key);
+    List<InetAddress> getNaturalEndpoints(String keyspaceName, String cf, String key);
+    List<InetAddress> getNaturalEndpoints(String keyspaceName, ByteBuffer key);
 
     /**
      * Takes the snapshot for the given keyspaces. A snapshot name must be specified.
@@ -192,7 +201,7 @@ public interface StorageServiceMBean extends NotificationEmitter
      * @param tag the tag given to the snapshot; may not be null or empty
      * @param keyspaceNames the name of the keyspaces to snapshot; empty means "all."
      */
-    public void takeSnapshot(String tag, String... keyspaceNames) throws IOException;
+    void takeSnapshot(String tag, String... keyspaceNames) throws IOException;
 
     /**
      * Takes the snapshot of a specific column family. A snapshot name must be specified.
@@ -201,7 +210,7 @@ public interface StorageServiceMBean extends NotificationEmitter
      * @param columnFamilyName the column family to snapshot
      * @param tag the tag given to the snapshot; may not be null or empty
      */
-    public void takeColumnFamilySnapshot(String keyspaceName, String columnFamilyName, String tag) throws IOException;
+    void takeColumnFamilySnapshot(String keyspaceName, String columnFamilyName, String tag) throws IOException;
 
     /**
      * Takes the snapshot of a multiple column family from different keyspaces. A snapshot name must be specified.
@@ -211,68 +220,85 @@ public interface StorageServiceMBean extends NotificationEmitter
      * @param columnFamilyList
      *            list of columnfamily from different keyspace in the form of ks1.cf1 ks2.cf2
      */
-    public void takeMultipleColumnFamilySnapshot(String tag, String... columnFamilyList) throws IOException;
+    void takeMultipleColumnFamilySnapshot(String tag, String... columnFamilyList) throws IOException;
 
     /**
      * Remove the snapshot with the given name from the given keyspaces.
      * If no tag is specified we will remove all snapshots.
      */
-    public void clearSnapshot(String tag, String... keyspaceNames) throws IOException;
+    void clearSnapshot(String tag, String... keyspaceNames) throws IOException;
 
     /**
-     *  Get the details of all the snapshot
-     * @return A map of snapshotName to all its details in Tabular form.
+     * Get the details of all the snapshot.
+     *
+     * @return A map of snapshotName to all its details in Tabular form
      */
-    public Map<String, TabularData> getSnapshotDetails();
+    Map<String, TabularData> getSnapshotDetails();
 
     /**
      * Get the true size taken by all snapshots across all keyspaces.
-     * @return True size taken by all the snapshots.
+     *
+     * @return True size taken by all the snapshots
      */
-    public long trueSnapshotsSize();
+    long trueSnapshotsSize();
 
     /**
-     * Forces major compaction of a single keyspace
+     * Forces major compaction of a single keyspace.
      */
-    public void forceKeyspaceCompaction(boolean splitOutput, String keyspaceName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException;
+    void forceKeyspaceCompaction(boolean splitOutput, String keyspaceName, String... columnFamilies)
+            throws IOException, ExecutionException, InterruptedException;
 
     /**
-     * Trigger a cleanup of keys on a single keyspace
+     * Trigger a cleanup of keys on a single keyspace.
      */
-    public int forceKeyspaceCleanup(String keyspaceName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException;
+    int forceKeyspaceCleanup(String keyspaceName, String... columnFamilies)
+            throws IOException, ExecutionException, InterruptedException;
+
+    /**
+     * See {@link #scrub(boolean, boolean, boolean, String, String...)}.
+     *
+     * @deprecated Use {@link #scrub(boolean, boolean, boolean, String, String...)} instead.
+     */
+    @Deprecated
+    int scrub(boolean disableSnapshot, boolean skipCorrupted, String keyspaceName, String... columnFamilies)
+            throws IOException, ExecutionException, InterruptedException;
 
     /**
      * Scrub (deserialize + reserialize at the latest version, skipping bad rows if any) the given keyspace.
      * If columnFamilies array is empty, all CFs are scrubbed.
      *
-     * Scrubbed CFs will be snapshotted first, if disableSnapshot is false
+     * Scrubbed CFs will be snapshotted first, if disableSnapshot is false.
      */
-    @Deprecated
-    public int scrub(boolean disableSnapshot, boolean skipCorrupted, String keyspaceName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException;
-    public int scrub(boolean disableSnapshot, boolean skipCorrupted, boolean checkData, String keyspaceName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException;
+    int scrub(
+            boolean disableSnapshot,
+            boolean skipCorrupted,
+            boolean checkData,
+            String keyspaceName,
+            String... columnFamilies)
+            throws IOException, ExecutionException, InterruptedException;
 
     /**
      * Verify (checksums of) the given keyspace.
      * If columnFamilies array is empty, all CFs are verified.
      *
-     * The entire sstable will be read to ensure each cell validates if extendedVerify is true
+     * The entire sstable will be read to ensure each cell validates if extendedVerify is true.
      */
-    public int verify(boolean extendedVerify, String keyspaceName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException;
+    int verify(boolean extendedVerify, String keyspaceName, String... columnFamilies)
+            throws IOException, ExecutionException, InterruptedException;
 
     /**
      * Rewrite all sstables to the latest version.
      * Unlike scrub, it doesn't skip bad rows and do not snapshot sstables first.
      */
-    public int upgradeSSTables(String keyspaceName, boolean excludeCurrentVersion, String... columnFamilies) throws IOException, ExecutionException, InterruptedException;
+    int upgradeSSTables(String keyspaceName, boolean excludeCurrentVersion, String... columnFamilies)
+            throws IOException, ExecutionException, InterruptedException;
 
     /**
      * Flush all memtables for the given column families, or all columnfamilies for the given keyspace
      * if none are explicitly listed.
-     * @param keyspaceName
-     * @param columnFamilies
-     * @throws IOException
      */
-    public void forceKeyspaceFlush(String keyspaceName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException;
+    void forceKeyspaceFlush(String keyspaceName, String... columnFamilies)
+            throws IOException, ExecutionException, InterruptedException;
 
     /**
      * Invoke repair asynchronously.
@@ -285,10 +311,22 @@ public interface StorageServiceMBean extends NotificationEmitter
      * @param options repair option.
      * @return Repair command number, or 0 if nothing to repair
      */
-    public int repairAsync(String keyspace, Map<String, String> options);
+    int repairAsync(String keyspace, Map<String, String> options);
 
+    /**
+     * Invoke repair asynchronously.
+     *
+     * @deprecated Use {@link #repairAsync} instead.
+     */
     @Deprecated
-    public int forceRepairAsync(String keyspace, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts,  boolean primaryRange, boolean repairedAt, String... columnFamilies) throws IOException;
+    int forceRepairAsync(
+            String keyspace,
+            boolean isSequential,
+            Collection<String> dataCenters,
+            Collection<String> hosts,
+            boolean primaryRange,
+            boolean repairedAt,
+            String... columnFamilies) throws IOException;
 
     /**
      * Invoke repair asynchronously.
@@ -299,87 +337,152 @@ public interface StorageServiceMBean extends NotificationEmitter
      *
      * @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
      * @return Repair command number, or 0 if nothing to repair
+     *
+     * @deprecated Use {@link #repairAsync} instead.
      */
     @Deprecated
-    public int forceRepairAsync(String keyspace, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+    int forceRepairAsync(
+            String keyspace,
+            int parallelismDegree,
+            Collection<String> dataCenters,
+            Collection<String> hosts,
+            boolean primaryRange,
+            boolean fullRepair,
+            String... columnFamilies);
 
+    /**
+     * Invoke repair asynchronously.
+     *
+     * @deprecated Use {@link #repairAsync} instead.
+     */
     @Deprecated
-    public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, Collection<String> dataCenters, Collection<String> hosts, boolean repairedAt, String... columnFamilies) throws IOException;
+    int forceRepairAsync(
+            String keyspace,
+            boolean isSequential,
+            boolean isLocal,
+            boolean primaryRange,
+            boolean fullRepair,
+            String... columnFamilies);
 
     /**
-     * Same as forceRepairAsync, but handles a specified range
+     * Same as {@link #forceRepairAsync}, but handles a specified range.
      *
      * @param parallelismDegree 0: sequential, 1: parallel, 2: DC parallel
+     *
+     * @deprecated Use {@link #repairAsync} instead.
      */
     @Deprecated
-    public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, int parallelismDegree, Collection<String> dataCenters, Collection<String> hosts, boolean fullRepair, String... columnFamilies);
+    int forceRepairRangeAsync(
+            String beginToken,
+            String endToken,
+            String keyspaceName,
+            int parallelismDegree,
+            Collection<String> dataCenters,
+            Collection<String> hosts,
+            boolean fullRepair,
+            String... columnFamilies);
 
+    /**
+     * Invoke repair asynchronously.
+     *
+     * @deprecated Use {@link #repairAsync} instead.
+     */
     @Deprecated
-    public int forceRepairAsync(String keyspace, boolean isSequential, boolean isLocal, boolean primaryRange, boolean fullRepair, String... columnFamilies);
+    int forceRepairRangeAsync(
+            String beginToken,
+            String endToken,
+            String keyspaceName,
+            boolean isSequential,
+            Collection<String> dataCenters,
+            Collection<String> hosts,
+            boolean repairedAt,
+            String... columnFamilies) throws IOException;
 
+    /**
+     * Invoke repair asynchronously.
+     *
+     * @deprecated Use {@link #repairAsync} instead.
+     */
     @Deprecated
-    public int forceRepairRangeAsync(String beginToken, String endToken, String keyspaceName, boolean isSequential, boolean isLocal, boolean repairedAt, String... columnFamilies);
+    int forceRepairRangeAsync(
+            String beginToken,
+            String endToken,
+            String keyspaceName,
+            boolean isSequential,
+            boolean isLocal,
+            boolean repairedAt,
+            String... columnFamilies);
 
-    public void forceTerminateAllRepairSessions();
+    void forceTerminateAllRepairSessions();
 
     /**
      * transfer this node's data to other machines and remove it from service.
      */
-    public void decommission() throws InterruptedException;
+    void decommission() throws InterruptedException;
 
     /**
-     * @param newToken token to move this node to.
      * This node will unload its data onto its neighbors, and bootstrap to the new token.
+     *
+     * @param newToken token to move this node to.
      */
-    public void move(String newToken) throws IOException;
+    void move(String newToken) throws IOException;
 
     /**
-     * removeToken removes token (and all data associated with
-     * enpoint that had it) from the ring
+     * removeNode removes the token (and all data associated with the endpoint that had it) from the ring.
      */
-    public void removeNode(String token);
+    void removeNode(String token);
 
     /**
      * Get the status of a token removal.
      */
-    public String getRemovalStatus();
+    String getRemovalStatus();
 
     /**
      * Force a remove operation to finish.
      */
-    public void forceRemoveCompletion();
+    void forceRemoveCompletion();
 
     /**
      * set the logging level at runtime<br>
      * <br>
      * If both classQualifer and level are empty/null, it will reload the configuration to reset.<br>
-     * If classQualifer is not empty but level is empty/null, it will set the level to null for the defined classQualifer<br>
+     * If classQualifier is not empty but level is empty/null, it will set the level to null for
+     * the defined classQualifier<br>
      * If level cannot be parsed, then the level will be defaulted to DEBUG<br>
      * <br>
      * The logback configuration should have < jmxConfigurator /> set
      *
      * @param classQualifier The logger's classQualifer
      * @param level The log level
-     * @throws Exception
      *
-     *  @see ch.qos.logback.classic.Level#toLevel(String)
+     * @see ch.qos.logback.classic.Level#toLevel(String)
      */
-    public void setLoggingLevel(String classQualifier, String level) throws Exception;
+    void setLoggingLevel(String classQualifier, String level) throws Exception;
 
-    /** get the runtime logging levels */
-    public Map<String,String> getLoggingLevels();
+    /**
+     *  Get the runtime logging levels.
+     */
+    Map<String, String> getLoggingLevels();
 
-    /** get the operational mode (leaving, joining, normal, decommissioned, client) **/
-    public String getOperationMode();
+    /**
+     * Get the operational mode (leaving, joining, normal, decommissioned, client).
+     */
+    String getOperationMode();
 
-    /** Returns whether the storage service is starting or not */
-    public boolean isStarting();
+    /**
+     * Returns whether the storage service is starting or not.
+     */
+    boolean isStarting();
 
-    /** get the progress of a drain operation */
-    public String getDrainProgress();
+    /**
+     * Get the progress of a drain operation.
+     */
+    String getDrainProgress();
 
-    /** makes node unavailable for writes, flushes memtables and replays commitlog. */
-    public void drain() throws IOException, InterruptedException, ExecutionException;
+    /**
+     * makes node unavailable for writes, flushes memtables and replays commitlog.
+     */
+    void drain() throws IOException, InterruptedException, ExecutionException;
 
     /**
      * Truncates (deletes) the given columnFamily from the provided keyspace.
@@ -391,13 +494,14 @@ public interface StorageServiceMBean extends NotificationEmitter
      * @param keyspace The keyspace to delete from
      * @param columnFamily The column family to delete data from.
      */
-    public void truncate(String keyspace, String columnFamily)throws TimeoutException, IOException;
+    void truncate(String keyspace, String columnFamily) throws TimeoutException, IOException;
 
     /**
-     * given a list of tokens (representing the nodes in the cluster), returns
-     *   a mapping from "token -> %age of cluster owned by that token"
+     * Gets the percentage of the cluster owned per token.
+     *
+     * @return A mapping from "token -> %age of cluster owned by that token"
      */
-    public Map<InetAddress, Float> getOwnership();
+    Map<InetAddress, Float> getOwnership();
 
     /**
      * Effective ownership is % of the data each node owns given the keyspace
@@ -406,62 +510,68 @@ public interface StorageServiceMBean extends NotificationEmitter
      * in the cluster have the same replication strategies and if yes then we will
      * use the first else a empty Map is returned.
      */
-    public Map<InetAddress, Float> effectiveOwnership(String keyspace) throws IllegalStateException;
+    Map<InetAddress, Float> effectiveOwnership(String keyspace) throws IllegalStateException;
 
-    public List<String> getKeyspaces();
+    List<String> getKeyspaces();
 
-    public List<String> getNonSystemKeyspaces();
+    List<String> getNonSystemKeyspaces();
 
     /**
-     * Change endpointsnitch class and dynamic-ness (and dynamic attributes) at runtime
+     * Change endpointsnitch class and dynamic-ness (and dynamic attributes) at runtime.
+     *
      * @param epSnitchClassName        the canonical path name for a class implementing IEndpointSnitch
      * @param dynamic                  boolean that decides whether dynamicsnitch is used or not
      * @param dynamicUpdateInterval    integer, in ms (default 100)
      * @param dynamicResetInterval     integer, in ms (default 600,000)
      * @param dynamicBadnessThreshold  double, (default 0.0)
      */
-    public void updateSnitch(String epSnitchClassName, Boolean dynamic, Integer dynamicUpdateInterval, Integer dynamicResetInterval, Double dynamicBadnessThreshold) throws ClassNotFoundException;
+    void updateSnitch(
+            String epSnitchClassName,
+            Boolean dynamic,
+            Integer dynamicUpdateInterval,
+            Integer dynamicResetInterval,
+            Double dynamicBadnessThreshold) throws ClassNotFoundException;
 
     // allows a user to forcibly 'kill' a sick node
-    public void stopGossiping();
+    void stopGossiping();
 
     // allows a user to recover a forcibly 'killed' node
-    public void startGossiping();
+    void startGossiping();
 
     // allows a user to see whether gossip is running or not
-    public boolean isGossipRunning();
+    boolean isGossipRunning();
 
     // allows a user to forcibly completely stop cassandra
-    public void stopDaemon();
+    void stopDaemon();
 
     // to determine if gossip is disabled
-    public boolean isInitialized();
+    boolean isInitialized();
 
     // allows a user to disable thrift
-    public void stopRPCServer();
+    void stopRPCServer();
 
     // allows a user to reenable thrift
-    public void startRPCServer();
+    void startRPCServer();
 
     // to determine if thrift is running
-    public boolean isRPCServerRunning();
+    boolean isRPCServerRunning();
 
-    public void stopNativeTransport();
-    public void startNativeTransport();
-    public boolean isNativeTransportRunning();
+    void stopNativeTransport();
+    void startNativeTransport();
+    boolean isNativeTransportRunning();
 
     // allows a node that have been started without joining the ring to join it
-    public void joinRing() throws IOException;
-    public boolean isJoined();
+    void joinRing() throws IOException;
+    boolean isJoined();
 
-    public void setStreamThroughputMbPerSec(int value);
-    public int getStreamThroughputMbPerSec();
+    void setStreamThroughputMbPerSec(int value);
+    int getStreamThroughputMbPerSec();
 
-    public int getCompactionThroughputMbPerSec();
-    public void setCompactionThroughputMbPerSec(int value);
+    int getCompactionThroughputMbPerSec();
+    void setCompactionThroughputMbPerSec(int value);
 
-    public boolean isIncrementalBackupsEnabled();
-    public void setIncrementalBackupsEnabled(boolean value);
+    boolean isIncrementalBackupsEnabled();
+    void setIncrementalBackupsEnabled(boolean value);
 
     /**
      * Initiate a process of streaming data for which we are responsible from other nodes. It is similar to bootstrap
@@ -470,26 +580,26 @@ public interface StorageServiceMBean extends NotificationEmitter
      *
      * @param sourceDc Name of DC from which to select sources for streaming or null to pick any node
      */
-    public void rebuild(String sourceDc);
+    void rebuild(String sourceDc);
 
     /** Starts a bulk load and blocks until it completes. */
-    public void bulkLoad(String directory);
+    void bulkLoad(String directory);
 
     /**
      * Starts a bulk load asynchronously and returns the String representation of the planID for the new
      * streaming session.
      */
-    public String bulkLoadAsync(String directory);
+    String bulkLoadAsync(String directory);
 
-    public void rescheduleFailedDeletions();
+    void rescheduleFailedDeletions();
 
     /**
-     * Load new SSTables to the given keyspace/columnFamily
+     * Load new SSTables to the given keyspace/columnFamily.
      *
      * @param ksName The parent keyspace name
      * @param cfName The ColumnFamily name where SSTables belong
      */
-    public void loadNewSSTables(String ksName, String cfName);
+    void loadNewSSTables(String ksName, String cfName);
 
     /**
      * Return a List of Tokens representing a sample of keys across all ColumnFamilyStores.
@@ -499,14 +609,14 @@ public interface StorageServiceMBean extends NotificationEmitter
      *
      * @return set of Tokens as Strings
      */
-    public List<String> sampleKeyRange();
+    List<String> sampleKeyRange();
 
     /**
-     * rebuild the specified indexes
+     * Rebuild the specified indexes.
      */
-    public void rebuildSecondaryIndex(String ksName, String cfName, String... idxNames);
+    void rebuildSecondaryIndex(String ksName, String cfName, String... idxNames);
 
-    public void resetLocalSchema() throws IOException;
+    void resetLocalSchema() throws IOException;
 
     /**
      * Enables/Disables tracing for the whole system. Only thrift requests can start tracing currently.
@@ -515,46 +625,65 @@ public interface StorageServiceMBean extends NotificationEmitter
      *            ]0,1[ will enable tracing on a partial number of requests with the provided probability. 0 will
      *            disable tracing and 1 will enable tracing for all requests (which mich severely cripple the system)
      */
-    public void setTraceProbability(double probability);
+    void setTraceProbability(double probability);
 
     /**
      * Returns the configured tracing probability.
      */
-    public double getTraceProbability();
+    double getTraceProbability();
 
     void disableAutoCompaction(String ks, String ... columnFamilies) throws IOException;
     void enableAutoCompaction(String ks, String ... columnFamilies) throws IOException;
 
-    public void deliverHints(String host) throws UnknownHostException;
+    void deliverHints(String host) throws UnknownHostException;
 
-    /** Returns the name of the cluster */
-    public String getClusterName();
-    /** Returns the cluster partitioner */
-    public String getPartitionerName();
+    /**
+     * Returns the name of the cluster.
+     */
+    String getClusterName();
+    /**
+     * Returns the cluster partitioner.
+     */
+    String getPartitionerName();
 
-    /** Returns the threshold for warning of queries with many tombstones */
-    public int getTombstoneWarnThreshold();
-    /** Sets the threshold for warning queries with many tombstones */
-    public void setTombstoneWarnThreshold(int tombstoneDebugThreshold);
+    /**
+     * Returns the threshold for warning of queries with many tombstones.
+     */
+    int getTombstoneWarnThreshold();
+    /**
+     * Sets the threshold for warning queries with many tombstones.
+     */
+    void setTombstoneWarnThreshold(int tombstoneDebugThreshold);
 
-    /** Returns the threshold for abandoning queries with many tombstones */
-    public int getTombstoneFailureThreshold();
-    /** Sets the threshold for abandoning queries with many tombstones */
-    public void setTombstoneFailureThreshold(int tombstoneDebugThreshold);
+    /**
+     * Returns the threshold for abandoning queries with many tombstones.
+     */
+    int getTombstoneFailureThreshold();
 
-    /** Returns the threshold for rejecting queries due to a large batch size */
-    public int getBatchSizeFailureThreshold();
-    /** Sets the threshold for rejecting queries due to a large batch size */
-    public void setBatchSizeFailureThreshold(int batchSizeDebugThreshold);
+    /**
+     * Sets the threshold for abandoning queries with many tombstones.
+     */
+    void setTombstoneFailureThreshold(int tombstoneDebugThreshold);
 
-    /** Sets the hinted handoff throttle in kb per second, per delivery thread. */
-    public void setHintedHandoffThrottleInKB(int throttleInKB);
+    /**
+     * Returns the threshold for rejecting queries due to a large batch size.
+     */
+    int getBatchSizeFailureThreshold();
+
+    /**
+     * Sets the threshold for rejecting queries due to a large batch size.
+     */
+    void setBatchSizeFailureThreshold(int batchSizeDebugThreshold);
+
+    /**
+     * Sets the hinted handoff throttle in kb per second, per delivery thread.
+     */
+    void setHintedHandoffThrottleInKB(int throttleInKB);
 
     /**
      * Resume bootstrap streaming when there is failed data streaming.
      *
-     *
      * @return true if the node successfully starts resuming. (this does not mean bootstrap streaming was success.)
      */
-    public boolean resumeBootstrap();
-}
\ No newline at end of file
+    boolean resumeBootstrap();
+}
diff --git a/atlasdb-cli/build.gradle b/atlasdb-cli/build.gradle
index c9dfb9febb3..623a7b851e5 100644
--- a/atlasdb-cli/build.gradle
+++ b/atlasdb-cli/build.gradle
@@ -7,7 +7,7 @@ mainClassName = 'com.palantir.atlasdb.cli.AtlasCli'
 applicationName = 'atlasdb'
 
 dependencies {
-  compile project(':atlasdb-server')
+  compile project(':atlasdb-service')
   compile project(':atlasdb-impl-shared')
   compile 'io.airlift:airline:0.7'
   compile 'com.google.dagger:dagger:2.0.2'
@@ -18,7 +18,7 @@ dependencies {
   testCompile project(':atlasdb-rocksdb')
 
   processor 'com.google.dagger:dagger-compiler:2.0.2'
-  processor 'org.immutables:value:2.0.21'
+  processor 'org.immutables:value:' + libVersions.immutables
 }
 
 configurations.matching({ it.name in ['compile', 'runtime'] }).all {
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java
index 98fff41dc37..c2bf3b7d6bf 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/AtlasCli.java
@@ -17,26 +17,39 @@
 
 import java.util.concurrent.Callable;
 
-import com.palantir.atlasdb.cli.command.CleanTransactionRange;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.palantir.atlasdb.cli.command.KvsMigrationCommand;
 import com.palantir.atlasdb.cli.command.SweepCommand;
-import com.palantir.atlasdb.cli.command.TimestampCommand;
+import com.palantir.atlasdb.cli.command.timestamp.CleanTransactionRange;
+import com.palantir.atlasdb.cli.command.timestamp.FastForwardTimestamp;
+import com.palantir.atlasdb.cli.command.timestamp.FetchTimestamp;
 
 import io.airlift.airline.Cli;
 import io.airlift.airline.Help;
 
 public class AtlasCli {
 
-    private static Cli<Callable> buildCli() {
+    private static final Logger log = LoggerFactory.getLogger(AtlasCli.class);
+
+    public static Cli<Callable> buildCli() {
         Cli.CliBuilder<Callable> builder = Cli.<Callable>builder("atlasdb")
                 .withDescription("Perform common AtlasDB tasks")
                 .withDefaultCommand(Help.class)
                 .withCommands(
                         Help.class,
-                        TimestampCommand.class,
-                        CleanTransactionRange.class,
                         SweepCommand.class,
                         KvsMigrationCommand.class);
+
+        builder.withGroup("timestamp")
+                .withDescription("Timestamp-centric commands")
+                .withDefaultCommand(Help.class)
+                .withCommands(
+                        FetchTimestamp.class,
+                        CleanTransactionRange.class,
+                        FastForwardTimestamp.class);
+
         return builder.build();
     }
 
@@ -49,7 +62,7 @@ public static void main(String[] args) {
             }
             System.exit(0);
         } catch (Exception e) {
-            System.err.println(e.getMessage());
+            log.error("Fatal exception thrown during cli command execution.  Exiting.", e);
             System.exit(1);
         }
     }
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java
index c7484395349..8da28183eca 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/AbstractCommand.java
@@ -19,37 +19,70 @@
 import java.io.IOException;
 import java.util.concurrent.Callable;
 
+import com.google.common.base.Optional;
 import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.AtlasDbConfigs;
+import com.palantir.atlasdb.config.ImmutableAtlasDbConfig;
 
 import io.airlift.airline.Option;
+import io.airlift.airline.OptionType;
 
 public abstract class AbstractCommand implements Callable<Integer> {
-
     @Option(name = {"-c", "--config"},
             title = "CONFIG PATH",
-            description = "path to yaml configuration file for atlasdb",
-            required = true)
+            type = OptionType.GLOBAL,
+            description = "path to yaml configuration file for atlasdb")
     private File configFile;
 
+    // TODO: Hide this argument once https://github.com/airlift/airline/issues/51 is fixed
+    @Option(name = {"--inline-config"},
+            title = "INLINE CONFIG",
+            type = OptionType.GLOBAL,
+            description = "inline configuration file for atlasdb")
+    private String inlineConfig;
+
     @Option(name = {"--config-root"},
             title = "CONFIG ROOT",
+            type = OptionType.GLOBAL,
             description = "field in the config yaml file that contains the atlasdb configuration root")
     private String configRoot = AtlasDbConfigs.ATLASDB_CONFIG_ROOT;
 
+    @Option(name = {"--offline"},
+            title = "OFFLINE",
+            type = OptionType.GLOBAL,
+            description = "run this cli offline")
+    private boolean offline = false;
+
     private AtlasDbConfig config;
-    
+
     protected AtlasDbConfig getAtlasDbConfig() {
         if (config == null) {
             try {
-                config = AtlasDbConfigs.load(configFile, configRoot);
+                if (configFile != null) {
+                    config = AtlasDbConfigs.load(configFile, configRoot);
+                } else if (inlineConfig != null) {
+                    config = AtlasDbConfigs.loadFromString(inlineConfig, "");
+                } else {
+                    throw new IllegalArgumentException("Required option '-c' is missing");
+                }
+                if (offline) {
+                    config = ImmutableAtlasDbConfig.builder()
+                            .from(config)
+                            .leader(Optional.absent())
+                            .lock(Optional.absent())
+                            .timestamp(Optional.absent())
+                            .build();
+                }
             } catch (IOException e) {
                 throw new RuntimeException(String.format("IOException thrown reading configuration file: %s",
-                        configFile.getPath()), e);
+                        configFile != null ? configFile.getPath() : "null"), e);
             }
         }
-        
+
         return config;
     }
 
+    protected boolean isOffline() {
+        return offline;
+    }
 }
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/CleanTransactionRange.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/CleanTransactionRange.java
deleted file mode 100644
index 13c90731617..00000000000
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/CleanTransactionRange.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * Copyright 2015 Palantir Technologies
- *
- * Licensed under the BSD-3 License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://opensource.org/licenses/BSD-3-Clause
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.palantir.atlasdb.cli.command;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.palantir.atlasdb.cli.services.AtlasDbServices;
-import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.api.RangeRequest;
-import com.palantir.atlasdb.keyvalue.api.RangeRequests;
-import com.palantir.atlasdb.keyvalue.api.RowResult;
-import com.palantir.atlasdb.keyvalue.api.Value;
-import com.palantir.atlasdb.transaction.impl.TransactionConstants;
-import com.palantir.common.base.ClosableIterator;
-import com.palantir.timestamp.PersistentTimestampService;
-import com.palantir.timestamp.TimestampService;
-
-import io.airlift.airline.Command;
-import io.airlift.airline.Option;
-
-@Command(name = "clean-transactions", description = "Clean a recently restored backup of a transaction table from an underlying database that lacks PITR backup semantics.")
-public class CleanTransactionRange extends SingleBackendCommand {
-
-    @Option(name = {"-s", "--start"},
-            title = "START_TIMESTAMP",
-            description = "Start timestamp; will cleanup transactions after (but not including) this timestamp",
-            required = true)
-    long startTimestampExclusive;
-
-    @Override
-    public int execute(AtlasDbServices services) {
-        long immutable = services.getTransactionManager().getImmutableTimestamp();
-        TimestampService ts = services.getTimestampService();
-        if(!isValid(immutable, ts)) {
-            return 1;
-        }
-
-        PersistentTimestampService pts = (PersistentTimestampService) ts;
-        KeyValueService kvs = services.getKeyValueService();
-
-        byte[] startRowInclusive = RangeRequests.nextLexicographicName(TransactionConstants.getValueForTimestamp(startTimestampExclusive));
-        ClosableIterator<RowResult<Value>> range = kvs.getRange(
-                TransactionConstants.TRANSACTION_TABLE,
-                RangeRequest.builder()
-                .startRowInclusive(startRowInclusive)
-                .build(),
-                Long.MAX_VALUE);
-
-        Multimap<Cell, Long> toDelete = HashMultimap.create();
-        long maxTimestamp = startTimestampExclusive;
-        while (range.hasNext()) {
-            RowResult<Value> row = range.next();
-            byte[] rowName = row.getRowName();
-            long startResult = TransactionConstants.getTimestampForValue(rowName);
-            maxTimestamp = Math.max(maxTimestamp, startResult);
-
-            Value value;
-            try {
-                value = row.getOnlyColumnValue();
-            } catch (IllegalStateException e){
-                //this should never happen
-                System.out.printf("Error: Found a row in the transactions table that didn't have 1 and only 1 column value: start=%d%n", startResult);
-                continue;
-            }
-
-            long endResult = TransactionConstants.getTimestampForValue(value.getContents());
-            maxTimestamp = Math.max(maxTimestamp, endResult);
-            System.out.printf("Found and cleaning possibly inconsistent transaction: [start=%d, commit=%d]%n", startResult, endResult);
-
-            Cell key = Cell.create(rowName, TransactionConstants.COMMIT_TS_COLUMN);
-            toDelete.put(key, value.getTimestamp());  //value.getTimestamp() should always be 0L but this is safer
-        }
-
-        if (!toDelete.isEmpty()) {
-            kvs.delete(TransactionConstants.TRANSACTION_TABLE, toDelete);
-            System.out.println("Delete completed.");
-
-            pts.fastForwardTimestamp(maxTimestamp+1);
-            System.out.printf("Timestamp succesfully forwarded past all cleaned/deleted transactions to %d%n", maxTimestamp);
-        } else {
-            System.out.println("Found no transactions inside the given range to clean up or delete.");
-        }
-
-        return 0;
-    }
-
-    private boolean isValid(long immutableTimestamp, TimestampService ts) {
-        boolean isValid = true;
-
-        if (immutableTimestamp <= startTimestampExclusive) {
-            System.err.println("Error: There are no commited transactions in this range");
-            isValid &= false;
-        }
-
-        if (!(ts instanceof PersistentTimestampService)) {
-            System.err.printf("Error: Restoring timestamp service must be of type %s, but yours is %s%n",
-                    PersistentTimestampService.class.toString(), ts.getClass().toString());
-            isValid &= false;
-        }
-
-        return isValid;
-    }
-
-}
\ No newline at end of file
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java
index 01e80c37e77..1ceab64e42f 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/KvsMigrationCommand.java
@@ -19,6 +19,9 @@
 import java.io.IOException;
 import java.util.concurrent.Callable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
@@ -39,6 +42,9 @@
 
 @Command(name = "migrate", description = "Migrate your data from one key value service to another.")
 public class KvsMigrationCommand implements Callable<Integer> {
+
+    private static final Logger log = LoggerFactory.getLogger(KvsMigrationCommand.class);
+
     @Option(name = {"-fc", "--fromConfig"},
             title = "CONFIG PATH",
             description = "path to yaml configuration file for the KVS you're migrating from",
@@ -93,7 +99,7 @@ public Integer call() throws Exception {
 
 	public int execute(AtlasDbServices fromServices, AtlasDbServices toServices) {
         if (!setup && !migrate && !validate) {
-            System.err.println("At least one of --setup, --migrate, or --validate should be specified.");
+            log.error("At least one of --setup, --migrate, or --validate should be specified.");
             return 1;
         }
         KeyValueServiceMigrator migrator;
@@ -116,7 +122,7 @@ public int execute(AtlasDbServices fromServices, AtlasDbServices toServices) {
                     batchSize,
                     ImmutableMap.<TableReference, Integer>of(),
                     (String message, KeyValueServiceMigrator.KvsMigrationMessageLevel level) -> {
-                        System.out.println(level.toString() + ": " + message);
+                        log.info(level.toString() + ": " + message);
                     },
                     ImmutableSet.<TableReference>of());
             validator.validate(true);
@@ -149,12 +155,12 @@ private KeyValueServiceMigrator getMigrator(AtlasDbServices fromServices, AtlasD
                 batchSize,
                 ImmutableMap.<TableReference, Integer>of(),
                 (String message, KeyValueServiceMigrator.KvsMigrationMessageLevel level) -> {
-                    System.out.println(level.toString() + ": " + message);
+                    log.info(level.toString() + ": " + message);
                 },
                 new TaskProgress() {
                     @Override
                     public void beginTask(String message, int tasks) {
-                        System.out.println(message);
+                        log.info(message);
                     }
 
                     @Override
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java
index e184bed72e6..b46b38ed275 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SingleBackendCommand.java
@@ -18,6 +18,7 @@
 import java.io.IOException;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.cli.services.AtlasDbServices;
 import com.palantir.atlasdb.cli.services.AtlasDbServicesFactory;
 import com.palantir.atlasdb.cli.services.DaggerAtlasDbServices;
@@ -28,9 +29,12 @@ public abstract class SingleBackendCommand extends AbstractCommand {
 
     @Override
     public Integer call() {
+        Preconditions.checkState(isOnlineRunSupported() || isOffline(), "This CLI can only be run offline");
+
         try (AtlasDbServices services = connect()) {
             return execute(services);
         } catch (Exception e) {
+            e.printStackTrace();
             throw Throwables.rewrapAndThrowUncheckedException(e);
         }
     }
@@ -47,4 +51,5 @@ public <T extends AtlasDbServices> T connect(AtlasDbServicesFactory factory) thr
         return factory.connect(ServicesConfigModule.create(getAtlasDbConfig()));
     }
 
+    public abstract boolean isOnlineRunSupported();
 }
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java
index 91a4b0de27f..d7bfd25670b 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/SweepCommand.java
@@ -22,6 +22,9 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.google.common.base.Functions;
 import com.google.common.base.Optional;
 import com.google.common.base.Stopwatch;
@@ -44,6 +47,8 @@
 @Command(name = "sweep", description = "Sweep old table rows")
 public class SweepCommand extends SingleBackendCommand {
 
+    private static final Logger log = LoggerFactory.getLogger(SweepCommand.class);
+
     @Option(name = {"-n", "--namespace"},
             description = "An atlas namespace to sweep")
     String namespace;
@@ -68,16 +73,21 @@ public class SweepCommand extends SingleBackendCommand {
             description = "Time to wait in milliseconds after each sweep batch (throttles long-running sweep jobs, default: 0)")
     long sleepTimeInMs = 0;
 
+    @Override
+    public boolean isOnlineRunSupported() {
+        return true;
+    }
+
 	@Override
 	public int execute(final AtlasDbServices services) {
         SweepTaskRunner sweepRunner = services.getSweepTaskRunner();
 
         if (!((namespace != null) ^ (table != null) ^ sweepAllTables)) {
-            System.err.println("Specify one of --namespace, --table, or --all options.");
+            log.error("Specify one of --namespace, --table, or --all options.");
             return 1;
         }
         if ((namespace != null) && (row != null)) {
-            System.err.println("Cannot specify a start row (" + row + ") when sweeping multiple tables (in namespace " + namespace + ")");
+            log.error("Cannot specify a start row (" + row + ") when sweeping multiple tables (in namespace " + namespace + ")");
             return 1;
         }
 
@@ -114,10 +124,10 @@ public int execute(final AtlasDbServices services) {
             while (startRow.isPresent()) {
                 Stopwatch watch = Stopwatch.createStarted();
                 SweepResults results = sweepRunner.run(table, batchSize, startRow.get());
-                System.out.println(String.format("Swept from %s to %s in table %s in %d ms, examined %d unique cells, deleted %d cells.",
+                log.info("Swept from {} to {} in table {} in {} ms, examined {} unique cells, deleted {} cells.",
                         encodeStartRow(startRow), encodeEndRow(results.getNextStartRow()),
                         table, watch.elapsed(TimeUnit.MILLISECONDS),
-                        results.getCellsExamined(), results.getCellsDeleted()));
+                        results.getCellsExamined(), results.getCellsDeleted());
                 startRow = results.getNextStartRow();
                 cellsDeleted.addAndGet(results.getCellsDeleted());
                 cellsExamined.addAndGet(results.getCellsExamined());
@@ -132,14 +142,14 @@ public int execute(final AtlasDbServices services) {
                 priorityTable.putCellsExamined(row1, cellsExamined.get());
                 priorityTable.putLastSweepTime(row1, System.currentTimeMillis());
 
-                System.out.println(String.format("Finished sweeping %s, examined %d unique cells, deleted %d cells.",
-                        table, cellsExamined.get(), cellsDeleted.get()));
+                log.info("Finished sweeping {}, examined {} unique cells, deleted {} cells.",
+                        table, cellsExamined.get(), cellsDeleted.get());
 
                 if (cellsDeleted.get() > 0) {
                     Stopwatch watch = Stopwatch.createStarted();
                     services.getKeyValueService().compactInternally(table);
-                    System.out.println(String.format("Finished performing compactInternally on %s in %d ms.",
-                            table, watch.elapsed(TimeUnit.MILLISECONDS)));
+                    log.info("Finished performing compactInternally on {} in {} ms.",
+                            table, watch.elapsed(TimeUnit.MILLISECONDS));
                 }
                 return null;
             });
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/TimestampCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/TimestampCommand.java
deleted file mode 100644
index be78fcc3245..00000000000
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/TimestampCommand.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright 2015 Palantir Technologies
- *
- * Licensed under the BSD-3 License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://opensource.org/licenses/BSD-3-Clause
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.palantir.atlasdb.cli.command;
-
-import org.joda.time.DateTime;
-import org.joda.time.format.ISODateTimeFormat;
-
-import com.palantir.atlasdb.cleaner.KeyValueServicePuncherStore;
-import com.palantir.atlasdb.cli.services.AtlasDbServices;
-
-import io.airlift.airline.Command;
-import io.airlift.airline.Option;
-
-@Command(name = "timestamp", description = "Get timestamp information")
-public class TimestampCommand extends SingleBackendCommand {
-    
-    @Option(name = {"-f", "--fresh"},
-            description = "Get a fresh timestamp")
-    private boolean fresh;
-    
-    @Option(name = {"-i", "--immutable"},
-    		description = "Get the current immutable timestamp")
-    private boolean immutable;
-    
-    @Option(name = {"-d", "--date-time"},
-            description = "Return the earliest approximate wall clock datetime at which the immutable timestamp" +
-                    " could have been used in a transaction.  Requires --immutable to be set")
-    private boolean dateTime;
-    
-	@Override
-	public int execute(AtlasDbServices services) {
-	    if(dateTime && !immutable) {
-	        System.err.println("You can't use --date-time without also using --immutable");
-	        return 1;
-	    }
-	    
-	    long latestTimestamp = services.getTimestampService().getFreshTimestamp();
-
-        if (fresh || !(fresh || immutable)) {
-            System.out.println("Fresh timestamp is: " + latestTimestamp);
-        }
-
-        if (immutable) {
-        	long immutableTimestamp = services.getTransactionManager().getImmutableTimestamp();
-            System.out.println("Most recent immutable timestamp is: " + immutableTimestamp);
-            
-            if (dateTime) {
-                long timeMillis = KeyValueServicePuncherStore.getMillisForTimestamp(
-                        services.getKeyValueService(), immutableTimestamp);
-                DateTime dt = new DateTime(timeMillis);
-                String stringTime = ISODateTimeFormat.dateTimeNoMillis().print(dt);
-                System.out.println("Wall clock datetime of immutable timestamp is: " + stringTime);
-            }
-        }
-
-        return 0;
-	}
-}
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java
new file mode 100644
index 00000000000..d96dd10dcfd
--- /dev/null
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/AbstractTimestampCommand.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.cli.command.timestamp;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Set;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+import com.palantir.atlasdb.cli.command.SingleBackendCommand;
+import com.palantir.atlasdb.cli.services.AtlasDbServices;
+
+import io.airlift.airline.Option;
+import io.airlift.airline.OptionType;
+
+public abstract class AbstractTimestampCommand extends SingleBackendCommand {
+
+    private static final Logger log = LoggerFactory.getLogger(AbstractTimestampCommand.class);
+
+    @Option(name = {"-f", "--file"},
+            title = "TIMESTAMP_FILE",
+            type = OptionType.GROUP,
+            description = "Write/Read the timestamp for this command via the specified file.")
+    private File file;
+
+    @Option(name = {"-t", "--timestamp"},
+            title = "TIMESTAMP",
+            type = OptionType.GROUP,
+            description = "The timestamp for to use for this command")
+    Long timestamp;
+
+    protected abstract boolean requireTimestamp();
+
+    protected abstract int executeTimestampCommand(AtlasDbServices services);
+
+    @Override
+    public int execute(AtlasDbServices services) {
+        initialize();
+        return executeTimestampCommand(services);
+    }
+
+    private void initialize() {
+        if (!requireTimestamp() && timestamp != null) {
+            throw new IllegalArgumentException("This command does not require an input timestamp but you specified one.");
+        } else if (requireTimestamp() && ((timestamp == null && file == null) || (timestamp != null && file != null))) {
+            throw new IllegalArgumentException("This command requires an input timestamp, "
+                    + "so you must specify one and only one (either directly or via a file).");
+        } else if (requireTimestamp() && file != null) {
+            timestamp = readTimestampFromFile();
+        }
+    }
+
+	private long readTimestampFromFile() {
+        String timestamp;
+        try {
+            timestamp = StringUtils.strip(Iterables.getOnlyElement(Files.readAllLines(file.toPath())));
+        } catch (IOException e) {
+            log.error("IOException thrown reading timestamp from file: {}", file.getPath());
+            throw Throwables.propagate(e);
+        }
+        return Long.parseLong(timestamp);
+    }
+
+	private void writeTimestampToFile() {
+        Set<String> lines = Sets.newHashSet(Long.toString(timestamp));
+        try {
+            Files.write(file.toPath(), lines, StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            log.error("IOException thrown writing timestamp to file: {}", file.getPath());
+            Throwables.propagate(e);
+        }
+	}
+
+	protected void writeTimestampToFileIfSpecified() {
+	    if (file != null) {
+	        writeTimestampToFile();
+	    }
+	}
+}
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java
new file mode 100644
index 00000000000..111fc9dca4f
--- /dev/null
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/CleanTransactionRange.java
@@ -0,0 +1,98 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.cli.command.timestamp;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.palantir.atlasdb.cli.services.AtlasDbServices;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import com.palantir.common.base.ClosableIterator;
+
+import io.airlift.airline.Command;
+
+@Command(name = "clean-transactions", description = "Clean a recently restored backup of a _transactions table "
+        + "from an underlying database that lacks PITR backup semantics.  Deletes all transactions with a "
+        + "commit timestamp greater than the timestamp provided.")
+public class CleanTransactionRange extends AbstractTimestampCommand {
+
+    private static final Logger log = LoggerFactory.getLogger(CleanTransactionRange.class);
+
+    @Override
+    public boolean isOnlineRunSupported() {
+        return false;
+    }
+
+    @Override
+    protected boolean requireTimestamp() {
+        return true;
+    }
+
+    @Override
+    protected int executeTimestampCommand(AtlasDbServices services) {
+        KeyValueService kvs = services.getKeyValueService();
+
+        byte[] startRowInclusive = TransactionConstants.getValueForTimestamp(timestamp);
+        ClosableIterator<RowResult<Value>> range = kvs.getRange(
+                TransactionConstants.TRANSACTION_TABLE,
+                RangeRequest.builder()
+                        .startRowInclusive(startRowInclusive)
+                        .build(),
+                Long.MAX_VALUE);
+
+        Multimap<Cell, Long> toDelete = HashMultimap.create();
+        while (range.hasNext()) {
+            RowResult<Value> row = range.next();
+            byte[] rowName = row.getRowName();
+            long startTs = TransactionConstants.getTimestampForValue(rowName);
+
+            Value value;
+            try {
+                value = row.getOnlyColumnValue();
+            } catch (IllegalStateException e){
+                //this should never happen
+                log.error("Found a row in the transactions table that didn't have 1 and only 1 column value: start={}", startTs);
+                continue;
+            }
+
+            long commitTs = TransactionConstants.getTimestampForValue(value.getContents());
+            if (commitTs <= timestamp) {
+                continue; // this is a valid transaction
+            }
+
+            log.info("Found and cleaning possibly inconsistent transaction: [start={}, commit={}]", startTs, commitTs);
+
+            Cell key = Cell.create(rowName, TransactionConstants.COMMIT_TS_COLUMN);
+            toDelete.put(key, value.getTimestamp());  //value.getTimestamp() should always be 0L
+        }
+
+        if (!toDelete.isEmpty()) {
+            kvs.delete(TransactionConstants.TRANSACTION_TABLE, toDelete);
+            log.info("Delete completed.");
+        } else {
+            log.info("Found no transactions after the given timestamp to delete.");
+        }
+
+        return 0;
+    }
+}
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java
new file mode 100644
index 00000000000..fd98b8a61c7
--- /dev/null
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FastForwardTimestamp.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.cli.command.timestamp;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.palantir.atlasdb.cli.services.AtlasDbServices;
+import com.palantir.timestamp.PersistentTimestampService;
+import com.palantir.timestamp.TimestampService;
+
+import io.airlift.airline.Command;
+
+@Command(name = "fast-forward", description = "Fast forward the stored upper limit of a persistent timestamp"
+        + " service to the specified timestamp.  Is used in the restore process to ensure that all future timestamps used are"
+        + " explicity greater than any that may have been used to write data to the KVS before backing up the underlying storage.")
+public class FastForwardTimestamp extends AbstractTimestampCommand {
+    private static final Logger log = LoggerFactory.getLogger(FastForwardTimestamp.class);
+
+    @Override
+    public boolean isOnlineRunSupported() {
+        return false;
+    }
+
+    @Override
+    protected boolean requireTimestamp() {
+        return true;
+    }
+
+    @Override
+    protected int executeTimestampCommand(AtlasDbServices services) {
+        TimestampService ts = services.getTimestampService();
+        if (!(ts instanceof PersistentTimestampService)) {
+            log.error("Timestamp service must be of type {}, but yours is {}.  Exiting.",
+                    PersistentTimestampService.class.toString(), ts.getClass().toString());
+            return 1;
+        }
+        PersistentTimestampService pts = (PersistentTimestampService) ts;
+
+        pts.fastForwardTimestamp(timestamp);
+        log.info("Timestamp succesfully fast-forwarded to {}", timestamp);
+        return 0;
+    }
+}
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java
new file mode 100644
index 00000000000..d116b5acfc5
--- /dev/null
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/command/timestamp/FetchTimestamp.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.cli.command.timestamp;
+
+import org.joda.time.DateTime;
+import org.joda.time.format.ISODateTimeFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.palantir.atlasdb.cleaner.KeyValueServicePuncherStore;
+import com.palantir.atlasdb.cli.services.AtlasDbServices;
+
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
+import io.airlift.airline.OptionType;
+
+@Command(name = "fetch", description = "Fetches a timestamp. By default"
+        + " this will be a fresh timestamp unless otherwise specified.")
+public class FetchTimestamp extends AbstractTimestampCommand {
+    private static final Logger log = LoggerFactory.getLogger(FetchTimestamp.class);
+
+    @Option(name = {"-i", "--immutable"},
+            type = OptionType.COMMAND,
+            description = "Get the current immutable timestamp, instead of a fresh one.")
+    private boolean immutable;
+
+    @Option(name = {"-d", "--date-time"},
+            type = OptionType.COMMAND,
+            description = "Return the earliest approximate wall clock datetime at which the chosen timestamp" +
+                    " could have been used in a transaction.")
+    private boolean dateTime;
+
+    private static final String IMMUTABLE_STRING = "Immutable";
+    private static final String FRESH_STRING = "Fresh";
+
+    @Override
+    public boolean isOnlineRunSupported() {
+        return true;
+    }
+
+    @Override
+    protected boolean requireTimestamp() {
+        return false;
+    }
+
+    @Override
+    protected int executeTimestampCommand(AtlasDbServices services) {
+        String name;
+        if (immutable) {
+            timestamp = services.getTransactionManager().getImmutableTimestamp();
+            name = IMMUTABLE_STRING;
+        } else {
+            timestamp = services.getTimestampService().getFreshTimestamp();
+            name = FRESH_STRING;
+        }
+        log.info("The {} timestamp is: {}", name, timestamp);
+        writeTimestampToFileIfSpecified();
+
+        if (dateTime) {
+            long timeMillis = KeyValueServicePuncherStore.getMillisForTimestamp(
+                    services.getKeyValueService(), timestamp);
+            DateTime dt = new DateTime(timeMillis);
+            String stringTime = ISODateTimeFormat.dateTime().print(dt);
+            log.info("Wall clock datetime of {} timestamp is: {}", name, stringTime);
+        }
+
+        log.info("Timestamp command completed succesfully.");
+        return 0;
+    }
+}
diff --git a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/services/ServicesConfig.java b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/services/ServicesConfig.java
index 6e346635217..49d54b29094 100644
--- a/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/services/ServicesConfig.java
+++ b/atlasdb-cli/src/main/java/com/palantir/atlasdb/cli/services/ServicesConfig.java
@@ -34,7 +34,7 @@ public abstract class ServicesConfig {
 
     @Value.Derived
     public ServiceDiscoveringAtlasSupplier atlasDbSupplier() {
-        return new ServiceDiscoveringAtlasSupplier(atlasDbConfig().keyValueService());
+        return new ServiceDiscoveringAtlasSupplier(atlasDbConfig().keyValueService(), atlasDbConfig().leader());
     }
 
     @Value.Default
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java
index 4cd4799d089..1613e6b3683 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestKvsMigrationCommand.java
@@ -42,7 +42,7 @@ private KvsMigrationCommand getCommand(String[] args) throws URISyntaxException
         String filePath = AbstractTestRunner.getResourcePath(InMemoryTestRunner.CONFIG_LOCATION);
         String[] initArgs = new String[] { "migrate", "-fc", filePath, "-mc", filePath };
         String[] fullArgs = ObjectArrays.concat(initArgs, args, String.class);
-        return AbstractTestRunner.buildCli(KvsMigrationCommand.class).parse(fullArgs);
+        return AbstractTestRunner.buildCommand(KvsMigrationCommand.class, fullArgs);
     }
 
     @Test
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java
index e73a43fcc16..f2aa3475c99 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSingleBackendCommand.java
@@ -48,6 +48,11 @@ public static class TestCommand extends SingleBackendCommand {
         @Option(name = {"-f2", "--flag2"}, description = "flag 2")
         String flag2;
 
+        @Override
+        public boolean isOnlineRunSupported() {
+            return true;
+        }
+
         @Override
         public int execute(AtlasDbServices services) {
             // test a method on each of the services
@@ -90,22 +95,22 @@ public void testRunHelp() {
 
     @Test
     public void testRun() {
-        assertSuccessful(runTest(new String[] { "test", "--config", SIMPLE_CONFIG_FILE}));
+        assertSuccessful(runTest(new String[] { "--config", SIMPLE_CONFIG_FILE, "test"}));
     }
 
     @Test
     public void testFlag1Run() {
-        assertSuccessful(runTest(new String[] { "test", "--config", SIMPLE_CONFIG_FILE, "--flag1"}));
+        assertSuccessful(runTest(new String[] { "--config", SIMPLE_CONFIG_FILE, "test", "--flag1"}));
     }
 
     @Test
     public void testFlag2Run() {
-        assertSuccessful(runTest(new String[] { "test", "-c", SIMPLE_CONFIG_FILE, "--flag2", "test.new_table"}));
+        assertSuccessful(runTest(new String[] { "-c", SIMPLE_CONFIG_FILE, "test", "--flag2", "test.new_table"}));
     }
 
     @Test
     public void testRunNestedConfig() {
-        assertSuccessful(runTest(new String[] { "test", "-c", NESTED_CONFIG_FILE, "-f1", "--config-root", "atlasdb", "-f2", "test.new_table"}));
+        assertSuccessful(runTest(new String[] { "-c", NESTED_CONFIG_FILE, "--config-root", "/config/dropwizardConfig/real/atlasdb", "test", "-f1", "-f2", "test.new_table"}));
     }
 
     @Test
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java
index 2341275a479..c9add1f65f8 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestSweepCommand.java
@@ -45,6 +45,8 @@
 import com.palantir.atlasdb.transaction.impl.SerializableTransactionManager;
 import com.palantir.timestamp.TimestampService;
 
+import io.airlift.airline.Command;
+
 public class TestSweepCommand {
 
     private static final Namespace NS1 = Namespace.create("test");
@@ -53,6 +55,7 @@ public class TestSweepCommand {
     private static final TableReference TABLE_TWO = TableReference.create(NS1, "two");
     private static final TableReference TABLE_THREE = TableReference.create(NS2, "one");
     private static final String COL = "c";
+    private static final String SWEEP_COMMAND = SweepCommand.class.getAnnotation(Command.class).name();
 
     private static AtomicLong sweepTimestamp;
     private static AtlasDbServicesFactory moduleFactory;
@@ -77,7 +80,7 @@ private InMemoryTestRunner makeRunner(String... args) {
 
     @Test
     public void testSweepTable() throws Exception {
-        try (SingleBackendCliTestRunner runner = makeRunner("-t", TABLE_ONE.getQualifiedName())) {
+        try (SingleBackendCliTestRunner runner = makeRunner(SWEEP_COMMAND, "-t", TABLE_ONE.getQualifiedName())) {
             TestAtlasDbServices services = runner.connect(moduleFactory);
             SerializableTransactionManager txm = services.getTransactionManager();
             TimestampService tss = services.getTimestampService();
@@ -110,7 +113,7 @@ public void testSweepTable() throws Exception {
 
     @Test
     public void testSweepNamespace() throws Exception {
-        try (SingleBackendCliTestRunner runner = makeRunner("-n", NS1.getName())) {
+        try (SingleBackendCliTestRunner runner = makeRunner(SWEEP_COMMAND, "-n", NS1.getName())) {
             TestAtlasDbServices services = runner.connect(moduleFactory);
             SerializableTransactionManager txm = services.getTransactionManager();
             TimestampService tss = services.getTimestampService();
@@ -142,7 +145,7 @@ public void testSweepNamespace() throws Exception {
 
     @Test
     public void testSweepAll() throws Exception {
-        try (SingleBackendCliTestRunner runner = makeRunner("-a")) {
+        try (SingleBackendCliTestRunner runner = makeRunner(SWEEP_COMMAND, "-a")) {
             TestAtlasDbServices services = runner.connect(moduleFactory);
             SerializableTransactionManager txm = services.getTransactionManager();
             TimestampService tss = services.getTimestampService();
@@ -174,7 +177,7 @@ public void testSweepAll() throws Exception {
 
     @Test
     public void testSweepStartRow() throws Exception {
-        try (SingleBackendCliTestRunner runner = makeRunner("-t", TABLE_ONE.getQualifiedName(), "-r", BaseEncoding.base16().encode("foo".getBytes()))) {
+        try (SingleBackendCliTestRunner runner = makeRunner(SWEEP_COMMAND, "-t", TABLE_ONE.getQualifiedName(), "-r", BaseEncoding.base16().encode("foo".getBytes()))) {
             TestAtlasDbServices services = runner.connect(moduleFactory);
             SerializableTransactionManager txm = services.getTransactionManager();
             TimestampService tss = services.getTimestampService();
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java
index 3c72e665f75..5f57c306e05 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/command/TestTimestampCommand.java
@@ -15,20 +15,43 @@
  */
 package com.palantir.atlasdb.cli.command;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 import java.util.Scanner;
+import java.util.concurrent.TimeUnit;
 
+import org.joda.time.DateTime;
 import org.joda.time.format.ISODateTimeFormat;
+import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import com.google.common.base.Preconditions;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSortedMap;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Uninterruptibles;
+import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.cleaner.GlobalClock;
+import com.palantir.atlasdb.cleaner.KeyValueServicePuncherStore;
+import com.palantir.atlasdb.cleaner.Puncher;
+import com.palantir.atlasdb.cleaner.PuncherStore;
+import com.palantir.atlasdb.cleaner.SimplePuncher;
+import com.palantir.atlasdb.cli.command.timestamp.FetchTimestamp;
 import com.palantir.atlasdb.cli.runner.InMemoryTestRunner;
 import com.palantir.atlasdb.cli.runner.SingleBackendCliTestRunner;
 import com.palantir.atlasdb.cli.services.AtlasDbServicesFactory;
 import com.palantir.atlasdb.cli.services.DaggerTestAtlasDbServices;
 import com.palantir.atlasdb.cli.services.ServicesConfigModule;
 import com.palantir.atlasdb.cli.services.TestAtlasDbServices;
+import com.palantir.common.time.Clock;
 import com.palantir.lock.LockClient;
 import com.palantir.lock.LockDescriptor;
 import com.palantir.lock.LockMode;
@@ -38,11 +61,15 @@
 import com.palantir.lock.StringLockDescriptor;
 import com.palantir.timestamp.TimestampService;
 
+@RunWith(Parameterized.class)
 public class TestTimestampCommand {
 
     private static LockDescriptor lock;
     private static AtlasDbServicesFactory moduleFactory;
 
+    private static final String TIMESTAMP_FILE_PATH = "test.timestamp";
+    private static final File TIMESTAMP_FILE = new File(TIMESTAMP_FILE_PATH);
+
     @BeforeClass
     public static void setup() throws Exception {
         lock = StringLockDescriptor.of("lock");
@@ -54,48 +81,133 @@ public TestAtlasDbServices connect(ServicesConfigModule servicesConfigModule) {
                         .build();
             }
         };
+        cleanUpTimestampFile();
+    }
+
+    @Parameterized.Parameter(value = 0)
+    public boolean isImmutable;
+
+    @Parameterized.Parameter(value = 1)
+    public boolean isToFile;
+
+    @Parameterized.Parameters
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(new Object[][] {
+                { true, true },
+                { true, false },
+                { false, true },
+                { false, false }
+        });
+    }
+
+    @After
+    public void cleanUp() {
+        cleanUpTimestampFile();
+    }
+
+    private static void cleanUpTimestampFile() {
+        if (TIMESTAMP_FILE.exists()){
+            TIMESTAMP_FILE.delete();
+        }
     }
 
     private SingleBackendCliTestRunner makeRunner(String... args) {
-        return new InMemoryTestRunner(TimestampCommand.class, args);
+        return new InMemoryTestRunner(FetchTimestamp.class, args);
     }
 
+    /*
+     * Test that the various values produced by fetching either a fresh timestamp or
+     * an immutable timestamp are correct relative to one another as well as the current
+     * state of locks held by the lock service. isImmutable designates whether or not we
+     * provided the argument to fetch the immutable timestamp rather than a fresh one.
+     *
+     * Also make sure that the wallclock times associated with those timestamps are correct
+     * according to the current state of the _punch table.  We always provide the argument
+     * to output this and thus always check it.
+     *
+     * Additionally, check that the formatting of commands that are writing the timestamps
+     * to a file for the purposes of scripting these commands is also correct.  isToFile
+     * designates whether or not we provided the argument to write to a file rather than just stdout
+     */
     @Test
-    public void testBasicInvariants() throws Exception {
-        try (SingleBackendCliTestRunner runner = makeRunner("-f", "-i", "-d")) {
+    public void genericTest() throws Exception {
+        List<String> cliArgs = Lists.newArrayList("timestamp"); //group command
+        if (isToFile) {
+            cliArgs.add("-f");
+            cliArgs.add(TIMESTAMP_FILE_PATH);
+        }
+        cliArgs.add("fetch");
+        if (isImmutable) {
+            cliArgs.add("-i");
+        }
+        cliArgs.add("-d"); //always test datetime
+
+        try (SingleBackendCliTestRunner runner = makeRunner(cliArgs.toArray(new String[0]))) {
             TestAtlasDbServices services = runner.connect(moduleFactory);
             RemoteLockService rls = services.getLockService();
             TimestampService tss = services.getTimestampService();
             LockClient client = services.getTestLockClient();
 
-            long lockedTs = tss.getFreshTimestamp();
+            // this is a really hacky way of forcing a punch to test the datetime output
+            Clock clock = GlobalClock.create(rls);
+            long prePunch = clock.getTimeMillis();
+            Uninterruptibles.sleepUninterruptibly(2, TimeUnit.MILLISECONDS);
+            long punchTs = tss.getFreshTimestamps(1000).getUpperBound();
+            PuncherStore puncherStore = KeyValueServicePuncherStore.create(services.getKeyValueService());
+            Puncher puncher = SimplePuncher.create(puncherStore, clock, Suppliers.ofInstance(AtlasDbConstants.DEFAULT_TRANSACTION_READ_TIMEOUT));
+            puncher.punch(punchTs);
+            Uninterruptibles.sleepUninterruptibly(2, TimeUnit.MILLISECONDS);
+            long postPunch = clock.getTimeMillis();
+
+            long immutableTs = tss.getFreshTimestamp();
             LockRequest request = LockRequest.builder(ImmutableSortedMap.of(
                     lock, LockMode.WRITE))
-                    .withLockedInVersionId(lockedTs).doNotBlock().build();
+                    .withLockedInVersionId(immutableTs).doNotBlock().build();
             LockRefreshToken token = rls.lock(client.getClientId(), request);
-
-            runner.run();
-
-            Scanner scanner = new Scanner(runner.run());
-            final long fresh = Long.parseLong(scanner.findInLine("\\d+"));
-            final long immutable = Long.parseLong(scanner.findInLine("\\d+"));
-            String immutableDateTime = scanner.findInLine("\\d+.*").trim();
-            ISODateTimeFormat.dateTimeNoMillis().parseDateTime(immutableDateTime);
-            Preconditions.checkArgument(immutable <= lockedTs);
-            Preconditions.checkArgument(fresh > lockedTs);
-            Preconditions.checkArgument(fresh < tss.getFreshTimestamp());
-            scanner.close();
+            long lastFreshTs = tss.getFreshTimestamps(1000).getUpperBound();
+            runAndVerify(runner, tss, isImmutable, immutableTs, lastFreshTs, prePunch, postPunch);
 
             rls.unlock(token);
+            lastFreshTs = tss.getFreshTimestamps(1000).getUpperBound();
+            // there are no locks so we now expect immutable to just be a fresh
+            runner.freshCommand();
+            runAndVerify(runner, tss, false, lastFreshTs, lastFreshTs, prePunch, postPunch);
+        }
+    }
+
+    private void runAndVerify(SingleBackendCliTestRunner runner, TimestampService tss,
+            boolean immutable, long immutableTs, long lastFreshTs,
+            long prePunch, long postPunch) throws IOException {
+        // run the stuff
+        Scanner scanner = new Scanner(runner.run(true, false));
+        // get timestamp from stdout
+        String line = scanner.findInLine(".*timestamp\\sis\\:\\s(\\d+.*)");
+        scanner.nextLine();
+        String[] parts = line.split(" ");
+        long timestamp = Long.parseLong(parts[parts.length-1]);
+        // get datetime from stdout
+        line = scanner.findInLine(".*Wall\\sclock\\sdatetime.*\\s(\\d+.*)");
+        parts = line.split(" ");
+        DateTime datetime = ISODateTimeFormat.dateTime().parseDateTime(parts[parts.length-1]);
+        // get timestamp from file
+        if (isToFile) {
+            Preconditions.checkArgument(TIMESTAMP_FILE.exists(), "Timestamp file doesn't exist.");
+            List<String> lines = Files.readAllLines(TIMESTAMP_FILE.toPath(), StandardCharsets.UTF_8);
+            timestamp = Long.parseLong(lines.get(0));
+        }
+        scanner.close();
 
-            scanner = new Scanner(runner.run());
-            final long newFresh = Long.parseLong(scanner.findInLine("\\d+"));
-            final long newImmutable = Long.parseLong(scanner.findInLine("\\d+"));
-            final String newImmutableDateTime = scanner.findInLine("\\d+.*").trim();
-            ISODateTimeFormat.dateTimeNoMillis().parseDateTime(newImmutableDateTime);
-            Preconditions.checkArgument(newFresh > fresh);
-            Preconditions.checkArgument(newImmutable > lockedTs);
-            scanner.close();
+        // verify correctness
+        Preconditions.checkArgument(datetime.isAfter(prePunch));
+        Preconditions.checkArgument(datetime.isBefore(postPunch));
+        if (immutable) {
+            Preconditions.checkArgument(timestamp == immutableTs);
+            Preconditions.checkArgument(timestamp < lastFreshTs);
+            Preconditions.checkArgument(timestamp < tss.getFreshTimestamp());
+        } else {
+            Preconditions.checkArgument(timestamp > immutableTs);
+            Preconditions.checkArgument(timestamp > lastFreshTs);
+            Preconditions.checkArgument(timestamp < tss.getFreshTimestamp());
         }
     }
 
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java
index 47b546a3c9e..e83816c8b42 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/AbstractTestRunner.java
@@ -24,14 +24,12 @@
 
 import org.apache.commons.lang.ArrayUtils;
 
+import com.palantir.atlasdb.cli.AtlasCli;
 import com.palantir.atlasdb.cli.command.SingleBackendCommand;
 import com.palantir.atlasdb.cli.services.AtlasDbServices;
 import com.palantir.atlasdb.cli.services.AtlasDbServicesFactory;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 
-import io.airlift.airline.Cli;
-import io.airlift.airline.Command;
-
 public abstract class AbstractTestRunner <S extends AtlasDbServices> implements SingleBackendCliTestRunner {
 
     private final Class<? extends SingleBackendCommand> cmdClass;
@@ -47,15 +45,18 @@ protected AbstractTestRunner(Class<? extends SingleBackendCommand> cmdClass, Str
 
     @Override
     public S connect(AtlasDbServicesFactory factory) throws Exception {
-        cmd = buildCli(cmdClass).parse(buildArgs());
+        cmd = buildCommand(cmdClass, buildArgs());
         services = cmd.connect(factory);
         return services;
     }
 
+    public void freshCommand() throws URISyntaxException {
+        cmd = buildCommand(cmdClass, buildArgs());
+    }
+
     private String[] buildArgs() throws URISyntaxException {
         String filePath = getResourcePath(getKvsConfigFileName());
-        String cmdName = cmdClass.getAnnotation(Command.class).name();
-        String[] initArgs = new String[] { cmdName, "-c", filePath };
+        String[] initArgs = new String[] { "-c", filePath };
         return (String[]) ArrayUtils.addAll(initArgs, args);
     }
 
@@ -101,12 +102,8 @@ public static String getResourcePath(String fileName) throws URISyntaxException
         return Paths.get(AbstractTestRunner.class.getClassLoader().getResource(fileName).toURI()).toString();
     }
 
-    public static <T extends Callable<Integer>> Cli<T> buildCli(Class<T> cmd) {
-        Cli.CliBuilder<T> builder = Cli.<T>builder("tester")
-                .withDescription("Testing " + cmd)
-                .withDefaultCommand(cmd)
-                .withCommands(cmd);
-        return builder.build();
+    public static <T extends Callable<Integer>> T buildCommand(Class<T> cmd, String... args) {
+        return (T) AtlasCli.buildCli().parse(args);
     }
 
 }
diff --git a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java
index 3777a765dde..0eb1717bebd 100644
--- a/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java
+++ b/atlasdb-cli/src/test/java/com/palantir/atlasdb/cli/runner/SingleBackendCliTestRunner.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.atlasdb.cli.runner;
 
+import java.net.URISyntaxException;
+
 import com.palantir.atlasdb.cli.services.AtlasDbServices;
 import com.palantir.atlasdb.cli.services.AtlasDbServicesFactory;
 
@@ -28,4 +30,8 @@ public interface SingleBackendCliTestRunner extends AutoCloseable {
 
     String run(boolean failOnNonZeroExit, boolean singleLine);
 
+    // Commands are often not idempotent.  Calling this will clear any state
+    // held in the command class instance, but not the KVS
+    void freshCommand() throws URISyntaxException;
+
 }
diff --git a/atlasdb-cli/src/test/resources/nested_cli_test_config.yml b/atlasdb-cli/src/test/resources/nested_cli_test_config.yml
index 0b12491cec8..921e961c844 100644
--- a/atlasdb-cli/src/test/resources/nested_cli_test_config.yml
+++ b/atlasdb-cli/src/test/resources/nested_cli_test_config.yml
@@ -9,8 +9,12 @@ config:
           port: 3829
 
     atlasdb:
-      keyValueService:
-        type: memory
+      notAnAtlas: configuration
+
+    real:
+      atlasdb:
+        keyValueService:
+          type: memory
 
 otherConfig:
   - type: otherType
diff --git a/atlasdb-client/build.gradle b/atlasdb-client/build.gradle
index 2ef9da9195c..2e2e609a173 100644
--- a/atlasdb-client/build.gradle
+++ b/atlasdb-client/build.gradle
@@ -16,7 +16,6 @@ dependencies {
   compile(project(":atlasdb-commons"))
   compile(project(":atlasdb-api"))
   compile(project(":atlasdb-client-protobufs"))
-  compile(project(":atlasdb-spi"))
   compile(group: "com.googlecode.json-simple",
           name: "json-simple",
           version: "1.1.1") {
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java
index 7cc4f97312f..17dbd0740af 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractKeyValueService.java
@@ -48,8 +48,10 @@
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.AtlasDbPerformanceConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.common.base.Throwables;
@@ -314,4 +316,9 @@ protected TableReference fromInternalTableName(String tableName) {
         }
         return TableReference.createUnsafe(tableName.replaceFirst("__", "."));
     }
+
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef, Iterable<byte[]> rows, ColumnRangeSelection columnRangeSelection, long timestamp) {
+        return KeyValueServices.filterGetRowsToColumnRange(this, tableRef, rows, columnRangeSelection, timestamp);
+    }
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java
index 66b82a9bbd4..d0b35854e48 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/DualWriteKeyValueService.java
@@ -22,10 +22,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -221,4 +223,9 @@ public void compactInternally(TableReference tableRef) {
         delegate1.compactInternally(tableRef);
         delegate2.compactInternally(tableRef);
     }
+
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef, Iterable<byte[]> rows, ColumnRangeSelection columnRangeSelection, long timestamp) {
+        return delegate1.getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+    }
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java
index c2ca9eb2de4..551223c8de4 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ForwardingKeyValueService.java
@@ -23,10 +23,12 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -98,6 +100,11 @@ public Map<Cell, Value> getRows(TableReference tableRef, Iterable<byte[]> rows,
         return delegate().getRows(tableRef, rows, columnSelection, timestamp);
     }
 
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef, Iterable<byte[]> rows, ColumnRangeSelection columnRangeSelection, long timestamp) {
+        return delegate().getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+    }
+
     @Override
     public Map<Cell, Long> getLatestTimestamps(TableReference tableRef, Map<Cell, Long> timestampByCell) {
         return delegate().getLatestTimestamps(tableRef, timestampByCell);
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java
index ecf67254716..e5cd1066ab0 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java
@@ -18,6 +18,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -46,9 +47,12 @@
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -101,18 +105,7 @@ public Map<Cell, Value> getRows(TableReference tableRef, Iterable<byte[]> rows,
                 Key key = entry.getKey();
                 Iterator<Entry<Key, byte[]>> cellIter = takeCell(entries, key);
                 if (columnSelection.contains(key.col)) {
-                    Entry<Key, byte[]> lastEntry = null;
-                    while (cellIter.hasNext()) {
-                        Entry<Key, byte[]> curEntry = cellIter.next();
-                        if (curEntry.getKey().ts >= timestamp) {
-                            break;
-                        }
-                        lastEntry = curEntry;
-                    }
-                    if (lastEntry != null) {
-                        long ts = lastEntry.getKey().ts;
-                        result.put(Cell.create(row, key.col), Value.createWithCopyOfData(lastEntry.getValue(), ts));
-                    }
+                    getLatestVersionOfCell(row, key, cellIter, timestamp, result);
                 }
                 Iterators.size(cellIter);
             }
@@ -121,6 +114,23 @@ public Map<Cell, Value> getRows(TableReference tableRef, Iterable<byte[]> rows,
         return result;
     }
 
+    private void getLatestVersionOfCell(byte[] row, Key key, Iterator<Entry<Key, byte[]>> cellIter, long timestamp,
+                                        @Output Map<Cell, Value> result) {
+        Entry<Key, byte[]> lastEntry = null;
+        while (cellIter.hasNext()) {
+            Entry<Key, byte[]> curEntry = cellIter.next();
+            if (curEntry.getKey().ts >= timestamp) {
+                break;
+            }
+            lastEntry = curEntry;
+        }
+        if (lastEntry != null) {
+            long ts = lastEntry.getKey().ts;
+            byte[] value = lastEntry.getValue();
+            result.put(Cell.create(row, key.col), Value.createWithCopyOfData(value, ts));
+        }
+    }
+
     @Override
     public Map<Cell, Value> get(TableReference tableRef, Map<Cell, Long> timestampByCell) {
         ConcurrentSkipListMap<Key, byte[]> table = getTableMap(tableRef).entries;
@@ -289,6 +299,41 @@ protected Entry<Key, byte[]> computeNext() {
         };
     }
 
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef, Iterable<byte[]> rows,
+                                                                  ColumnRangeSelection columnRangeSelection, long timestamp) {
+        Map<byte[], RowColumnRangeIterator> result = Maps.newHashMap();
+        ConcurrentSkipListMap<Key, byte[]> table = getTableMap(tableRef).entries;
+
+        for (byte[] row : rows) {
+            Cell rowBegin;
+            if (columnRangeSelection.getStartCol().length > 0) {
+                rowBegin = Cell.create(row, columnRangeSelection.getStartCol());
+            } else {
+                rowBegin = Cells.createSmallestCellForRow(row);
+            }
+            // Inclusive last cell.
+            Cell rowEnd;
+            if (columnRangeSelection.getEndCol().length > 0) {
+                rowEnd = Cell.create(row, RangeRequests.previousLexicographicName(columnRangeSelection.getEndCol()));
+            } else {
+                rowEnd = Cells.createLargestCellForRow(row);
+            }
+            PeekingIterator<Entry<Key, byte[]>> entries = Iterators.peekingIterator(table.subMap(
+                    new Key(rowBegin, Long.MIN_VALUE), new Key(rowEnd, timestamp)).entrySet().iterator());
+            LinkedHashMap<Cell, Value> rowResults = new LinkedHashMap<Cell, Value>();
+            while (entries.hasNext()) {
+                Entry<Key, byte[]> entry = entries.peek();
+                Key key = entry.getKey();
+                Iterator<Entry<Key, byte[]>> cellIter = takeCell(entries, key);
+                getLatestVersionOfCell(row, key, cellIter, timestamp, rowResults);
+            }
+            result.put(row, new LocalRowColumnRangeIterator(rowResults.entrySet().iterator()));
+        }
+
+        return result;
+    }
+
     private interface ResultProducer<T> {
         @Nullable T apply(Iterator<Entry<Key, byte[]>> timestampValues);
     }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java
index 7abdf5eca28..d81898488b6 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/KeyValueServices.java
@@ -19,20 +19,28 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
 import java.util.concurrent.ExecutorService;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Maps;
+import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -41,6 +49,7 @@
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.BlockingWorkerPool;
+import com.palantir.util.crypto.Sha256Hash;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
 
@@ -146,4 +155,45 @@ public Map.Entry<Cell, Value> apply(Map.Entry<Cell, byte[]> entry) {
             }
         });
     }
+
+    // TODO: kill this when we can properly implement this on all KVSes
+    public static Map<byte[], RowColumnRangeIterator> filterGetRowsToColumnRange(KeyValueService kvs, TableReference tableRef, Iterable<byte[]> rows, ColumnRangeSelection columnRangeSelection, long timestamp) {
+        log.warn("Using inefficient postfiltering for getRowsColumnRange because the KVS doesn't support it natively. Production " +
+                "environments should use a KVS with a proper implementation.");
+        Map<Cell, Value> allValues = kvs.getRows(tableRef, rows, ColumnSelection.all(), timestamp);
+        Map<Sha256Hash, byte[]> hashesToBytes = Maps.newHashMap();
+        Map<Sha256Hash, ImmutableSortedMap.Builder<byte[], Value>> rowsToColumns = Maps.newHashMap();
+
+        for (byte[] row : rows) {
+            Sha256Hash rowHash = Sha256Hash.computeHash(row);
+            hashesToBytes.put(rowHash, row);
+            ImmutableSortedMap.Builder<byte[], Value> builder =
+                    ImmutableSortedMap.<byte[], Value>orderedBy(UnsignedBytes.lexicographicalComparator());
+            rowsToColumns.put(rowHash, builder);
+        }
+        for (Map.Entry<Cell, Value> e : allValues.entrySet()) {
+            Sha256Hash rowHash = Sha256Hash.computeHash(e.getKey().getRowName());
+            rowsToColumns.get(rowHash).put(e.getKey().getColumnName(), e.getValue());
+        }
+
+        Map<byte[], RowColumnRangeIterator> results = Maps.newHashMap();
+        for (Map.Entry<Sha256Hash, ImmutableSortedMap.Builder<byte[], Value>> row : rowsToColumns.entrySet()) {
+            SortedMap<byte[], Value> map = row.getValue().build();
+            Set<Map.Entry<byte[], Value>> subMap;
+            if ((columnRangeSelection.getStartCol().length == 0) && (columnRangeSelection.getEndCol().length == 0)) {
+                subMap = map.entrySet();
+            } else if (columnRangeSelection.getStartCol().length == 0) {
+                subMap = map.headMap(columnRangeSelection.getEndCol()).entrySet();
+            } else if (columnRangeSelection.getEndCol().length == 0) {
+                subMap = map.tailMap(columnRangeSelection.getStartCol()).entrySet();
+            } else {
+                subMap = map.subMap(columnRangeSelection.getStartCol(), columnRangeSelection.getEndCol()).entrySet();
+            }
+            byte[] rowName = hashesToBytes.get(row.getKey());
+            results.put(hashesToBytes.get(row.getKey()),
+                    new LocalRowColumnRangeIterator(Iterators.transform(subMap.iterator(), e ->
+                            Pair.<Cell, Value>of(Cell.create(rowName, e.getKey()), e.getValue()))));
+        }
+        return results;
+    }
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java
new file mode 100644
index 00000000000..14479ab6b69
--- /dev/null
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/LocalRowColumnRangeIterator.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.impl;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
+import com.palantir.atlasdb.keyvalue.api.Value;
+
+public class LocalRowColumnRangeIterator implements RowColumnRangeIterator {
+    private final Iterator<Map.Entry<Cell, Value>> it;
+
+    public LocalRowColumnRangeIterator(Iterator<Map.Entry<Cell, Value>> it) {
+        this.it = it;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return it.hasNext();
+    }
+
+    @Override
+    public Map.Entry<Cell, Value> next() {
+        return it.next();
+    }
+}
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java
index 1adc6bc5b7e..ff40d165584 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ProfilingKeyValueService.java
@@ -30,10 +30,12 @@
 import com.google.common.collect.Multimap;
 import com.google.common.primitives.Longs;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -450,4 +452,19 @@ public void compactInternally(TableReference tableRef) {
             delegate.compactInternally(tableRef);
         }
     }
+
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef, Iterable<byte[]> rows,
+                                                                  ColumnRangeSelection columnRangeSelection, long timestamp) {
+        if (log.isTraceEnabled()) {
+            Stopwatch stopwatch = Stopwatch.createStarted();
+            Map<byte[], RowColumnRangeIterator> result = delegate.getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+            log.trace("Call to KVS.getRowsColumnRange on table {} for {} rows with range {} took {} ms.",
+                    tableRef.getQualifiedName(), Iterables.size(rows), columnRangeSelection, stopwatch.elapsed(TimeUnit.MILLISECONDS));
+            logTimeAndTable("getRowsColumnRange", tableRef.getQualifiedName(), stopwatch);
+            return result;
+        } else {
+            return delegate.getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+        }
+    }
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java
index 70a0a2ddf1b..333336be03a 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/TracingPrefsConfig.java
@@ -53,7 +53,7 @@ public void run() {
                     tracingMinDurationToTraceMillis = Integer.parseInt(tracingPrefConfig.getProperty("min_duration_to_log_ms", "0"));
                     String tableString = tracingPrefConfig.getProperty("tables_to_trace", "");
                     tracedTables = ImmutableSet.copyOf(Splitter.on(",").trimResults().split(tableString));
-                    if (loadedConfig == false) { // only log leading edge event
+                    if (tracingEnabled && !loadedConfig) { // only log leading edge event
                         log.error("Successfully loaded an " + TRACING_PREF_FILENAME
                                 + " file. This is usually a large performance hit and should only be used for periods of debugging. "
                                 + "[tracing_enabled = " + tracingEnabled
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java
index 0e8fb01cba1..222cace01a0 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/ValidatingQueryRewritingKeyValueService.java
@@ -34,10 +34,12 @@
 import com.google.common.collect.Multimaps;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -255,4 +257,9 @@ public void truncateTables(Set<TableReference> tableRefs) {
         }
         delegate.truncateTables(tableRefs);
     }
+
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef, Iterable<byte[]> rows, ColumnRangeSelection columnRangeSelection, long timestamp) {
+        return delegate().getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+    }
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepPriorityTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepPriorityTable.java
index 7df7fca123b..9a9f7282906 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepPriorityTable.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepPriorityTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class SweepPriorityTable implements
     private final List<SweepPriorityTrigger> triggers;
     private final static String rawTableName = "priority";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(SweepPriorityNamedColumn.values());
 
     static SweepPriorityTable of(Transaction t, Namespace namespace) {
         return new SweepPriorityTable(t, namespace, ImmutableList.<SweepPriorityTrigger>of());
@@ -1026,7 +1029,7 @@ public void delete(Iterable<SweepPriorityRow> rows) {
 
     @Override
     public Optional<SweepPriorityRowResult> getRow(SweepPriorityRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -1042,7 +1045,7 @@ public Optional<SweepPriorityRowResult> getRow(SweepPriorityRow row, ColumnSelec
 
     @Override
     public List<SweepPriorityRowResult> getRows(Iterable<SweepPriorityRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -1057,7 +1060,7 @@ public List<SweepPriorityRowResult> getRows(Iterable<SweepPriorityRow> rows, Col
 
     @Override
     public List<SweepPriorityRowResult> getAsyncRows(Iterable<SweepPriorityRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -1074,7 +1077,7 @@ public List<SweepPriorityRowResult> call() {
 
     @Override
     public List<SweepPriorityNamedColumnValue<?>> getRowColumns(SweepPriorityRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -1094,7 +1097,7 @@ public List<SweepPriorityNamedColumnValue<?>> getRowColumns(SweepPriorityRow row
 
     @Override
     public Multimap<SweepPriorityRow, SweepPriorityNamedColumnValue<?>> getRowsMultimap(Iterable<SweepPriorityRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -1104,7 +1107,7 @@ public Multimap<SweepPriorityRow, SweepPriorityNamedColumnValue<?>> getRowsMulti
 
     @Override
     public Multimap<SweepPriorityRow, SweepPriorityNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<SweepPriorityRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -1135,8 +1138,22 @@ private static Multimap<SweepPriorityRow, SweepPriorityNamedColumnValue<?>> getR
         return rowMap;
     }
 
+    @Override
+    public Map<SweepPriorityRow, BatchingVisitable<SweepPriorityNamedColumnValue<?>>> getRowsColumnRange(Iterable<SweepPriorityRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<SweepPriorityRow, BatchingVisitable<SweepPriorityNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            SweepPriorityRow row = SweepPriorityRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<SweepPriorityNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<SweepPriorityRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<SweepPriorityRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -1187,6 +1204,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -1244,5 +1263,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "x71bt7mpWXXGo3KAX+BzUw==";
+    static String __CLASS_HASH = "T+WPPjaF/5XlpHTWyZdZrw==";
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepProgressTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepProgressTable.java
index 728971ec195..c94da0f2052 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepProgressTable.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/schema/generated/SweepProgressTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class SweepProgressTable implements
     private final List<SweepProgressTrigger> triggers;
     private final static String rawTableName = "progress";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(SweepProgressNamedColumn.values());
 
     static SweepProgressTable of(Transaction t, Namespace namespace) {
         return new SweepProgressTable(t, namespace, ImmutableList.<SweepProgressTrigger>of());
@@ -1026,7 +1029,7 @@ public void delete(Iterable<SweepProgressRow> rows) {
 
     @Override
     public Optional<SweepProgressRowResult> getRow(SweepProgressRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -1042,7 +1045,7 @@ public Optional<SweepProgressRowResult> getRow(SweepProgressRow row, ColumnSelec
 
     @Override
     public List<SweepProgressRowResult> getRows(Iterable<SweepProgressRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -1057,7 +1060,7 @@ public List<SweepProgressRowResult> getRows(Iterable<SweepProgressRow> rows, Col
 
     @Override
     public List<SweepProgressRowResult> getAsyncRows(Iterable<SweepProgressRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -1074,7 +1077,7 @@ public List<SweepProgressRowResult> call() {
 
     @Override
     public List<SweepProgressNamedColumnValue<?>> getRowColumns(SweepProgressRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -1094,7 +1097,7 @@ public List<SweepProgressNamedColumnValue<?>> getRowColumns(SweepProgressRow row
 
     @Override
     public Multimap<SweepProgressRow, SweepProgressNamedColumnValue<?>> getRowsMultimap(Iterable<SweepProgressRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -1104,7 +1107,7 @@ public Multimap<SweepProgressRow, SweepProgressNamedColumnValue<?>> getRowsMulti
 
     @Override
     public Multimap<SweepProgressRow, SweepProgressNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<SweepProgressRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -1135,8 +1138,22 @@ private static Multimap<SweepProgressRow, SweepProgressNamedColumnValue<?>> getR
         return rowMap;
     }
 
+    @Override
+    public Map<SweepProgressRow, BatchingVisitable<SweepProgressNamedColumnValue<?>>> getRowsColumnRange(Iterable<SweepProgressRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<SweepProgressRow, BatchingVisitable<SweepProgressNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            SweepProgressRow row = SweepProgressRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<SweepProgressNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<SweepProgressRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<SweepProgressRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -1187,6 +1204,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -1244,5 +1263,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "JdYIsvXhQw3ZkZMVh3ypQA==";
+    static String __CLASS_HASH = "mpc+srnv0P/WHkIAiS2Dsw==";
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java
index 5d0eecc7df4..2d3c4f8665d 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/api/AtlasDbImmutableTable.java
@@ -16,11 +16,14 @@
 package com.palantir.atlasdb.table.api;
 
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 
 import com.google.common.collect.Multimap;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.transaction.api.ConstraintCheckable;
+import com.palantir.common.base.BatchingVisitable;
 
 /*
  * Each AtlasDbTable should implement this interface.
@@ -37,4 +40,6 @@ Multimap<ROW, COLUMN_VALUE> getAsyncRowsMultimap(Iterable<ROW> rows,
     Multimap<ROW, COLUMN_VALUE> getAsyncRowsMultimap(Iterable<ROW> rows,
                                                      ColumnSelection columnSelection,
                                                      ExecutorService exec);
+    Map<ROW, BatchingVisitable<COLUMN_VALUE>> getRowsColumnRange(Iterable<ROW> rows,
+                                                                 ColumnRangeSelection columnRangeSelection);
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java
index 32b7028740c..a968a08d3e5 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/AbstractDefinition.java
@@ -127,6 +127,8 @@ void validateFirstRowComp(NameComponentDescription comp) {
         if (CRITICAL_ROW_TYPES.contains(comp.getType())) {
             log.error(
                 "First row component {} of type {} will likely cause hot-spotting with the partitioner in Cassandra. " +
+                "This is caused by the structure of variable-sized types which will state their length prior to the value " +
+                "resulting in them being partition predominantly by the LENGTH of the values which is likely to be similar. " +
                 "If you anticipate never running on Cassandra or feel you can safely ignore this case " +
                 "(for instance, if this table will never be very large) " +
                 "then this error can be safely ignored by adding ignoreHotspottingChecks() to the table schema. " +
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java
index 284e56842e9..8a80078874c 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/RowOrDynamicColumnRenderer.java
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.ValueByteOrder;
@@ -34,12 +35,15 @@ class RowOrDynamicColumnRenderer extends Renderer {
     private final String Name;
     private final NameMetadataDescription desc;
     private final boolean rangeScanAllowed;
+    private final boolean isDynamicColumn;
 
-    public RowOrDynamicColumnRenderer(Renderer parent, String Name, NameMetadataDescription desc, boolean rangeScanAllowed) {
+    public RowOrDynamicColumnRenderer(Renderer parent, String Name, NameMetadataDescription desc, boolean rangeScanAllowed, boolean isDynamicColumn) {
         super(parent);
         this.Name = Name;
         this.desc = desc;
+        Preconditions.checkArgument(!rangeScanAllowed || !isDynamicColumn, "Cannot have row range scans allowed on a dynamic column renderer.");
         this.rangeScanAllowed = rangeScanAllowed;
+        this.isDynamicColumn = isDynamicColumn;
     }
 
     @Override
@@ -68,7 +72,7 @@ protected void run() {
             line();
             bytesHydrator();
             line();
-            if (rangeScanAllowed) {
+            if (rangeScanAllowed || isDynamicColumn) {
                 int firstSortedIndex = desc.getRowParts().size() - 1;
                 for ( ; firstSortedIndex > 0; firstSortedIndex--) {
                     if (!desc.getRowParts().get(firstSortedIndex).getType().supportsRangeScans()) {
@@ -76,7 +80,11 @@ protected void run() {
                     }
                 }
                 for (int i = 1; i <= desc.getRowParts().size() - 1; i++) {
-                    createPrefixRange(i, firstSortedIndex < i);
+                    if (isDynamicColumn) {
+                        createColumnPrefixRange(i, firstSortedIndex < i);
+                    } else {
+                        createPrefixRange(i, firstSortedIndex < i);
+                    }
                     line();
                     prefix(i, firstSortedIndex < i);
                     line();
@@ -197,25 +205,38 @@ private void bytesHydrator() {
     private void createPrefixRange(int i, boolean isSorted) {
         List<NameComponentDescription> components = getRowPartsWithoutHash().subList(0, i);
         line("public static RangeRequest.Builder createPrefixRange", isSorted ? "" : "Unsorted"); renderParameterList(components); lineEnd(" {"); {
-            List<String> vars = Lists.newArrayList();
-            if (desc.hasFirstComponentHash()) {
-                renderComputeFirstComponentHash();
-                String var = NameMetadataDescription.HASH_ROW_COMPONENT_NAME + "Bytes";
-                vars.add(var);
-                line("byte[] ", var, " = ", ValueType.FIXED_LONG.getPersistCode(NameMetadataDescription.HASH_ROW_COMPONENT_NAME), ";");
-            }
-            for (NameComponentDescription comp : components) {
-                String var = varName(comp) + "Bytes";
-                vars.add(var);
-                line("byte[] ", var, " = ", comp.getType().getPersistCode(varName(comp)), ";");
-                if (comp.getOrder() == ValueByteOrder.DESCENDING) {
-                    line("EncodingUtils.flipAllBitsInPlace(", var, ");");
-                }
-            }
+            List<String> vars = renderComponentBytes(components);
             line("return RangeRequest.builder().prefixRange(EncodingUtils.add(", Joiner.on(", ").join(vars), "));");
         } line("}");
     }
 
+    private void createColumnPrefixRange(int i, boolean isSorted) {
+        List<NameComponentDescription> components = getRowPartsWithoutHash().subList(0, i);
+        line("public static ColumnRangeSelection createPrefixRange", isSorted ? "" : "Unsorted"); renderParameterList(components); replace(")", ", int batchSize)"); lineEnd(" {"); {
+            List<String> vars = renderComponentBytes(components);
+            line("return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(", Joiner.on(", ").join(vars), "), batchSize);");
+        } line("}");
+    }
+
+    private List<String> renderComponentBytes(List<NameComponentDescription> components) {
+        List<String> vars = Lists.newArrayList();
+        if (desc.hasFirstComponentHash()) {
+            renderComputeFirstComponentHash();
+            String var = NameMetadataDescription.HASH_ROW_COMPONENT_NAME + "Bytes";
+            vars.add(var);
+            line("byte[] ", var, " = ", ValueType.FIXED_LONG.getPersistCode(NameMetadataDescription.HASH_ROW_COMPONENT_NAME), ";");
+        }
+        for (NameComponentDescription comp : components) {
+            String var = varName(comp) + "Bytes";
+            vars.add(var);
+            line("byte[] ", var, " = ", comp.getType().getPersistCode(varName(comp)), ";");
+            if (comp.getOrder() == ValueByteOrder.DESCENDING) {
+                line("EncodingUtils.flipAllBitsInPlace(", var, ");");
+            }
+        }
+        return vars;
+    }
+
     private void prefix(int i, boolean isSorted) {
         List<NameComponentDescription> components = getRowPartsWithoutHash().subList(0, i);
         line("public static Prefix prefix", isSorted ? "" : "Unsorted"); renderParameterList(components); lineEnd(" {"); {
@@ -282,14 +303,30 @@ private void renderEquals() {
     private void renderHashCode() {
         line("@Override");
         line("public int hashCode() {"); {
-            line("return Objects.hashCode(");
-            for (NameComponentDescription comp : desc.getRowParts()) {
-                lineEnd(varName(comp), ", ");
-            }
-            replace(", ", ");");
+            renderHashCodeMethodCall();
         } line("}");
     }
 
+    private void renderHashCodeMethodCall() {
+        if (desc.getRowParts().size() > 1) {
+            renderHashCodeMethodCall("return Arrays.deepHashCode(new Object[]{ ", " });");
+        } else {
+            renderHashCodeMethodCall("return Objects.hashCode(", ");");
+        }
+    }
+
+    private void renderHashCodeMethodCall(String methodOpening, String methodClosing) {
+        line(methodOpening);
+        renderVariableList();
+        replace(", ", methodClosing);
+    }
+
+    private void renderVariableList() {
+        for (NameComponentDescription comp : desc.getRowParts()) {
+            lineEnd(varName(comp), ", ");
+        }
+    }
+
     private void renderCompareTo() {
         line("@Override");
         line("public int compareTo(", Name, " o) {");
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java
index 470cb046bc6..2f8a3bc3938 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/table/description/render/TableRenderer.java
@@ -64,6 +64,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -230,7 +232,7 @@ protected void run() {
                 line("                                    ", Table, ".", ColumnValue, ",");
                 line("                                    ", Table, ".", RowResult, "> {");
             } {
-                fields();
+                fields(isDynamic(table));
                 line();
                 staticFactories();
                 line();
@@ -246,7 +248,7 @@ protected void run() {
                 line();
                 renderGetNamespace();
                 line();
-                new RowOrDynamicColumnRenderer(this, Row, table.getRowMetadata(), table.isRangeScanAllowed()).run();
+                new RowOrDynamicColumnRenderer(this, Row, table.getRowMetadata(), table.isRangeScanAllowed(), false).run();
                 line();
                 if (isDynamic(table)) {
                     renderDynamic();
@@ -330,6 +332,8 @@ private void renderNamed() {
             renderGetRowColumns(false);
             line();
             renderGetRowsMultimap(false);
+            line();
+            renderGetRowsColumnRange(false);
 
             if (!cellReferencingIndices.isEmpty()) {
                 line();
@@ -342,7 +346,7 @@ private void renderNamed() {
         }
 
         private void renderDynamic() {
-            new RowOrDynamicColumnRenderer(this, Column, table.getColumns().getDynamicColumn().getColumnNameDesc(), false).run();
+            new RowOrDynamicColumnRenderer(this, Column, table.getColumns().getDynamicColumn().getColumnNameDesc(), false, true).run();
             line();
             renderTrigger();
             line();
@@ -367,15 +371,18 @@ private void renderDynamic() {
             renderGetRowColumns(true);
             line();
             renderGetRowsMultimap(true);
+            line();
+            renderGetRowsColumnRange(true);
         }
 
-        private void fields() {
+        private void fields(boolean isDynamic) {
             line("private final Transaction t;");
             line("private final List<", Trigger, "> triggers;");
             if (!isGeneric) {
                 line("private final static String rawTableName = \"" + raw_table_name + "\";");
             }
             line("private final TableReference tableRef;");
+            line("private final static ColumnSelection allColumns = ", isDynamic ? "ColumnSelection.all();" : "getColumnSelection(" + Column + ".values());");
         }
 
         private void staticFactories() {
@@ -612,7 +619,7 @@ private void renderDynamicTouch() {
         private void renderGetRowColumns(boolean isDynamic) {
             line("@Override");
             line("public List<", ColumnValue, "> getRowColumns(", Row, " row) {"); {
-                line("return getRowColumns(row, ColumnSelection.all());");
+                line("return getRowColumns(row, allColumns);");
             } line("}");
             line();
             line("@Override");
@@ -949,7 +956,7 @@ private void renderNamedDelete() {
         private void renderGetRange() {
             line("public BatchingVisitableView<", RowResult, "> getRange(RangeRequest range) {"); {
                 line("if (range.getColumnNames().isEmpty()) {"); {
-                    line("range = range.getBuilder().retainColumns(ColumnSelection.all()).build();");
+                    line("range = range.getBuilder().retainColumns(allColumns).build();");
                 } line("}");
                 line("return BatchingVisitables.transform(t.getRange(tableRef, range), new Function<RowResult<byte[]>, ", RowResult, ">() {"); {
                     line("@Override");
@@ -1018,7 +1025,7 @@ private void renderNamedDeleteRanges() {
 
         private void renderGetAllRowsUnordered() {
             line("public BatchingVisitableView<", RowResult, "> getAllRowsUnordered() {"); {
-                line("return getAllRowsUnordered(ColumnSelection.all());");
+                line("return getAllRowsUnordered(allColumns);");
             } line("}");
             line();
             line("public BatchingVisitableView<", RowResult, "> getAllRowsUnordered(ColumnSelection columns) {"); {
@@ -1035,7 +1042,7 @@ private void renderGetAllRowsUnordered() {
         private void renderNamedGetRow() {
             line("@Override");
             line("public Optional<", RowResult, "> getRow(", Row, " row) {"); {
-                line("return getRow(row, ColumnSelection.all());");
+                line("return getRow(row, allColumns);");
             } line("}");
             line();
             line("@Override");
@@ -1053,7 +1060,7 @@ private void renderNamedGetRow() {
         private void renderNamedGetRows() {
             line("@Override");
             line("public List<", RowResult, "> getRows(Iterable<", Row, "> rows) {"); {
-                line("return getRows(rows, ColumnSelection.all());");
+                line("return getRows(rows, allColumns);");
             } line("}");
             line();
             line("@Override");
@@ -1068,7 +1075,7 @@ private void renderNamedGetRows() {
             line();
             line("@Override");
             line("public List<", RowResult, "> getAsyncRows(Iterable<", Row, "> rows, ExecutorService exec) {"); {
-                line("return getAsyncRows(rows, ColumnSelection.all(), exec);");
+                line("return getAsyncRows(rows, allColumns, exec);");
             } line("}");
             line();
             line("@Override");
@@ -1117,7 +1124,7 @@ private void renderDynamicGet() {
         private void renderGetRowsMultimap(boolean isDynamic) {
             line("@Override");
             line("public Multimap<", Row, ", ", ColumnValue, "> getRowsMultimap(Iterable<", Row, "> rows) {"); {
-                line("return getRowsMultimapInternal(rows, ColumnSelection.all());");
+                line("return getRowsMultimapInternal(rows, allColumns);");
             } line("}");
             line();
             line("@Override");
@@ -1127,7 +1134,7 @@ private void renderGetRowsMultimap(boolean isDynamic) {
             line();
             line("@Override");
             line("public Multimap<", Row, ", ", ColumnValue, "> getAsyncRowsMultimap(Iterable<", Row, "> rows, ExecutorService exec) {"); {
-                line("return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);");
+                line("return getAsyncRowsMultimap(rows, allColumns, exec);");
             } line("}");
             line();
             line("@Override");
@@ -1165,6 +1172,28 @@ private void renderGetRowsMultimap(boolean isDynamic) {
             } line("}");
         }
 
+        private void renderGetRowsColumnRange(boolean isDynamic) {
+            line("@Override");
+            line("public Map<", Row, ", BatchingVisitable<", ColumnValue, ">> getRowsColumnRange(Iterable<", Row, "> rows, ColumnRangeSelection columnRangeSelection) {"); {
+                line("Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);");
+                line("Map<", Row, ", BatchingVisitable<", ColumnValue, ">> transformed = Maps.newHashMapWithExpectedSize(results.size());");
+                line("for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {"); {
+                    line(Row, " row = ", Row, ".BYTES_HYDRATOR.hydrateFromBytes(e.getKey());");
+                    line("BatchingVisitable<", ColumnValue, "> bv = BatchingVisitables.transform(e.getValue(), result -> {"); {
+                        if (isDynamic) {
+                            line(Column," col = ", Column, ".BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());");
+                            line(table.getColumns().getDynamicColumn().getValue().getJavaObjectTypeName(), " val = ", ColumnValue, ".hydrateValue(result.getValue());");
+                            line("return ", ColumnValue, ".of(col, val);");
+                        } else {
+                            line("return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());");
+                        }
+                    } line("});");
+                    line("transformed.put(row, bv);");
+                } line("}");
+                line("return transformed;");
+            } line("}");
+        }
+
         private void renderFindConstraintFailures() {
             line("@Override");
             line("public List<String> findConstraintFailures(Map<Cell, byte[]> writes,");
@@ -1205,7 +1234,7 @@ private void renderAdd() {
             line();
             line("@Override");
             line("public void addUnlessExists(Set<", Row, "> rows", params, ") {"); {
-                line("SortedMap<byte[], RowResult<byte[]>> results = t.getRows(tableRef, Persistables.persistAll(rows), ColumnSelection.all());");
+                line("SortedMap<byte[], RowResult<byte[]>> results = t.getRows(tableRef, Persistables.persistAll(rows), allColumns);");
                 line("Map<", Row, ", ", ColumnValue, "> map = Maps.newHashMapWithExpectedSize(rows.size() - results.size());");
                 line(ColumnValue, " col = Exists.of(0L);");
                 line("for (", Row, " row : rows) {"); {
@@ -1328,6 +1357,8 @@ public boolean apply(IndexMetadata index) {
         Hashing.class,
         ValueType.class,
         Generated.class,
-        TableReference.class
+        TableReference.class,
+        ColumnRangeSelection.class,
+        ColumnRangeSelections.class,
     };
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransaction.java
index d413cfa8d3a..9d8ab32933f 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransaction.java
@@ -63,11 +63,6 @@ final public void setTransactionType(TransactionType transactionType) {
         this.transactionType = transactionType;
     }
 
-    @Override
-    final public void delete(TableReference tableRef, Set<Cell> cells) {
-        put(tableRef, Cells.constantValueMap(cells, PtBytes.EMPTY_BYTE_ARRAY));
-    }
-
     public boolean isTempTable(TableReference tableRef) {
         return tempTables.contains(tableRef);
     }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java
index 38847b80faf..d4c914ef2ce 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransaction.java
@@ -161,21 +161,17 @@ public Map<Cell, byte[]> get(TableReference tableRef, Set<Cell> cells) {
 
     @Override
     final public void delete(TableReference tableRef, Set<Cell> cells) {
-        if (cells.isEmpty()) {
-            log.info("Attempted delete on '{}' table with empty cells", tableRef);
-            return;
-        }
-        put(tableRef, Cells.constantValueMap(cells, PtBytes.EMPTY_BYTE_ARRAY));
+        super.delete(tableRef, cells);
+        addToColCache(tableRef, Cells.constantValueMap(cells, PtBytes.EMPTY_BYTE_ARRAY));
     }
 
     @Override
     public void put(TableReference tableRef, Map<Cell, byte[]> values) {
-        if (values.isEmpty()) {
-            log.info("Attempted put on '{}' table with empty cells", tableRef);
-            return;
-        }
-
         super.put(tableRef, values);
+        addToColCache(tableRef, values);
+    }
+
+    private void addToColCache(TableReference tableRef, Map<Cell, byte[]> values) {
         Map<Cell, byte[]> colCache = getColCacheForTable(tableRef);
         for (Map.Entry<Cell, byte[]> e : values.entrySet()) {
             byte[] value = e.getValue();
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java
index a7a920de1c5..b616075fee0 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManager.java
@@ -15,47 +15,56 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Supplier;
 
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
 
 public class ConflictDetectionManager {
-    private final RecomputingSupplier<Map<TableReference, ConflictHandler>> supplier;
+    private final Supplier<Map<TableReference, ConflictHandler>> supplier;
     private final Map<TableReference, ConflictHandler> overrides;
+    private final RecomputingSupplier<Map<TableReference, ConflictHandler>> cachedResult;
 
-    public ConflictDetectionManager(RecomputingSupplier<Map<TableReference, ConflictHandler>> supplier) {
+    /**
+     * @param supplier A {@link Supplier} which returns the current conflict detection
+     *                 configuration to the database. Note that the result is cached,
+     *                 so changes to configuration must be followed by a call to
+     *                 {@link #recompute()} in order to be picked up.
+     */
+    ConflictDetectionManager(Supplier<Map<TableReference, ConflictHandler>> supplier) {
         this.supplier = supplier;
         this.overrides = Maps.newConcurrentMap();
+        this.cachedResult = RecomputingSupplier.create(() -> {
+            Map<TableReference, ConflictHandler> ret = new HashMap<>(this.supplier.get());
+            ret.putAll(overrides);
+            return Collections.unmodifiableMap(ret);
+        });
     }
 
     public void setConflictDetectionMode(TableReference table, ConflictHandler handler) {
         overrides.put(table, handler);
+        cachedResult.recompute();
     }
 
     public void removeConflictDetectionMode(TableReference table) {
         overrides.remove(table);
+        cachedResult.recompute();
     }
 
     public boolean isEmptyOrContainsTable(TableReference tableRef) {
-        Map<TableReference, ConflictHandler> tableToConflictHandler = supplier.get();
-        if (tableToConflictHandler.isEmpty() && overrides.isEmpty()) {
-            return true;
-        }
-        if (tableToConflictHandler.containsKey(tableRef) || overrides.containsKey(tableRef)) {
-            return true;
-        }
-        return false;
+        Map<TableReference, ConflictHandler> tableToConflict = cachedResult.get();
+        return tableToConflict.isEmpty() || tableToConflict.containsKey(tableRef);
     }
 
     public Map<TableReference, ConflictHandler> get() {
-        Map<TableReference, ConflictHandler> ret = Maps.newHashMap(supplier.get());
-        ret.putAll(overrides);
-        return ret;
+        return cachedResult.get();
     }
 
     public void recompute() {
-        supplier.recompute();
+        cachedResult.recompute();
     }
 }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java
index d2045dd4a43..fe94bb176d1 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagers.java
@@ -17,11 +17,9 @@
 
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 
-import com.google.common.base.Function;
 import com.google.common.base.Functions;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -40,11 +38,11 @@ public static ConflictDetectionManager createDefault(KeyValueService kvs) {
     }
 
     public static ConflictDetectionManager createFromSchema(Schema schema) {
-        return new ConflictDetectionManager(RecomputingSupplier.create(Suppliers.ofInstance(getTablesToConflictDetect(schema))));
+        return new ConflictDetectionManager(() -> getTablesToConflictDetect(schema));
     }
 
     public static ConflictDetectionManager fromMap(final Map<TableReference, ConflictHandler> map) {
-        return new ConflictDetectionManager(RecomputingSupplier.create(Suppliers.ofInstance(map)));
+        return new ConflictDetectionManager(() -> map);
     }
 
     /**
@@ -54,34 +52,23 @@ public static ConflictDetectionManager withoutConflictDetection(KeyValueService
         return new ConflictDetectionManager(getNoConflictDetectSupplier(kvs));
     }
 
-    private static RecomputingSupplier<Map<TableReference, ConflictHandler>> getNoConflictDetectSupplier(final KeyValueService kvs) {
-        return RecomputingSupplier.create(new Supplier<Map<TableReference, ConflictHandler>>() {
-            @Override
-            public Map<TableReference, ConflictHandler> get() {
-                Set<TableReference> tables = kvs.getAllTableNames();
-                return Maps.asMap(tables, Functions.constant(ConflictHandler.IGNORE_ALL));
-            }
-        });
+    private static Supplier<Map<TableReference, ConflictHandler>> getNoConflictDetectSupplier(final KeyValueService kvs) {
+        return () -> {
+            Set<TableReference> tables = kvs.getAllTableNames();
+            return Maps.asMap(tables, Functions.constant(ConflictHandler.IGNORE_ALL));
+        };
     }
 
-    private static RecomputingSupplier<Map<TableReference, ConflictHandler>> getTablesToConflictDetectSupplier(final KeyValueService keyValueService) {
-        return RecomputingSupplier.create(new Supplier<Map<TableReference, ConflictHandler>>() {
-            @Override
-            public Map<TableReference, ConflictHandler> get() {
-                return getTablesToConflictDetect(keyValueService);
-            }
-        });
+    private static Supplier<Map<TableReference, ConflictHandler>> getTablesToConflictDetectSupplier(final KeyValueService keyValueService) {
+        return () -> getTablesToConflictDetect(keyValueService);
     }
 
     private static Map<TableReference, ConflictHandler> getTablesToConflictDetect(KeyValueService kvs) {
-        return ImmutableMap.copyOf(Maps.transformValues(kvs.getMetadataForTables(), new Function<byte[], ConflictHandler>() {
-            @Override
-            public ConflictHandler apply(byte[] metadataForTable) {
-                if (metadataForTable != null && metadataForTable.length > 0) {
-                    return TableMetadata.BYTES_HYDRATOR.hydrateFromBytes(metadataForTable).getConflictHandler();
-                } else {
-                    return ConflictHandler.RETRY_ON_WRITE_WRITE;
-                }
+        return ImmutableMap.copyOf(Maps.transformValues(kvs.getMetadataForTables(), metadataForTable -> {
+            if (metadataForTable != null && metadataForTable.length > 0) {
+                return TableMetadata.BYTES_HYDRATOR.hydrateFromBytes(metadataForTable).getConflictHandler();
+            } else {
+                return ConflictHandler.RETRY_ON_WRITE_WRITE;
             }
         }));
     }
diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java
index 1eee1bf41e9..d9e413a750b 100644
--- a/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java
+++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/transaction/impl/ForwardingTransaction.java
@@ -21,6 +21,7 @@
 
 import com.google.common.collect.ForwardingObject;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
@@ -49,6 +50,13 @@ public SortedMap<byte[], RowResult<byte[]>> getRows(TableReference tableRef,
         return delegate().getRows(tableRef, rows, columnSelection);
     }
 
+    @Override
+    public Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> getRowsColumnRange(TableReference tableRef,
+                                                                                     Iterable<byte[]> rows,
+                                                                                     ColumnRangeSelection columnRangeSelection) {
+        return delegate().getRowsColumnRange(tableRef, rows, columnRangeSelection);
+    }
+
     @Override
     public Map<Cell, byte[]> get(TableReference tableRef, Set<Cell> cells) {
         return delegate().get(tableRef, cells);
diff --git a/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagerTest.java b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagerTest.java
new file mode 100644
index 00000000000..4d21d87f215
--- /dev/null
+++ b/atlasdb-client/src/test/java/com/palantir/atlasdb/transaction/impl/ConflictDetectionManagerTest.java
@@ -0,0 +1,135 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.transaction.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.transaction.api.ConflictHandler;
+
+public class ConflictDetectionManagerTest {
+
+    private static final TableReference TABLE_1 = TableReference.fromString("default.table1");
+    private static final TableReference TABLE_2 = TableReference.fromString("default.table2");
+    private static final TableReference TABLE_3 = TableReference.fromString("default.table3");
+    private static final TableReference TABLE_4 = TableReference.fromString("default.table4");
+
+    private Map<TableReference, ConflictHandler> map;
+    private AtomicInteger callCount;
+    private ConflictDetectionManager manager;
+
+    @Before
+    public void setUp() {
+        map = new HashMap<>();
+        callCount = new AtomicInteger(0);
+        manager = new ConflictDetectionManager(() -> {
+            callCount.incrementAndGet();
+            return map;
+        });
+    }
+
+    @Test
+    public void testEmptyManager() {
+        Assert.assertTrue(manager.isEmptyOrContainsTable(TableReference.fromString("default.table")));
+        Assert.assertTrue(manager.get().isEmpty());
+        manager.recompute();
+        Assert.assertTrue(manager.get().isEmpty());
+    }
+
+    @Test
+    public void testRecomputeNoOverrides() {
+        map.put(TABLE_1, ConflictHandler.IGNORE_ALL);
+        map.put(TABLE_3, ConflictHandler.IGNORE_ALL);
+
+        // Initial get() loads supplier properly
+        Assert.assertEquals(ImmutableMap.of(
+                        TABLE_1, ConflictHandler.IGNORE_ALL,
+                        TABLE_3, ConflictHandler.IGNORE_ALL),
+                manager.get());
+        Assert.assertEquals(1, callCount.get());
+
+        map.clear();
+        map.put(TABLE_1, ConflictHandler.RETRY_ON_VALUE_CHANGED);
+        map.put(TABLE_2, ConflictHandler.IGNORE_ALL);
+
+        // results are cached
+        Assert.assertEquals(ImmutableMap.of(
+                        TABLE_1, ConflictHandler.IGNORE_ALL,
+                        TABLE_3, ConflictHandler.IGNORE_ALL),
+                manager.get());
+        Assert.assertEquals(1, callCount.get());
+
+        manager.recompute();
+
+        // recompute() recomputes the cached result
+        Assert.assertEquals(ImmutableMap.of(
+                        TABLE_1, ConflictHandler.RETRY_ON_VALUE_CHANGED,
+                        TABLE_2, ConflictHandler.IGNORE_ALL),
+                manager.get());
+        Assert.assertEquals(2, callCount.get());
+    }
+
+    @Test
+    public void testWithOverrides() {
+        map.put(TABLE_1, ConflictHandler.IGNORE_ALL);
+        map.put(TABLE_3, ConflictHandler.IGNORE_ALL);
+
+        Assert.assertEquals(ImmutableMap.of(
+                TABLE_1, ConflictHandler.IGNORE_ALL,
+                TABLE_3, ConflictHandler.IGNORE_ALL),
+                manager.get());
+
+        manager.setConflictDetectionMode(TABLE_1, ConflictHandler.RETRY_ON_VALUE_CHANGED);
+        manager.setConflictDetectionMode(TABLE_2, ConflictHandler.RETRY_ON_VALUE_CHANGED);
+
+        Assert.assertEquals(ImmutableMap.of(
+                TABLE_1, ConflictHandler.RETRY_ON_VALUE_CHANGED,
+                TABLE_2, ConflictHandler.RETRY_ON_VALUE_CHANGED,
+                TABLE_3, ConflictHandler.IGNORE_ALL),
+                manager.get());
+
+        manager.removeConflictDetectionMode(TABLE_1);
+
+        Assert.assertEquals(ImmutableMap.of(
+                TABLE_1, ConflictHandler.IGNORE_ALL,
+                TABLE_2, ConflictHandler.RETRY_ON_VALUE_CHANGED,
+                TABLE_3, ConflictHandler.IGNORE_ALL),
+                manager.get());
+    }
+
+    @Test
+    public void testIsEmptyOrContainsTable() {
+        map.put(TABLE_1, ConflictHandler.IGNORE_ALL);
+        map.put(TABLE_3, ConflictHandler.IGNORE_ALL);
+
+        manager.setConflictDetectionMode(TABLE_1, ConflictHandler.RETRY_ON_VALUE_CHANGED);
+        manager.setConflictDetectionMode(TABLE_2, ConflictHandler.RETRY_ON_VALUE_CHANGED);
+
+        int startCount = callCount.get();
+        Assert.assertTrue(manager.isEmptyOrContainsTable(TABLE_1));
+        Assert.assertTrue(manager.isEmptyOrContainsTable(TABLE_2));
+        Assert.assertTrue(manager.isEmptyOrContainsTable(TABLE_3));
+        Assert.assertFalse(manager.isEmptyOrContainsTable(TABLE_4));
+        Assert.assertEquals(startCount, callCount.get());
+    }
+}
\ No newline at end of file
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/time/SystemClock.java b/atlasdb-commons/src/main/java/com/palantir/common/time/SystemClock.java
index 1d3fa968006..4fc8a89c9d9 100644
--- a/atlasdb-commons/src/main/java/com/palantir/common/time/SystemClock.java
+++ b/atlasdb-commons/src/main/java/com/palantir/common/time/SystemClock.java
@@ -22,12 +22,6 @@
  * @author jweel
  */
 public final class SystemClock implements Clock {
-    public static SystemClock create() {
-        return new SystemClock();
-    }
-
-    private SystemClock() {//
-    }
 
     @Override
     public long getTimeMillis() {
diff --git a/commons-db/src/main/java/com/palantir/exception/PalantirSqlException.java b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java
similarity index 93%
rename from commons-db/src/main/java/com/palantir/exception/PalantirSqlException.java
rename to atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java
index 7557232693a..8bfa6e35c86 100644
--- a/commons-db/src/main/java/com/palantir/exception/PalantirSqlException.java
+++ b/atlasdb-commons/src/main/java/com/palantir/exception/PalantirSqlException.java
@@ -17,8 +17,7 @@
 
 import java.sql.SQLException;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
-
+import com.google.common.base.Optional;
 import com.palantir.common.exception.PalantirRuntimeException;
 
 /**
@@ -73,8 +72,8 @@ public static PalantirSqlException create(String msg) {
     }
 
     public static PalantirSqlException create(SQLException e) {
-        // the detail message string of a throwable can be null.
-        return new PalantirSqlException(ExceptionUtils.getMessage(e), e);
+        String msg = Optional.fromNullable(e.getMessage()).or(e.getClass().getName() + "with null message");
+        return new PalantirSqlException(msg, e);
     }
 
     public static PalantirSqlException createForChaining() {
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/SQLConstants.java b/atlasdb-commons/src/main/java/com/palantir/nexus/db/SQLConstants.java
similarity index 100%
rename from commons-db/src/main/java/com/palantir/nexus/db/SQLConstants.java
rename to atlasdb-commons/src/main/java/com/palantir/nexus/db/SQLConstants.java
diff --git a/atlasdb-config/build.gradle b/atlasdb-config/build.gradle
index fba194965ed..d2b000dcc0f 100644
--- a/atlasdb-config/build.gradle
+++ b/atlasdb-config/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'org.inferred.processors'
 apply from: "../gradle/shared.gradle"
 
 dependencies {
-    compile project(':atlasdb-spi')
+    compile project(':atlasdb-api')
     compile project(':atlasdb-impl-shared')
     compile project(':leader-election-impl')
     compile project(':lock-impl')
@@ -12,7 +12,7 @@ dependencies {
     compile('com.netflix.feign:feign-jaxrs:8.6.1') {
         exclude module: 'jsr311-api'
     }
-    // versions below 8.10.0 have a bug where POST requets must have a body
+    // versions below 8.10.0 have a bug where POST requests must have a body
     compile('com.netflix.feign:feign-okhttp:8.10.1') {
         exclude module: 'feign-core'
     }
@@ -21,8 +21,9 @@ dependencies {
     compile 'com.fasterxml.jackson.core:jackson-databind:' + libVersions.jackson
     compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:' + libVersions.jackson
     compile 'io.dropwizard:dropwizard-jackson:' + libVersions.dropwizard
+    compile group: 'com.google.code.findbugs', name: 'annotations', version: libVersions.findbugsAnnotations
 
-    processor 'org.immutables:value:2.0.21'
+    processor 'org.immutables:value:' + libVersions.immutables
     processor 'com.google.auto.service:auto-service:1.0-rc2'
 
     testCompile(group: "org.jmock", name: "jmock", version: libVersions.jmock) {
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java
index 33cad9497ff..8b45b477845 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/AtlasDbConfigs.java
@@ -17,18 +17,28 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 
+import javax.annotation.Nullable;
+
+import com.fasterxml.jackson.core.JsonPointer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.google.common.base.Strings;
 
 import io.dropwizard.jackson.DiscoverableSubtypeResolver;
 
 public final class AtlasDbConfigs {
 
-    public static final String ATLASDB_CONFIG_ROOT = "atlasdb";
+    public static final String ATLASDB_CONFIG_ROOT = "/atlasdb";
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(new YAMLFactory());
+
+    static {
+        OBJECT_MAPPER.setSubtypeResolver(new DiscoverableSubtypeResolver());
+        OBJECT_MAPPER.registerModule(new GuavaModule());
+    }
 
     private AtlasDbConfigs() {
         // uninstantiable
@@ -38,38 +48,47 @@ public static AtlasDbConfig load(File configFile) throws IOException {
         return load(configFile, ATLASDB_CONFIG_ROOT);
     }
 
-    public static AtlasDbConfig load(File configFile, String configRoot) throws IOException {
-        ObjectMapper configMapper = new ObjectMapper(new YAMLFactory());
-        configMapper.setSubtypeResolver(new DiscoverableSubtypeResolver());
-        JsonNode rootNode = getConfigNode(configMapper, configFile, configRoot);
-        return configMapper.treeToValue(rootNode, AtlasDbConfig.class);
+    public static AtlasDbConfig load(File configFile, @Nullable String configRoot) throws IOException {
+        JsonNode rootNode = getConfigNode(configFile, configRoot);
+        return OBJECT_MAPPER.treeToValue(rootNode, AtlasDbConfig.class);
     }
 
-    private static JsonNode getConfigNode(ObjectMapper configMapper, File configFile, String configRoot) throws IOException {
-        JsonNode node = configMapper.readTree(configFile);
-        if (Strings.isNullOrEmpty(configRoot)) {
-            return node;
-        } else {
-            JsonNode rootNode = findRoot(node, configRoot);
-            if (rootNode != null) {
-                return rootNode;
-            }
+    public static AtlasDbConfig loadFromString(String fileContents, @Nullable String configRoot) throws IOException {
+        JsonNode rootNode = getConfigNode(fileContents, configRoot);
+        return OBJECT_MAPPER.treeToValue(rootNode, AtlasDbConfig.class);
+    }
+
+    private static JsonNode getConfigNode(File configFile, @Nullable String configRoot) throws IOException {
+        JsonNode node = OBJECT_MAPPER.readTree(configFile);
+        JsonNode configNode = findRoot(node, configRoot);
+
+        if (configNode == null) {
             throw new IllegalArgumentException("Could not find " + configRoot + " in yaml file " + configFile);
         }
+
+        return configNode;
     }
 
-    private static JsonNode findRoot(JsonNode node, String configRoot) {
-        if (node.has(configRoot)) {
-            return node.get(configRoot);
-        } else {
-            Iterator<String> iter = node.fieldNames();
-            while (iter.hasNext()) {
-                JsonNode root = findRoot(node.get(iter.next()), configRoot);
-                if (root != null) {
-                    return root;
-                }
-            }
+    private static JsonNode getConfigNode(String fileContents, @Nullable String configRoot) throws IOException {
+        JsonNode node = OBJECT_MAPPER.readTree(fileContents);
+        JsonNode configNode = findRoot(node, configRoot);
+
+        if (configNode == null) {
+            throw new IllegalArgumentException("Could not find " + configRoot + " in given string");
+        }
+
+        return configNode;
+    }
+
+    private static JsonNode findRoot(JsonNode node, @Nullable String configRoot) {
+        if (Strings.isNullOrEmpty(configRoot)) {
+            return node;
+        }
+
+        JsonNode root = node.at(JsonPointer.valueOf(configRoot));
+        if (root.isMissingNode()) {
             return null;
         }
+        return root;
     }
 }
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java
index a57a98a564d..abf154dd79d 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/config/ServerListConfig.java
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 package com.palantir.atlasdb.config;
 
 import java.util.Set;
@@ -28,8 +28,6 @@
 @JsonSerialize(as = ImmutableServerListConfig.class)
 @Value.Immutable
 public interface ServerListConfig {
-
-    @Size(min=1)
+    @Size(min = 1)
     Set<String> servers();
-
 }
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java
index 9a487ff4645..cb8206d8037 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/Leaders.java
@@ -43,7 +43,10 @@
 import com.palantir.paxos.PaxosProposer;
 import com.palantir.paxos.PaxosProposerImpl;
 
-public class Leaders {
+public final class Leaders {
+    private Leaders() {
+        // Utility class
+    }
 
     /**
      * Creates a LeaderElectionService using the supplied configuration and
@@ -99,18 +102,19 @@ public static LeaderElectionService create(
         return leader;
     }
 
-    public static Map<PingableLeader, HostAndPort> generatePingables(Collection<String> remoteEndpoints,
-                                                                    Optional<SSLSocketFactory> sslSocketFactory) {
+    public static Map<PingableLeader, HostAndPort> generatePingables(
+            Collection<String> remoteEndpoints,
+            Optional<SSLSocketFactory> sslSocketFactory) {
         /* The interface used as a key here may be a proxy, which may have strange .equals() behavior.
          * This is circumvented by using an IdentityHashMap which will just use native == for equality.
          */
-        Map<PingableLeader, HostAndPort> pingables = new IdentityHashMap<PingableLeader, HostAndPort>();
+        Map<PingableLeader, HostAndPort> pingables = new IdentityHashMap<>();
         for (String endpoint : remoteEndpoints) {
-            PingableLeader remoteInterface = AtlasDbHttpClients.createProxy(sslSocketFactory, endpoint, PingableLeader.class);
+            PingableLeader remoteInterface = AtlasDbHttpClients
+                    .createProxy(sslSocketFactory, endpoint, PingableLeader.class);
             HostAndPort hostAndPort = HostAndPort.fromString(endpoint);
             pingables.put(remoteInterface, hostAndPort);
         }
         return pingables;
     }
-
 }
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java
index f8df5d97711..9d604d7300f 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplier.java
@@ -15,14 +15,14 @@
  */
 package com.palantir.atlasdb.factory;
 
-import static java.util.stream.StreamSupport.stream;
-
-import static com.google.common.base.Suppliers.memoize;
-
 import java.util.ServiceLoader;
 import java.util.function.Predicate;
+import java.util.stream.StreamSupport;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.spi.AtlasDbFactory;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
@@ -35,16 +35,16 @@ public class ServiceDiscoveringAtlasSupplier {
     private final Supplier<KeyValueService> keyValueService;
     private final Supplier<TimestampService> timestampService;
 
-    public ServiceDiscoveringAtlasSupplier(KeyValueServiceConfig config) {
+    public ServiceDiscoveringAtlasSupplier(KeyValueServiceConfig config, Optional<LeaderConfig> leaderConfig) {
         this.config = config;
-        AtlasDbFactory atlasFactory = stream(loader.spliterator(), false)
+        AtlasDbFactory atlasFactory = StreamSupport.stream(loader.spliterator(), false)
                 .filter(producesCorrectType())
                 .findFirst()
                 .orElseThrow(() -> new IllegalStateException(
-                    "No atlas provider for KeyValueService type " + config.type() + " could be found. " +
-                            "Have you annotated it with @AutoService(AtlasDbFactory.class)?"
+                        "No atlas provider for KeyValueService type " + config.type() + " could be found."
+                        + " Have you annotated it with @AutoService(AtlasDbFactory.class)?"
                 ));
-        keyValueService = memoize(() -> atlasFactory.createRawKeyValueService(config));
+        keyValueService = Suppliers.memoize(() -> atlasFactory.createRawKeyValueService(config, leaderConfig));
         timestampService = () -> atlasFactory.createTimestampService(getKeyValueService());
     }
 
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java
index a9f86dc5bd1..dc1267becc3 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/factory/TransactionManagers.java
@@ -39,6 +39,7 @@
 import com.palantir.atlasdb.http.AtlasDbHttpClients;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.NamespacedKeyValueServices;
+import com.palantir.atlasdb.keyvalue.impl.ProfilingKeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.SweepStatsKeyValueService;
 import com.palantir.atlasdb.schema.SweepSchema;
 import com.palantir.atlasdb.schema.generated.SweepTableFactory;
@@ -67,22 +68,27 @@
 import com.palantir.lock.impl.LockServiceImpl;
 import com.palantir.timestamp.TimestampService;
 
-public class TransactionManagers {
-
+public final class TransactionManagers {
     private static final Logger log = LoggerFactory.getLogger(TransactionManagers.class);
 
     private static final ServiceLoader<AtlasDbFactory> loader = ServiceLoader.load(AtlasDbFactory.class);
     public static final LockClient LOCK_CLIENT = LockClient.of("atlas instance");
 
+    private TransactionManagers() {
+        // Utility class
+    }
+
     /**
-     * Create a {@link SerializableTransactionManager} with provided configuration, {@link SSLSocketFactory}, {@link Schema},
-     * and an environment in which to register HTTP server endpoints.
+     * Create a {@link SerializableTransactionManager} with provided configuration,
+     * {@link SSLSocketFactory}, {@link Schema}, and an environment in which to
+     * register HTTP server endpoints.
      */
-    public static SerializableTransactionManager create(AtlasDbConfig config,
-                                                        Optional<SSLSocketFactory> sslSocketFactory,
-                                                        Schema schema,
-                                                        Environment env,
-                                                        boolean allowHiddenTableAccess) {
+    public static SerializableTransactionManager create(
+            AtlasDbConfig config,
+            Optional<SSLSocketFactory> sslSocketFactory,
+            Schema schema,
+            Environment env,
+            boolean allowHiddenTableAccess) {
         return create(config, sslSocketFactory, ImmutableSet.of(schema), env, allowHiddenTableAccess);
     }
 
@@ -90,20 +96,25 @@ public static SerializableTransactionManager create(AtlasDbConfig config,
      * Create a {@link SerializableTransactionManager} with provided configuration, {@link SSLSocketFactory}, a set of
      * {@link Schema}s, and an environment in which to register HTTP server endpoints.
      */
-    public static SerializableTransactionManager create(AtlasDbConfig config,
-                                                        Optional<SSLSocketFactory> sslSocketFactory,
-                                                        Set<Schema> schemas,
-                                                        Environment env,
-                                                        boolean allowHiddenTableAccess) {
-        final ServiceDiscoveringAtlasSupplier atlasFactory = new ServiceDiscoveringAtlasSupplier(config.keyValueService());
-        final KeyValueService rawKvs = atlasFactory.getKeyValueService();
-
-        LockAndTimestampServices lts = createLockAndTimestampServices(config, sslSocketFactory, env,
+    public static SerializableTransactionManager create(
+            AtlasDbConfig config,
+            Optional<SSLSocketFactory> sslSocketFactory,
+            Set<Schema> schemas,
+            Environment env,
+            boolean allowHiddenTableAccess) {
+        ServiceDiscoveringAtlasSupplier atlasFactory =
+                new ServiceDiscoveringAtlasSupplier(config.keyValueService(), config.leader());
+        KeyValueService rawKvs = atlasFactory.getKeyValueService();
+
+        LockAndTimestampServices lts = createLockAndTimestampServices(
+                config,
+                sslSocketFactory,
+                env,
                 LockServiceImpl::create,
-                atlasFactory::getTimestampService
-        );
+                atlasFactory::getTimestampService);
 
         KeyValueService kvs = NamespacedKeyValueServices.wrapWithStaticNamespaceMappingKvs(rawKvs);
+        kvs = ProfilingKeyValueService.create(kvs);
         kvs = new SweepStatsKeyValueService(kvs, lts.time());
 
         TransactionTables.createTables(kvs);
@@ -112,7 +123,11 @@ public static SerializableTransactionManager create(AtlasDbConfig config,
         ConflictDetectionManager conflictManager = ConflictDetectionManagers.createDefault(kvs);
         SweepStrategyManager sweepStrategyManager = SweepStrategyManagers.createDefault(kvs);
 
-        for (Schema schema : ImmutableSet.<Schema>builder().add(SweepSchema.INSTANCE.getLatestSchema()).addAll(schemas).build()) {
+        Set<Schema> allSchemas = ImmutableSet.<Schema>builder()
+                .add(SweepSchema.INSTANCE.getLatestSchema())
+                .addAll(schemas)
+                .build();
+        for (Schema schema : allSchemas) {
             Schemas.createTablesAndIndexes(schema, kvs);
         }
 
@@ -166,21 +181,11 @@ public static SerializableTransactionManager create(AtlasDbConfig config,
     }
 
     private static Supplier<Long> getImmutableTsSupplier(final TransactionManager txManager) {
-        return new Supplier<Long>() {
-            @Override
-            public Long get() {
-                return txManager.getImmutableTimestamp();
-            }
-        };
+        return () -> txManager.getImmutableTimestamp();
     }
 
     private static Supplier<Long> getUnreadableTsSupplier(final TransactionManager txManager) {
-        return new Supplier<Long>() {
-            @Override
-            public Long get() {
-                return txManager.getUnreadableTimestamp();
-            }
-        };
+        return () -> txManager.getUnreadableTimestamp();
     }
 
     public static LockAndTimestampServices createLockAndTimestampServices(
@@ -189,37 +194,60 @@ public static LockAndTimestampServices createLockAndTimestampServices(
             Environment env,
             Supplier<RemoteLockService> lock,
             Supplier<TimestampService> time) {
-
-        LockAndTimestampServices lockAndTimestampServices = createRawServices(config, sslSocketFactory, env, lock, time);
+        LockAndTimestampServices lockAndTimestampServices =
+                createRawServices(config, sslSocketFactory, env, lock, time);
         return withRefreshingLockService(lockAndTimestampServices);
     }
 
-    private static LockAndTimestampServices withRefreshingLockService(LockAndTimestampServices lockAndTimestampServices) {
+    private static LockAndTimestampServices withRefreshingLockService(
+            LockAndTimestampServices lockAndTimestampServices) {
         return ImmutableLockAndTimestampServices.builder()
                 .from(lockAndTimestampServices)
                 .lock(LockRefreshingRemoteLockService.create(lockAndTimestampServices.lock()))
                 .build();
     }
 
-    private static LockAndTimestampServices createRawServices(AtlasDbConfig config, Optional<SSLSocketFactory> sslSocketFactory, Environment env, Supplier<RemoteLockService> lock, Supplier<TimestampService> time) {
+    private static LockAndTimestampServices createRawServices(
+            AtlasDbConfig config,
+            Optional<SSLSocketFactory> sslSocketFactory,
+            Environment env,
+            Supplier<RemoteLockService> lock,
+            Supplier<TimestampService> time) {
         if (config.leader().isPresent()) {
             LeaderElectionService leader = Leaders.create(sslSocketFactory, env, config.leader().get());
             env.register(AwaitingLeadershipProxy.newProxyInstance(RemoteLockService.class, lock, leader));
             env.register(AwaitingLeadershipProxy.newProxyInstance(TimestampService.class, time, leader));
 
-            warnIf(config.lock().isPresent(), "Ignoring lock server configuration because leadership election is enabled");
-            warnIf(config.timestamp().isPresent(), "Ignoring timestamp server configuration because leadership election is enabled");
+            warnIf(config.lock().isPresent(),
+                    "Ignoring lock server configuration because leadership election is enabled");
+            warnIf(config.timestamp().isPresent(),
+                    "Ignoring timestamp server configuration because leadership election is enabled");
 
             return ImmutableLockAndTimestampServices.builder()
                     .lock(createService(sslSocketFactory, config.leader().get().leaders(), RemoteLockService.class))
                     .time(createService(sslSocketFactory, config.leader().get().leaders(), TimestampService.class))
                     .build();
         } else {
-            warnIf(config.lock().isPresent() != config.timestamp().isPresent(), "Using embedded instances for one (but not both) of lock and timestamp services");
+            warnIf(config.lock().isPresent() != config.timestamp().isPresent(),
+                    "Using embedded instances for one (but not both) of lock and timestamp services");
+
+            RemoteLockService lockService = config.lock()
+                    .transform(new ServiceCreator<>(sslSocketFactory, RemoteLockService.class))
+                    .or(lock);
+            TimestampService timeService = config.timestamp()
+                    .transform(new ServiceCreator<>(sslSocketFactory, TimestampService.class))
+                    .or(time);
+
+            if (!config.lock().isPresent()) {
+                env.register(lockService);
+            }
+            if (!config.timestamp().isPresent()) {
+                env.register(timeService);
+            }
 
             return ImmutableLockAndTimestampServices.builder()
-                    .lock(config.lock().transform(new ServiceCreator<>(sslSocketFactory, RemoteLockService.class)).or(lock))
-                    .time(config.timestamp().transform(new ServiceCreator<>(sslSocketFactory, TimestampService.class)).or(time))
+                    .lock(lockService)
+                    .time(timeService)
                     .build();
         }
     }
@@ -230,7 +258,10 @@ private static void warnIf(boolean arg, String warning) {
         }
     }
 
-    private static <T> T createService(Optional<SSLSocketFactory> sslSocketFactory, Set<String> uris, Class<T> serviceClass) {
+    private static <T> T createService(
+            Optional<SSLSocketFactory> sslSocketFactory,
+            Set<String> uris,
+            Class<T> serviceClass) {
         return AtlasDbHttpClients.createProxyWithFailover(sslSocketFactory, uris, serviceClass);
     }
 
@@ -238,7 +269,7 @@ private static class ServiceCreator<T> implements Function<ServerListConfig, T>
         private Optional<SSLSocketFactory> sslSocketFactory;
         private Class<T> serviceClass;
 
-        public ServiceCreator(Optional<SSLSocketFactory> sslSocketFactory, Class<T> serviceClass) {
+        ServiceCreator(Optional<SSLSocketFactory> sslSocketFactory, Class<T> serviceClass) {
             this.sslSocketFactory = sslSocketFactory;
             this.serviceClass = serviceClass;
         }
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java
index f810240b2d4..fc6fc3840c6 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/AtlasDbHttpClients.java
@@ -34,13 +34,16 @@
 import feign.jaxrs.JAXRSContract;
 import feign.okhttp.OkHttpClient;
 
-public class AtlasDbHttpClients {
-
+public final class AtlasDbHttpClients {
     private static final ObjectMapper mapper = new ObjectMapper();
     private static final Contract contract = new JAXRSContract();
     private static final Encoder encoder = new JacksonEncoder(mapper);
     private static final Decoder decoder = new TextDelegateDecoder(new JacksonDecoder(mapper));
 
+    private AtlasDbHttpClients() {
+        // Utility class
+    }
+
     /**
      * Constructs a dynamic proxy for the specified type, using the supplied SSL factory if is present, and feign {@link
      * feign.Client.Default} HTTP client.
@@ -96,5 +99,4 @@ private static Client newOkHttpClient(Optional<SSLSocketFactory> sslSocketFactor
         client.setSslSocketFactory(sslSocketFactory.orNull());
         return new OkHttpClient(client);
     }
-
 }
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java
index 564ab2e4bf4..c23a95cb52d 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/FailoverFeignTarget.java
@@ -27,6 +27,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import feign.Client;
 import feign.Request;
 import feign.Request.Options;
@@ -52,7 +53,7 @@ public class FailoverFeignTarget<T> implements Target<T>, Retryer {
     private final AtomicLong numSwitches = new AtomicLong();
     private final AtomicLong startTimeOfFastFailover = new AtomicLong();
 
-    final ThreadLocal<Integer> mostRecentServerIndex = new ThreadLocal<Integer>();
+    final ThreadLocal<Integer> mostRecentServerIndex = new ThreadLocal<>();
 
     public FailoverFeignTarget(Collection<String> servers, Class<T> type) {
         this.servers = ImmutableList.copyOf(ImmutableSet.copyOf(servers));
@@ -66,10 +67,9 @@ public void sucessfulCall() {
     }
 
     @Override
-    public void continueOrPropagate(RetryableException e) {
-
+    public void continueOrPropagate(RetryableException ex) {
         boolean isFastFailoverException;
-        if (e.retryAfter() == null) {
+        if (ex.retryAfter() == null) {
             // This is the case where we have failed due to networking or other IOException error.
             isFastFailoverException = false;
         } else {
@@ -98,37 +98,39 @@ public void continueOrPropagate(RetryableException e) {
             }
         }
 
-        checkAndHandleFailure(e);
+        checkAndHandleFailure(ex);
         if (!isFastFailoverException) {
             pauseForBackOff();
         }
-        return;
     }
 
-    private void checkAndHandleFailure(RetryableException e) {
+    private void checkAndHandleFailure(RetryableException ex) {
         final long fastFailoverStartTime = startTimeOfFastFailover.get();
         final long currentTime = System.currentTimeMillis();
-        boolean failedDueToFastFailover = fastFailoverStartTime != 0 && (currentTime - fastFailoverStartTime) > fastFailoverTimeoutMillis;
+        boolean failedDueToFastFailover = fastFailoverStartTime != 0
+                && (currentTime - fastFailoverStartTime) > fastFailoverTimeoutMillis;
         boolean failedDueToNumSwitches = numSwitches.get() >= numServersToTryBeforeFailing;
 
         if (failedDueToFastFailover) {
-            log.warn("This connection has been instructed to fast failover for " +
-                    TimeUnit.MILLISECONDS.toSeconds(fastFailoverTimeoutMillis) +
-                    " seconds without establishing a successful connection." +
-                    " The remote hosts have been in a fast failover state for too long.");
+            log.warn("This connection has been instructed to fast failover for "
+                    + TimeUnit.MILLISECONDS.toSeconds(fastFailoverTimeoutMillis)
+                    + " seconds without establishing a successful connection."
+                    + " The remote hosts have been in a fast failover state for too long.");
         } else if (failedDueToNumSwitches) {
             log.warn("This connection has tried " + numServersToTryBeforeFailing
-                    + " hosts each " + failuresBeforeSwitching + " times and has failed out.", e);
+                    + " hosts each " + failuresBeforeSwitching + " times and has failed out.", ex);
         }
 
         if (failedDueToFastFailover || failedDueToNumSwitches) {
-            throw e;
+            throw ex;
         }
     }
 
 
     private void pauseForBackOff() {
-        double pow = Math.pow(GOLDEN_RATIO, (numSwitches.get() * failuresBeforeSwitching) + failuresSinceLastSwitch.get());
+        double pow = Math.pow(
+                GOLDEN_RATIO,
+                numSwitches.get() * failuresBeforeSwitching + failuresSinceLastSwitch.get());
         long timeout = Math.min(maxBackoffMillis, Math.round(pow));
 
         try {
@@ -139,6 +141,8 @@ private void pauseForBackOff() {
         }
     }
 
+    @SuppressFBWarnings("CN_IDIOM_NO_SUPER_CALL")
+    @SuppressWarnings({"checkstyle:NoClone", "checkstyle:SuperClone"})
     @Override
     public Retryer clone() {
         mostRecentServerIndex.remove();
diff --git a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java
index bb7b9b737b3..f3ba13ab580 100644
--- a/atlasdb-config/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java
+++ b/atlasdb-config/src/main/java/com/palantir/atlasdb/http/TextDelegateDecoder.java
@@ -45,7 +45,8 @@
 import feign.codec.StringDecoder;
 
 /**
- * If the response has a Content-Type of text/plain, then this decoder uses a string decoder. Otherwise, it falls back to the delegate.
+ * If the response has a Content-Type of text/plain, then this decoder uses a string decoder.
+ * Otherwise, it falls back to the delegate.
  * @author jmeacham
  */
 public class TextDelegateDecoder implements Decoder {
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java
index f024ee370a0..a513d212d72 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/AutoServiceAnnotatedAtlasDbFactory.java
@@ -21,7 +21,9 @@
 import org.jmock.Mockery;
 
 import com.google.auto.service.AutoService;
+import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.spi.AtlasDbFactory;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
@@ -42,7 +44,7 @@ public String getType() {
     }
 
     @Override
-    public KeyValueService createRawKeyValueService(KeyValueServiceConfig config) {
+    public KeyValueService createRawKeyValueService(KeyValueServiceConfig config, Optional<LeaderConfig> leaderConfig) {
         return keyValueService;
     }
 
diff --git a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java
index 0467c8d00eb..7644a9633f9 100644
--- a/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java
+++ b/atlasdb-config/src/test/java/com/palantir/atlasdb/factory/ServiceDiscoveringAtlasSupplierTest.java
@@ -15,9 +15,9 @@
  */
 package com.palantir.atlasdb.factory;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 import org.hamcrest.Description;
@@ -27,6 +27,8 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import com.google.common.base.Optional;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.spi.AtlasDbFactory;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import com.palantir.timestamp.TimestampService;
@@ -35,22 +37,23 @@ public class ServiceDiscoveringAtlasSupplierTest {
     private final KeyValueServiceConfig kvsConfig = () -> AutoServiceAnnotatedAtlasDbFactory.TYPE;
     private final KeyValueServiceConfig invalidKvsConfig = () -> "should not be found kvs";
     private final AtlasDbFactory delegate = new AutoServiceAnnotatedAtlasDbFactory();
+    private final Optional<LeaderConfig> leaderConfig = Optional.of(mock(LeaderConfig.class));
 
     @Rule
     public final ExpectedException exception = ExpectedException.none();
 
     @Test
     public void delegateToFactoriesAnnotatedWithAutoServiceForCreatingKeyValueServices() {
-        ServiceDiscoveringAtlasSupplier atlasSupplier = new ServiceDiscoveringAtlasSupplier(kvsConfig);
+        ServiceDiscoveringAtlasSupplier atlasSupplier = new ServiceDiscoveringAtlasSupplier(kvsConfig, leaderConfig);
 
         assertThat(
                 atlasSupplier.getKeyValueService(),
-                is(delegate.createRawKeyValueService(kvsConfig)));
+                is(delegate.createRawKeyValueService(kvsConfig, leaderConfig)));
     }
 
     @Test
     public void delegateToFactoriesAnnotatedWithAutoServiceForCreatingTimestampServices() {
-        ServiceDiscoveringAtlasSupplier atlasSupplier = new ServiceDiscoveringAtlasSupplier(kvsConfig);
+        ServiceDiscoveringAtlasSupplier atlasSupplier = new ServiceDiscoveringAtlasSupplier(kvsConfig, leaderConfig);
         TimestampService timestampService = mock(TimestampService.class);
         AutoServiceAnnotatedAtlasDbFactory.nextTimestampServiceToReturn(timestampService);
 
@@ -66,14 +69,16 @@ public void notAllowConstructionWithoutAValidBackingFactory() {
         exception.expectMessage(invalidKvsConfig.type());
         exception.expectMessage("Have you annotated it with @AutoService(AtlasDbFactory.class)?");
 
-        new ServiceDiscoveringAtlasSupplier(invalidKvsConfig);
+        new ServiceDiscoveringAtlasSupplier(invalidKvsConfig, leaderConfig);
     }
 
     @Test
     public void returnDifferentTimestampServicesOnSubsequentCalls() {
         // Need to get a newly-initialized timestamp service in case leadership changed between calls.
-        ServiceDiscoveringAtlasSupplier supplier = new ServiceDiscoveringAtlasSupplier(kvsConfig);
-        AutoServiceAnnotatedAtlasDbFactory.nextTimestampServiceToReturn(mock(TimestampService.class), mock(TimestampService.class));
+        ServiceDiscoveringAtlasSupplier supplier = new ServiceDiscoveringAtlasSupplier(kvsConfig, leaderConfig);
+        AutoServiceAnnotatedAtlasDbFactory.nextTimestampServiceToReturn(
+                mock(TimestampService.class),
+                mock(TimestampService.class));
 
         assertThat(supplier.getTimestampService(), is(not(sameObjectAs(supplier.getTimestampService()))));
     }
diff --git a/atlasdb-console/build.gradle b/atlasdb-console/build.gradle
index d5d0b3bcb23..5815d7960c0 100644
--- a/atlasdb-console/build.gradle
+++ b/atlasdb-console/build.gradle
@@ -2,9 +2,9 @@ apply from: "../gradle/shared.gradle"
 apply plugin: 'groovy'
 
 dependencies {
-    compile project(':atlasdb-server')
+    compile project(':atlasdb-service')
     compile('org.fusesource.jansi:jansi:1.11')
-    compile('commons-cli:commons-cli:1.1')
+    compile('commons-cli:commons-cli:1.2')
     compile('jline:jline:2.12')
     compile('org.codehaus.groovy:groovy-all:' + libVersions.groovy)
 
diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java
index a382feafbe8..89d83e469e8 100644
--- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java
+++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java
@@ -25,12 +25,14 @@
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.tools.shell.Main;
 
+import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.console.module.AtlasCoreModule;
 
 import groovy.lang.Binding;
@@ -47,25 +49,38 @@ public class AtlasConsoleMain {
     private static final String SCRIPT_FLAG_LONG = "script";
     private static final String EVAL_FLAG_SHORT = "e";
     private static final String EVAL_FLAG_LONG = "evaluate";
+    private static final String BIND_FLAG_SHORT = "b";
+    private static final String BIND_FLAG_LONG = "bind";
+
+    public static final Options OPTIONS = new Options()
+            .addOption(HELP_FLAG_SHORT, HELP_FLAG_LONG, false, "Prints help message.")
+            .addOption(SCRIPT_FLAG_SHORT, SCRIPT_FLAG_LONG, false, "Path to .groovy file to execute as non-interactive application")
+            .addOption(EVAL_FLAG_SHORT, EVAL_FLAG_LONG, true, "Groovy code to evaluate prior to startup in interactive mode")
+            .addOption(CLASSPATH_FLAG_SHORT, CLASSPATH_FLAG_LONG, true, "Additional locations to include on the classpath")
+            .addOption(OptionBuilder
+                    .withLongOpt(BIND_FLAG_LONG)
+                    .hasArgs(2)
+                    .withDescription("Additional bindings to include in the cli")
+                    .create(BIND_FLAG_SHORT));
+
+    private static String[] additionalBindingsToSetUp = new String[] {};
 
     protected AtlasConsoleMain() {
     }
 
     public void run(String[] args) {
-        Options options = setupOptions();
-
         try {
             CommandLineParser parser = new GnuParser();
-            CommandLine cli = parser.parse(options, args);
+            CommandLine cli = parser.parse(OPTIONS, args);
             if (cli.hasOption(HELP_FLAG_SHORT)) {
                 usage();
-                new HelpFormatter().printHelp("atlasDBConsole", options, true);
+                new HelpFormatter().printHelp("atlasDBConsole", OPTIONS, true);
                 System.exit(0); // (authorized)
             }
             System.exit(execute(cli));
         } catch (ParseException e) {
             System.out.println("Invalid command line - " + e.getMessage()); // (authorized)
-            new HelpFormatter().printHelp("atlasDBConsole", options, true);
+            new HelpFormatter().printHelp("atlasDBConsole", OPTIONS, true);
             System.exit(1); // (authorized)
         } catch (IOException e) {
             System.out.println("Invalid script file input - " + e.getMessage()); // (authorized)
@@ -82,9 +97,16 @@ protected int execute(CommandLine cli) throws CompilationFailedException, IOExce
                     ":set interpreterMode\n" +
                     ":set show-last-result false\n" +
                     getJavaCallbackString();
+
+            if(cli.hasOption(BIND_FLAG_SHORT)) {
+                additionalBindingsToSetUp = cli.getOptionValues(BIND_FLAG_SHORT);
+                Preconditions.checkArgument(additionalBindingsToSetUp.length % 2 == 0, "An odd amount of parameters were passed into --bind");
+            }
+
             if(cli.hasOption(EVAL_FLAG_SHORT)) {
-                setupScript += "\n" + cli.getOptionValue(EVAL_FLAG_SHORT);
+                setupScript += "\n" + Joiner.on('\n').join(cli.getOptionValues(EVAL_FLAG_SHORT));
             }
+
             setupScript += "\n//AtlasConsole started!";
             List<String> args = new ArrayList<String>(Arrays.asList(cli.getArgs()));
             args.add(setupScript);
@@ -98,15 +120,6 @@ protected int execute(CommandLine cli) throws CompilationFailedException, IOExce
         return 0;
     }
 
-    protected Options setupOptions() {
-        Options options = new Options();
-        options.addOption(new Option(HELP_FLAG_SHORT, HELP_FLAG_LONG, false, "Prints help message."));
-        options.addOption(SCRIPT_FLAG_SHORT, SCRIPT_FLAG_LONG, false, "Path to .groovy file to execute as non-interactive application");
-        options.addOption(EVAL_FLAG_SHORT, EVAL_FLAG_LONG, true, "Groovy code to evaluate prior to startup in interactive mode");
-        options.addOption(CLASSPATH_FLAG_SHORT, CLASSPATH_FLAG_LONG, true, "Additional locations to include on the classpath");
-        return options;
-    }
-
     protected void usage() {
         String prependMessage = "\nAtlasConsole is a command line utility to view and modify an instance of AtlasDB.\n" +
                       "In addition to the arguments listed below, the utility accepts a filepath to a Groovy script to run" +
@@ -136,6 +149,10 @@ public static void main(String[] args) {
     }
 
     private static Binding setupBinding(Binding binding) {
+        for(int i = 0; i < additionalBindingsToSetUp.length; i += 2) {
+            binding.setVariable(additionalBindingsToSetUp[i], additionalBindingsToSetUp[i + 1]);
+        }
+
         AtlasConsoleService atlasConsoleService = new DisconnectedAtlasConsoleService();
         AtlasConsoleServiceWrapper atlasConsoleServiceWrapper = AtlasConsoleServiceWrapper.init(atlasConsoleService);
         return AtlasConsoleBinder.create(binding, new AtlasCoreModule(atlasConsoleServiceWrapper));
@@ -154,5 +171,5 @@ public static void callback(Script script) throws CompilationFailedException, IO
         System.setSecurityManager(null);
         setupBinding(script.getBinding());
     }
-    
+
 }
diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/module/AtlasCoreModule.groovy b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/module/AtlasCoreModule.groovy
index fc857a15e7d..c3449960bd8 100644
--- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/module/AtlasCoreModule.groovy
+++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/module/AtlasCoreModule.groovy
@@ -120,6 +120,7 @@ class AtlasCoreModule implements AtlasConsoleModule {
                 'pp': this.&pp,
                 'pptable': this.&pptable,
                 'connect': this.&connect,
+                'connectInline': this.&connectInline
         ]
     }
 
@@ -134,7 +135,14 @@ class AtlasCoreModule implements AtlasConsoleModule {
     }
 
     public connect(String yamlFilePath) {
-        AtlasDbConfig config = AtlasDbConfigs.load(new File(yamlFilePath));
+        setupConnection(AtlasDbConfigs.load(new File(yamlFilePath)));
+    }
+
+    public connectInline(String fileContents) {
+        setupConnection(AtlasDbConfigs.loadFromString(fileContents, null));
+    }
+
+    private setupConnection(AtlasDbConfig config) {
         SerializableTransactionManager tm = TransactionManagers.create(config, Optional.<SSLSocketFactory>absent(), ImmutableSet.<Schema>of(),
                 new com.palantir.atlasdb.factory.TransactionManagers.Environment() {
                     @Override
diff --git a/atlasdb-dbkvs-hikari/build.gradle b/atlasdb-dbkvs-hikari/build.gradle
index 25d6ebb0dcb..206d224cda0 100644
--- a/atlasdb-dbkvs-hikari/build.gradle
+++ b/atlasdb-dbkvs-hikari/build.gradle
@@ -7,5 +7,5 @@ dependencies {
   compile 'com.fasterxml.jackson.core:jackson-databind:' + libVersions.jackson
   compile 'com.codahale.metrics:metrics-core:3.0.2'
 
-  processor 'org.immutables:value:2.0.21'
+  processor 'org.immutables:value:' + libVersions.immutables
 }
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java
index 062086a8c07..f901c666310 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/ConnectionConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Palantir Technologies
+ * Copyright 2016 Palantir Technologies
  *
  * Licensed under the BSD-3 License (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,12 +41,13 @@ public abstract class ConnectionConfig {
     public abstract String type();
 
     public abstract String getDbLogin();
-    public abstract String getDbPassword();
+    public abstract MaskedValue getDbPassword();
 
     public abstract String getUrl();
     public abstract String getDriverClass();
     public abstract String getTestQuery();
 
+    @JsonIgnore
     @Value.Derived
     public abstract DBType getDbType();
 
@@ -95,6 +96,10 @@ public int getConnectionTimeoutSeconds() {
         return 45;
     }
 
+    /**
+     * This is JsonIgnore'd because it doesn't serialise. Serialisation is needed for atlasdb-dropwizard-bundle.
+     */
+    @JsonIgnore
     @Value.Default
     public Visitor<Connection> getOnAcquireConnectionVisitor() {
         return Visitors.emptyVisitor();
@@ -123,6 +128,9 @@ public HikariConfig getHikariConfig() {
         config.setMaxLifetime(TimeUnit.SECONDS.toMillis(getMaxConnectionAge()));
         config.setIdleTimeout(TimeUnit.SECONDS.toMillis(getMaxIdleTime()));
         config.setLeakDetectionThreshold(getUnreturnedConnectionTimeout());
+        // Not a bug - we don't want to use connectionTimeout here, since Hikari uses a different terminology.
+        // See https://github.com/brettwooldridge/HikariCP/wiki/Configuration - connectionTimeout = how long to wait for a connection to be opened.
+        // ConnectionConfig.connectionTimeoutSeconds is passed in via getHikariProperties(), in subclasses.
         config.setConnectionTimeout(getCheckoutTimeout());
 
         // TODO: See if driver supports JDBC4 (isValid()) and use it.
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java
new file mode 100644
index 00000000000..e80f25f3e0d
--- /dev/null
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/MaskedValue.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.nexus.db.pool.config;
+
+import org.immutables.value.Value;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+@JsonDeserialize(as = ImmutableMaskedValue.class)
+@JsonSerialize(as = ImmutableMaskedValue.class)
+@Value.Immutable(builder = false)
+public abstract class MaskedValue {
+    @Value.Parameter
+    abstract String value();
+    @Override
+    public String toString() { return "<REDACTED>"; }
+
+    public String unmasked() {
+        return value();
+    }
+}
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java
index 792563369cc..4198d519419 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/OracleConnectionConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Palantir Technologies
+ * Copyright 2016 Palantir Technologies
  *
  * Licensed under the BSD-3 License (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,11 +98,12 @@ public ConnectionProtocol getProtocol() {
 
     @Override
     @Value.Default
+    @Value.Auxiliary
     public Properties getHikariProperties() {
         Properties props = new Properties();
 
         props.setProperty("user", getDbLogin());
-        props.setProperty("password", getDbPassword());
+        props.setProperty("password", getDbPassword().unmasked());
 
         props.setProperty("oracle.net.keepAlive", "true");
         props.setProperty("oracle.jdbc.ReadTimeout", Long.toString(TimeUnit.SECONDS.toMillis(getSocketTimeoutSeconds())));
diff --git a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java
index 0da25d09b55..6e0e0f9ff02 100644
--- a/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java
+++ b/atlasdb-dbkvs-hikari/src/main/java/com/palantir/nexus/db/pool/config/PostgresConnectionConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Palantir Technologies
+ * Copyright 2016 Palantir Technologies
  *
  * Licensed under the BSD-3 License (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,11 +57,12 @@ public String getTestQuery() {
 
     @Override
     @Value.Default
+    @Value.Auxiliary
     public Properties getHikariProperties() {
         Properties props = new Properties();
 
         props.setProperty("user", getDbLogin());
-        props.setProperty("password", getDbPassword());
+        props.setProperty("password", getDbPassword().unmasked());
 
         props.setProperty("tcpKeepAlive", "true");
         props.setProperty("socketTimeout", Integer.toString(getSocketTimeoutSeconds()));
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceSerializableTransactionTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceSerializableTransactionTest.java
index ca16e4540fe..de83c879496 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceSerializableTransactionTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceSerializableTransactionTest.java
@@ -24,6 +24,6 @@ public class DbkvsKeyValueServiceSerializableTransactionTest extends
 
     @Override
     protected KeyValueService getKeyValueService() {
-        return ConnectionManagerAwareDbKvs.create(DbkvsTestSuite.POSTGRES_KVS_CONFIG);
+        return ConnectionManagerAwareDbKvs.create(DbkvsTestSuite.getKvsConfig());
     }
 }
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceSweeperTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceSweeperTest.java
index b872ba77622..d0e1328d391 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceSweeperTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceSweeperTest.java
@@ -15,13 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import com.palantir.atlasdb.cleaner.AbstractSweeperTest;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs;
+import com.palantir.atlasdb.sweep.AbstractSweeperTest;
 
 public class DbkvsKeyValueServiceSweeperTest extends AbstractSweeperTest {
     @Override
     protected KeyValueService getKeyValueService() {
-        return ConnectionManagerAwareDbKvs.create(DbkvsTestSuite.POSTGRES_KVS_CONFIG);
+        return ConnectionManagerAwareDbKvs.create(DbkvsTestSuite.getKvsConfig());
     }
 }
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceTest.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceTest.java
index 956e7cc6df6..2fb30d2962c 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceTest.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsKeyValueServiceTest.java
@@ -16,22 +16,16 @@
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
 import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
-import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs;
 import com.palantir.atlasdb.keyvalue.impl.AbstractAtlasDbKeyValueServiceTest;
-import com.palantir.exception.PalantirSqlException;
 
 public class DbkvsKeyValueServiceTest extends AbstractAtlasDbKeyValueServiceTest {
     @Override
     protected KeyValueService getKeyValueService() {
-        KeyValueService kvs = ConnectionManagerAwareDbKvs.create(DbkvsTestSuite.POSTGRES_KVS_CONFIG);
+        KeyValueService kvs = ConnectionManagerAwareDbKvs.create(DbkvsTestSuite.getKvsConfig());
         for (TableReference table : kvs.getAllTableNames()) {
             if (!table.getQualifiedName().equals("_metadata")) {
                 kvs.dropTable(table);
@@ -40,19 +34,9 @@ protected KeyValueService getKeyValueService() {
         return kvs;
     }
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     @Override
     @Ignore
     public void testGetRangeWithHistory() {
         /* Have to ignore this test as it is an unsupported operation for this KVS */
     }
-
-    @Test
-    public void testRejectCaseInsensitiveDuplicateTableName() {
-        keyValueService.createTable(TableReference.create(Namespace.EMPTY_NAMESPACE, "Duplicate"), AtlasDbConstants.GENERIC_TABLE_METADATA);
-        thrown.expect(PalantirSqlException.class);
-        keyValueService.createTable(TableReference.create(Namespace.EMPTY_NAMESPACE, "duplicate"), AtlasDbConstants.GENERIC_TABLE_METADATA);
-    }
 }
diff --git a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsTestSuite.java b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsTestSuite.java
index 7b37922ba16..c6eab39774b 100644
--- a/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsTestSuite.java
+++ b/atlasdb-dbkvs-tests/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/DbkvsTestSuite.java
@@ -15,8 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
-import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.util.concurrent.Callable;
 
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -24,11 +24,14 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import com.palantir.docker.compose.DockerComposition;
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.Duration;
+import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs;
+import com.palantir.docker.compose.DockerComposeRule;
+import com.palantir.docker.compose.connection.Container;
 import com.palantir.docker.compose.connection.DockerPort;
-import com.palantir.docker.compose.connection.waiting.HealthCheck;
-import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
 import com.palantir.nexus.db.pool.config.ConnectionConfig;
+import com.palantir.nexus.db.pool.config.ImmutableMaskedValue;
 import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig;
 
 @RunWith(Suite.class)
@@ -36,41 +39,64 @@
         DbkvsKeyValueServiceTest.class,
         DbkvsKeyValueServiceSerializableTransactionTest.class,
         DbkvsKeyValueServiceSweeperTest.class
-})
-public class DbkvsTestSuite {
+        })
+public final class DbkvsTestSuite {
+    private static final int POSTGRES_PORT_NUMBER = 5432;
+
+    private DbkvsTestSuite() {
+        // Test suite
+    }
 
-    public static final int POSTGRES_PORT_NUMBER = 5432;
     @ClassRule
-    public static final DockerComposition composition = DockerComposition.of("src/test/resources/docker-compose.yml")
-            .waitingForHostNetworkedPort(POSTGRES_PORT_NUMBER, toBeOpen())
+    public static final DockerComposeRule docker = DockerComposeRule.builder()
+            .file("src/test/resources/docker-compose.yml")
+            .waitingForService("postgres", Container::areAllPortsOpen)
             .saveLogsTo("container-logs")
+            .skipShutdown(true)
             .build();
 
-    static InetSocketAddress POSTGRES_ADDRESS;
-
-    static DbKeyValueServiceConfig POSTGRES_KVS_CONFIG;
-
     @BeforeClass
-    public static void waitUntilDbkvsIsUp() throws IOException, InterruptedException {
-        DockerPort port = composition.hostNetworkedPort(POSTGRES_PORT_NUMBER);
-        POSTGRES_ADDRESS = new InetSocketAddress(port.getIp(), port.getExternalPort());
+    public static void waitUntilDbkvsIsUp() throws InterruptedException {
+        Awaitility.await()
+                .atMost(Duration.ONE_MINUTE)
+                .pollInterval(Duration.ONE_SECOND)
+                .until(canCreateKeyValueService());
+    }
+
+    public static DbKeyValueServiceConfig getKvsConfig() {
+        DockerPort port = docker.containers()
+                .container("postgres")
+                .port(POSTGRES_PORT_NUMBER);
 
+        InetSocketAddress postgresAddress = new InetSocketAddress(port.getIp(), port.getExternalPort());
 
         ConnectionConfig connectionConfig = ImmutablePostgresConnectionConfig.builder()
                 .dbName("atlas")
                 .dbLogin("palantir")
-                .dbPassword("palantir")
-                .host(POSTGRES_ADDRESS.getHostName())
-                .port(POSTGRES_ADDRESS.getPort())
+                .dbPassword(ImmutableMaskedValue.of("palantir"))
+                .host(postgresAddress.getHostName())
+                .port(postgresAddress.getPort())
                 .build();
 
-        POSTGRES_KVS_CONFIG = ImmutableDbKeyValueServiceConfig.builder()
+        return ImmutableDbKeyValueServiceConfig.builder()
                 .connection(connectionConfig)
                 .ddl(ImmutablePostgresDdlConfig.builder().build())
                 .build();
     }
 
-    private static HealthCheck<DockerPort> toBeOpen() {
-        return port -> SuccessOrFailure.fromBoolean(port.isListeningNow(), "" + "" + port + " was not open");
+    private static Callable<Boolean> canCreateKeyValueService() {
+        return () -> {
+            ConnectionManagerAwareDbKvs kvs = null;
+            try {
+                kvs = ConnectionManagerAwareDbKvs.create(getKvsConfig());
+                return kvs.getConnectionManager().getConnection().isValid(5);
+            } catch (Exception e) {
+                return false;
+            } finally {
+                if (kvs != null) {
+                    kvs.close();
+                }
+            }
+        };
     }
 }
diff --git a/atlasdb-dbkvs-tests/src/test/resources/docker-compose.yml b/atlasdb-dbkvs-tests/src/test/resources/docker-compose.yml
index b01ab811fce..ff0526d7994 100644
--- a/atlasdb-dbkvs-tests/src/test/resources/docker-compose.yml
+++ b/atlasdb-dbkvs-tests/src/test/resources/docker-compose.yml
@@ -7,8 +7,5 @@ services:
        POSTGRES_PASSWORD: palantir
        POSTGRES_USER: palantir
        POSTGRES_DB: atlas
-#    ports:
-#      - "5432"
-#    environment:
-#      - LOCAL_JMX=no
-    network_mode: host
+    ports:
+      - "5432"
diff --git a/atlasdb-dbkvs/build.gradle b/atlasdb-dbkvs/build.gradle
index edee8815960..7e7ddf3f427 100644
--- a/atlasdb-dbkvs/build.gradle
+++ b/atlasdb-dbkvs/build.gradle
@@ -3,15 +3,15 @@ apply plugin: 'org.inferred.processors'
 apply from: "../gradle/shared.gradle"
 
 dependencies {
+  compile project(":atlasdb-api")
   compile project(":atlasdb-client")
   compile project(":atlasdb-dbkvs-hikari")
-  compile project(":atlasdb-spi")
   compile project(':timestamp-impl')
   compile project(':commons-db')
   compile project(':commons-api')
 
   testCompile project(':atlasdb-config')
 
-  processor 'org.immutables:value:2.0.21'
+  processor 'org.immutables:value:' + libVersions.immutables
   processor "com.google.auto.service:auto-service:1.0-rc2"
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java
index 090a71794cc..0892fd58986 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbAtlasDbFactory.java
@@ -16,8 +16,10 @@
 package com.palantir.atlasdb.keyvalue.dbkvs;
 
 import com.google.auto.service.AutoService;
+import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ConnectionManagerAwareDbKvs;
 import com.palantir.atlasdb.keyvalue.dbkvs.timestamp.InDbTimestampBoundStore;
@@ -29,15 +31,17 @@
 @AutoService(AtlasDbFactory.class)
 public class DbAtlasDbFactory implements AtlasDbFactory {
     public static final String TYPE = "relational";
+
     @Override
     public String getType() {
         return TYPE;
     }
 
     @Override
-    public KeyValueService createRawKeyValueService(KeyValueServiceConfig config) {
+    public KeyValueService createRawKeyValueService(KeyValueServiceConfig config, Optional<LeaderConfig> leaderConfig) {
         Preconditions.checkArgument(config instanceof DbKeyValueServiceConfig,
-                "DbAtlasDbFactory expects a configuration of type DbKeyValueServiceConfiguration, found %s", config.getClass());
+                "DbAtlasDbFactory expects a configuration of type DbKeyValueServiceConfiguration, found %s",
+                config.getClass());
         return ConnectionManagerAwareDbKvs.create((DbKeyValueServiceConfig) config);
     }
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java
index 32195d4f67f..b204226008b 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DbKeyValueServiceConfig.java
@@ -31,7 +31,6 @@
 @JsonTypeName(DbAtlasDbFactory.TYPE)
 @Value.Immutable
 public abstract class DbKeyValueServiceConfig implements KeyValueServiceConfig {
-
     public abstract DdlConfig ddl();
 
     public abstract ConnectionConfig connection();
@@ -47,5 +46,4 @@ protected final void check() {
                 "ddl config (%s) and connection config (%s) must be for the same physical store",
                 ddl().type(), connection().type());
     }
-
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java
index 0befdca17dc..51cb7605f68 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/DdlConfig.java
@@ -25,9 +25,11 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.DbTableFactory;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", visible = false)
-@JsonSubTypes({@JsonSubTypes.Type(PostgresDdlConfig.class), @JsonSubTypes.Type(OracleDdlConfig.class), @JsonSubTypes.Type(H2DdlConfig.class)})
+@JsonSubTypes({
+        @JsonSubTypes.Type(PostgresDdlConfig.class),
+        @JsonSubTypes.Type(OracleDdlConfig.class),
+        @JsonSubTypes.Type(H2DdlConfig.class)})
 public abstract class DdlConfig {
-
     public abstract String type();
 
     public abstract Supplier<DbTableFactory> tableFactorySupplier();
@@ -61,5 +63,4 @@ public int mutationBatchCount() {
     public int mutationBatchSizeBytes() {
         return 2 * 1024 * 1024;
     }
-
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java
index 8b7d4a03059..fb8330cef05 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/H2DdlConfig.java
@@ -29,7 +29,6 @@
 @JsonTypeName(H2DdlConfig.TYPE)
 @Value.Immutable
 public abstract class H2DdlConfig extends DdlConfig {
-
     public static final String TYPE = "h2";
 
     @Override
@@ -42,5 +41,4 @@ public Supplier<DbTableFactory> tableFactorySupplier() {
     public final String type() {
         return TYPE;
     }
-
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java
index e3d6095c176..eb8feb9024d 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/OracleDdlConfig.java
@@ -31,7 +31,6 @@
 @JsonTypeName(OracleDdlConfig.TYPE)
 @Value.Immutable
 public abstract class OracleDdlConfig extends DdlConfig {
-
     public static final String TYPE = "oracle";
 
     public abstract JdbcHandler jdbcHandler();
@@ -64,5 +63,4 @@ public Supplier<DbTableFactory> tableFactorySupplier() {
     public final String type() {
         return TYPE;
     }
-
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java
index 50e1fd8414d..1eda56639e8 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/PostgresDdlConfig.java
@@ -29,7 +29,6 @@
 @JsonTypeName(PostgresDdlConfig.TYPE)
 @Value.Immutable
 public abstract class PostgresDdlConfig extends DdlConfig {
-
     public static final String TYPE = "postgres";
 
     @Override
@@ -41,5 +40,4 @@ public Supplier<DbTableFactory> tableFactorySupplier() {
     public final String type() {
         return TYPE;
     }
-
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbReadTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbReadTable.java
index ef4358149cb..e719f380993 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbReadTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/AbstractDbReadTable.java
@@ -17,6 +17,7 @@
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.Callable;
@@ -24,11 +25,11 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Queues;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.common.base.ClosableIterator;
@@ -47,12 +48,13 @@ protected AbstractDbReadTable(ConnectionSupplier conns,
     }
 
     @Override
-    public ClosableIterator<AgnosticLightResultRow> getLatestRows(Iterable<byte[]> rows,
-                                                                  final ColumnSelection columns,
-                                                                  final long ts,
-                                                                  final boolean includeValues) {
+    public ClosableIterator<AgnosticLightResultRow> getLatestRows(
+            Iterable<byte[]> rows,
+            ColumnSelection columns,
+            long ts,
+            boolean includeValues) {
         if (columns.noColumnsSelected()) {
-            return ClosableIterators.wrap(ImmutableSet.<AgnosticLightResultRow>of().iterator());
+            return ClosableIterators.emptyImmutableClosableIterator();
         }
         if (isSingleton(rows)) {
             return run(queryFactory.getLatestRowQuery(
@@ -64,17 +66,13 @@ public ClosableIterator<AgnosticLightResultRow> getLatestRows(Iterable<byte[]> r
         return getLatestRowsInternal(rows, columns, ts, includeValues);
     }
 
-    protected abstract ClosableIterator<AgnosticLightResultRow> getLatestRowsInternal(Iterable<byte[]> rows,
-                                                                                      ColumnSelection columns,
-                                                                                      long ts,
-                                                                                      boolean includeValues);
-
     @Override
-    public ClosableIterator<AgnosticLightResultRow> getLatestRows(Map<byte[], Long> rows,
-                                                                  final ColumnSelection columns,
-                                                                  final boolean includeValues) {
+    public ClosableIterator<AgnosticLightResultRow> getLatestRows(
+            Map<byte[], Long> rows,
+            ColumnSelection columns,
+            boolean includeValues) {
         if (columns.noColumnsSelected()) {
-            return ClosableIterators.wrap(ImmutableSet.<AgnosticLightResultRow>of().iterator());
+            return ClosableIterators.emptyImmutableClosableIterator();
         }
         if (rows.size() == 1) {
             return run(queryFactory.getLatestRowQuery(
@@ -86,17 +84,25 @@ public ClosableIterator<AgnosticLightResultRow> getLatestRows(Map<byte[], Long>
         return getLatestRowsInternal(rows, columns, includeValues);
     }
 
-    protected abstract ClosableIterator<AgnosticLightResultRow> getLatestRowsInternal(Map<byte[], Long> rows,
-                                                                                      ColumnSelection columns,
-                                                                                      boolean includeValues);
+    protected abstract ClosableIterator<AgnosticLightResultRow> getLatestRowsInternal(
+            Map<byte[], Long> rows,
+            ColumnSelection columns,
+            boolean includeValues);
+
+    protected abstract ClosableIterator<AgnosticLightResultRow> getLatestRowsInternal(
+            Iterable<byte[]> rows,
+            ColumnSelection columns,
+            long ts,
+            boolean includeValues);
 
     @Override
-    public ClosableIterator<AgnosticLightResultRow> getAllRows(Iterable<byte[]> rows,
-                                                               final ColumnSelection columns,
-                                                               final long ts,
-                                                               final boolean includeValues) {
+    public ClosableIterator<AgnosticLightResultRow> getAllRows(
+            Iterable<byte[]> rows,
+            ColumnSelection columns,
+            long ts,
+            boolean includeValues) {
         if (columns.noColumnsSelected()) {
-            return ClosableIterators.wrap(ImmutableSet.<AgnosticLightResultRow>of().iterator());
+            return ClosableIterators.emptyImmutableClosableIterator();
         }
         if (isSingleton(rows)) {
             return run(queryFactory.getAllRowQuery(
@@ -108,17 +114,13 @@ public ClosableIterator<AgnosticLightResultRow> getAllRows(Iterable<byte[]> rows
         return getAllRowsInternal(rows, columns, ts, includeValues);
     }
 
-    protected abstract ClosableIterator<AgnosticLightResultRow> getAllRowsInternal(Iterable<byte[]> rows,
-                                                                                   ColumnSelection columns,
-                                                                                   long ts,
-                                                                                   boolean includeValues);
-
     @Override
-    public ClosableIterator<AgnosticLightResultRow> getAllRows(Map<byte[], Long> rows,
-                                                               final ColumnSelection columns,
-                                                               final boolean includeValues) {
+    public ClosableIterator<AgnosticLightResultRow> getAllRows(
+            Map<byte[], Long> rows,
+            ColumnSelection columns,
+            boolean includeValues) {
         if (columns.noColumnsSelected()) {
-            return ClosableIterators.wrap(ImmutableSet.<AgnosticLightResultRow>of().iterator());
+            return ClosableIterators.emptyImmutableClosableIterator();
         }
         if (rows.size() == 1) {
             return run(queryFactory.getAllRowQuery(
@@ -130,14 +132,22 @@ public ClosableIterator<AgnosticLightResultRow> getAllRows(Map<byte[], Long> row
         return getAllRowsInternal(rows, columns, includeValues);
     }
 
-    protected abstract ClosableIterator<AgnosticLightResultRow> getAllRowsInternal(Map<byte[], Long> rows,
-                                                                                   ColumnSelection columns,
-                                                                                   boolean includeValues);
+    protected abstract ClosableIterator<AgnosticLightResultRow> getAllRowsInternal(
+            Iterable<byte[]> rows,
+            ColumnSelection columns,
+            long ts,
+            boolean includeValues);
+
+    protected abstract ClosableIterator<AgnosticLightResultRow> getAllRowsInternal(
+            Map<byte[], Long> rows,
+            ColumnSelection columns,
+            boolean includeValues);
 
     @Override
-    public ClosableIterator<AgnosticLightResultRow> getLatestCells(Iterable<Cell> cells,
-                                                                   final long ts,
-                                                                   final boolean includeValue) {
+    public ClosableIterator<AgnosticLightResultRow> getLatestCells(
+            Iterable<Cell> cells,
+            long ts,
+            boolean includeValue) {
         if (isSingleton(cells)) {
             return run(queryFactory.getLatestCellQuery(
                     Iterables.getOnlyElement(cells),
@@ -147,13 +157,10 @@ public ClosableIterator<AgnosticLightResultRow> getLatestCells(Iterable<Cell> ce
         return getLatestCellsInternal(cells, ts, includeValue);
     }
 
-    protected abstract ClosableIterator<AgnosticLightResultRow> getLatestCellsInternal(Iterable<Cell> cells,
-                                                                                       long ts,
-                                                                                       boolean includeValue);
-
     @Override
-    public ClosableIterator<AgnosticLightResultRow> getLatestCells(Map<Cell, Long> cells,
-                                                                   final boolean includeValue) {
+    public ClosableIterator<AgnosticLightResultRow> getLatestCells(
+            Map<Cell, Long> cells,
+            boolean includeValue) {
         if (cells.size() == 1) {
             return run(queryFactory.getLatestCellQuery(
                     Iterables.getOnlyElement(cells.keySet()),
@@ -163,13 +170,20 @@ public ClosableIterator<AgnosticLightResultRow> getLatestCells(Map<Cell, Long> c
         return getLatestCellsInternal(cells, includeValue);
     }
 
-    protected abstract ClosableIterator<AgnosticLightResultRow> getLatestCellsInternal(Map<Cell, Long> cells,
-                                                                                       boolean includeValue);
+    protected abstract ClosableIterator<AgnosticLightResultRow> getLatestCellsInternal(
+            Iterable<Cell> cells,
+            long ts,
+            boolean includeValue);
+
+    protected abstract ClosableIterator<AgnosticLightResultRow> getLatestCellsInternal(
+            Map<Cell, Long> cells,
+            boolean includeValue);
 
     @Override
-    public ClosableIterator<AgnosticLightResultRow> getAllCells(Iterable<Cell> cells,
-                                                                final long ts,
-                                                                final boolean includeValue) {
+    public ClosableIterator<AgnosticLightResultRow> getAllCells(
+            Iterable<Cell> cells,
+            long ts,
+            boolean includeValue) {
         if (isSingleton(cells)) {
             return run(queryFactory.getAllCellQuery(
                     Iterables.getOnlyElement(cells),
@@ -179,13 +193,10 @@ public ClosableIterator<AgnosticLightResultRow> getAllCells(Iterable<Cell> cells
         return getAllCellsInternal(cells, ts, includeValue);
     }
 
-    protected abstract ClosableIterator<AgnosticLightResultRow> getAllCellsInternal(Iterable<Cell> cells,
-                                                                                    long ts,
-                                                                                    boolean includeValue);
-
     @Override
-    public ClosableIterator<AgnosticLightResultRow> getAllCells(Map<Cell, Long> cells,
-                                                                final boolean includeValue) {
+    public ClosableIterator<AgnosticLightResultRow> getAllCells(
+            Map<Cell, Long> cells,
+            boolean includeValue) {
         if (cells.size() == 1) {
             return run(queryFactory.getAllCellQuery(
                     Iterables.getOnlyElement(cells.keySet()),
@@ -195,8 +206,14 @@ public ClosableIterator<AgnosticLightResultRow> getAllCells(Map<Cell, Long> cell
         return getAllCellsInternal(cells, includeValue);
     }
 
-    protected abstract ClosableIterator<AgnosticLightResultRow> getAllCellsInternal(Map<Cell, Long> cells,
-                                                                                    boolean includeValue);
+    protected abstract ClosableIterator<AgnosticLightResultRow> getAllCellsInternal(
+            Iterable<Cell> cells,
+            long ts,
+            boolean includeValue);
+
+    protected abstract ClosableIterator<AgnosticLightResultRow> getAllCellsInternal(
+            Map<Cell, Long> cells,
+            boolean includeValue);
 
     @Override
     public ClosableIterator<AgnosticLightResultRow> getRange(RangeRequest range, long ts, int maxRows) {
@@ -207,6 +224,18 @@ public ClosableIterator<AgnosticLightResultRow> getRange(RangeRequest range, lon
         return ClosableIterators.wrap(results.iterator(), results);
     }
 
+    @Override
+    public ClosableIterator<AgnosticLightResultRow> getRowsColumnRange(
+            List<byte[]> rows,
+            long ts,
+            ColumnRangeSelection columnRangeSelection) {
+        FullQuery query = queryFactory.getRowsColumnRangeQuery(rows, ts, columnRangeSelection);
+        AgnosticLightResultSet results = conns.get()
+                .selectLightResultSetUnregisteredQuery(query.getQuery(), query.getArgs());
+        results.setFetchSize(columnRangeSelection.getBatchHint() * rows.size());
+        return ClosableIterators.wrap(results.iterator(), results);
+    }
+
     @Override
     public boolean hasOverflowValues() {
         return queryFactory.hasOverflowValues();
@@ -219,10 +248,10 @@ public ClosableIterator<AgnosticLightResultRow> getOverflow(Collection<OverflowV
             return run(Iterables.getOnlyElement(queries));
         }
         Queue<Future<ClosableIterator<AgnosticLightResultRow>>> futures = Queues.newArrayDeque();
-        for (final FullQuery query : queries) {
+        for (FullQuery query : queries) {
             futures.add(submit(MoreExecutors.directExecutor(), query));
         }
-        return new LazyClosableIterator<AgnosticLightResultRow>(futures);
+        return new LazyClosableIterator<>(futures);
     }
 
     private boolean isSingleton(Iterable<?> iterable) {
@@ -234,18 +263,13 @@ private boolean isSingleton(Iterable<?> iterable) {
         return !iter.hasNext();
     }
 
-    protected Callable<ClosableIterator<AgnosticLightResultRow>> getCallable(final FullQuery query) {
-        return new Callable<ClosableIterator<AgnosticLightResultRow>>() {
-            @Override
-            public ClosableIterator<AgnosticLightResultRow> call() throws InterruptedException {
-                return run(query);
-            }
-        };
+    protected Callable<ClosableIterator<AgnosticLightResultRow>> getCallable(FullQuery query) {
+        return () -> run(query);
     }
 
     protected Future<ClosableIterator<AgnosticLightResultRow>> submit(Executor exec, FullQuery query) {
         FutureTask<ClosableIterator<AgnosticLightResultRow>> task =
-                new FutureClosableIteratorTask<AgnosticLightResultRow>(getCallable(query));
+                new FutureClosableIteratorTask<>(getCallable(query));
         exec.execute(task);
         return task;
     }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/BatchedDbReadTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/BatchedDbReadTable.java
index c42ca24a4b4..d2afa42abfa 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/BatchedDbReadTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/BatchedDbReadTable.java
@@ -29,8 +29,10 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Queues;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.dbkvs.DdlConfig;
 import com.palantir.common.base.ClosableIterator;
@@ -142,6 +144,16 @@ public ClosableIterator<AgnosticLightResultRow> getAllCellsInternal(Map<Cell, Lo
         return new LazyClosableIterator<AgnosticLightResultRow>(futures);
     }
 
+    @Override
+    public ClosableIterator<AgnosticLightResultRow> getRowsColumnRange(List<byte[]> rows, long ts,
+                                                                       ColumnRangeSelection columnRangeSelection) {
+        Queue<Future<ClosableIterator<AgnosticLightResultRow>>> futures = Queues.newArrayDeque();
+        for (final List<byte[]> batch : Lists.partition(rows, getBatchSize())) {
+            futures.add(submit(exec, queryFactory.getRowsColumnRangeQuery(batch, ts, columnRangeSelection)));
+        }
+        return new LazyClosableIterator<AgnosticLightResultRow>(futures);
+    }
+
     @Override
     protected ClosableIterator<AgnosticLightResultRow> run(FullQuery query) {
         final SqlConnection freshConn = conns.getFresh();
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java
index 85e1f00268a..d8e22cce2f0 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionManagerAwareDbKvs.java
@@ -45,7 +45,8 @@ public static ConnectionManagerAwareDbKvs create(DbKeyValueServiceConfig config)
         return new ConnectionManagerAwareDbKvs(DbKvs.create(config, sqlConnSupplier), connManager);
     }
 
-    private static SqlConnectionSupplier getSimpleTimedSqlConnectionSupplier(ReentrantManagedConnectionSupplier connectionSupplier) {
+    private static SqlConnectionSupplier getSimpleTimedSqlConnectionSupplier(
+            ReentrantManagedConnectionSupplier connectionSupplier) {
         Supplier<Connection> supplier = () -> connectionSupplier.get();
         SQL sql = new SQL() {
             @Override
@@ -63,7 +64,7 @@ protected Iterable<SqlTimer> getSqlTimers() {
                     }
 
                     @Override
-                    final public SqlTimer getSqlTimer() {
+                    public SqlTimer getSqlTimer() {
                         return SqlTimers.createCombinedSqlTimer(getSqlTimers());
                     }
                 };
@@ -75,7 +76,10 @@ final public SqlTimer getSqlTimer() {
             public SqlConnection get() {
                 return new ConnectionBackedSqlConnectionImpl(
                         supplier.get(),
-                        () -> { throw new UnsupportedOperationException("This Sql connection does not provide reliable timestamp."); },
+                        () -> {
+                            throw new UnsupportedOperationException(
+                                    "This SQL connection does not provide reliable timestamp.");
+                        },
                         new SqlConnectionHelper(sql));
             }
 
@@ -100,4 +104,4 @@ public ConnectionManager getConnectionManager() {
         return connManager;
     }
 
-}
\ No newline at end of file
+}
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java
index 9f29bd39bbc..bef59c0f8e5 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ConnectionSupplier.java
@@ -43,8 +43,6 @@ public SqlConnection get() {
     /**
      * Returns fresh PalantirSqlConnection. It is the responsibility of the consumer of this method
      * to close the returned connection when done.
-     *
-     * @return
      */
     public SqlConnection getFresh() {
         close();
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java
index cff61e951a1..8af634fdf05 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbKvs.java
@@ -17,6 +17,7 @@
 
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
@@ -24,12 +25,15 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.NavigableMap;
+import java.util.Optional;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.slf4j.Logger;
@@ -42,6 +46,9 @@
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -53,10 +60,12 @@
 import com.google.common.util.concurrent.Atomics;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -65,6 +74,8 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.ranges.DbKvsGetRanges;
 import com.palantir.atlasdb.keyvalue.impl.AbstractKeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.Cells;
+import com.palantir.atlasdb.keyvalue.impl.LocalRowColumnRangeIterator;
+import com.palantir.common.annotation.Output;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.base.ClosableIterators;
 import com.palantir.common.base.Throwables;
@@ -73,12 +84,14 @@
 import com.palantir.nexus.db.sql.AgnosticResultRow;
 import com.palantir.nexus.db.sql.AgnosticResultSet;
 import com.palantir.nexus.db.sql.SqlConnection;
+import com.palantir.util.crypto.Sha256Hash;
 import com.palantir.util.paging.AbstractPagingIterable;
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
 
 public class DbKvs extends AbstractKeyValueService {
     private static final Logger log = LoggerFactory.getLogger(DbKvs.class);
+
     private final DdlConfig config;
     private final DbTableFactory dbTables;
     private final SqlConnectionSupplier connections;
@@ -112,7 +125,7 @@ private void databaseSpecificInitialization() {
         runInitialization(new Function<DbTableInitializer, Void>() {
             @Nullable
             @Override
-            public Void apply(@Nullable DbTableInitializer initializer) {
+            public Void apply(@Nonnull DbTableInitializer initializer) {
                 initializer.createUtilityTables();
                 return null;
             }
@@ -122,7 +135,7 @@ public Void apply(@Nullable DbTableInitializer initializer) {
     private void createMetadataTable() {
         runInitialization(new Function<DbTableInitializer, Void>() {
             @Override
-            public Void apply(@Nullable DbTableInitializer initializer) {
+            public Void apply(@Nonnull DbTableInitializer initializer) {
                 initializer.createMetadataTable(AtlasDbConstants.METADATA_TABLE.getQualifiedName());
                 return null;
             }
@@ -148,36 +161,31 @@ public void teardown() {
     }
 
     @Override
-    public Map<Cell, Value> getRows(TableReference tableRef,
-                                    final Iterable<byte[]> rows,
-                                    final ColumnSelection columnSelection,
-                                    final long timestamp) {
-        return runRead(tableRef, new Function<DbReadTable, Map<Cell, Value>>() {
-            @Override
-            public Map<Cell, Value> apply(DbReadTable table) {
-                ClosableIterator<AgnosticLightResultRow> iter = table.getLatestRows(rows, columnSelection, timestamp, true);
-                return extractResults(table, iter);
-            }
-        });
+    public Map<Cell, Value> getRows(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnSelection columnSelection,
+            long timestamp) {
+        return runRead(tableRef, table ->
+                extractResults(table, () ->
+                        table.getLatestRows(rows, columnSelection, timestamp, true)));
     }
 
     @Override
-    public Map<Cell, Value> get(TableReference tableRef, final Map<Cell, Long> timestampByCell) {
-        return runRead(tableRef, new Function<DbReadTable, Map<Cell, Value>>() {
-            @Override
-            public Map<Cell, Value> apply(DbReadTable table) {
-                ClosableIterator<AgnosticLightResultRow> iter = table.getLatestCells(timestampByCell, true);
-                return extractResults(table, iter);
-            }
-        });
+    public Map<Cell, Value> get(TableReference tableRef, Map<Cell, Long> timestampByCell) {
+        return runRead(tableRef, table ->
+                extractResults(table, () ->
+                        table.getLatestCells(timestampByCell, true)));
     }
 
     @SuppressWarnings("deprecation")
-    private Map<Cell, Value> extractResults(DbReadTable table, ClosableIterator<AgnosticLightResultRow> iter) {
+    private Map<Cell, Value> extractResults(
+            DbReadTable table,
+            Supplier<ClosableIterator<AgnosticLightResultRow>> resultSupplier) {
         boolean hasOverflow = table.hasOverflowValues();
         Map<Cell, Value> results = Maps.newHashMap();
         Map<Cell, OverflowValue> overflowResults = Maps.newHashMap();
-        try {
+        try (ClosableIterator<AgnosticLightResultRow> iter = resultSupplier.get()) {
             while (iter.hasNext()) {
                 AgnosticLightResultRow row = iter.next();
                 Cell cell = Cell.create(row.getBytes("row_name"), row.getBytes("col_name"));
@@ -189,51 +197,20 @@ private Map<Cell, Value> extractResults(DbReadTable table, ClosableIterator<Agno
                         results.put(cell, oldValue);
                     }
                 } else {
-                    OverflowValue ov = new OverflowValue(row.getLong("ts"), overflowId);
+                    OverflowValue ov = ImmutableOverflowValue.of(row.getLong("ts"), overflowId);
                     OverflowValue oldOv = overflowResults.put(cell, ov);
-                    if (oldOv != null && oldOv.ts > ov.ts) {
+                    if (oldOv != null && oldOv.ts() > ov.ts()) {
                         overflowResults.put(cell, oldOv);
                     }
                 }
             }
-        } finally {
-            iter.close();
-        }
-        for (Iterator<Entry<Cell, OverflowValue>> entryIter = overflowResults.entrySet().iterator(); entryIter.hasNext(); ) {
-            Entry<Cell, OverflowValue> entry = entryIter.next();
-            Value value = results.get(entry.getKey());
-            if (value != null && value.getTimestamp() > entry.getValue().ts) {
-                entryIter.remove();
-            }
-        }
-        if (!overflowResults.isEmpty()) {
-            Map<Long, byte[]> values = Maps.newHashMapWithExpectedSize(overflowResults.size());
-            ClosableIterator<AgnosticLightResultRow> overflowIter = table.getOverflow(overflowResults.values());
-            try {
-                while (overflowIter.hasNext()) {
-                    AgnosticLightResultRow row = overflowIter.next();
-                    // QA-94468 LONG RAW typed columns ("val" in this case) must be retrieved first from the result set
-                    // see https://docs.oracle.com/cd/B19306_01/java.102/b14355/jstreams.htm#i1007581
-                    byte[] val = row.getBytes("val");
-                    long id = row.getLong("id");
-                    values.put(id, val);
-                }
-            } finally {
-                overflowIter.close();
-            }
-            for (Entry<Cell, OverflowValue> entry : overflowResults.entrySet()) {
-                Cell cell = entry.getKey();
-                OverflowValue ov = entry.getValue();
-                byte[] val = values.get(ov.id);
-                Preconditions.checkNotNull(val, "Failed to load overflow data: cell=%s, overflowId=%s", cell, ov.id);
-                results.put(cell, Value.create(val, ov.ts));
-            }
         }
+        fillOverflowValues(table, overflowResults, results);
         return results;
     }
 
     @Override
-    public Map<Cell, Long> getLatestTimestamps(TableReference tableRef, final Map<Cell, Long> timestampByCell) {
+    public Map<Cell, Long> getLatestTimestamps(TableReference tableRef, Map<Cell, Long> timestampByCell) {
         return runRead(tableRef, new Function<DbReadTable, Map<Cell, Long>>() {
             @Override
             @SuppressWarnings("deprecation")
@@ -259,26 +236,21 @@ public Map<Cell, Long> apply(DbReadTable table) {
     }
 
     public Function<Entry<Cell, byte[]>, Long> getByteSizingFunction() {
-        return new Function<Entry<Cell, byte[]>, Long>(){
-            @Override
-            public Long apply(Entry<Cell, byte[]> entry) {
-                return Cells.getApproxSizeOfCell(entry.getKey()) + entry.getValue().length;
-            }
-        };
+        return entry -> Cells.getApproxSizeOfCell(entry.getKey()) + entry.getValue().length;
     }
 
     public Function<Entry<Cell, Value>, Long> getValueSizingFunction() {
-        return new Function<Entry<Cell, Value>, Long>(){
-            @Override
-            public Long apply(Entry<Cell, Value> entry) {
-                return Cells.getApproxSizeOfCell(entry.getKey()) + entry.getValue().getContents().length;
-            }
-        };
+        return entry -> Cells.getApproxSizeOfCell(entry.getKey()) + entry.getValue().getContents().length;
     }
 
     private void put(TableReference tableRef, Map<Cell, byte[]> values, long timestamp, boolean idempotent) {
-        final Iterable<List<Entry<Cell, byte[]>>> batches = partitionByCountAndBytes(
-                values.entrySet(), config.mutationBatchCount(), config.mutationBatchSizeBytes(), tableRef, getByteSizingFunction());
+        Iterable<List<Entry<Cell, byte[]>>> batches = partitionByCountAndBytes(
+                values.entrySet(),
+                config.mutationBatchCount(),
+                config.mutationBatchSizeBytes(),
+                tableRef,
+                getByteSizingFunction());
+
         runWrite(tableRef, new Function<DbWriteTable, Void>() {
             @Override
             public Void apply(DbWriteTable table) {
@@ -299,11 +271,16 @@ public Void apply(DbWriteTable table) {
     }
 
     @Override
-    public void put(TableReference tableRef, final Map<Cell, byte[]> values, final long timestamp) throws KeyAlreadyExistsException {
+    public void put(TableReference tableRef, Map<Cell, byte[]> values, long timestamp)
+            throws KeyAlreadyExistsException {
         put(tableRef, values, timestamp, true);
     }
 
-    private void putIfNotUpdate(TableReference tableRef, DbWriteTable table, List<Entry<Cell, Value>> batch, KeyAlreadyExistsException e) {
+    private void putIfNotUpdate(
+            TableReference tableRef,
+            DbWriteTable table,
+            List<Entry<Cell, Value>> batch,
+            KeyAlreadyExistsException ex) {
         Map<Cell, Long> timestampByCell = Maps.newHashMap();
         for (Entry<Cell, Value> entry : batch) {
             timestampByCell.put(entry.getKey(), entry.getValue().getTimestamp() + 1);
@@ -319,43 +296,53 @@ private void putIfNotUpdate(TableReference tableRef, DbWriteTable table, List<En
                 if (results.get(key).equals(value)) {
                     iter.remove();
                 } else {
-                    throw new KeyAlreadyExistsException("primary key violation for key " + key + " with value " + value, e);
+                    throw new KeyAlreadyExistsException(
+                            "primary key violation for key " + key + " with value " + value,
+                            ex);
                 }
             }
         }
         table.put(batch);
     }
 
-    private void putIfNotUpdate(TableReference tableRef, DbWriteTable table, List<Entry<Cell, byte[]>> batch, final long timestamp, KeyAlreadyExistsException e) {
-        List<Entry<Cell, Value>> batchValues = Lists.transform(batch, new Function<Entry<Cell, byte[]>, Entry<Cell, Value>>() {
-            @Override
-            public Entry<Cell, Value> apply(final Entry<Cell, byte[]> input) {
-                final Value value = Value.create(input.getValue(), timestamp);
-                return new Entry<Cell, Value>() {
-                    @Override
-                    public Cell getKey() {
-                        return input.getKey();
-                    }
+    private void putIfNotUpdate(
+            TableReference tableRef,
+            DbWriteTable table,
+            List<Entry<Cell, byte[]>> batch,
+            long timestamp,
+            KeyAlreadyExistsException ex) {
+        List<Entry<Cell, Value>> batchValues = Lists.transform(batch, input -> {
+            Value value = Value.create(input.getValue(), timestamp);
+            return new Entry<Cell, Value>() {
+                @Override
+                public Cell getKey() {
+                    return input.getKey();
+                }
 
-                    @Override
-                    public Value getValue() {
-                        return value;
-                    }
+                @Override
+                public Value getValue() {
+                    return value;
+                }
 
-                    @Override
-                    public Value setValue(Value value) {
-                        throw new UnsupportedOperationException();
-                    }
-                };
-            }
+                @Override
+                public Value setValue(Value value) {
+                    throw new UnsupportedOperationException();
+                }
+            };
         });
-        putIfNotUpdate(tableRef, table, batchValues, e);
+        putIfNotUpdate(tableRef, table, batchValues, ex);
     }
 
     @Override
-    public void putWithTimestamps(TableReference tableRef, final Multimap<Cell, Value> cellValues) throws KeyAlreadyExistsException {
-        final Iterable<List<Entry<Cell, Value>>> batches = partitionByCountAndBytes(
-                cellValues.entries(), config.mutationBatchCount(), config.mutationBatchSizeBytes(), tableRef, getValueSizingFunction());
+    public void putWithTimestamps(TableReference tableRef, Multimap<Cell, Value> cellValues)
+            throws KeyAlreadyExistsException {
+        Iterable<List<Entry<Cell, Value>>> batches = partitionByCountAndBytes(
+                cellValues.entries(),
+                config.mutationBatchCount(),
+                config.mutationBatchSizeBytes(),
+                tableRef,
+                getValueSizingFunction());
+
         runWrite(tableRef, new Function<DbWriteTable, Void>() {
             @Override
             public Void apply(DbWriteTable table) {
@@ -380,14 +367,12 @@ public void putUnlessExists(TableReference tableRef, Map<Cell, byte[]> values) t
     public void delete(TableReference tableRef, Multimap<Cell, Long> keys) {
         // QA-86494: We sort our deletes here because we have seen oracle deadlock errors here.
         ImmutableList<Entry<Cell, Long>> sorted = ORDERING.immutableSortedCopy(keys.entries());
-        final Iterable<List<Entry<Cell, Long>>> partitions =
-                partitionByCountAndBytes(sorted, 10000, getMultiPutBatchSizeBytes(), tableRef,
-                new Function<Entry<Cell, Long>, Long>() {
-            @Override
-            public Long apply(Entry<Cell, Long> entry) {
-                return Cells.getApproxSizeOfCell(entry.getKey()) + 8;
-            }
-        });
+        Iterable<List<Entry<Cell, Long>>> partitions = partitionByCountAndBytes(
+                sorted,
+                10000,
+                getMultiPutBatchSizeBytes(),
+                tableRef,
+                entry -> Cells.getApproxSizeOfCell(entry.getKey()) + 8);
         runWriteForceAutocommit(tableRef, new Function<DbWriteTable, Void>() {
             @Override
             public Void apply(DbWriteTable table) {
@@ -411,51 +396,52 @@ public int compare(Entry<Cell, Long> entry1, Entry<Cell, Long> entry2) {
     });
 
     @Override
-    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(final TableReference tableRef,
-                                                                                                           Iterable<RangeRequest> rangeRequests,
-                                                                                                           final long timestamp) {
-        return new DbKvsGetRanges(this, config, dbTables.getDbType(), connections).getFirstBatchForRanges(tableRef, rangeRequests, timestamp);
+    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests,
+            long timestamp) {
+        return new DbKvsGetRanges(this, config, dbTables.getDbType(), connections)
+                .getFirstBatchForRanges(tableRef, rangeRequests, timestamp);
     }
 
     @Override
-    public ClosableIterator<RowResult<Value>> getRange(final TableReference tableRef,
-                                                       final RangeRequest rangeRequest,
-                                                       final long timestamp) {
-        Iterable<RowResult<Value>> rows = new AbstractPagingIterable<RowResult<Value>, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>() {
-            @Override
-            protected TokenBackedBasicResultsPage<RowResult<Value>, byte[]> getFirstPage() {
-                return getPage(tableRef, rangeRequest, timestamp);
-            }
+    public ClosableIterator<RowResult<Value>> getRange(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp) {
+        Iterable<RowResult<Value>> rows =
+                new AbstractPagingIterable<RowResult<Value>, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>() {
+                    @Override
+                    protected TokenBackedBasicResultsPage<RowResult<Value>, byte[]> getFirstPage() {
+                        return getPage(tableRef, rangeRequest, timestamp);
+                    }
 
-            @Override
-            protected TokenBackedBasicResultsPage<RowResult<Value>, byte[]> getNextPage(
-                    TokenBackedBasicResultsPage<RowResult<Value>, byte[]> previous) {
-                byte[] newStartRow = previous.getTokenForNextPage();
-                final RangeRequest newRange = rangeRequest.getBuilder().startRowInclusive(newStartRow).build();
-                return getPage(tableRef, newRange, timestamp);
-            }
-        };
+                    @Override
+                    protected TokenBackedBasicResultsPage<RowResult<Value>, byte[]> getNextPage(
+                            TokenBackedBasicResultsPage<RowResult<Value>, byte[]> previous) {
+                        byte[] newStartRow = previous.getTokenForNextPage();
+                        RangeRequest newRange = rangeRequest.getBuilder().startRowInclusive(newStartRow).build();
+                        return getPage(tableRef, newRange, timestamp);
+                    }
+                };
         return ClosableIterators.wrap(rows.iterator());
     }
 
     @Override
-    public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(TableReference tableRef,
-                                                                       RangeRequest rangeRequest,
-                                                                       long timestamp) {
+    public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp) {
         throw new UnsupportedOperationException();
     }
 
-    private TokenBackedBasicResultsPage<RowResult<Value>, byte[]> getPage(TableReference tableRef,
-                                                                          final RangeRequest range,
-                                                                          final long timestamp) {
+    private TokenBackedBasicResultsPage<RowResult<Value>, byte[]> getPage(
+            TableReference tableRef,
+            RangeRequest range,
+            long timestamp) {
         Stopwatch watch = Stopwatch.createStarted();
         try {
-            return runRead(tableRef, new Function<DbReadTable, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>() {
-                @Override
-                public TokenBackedBasicResultsPage<RowResult<Value>, byte[]> apply(DbReadTable table) {
-                    return getPageInternal(table, range, timestamp);
-                }
-            });
+            return runRead(tableRef, table -> getPageInternal(table, range, timestamp));
         } finally {
             log.info("Call to KVS.getPage on table {} took {} ms.", tableRef, watch.elapsed(TimeUnit.MILLISECONDS));
         }
@@ -467,9 +453,9 @@ private TokenBackedBasicResultsPage<RowResult<Value>, byte[]> getPageInternal(Db
                                                                                   long timestamp) {
         Comparator<byte[]> comp = UnsignedBytes.lexicographicalComparator();
         SortedSet<byte[]> rows = Sets.newTreeSet(comp);
-        int maxRows = range.getBatchHint() == null ? 100 : (int) (1.1 * range.getBatchHint());
-        ClosableIterator<AgnosticLightResultRow> rangeResults = table.getRange(range, timestamp, maxRows);
-        try {
+        int maxRows = getMaxRowsFromBatchHint(range.getBatchHint());
+
+        try (ClosableIterator<AgnosticLightResultRow> rangeResults = table.getRange(range, timestamp, maxRows)) {
             while (rows.size() < maxRows && rangeResults.hasNext()) {
                 byte[] rowName = rangeResults.next().getBytes("row_name");
                 if (rowName != null) {
@@ -479,23 +465,26 @@ private TokenBackedBasicResultsPage<RowResult<Value>, byte[]> getPageInternal(Db
             if (rows.isEmpty()) {
                 return SimpleTokenBackedResultsPage.create(null, ImmutableList.<RowResult<Value>>of(), false);
             }
-        } finally {
-            rangeResults.close();
         }
-        ColumnSelection columns = ColumnSelection.all();
+
+        ColumnSelection columns;
         if (!range.getColumnNames().isEmpty()) {
             columns = ColumnSelection.create(range.getColumnNames());
+        } else {
+            columns = ColumnSelection.all();
         }
-        ClosableIterator<AgnosticLightResultRow> rowResults = table.getLatestRows(rows, columns, timestamp, true);
-        Map<Cell, Value> results = extractResults(table, rowResults);
+
+        Map<Cell, Value> results = extractResults(table, () -> table.getLatestRows(rows, columns, timestamp, true));
         NavigableMap<byte[], SortedMap<byte[], Value>> cellsByRow = Cells.breakCellsUpByRow(results);
         if (range.isReverse()) {
             cellsByRow = cellsByRow.descendingMap();
         }
+
         List<RowResult<Value>> finalResults = Lists.newArrayListWithCapacity(results.size());
         for (Entry<byte[], SortedMap<byte[], Value>> entry : cellsByRow.entrySet()) {
             finalResults.add(RowResult.create(entry.getKey(), entry.getValue()));
         }
+
         byte[] nextRow = null;
         boolean mayHaveMoreResults = false;
         byte[] lastRow = range.isReverse() ? rows.first() : rows.last();
@@ -507,10 +496,13 @@ private TokenBackedBasicResultsPage<RowResult<Value>, byte[]> getPageInternal(Db
     }
 
     @Override
-    public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(final TableReference tableRef,
-                                                                       final RangeRequest rangeRequest,
-                                                                       final long timestamp) {
-        Iterable<RowResult<Set<Long>>> rows = new AbstractPagingIterable<RowResult<Set<Long>>, TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]>>() {
+    public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp) {
+        Iterable<RowResult<Set<Long>>> rows = new AbstractPagingIterable<
+                RowResult<Set<Long>>,
+                TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]>>() {
             @Override
             protected TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> getFirstPage() {
                 return getTimestampsPage(tableRef, rangeRequest, timestamp);
@@ -520,26 +512,23 @@ protected TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> getFirstPage
             protected TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> getNextPage(
                     TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> previous) {
                 byte[] newStartRow = previous.getTokenForNextPage();
-                final RangeRequest newRange = rangeRequest.getBuilder().startRowInclusive(newStartRow).build();
+                RangeRequest newRange = rangeRequest.getBuilder().startRowInclusive(newStartRow).build();
                 return getTimestampsPage(tableRef, newRange, timestamp);
             }
         };
         return ClosableIterators.wrap(rows.iterator());
     }
 
-    private TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> getTimestampsPage(TableReference tableRef,
-                                                                                        final RangeRequest range,
-                                                                                        final long timestamp) {
+    private TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> getTimestampsPage(
+            TableReference tableRef,
+            RangeRequest range,
+            long timestamp) {
         Stopwatch watch = Stopwatch.createStarted();
         try {
-            return runRead(tableRef, new Function<DbReadTable, TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]>>() {
-                @Override
-                public TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> apply(DbReadTable table) {
-                    return getTimestampsPageInternal(table, range, timestamp);
-                }
-            });
+            return runRead(tableRef, table -> getTimestampsPageInternal(table, range, timestamp));
         } finally {
-            log.info("Call to KVS.getTimestampsPage on table {} took {} ms.", tableRef, watch.elapsed(TimeUnit.MILLISECONDS));
+            log.info("Call to KVS.getTimestampsPage on table {} took {} ms.",
+                    tableRef, watch.elapsed(TimeUnit.MILLISECONDS));
         }
     }
 
@@ -549,9 +538,10 @@ private TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> getTimestampsP
                                                                                                 long timestamp) {
         Comparator<byte[]> comp = UnsignedBytes.lexicographicalComparator();
         SortedSet<byte[]> rows = Sets.newTreeSet(comp);
-        int maxRows = range.getBatchHint() == null ? 100 : (int) (1.1 * range.getBatchHint());
-        ClosableIterator<AgnosticLightResultRow> rangeResults = table.getRange(range, timestamp, maxRows);
-        try {
+        int maxRows = getMaxRowsFromBatchHint(range.getBatchHint());
+
+
+        try (ClosableIterator<AgnosticLightResultRow> rangeResults = table.getRange(range, timestamp, maxRows)) {
             while (rows.size() < maxRows && rangeResults.hasNext()) {
                 byte[] rowName = rangeResults.next().getBytes("row_name");
                 if (rowName != null) {
@@ -561,26 +551,25 @@ private TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> getTimestampsP
             if (rows.isEmpty()) {
                 return SimpleTokenBackedResultsPage.create(null, ImmutableList.<RowResult<Set<Long>>>of(), false);
             }
-        } finally {
-            rangeResults.close();
         }
+
         ColumnSelection columns = ColumnSelection.all();
         if (!range.getColumnNames().isEmpty()) {
             columns = ColumnSelection.create(range.getColumnNames());
         }
-        ClosableIterator<AgnosticLightResultRow> rowResults = table.getAllRows(rows, columns, timestamp, false);
+
         SetMultimap<Cell, Long> results = HashMultimap.create();
-        try {
+        try (ClosableIterator<AgnosticLightResultRow> rowResults = table.getAllRows(rows, columns, timestamp, false)) {
             while (rowResults.hasNext()) {
                 AgnosticLightResultRow row = rowResults.next();
                 Cell cell = Cell.create(row.getBytes("row_name"), row.getBytes("col_name"));
                 long ts = row.getLong("ts");
                 results.put(cell, ts);
             }
-        } finally {
-            rowResults.close();
         }
-        NavigableMap<byte[], SortedMap<byte[], Set<Long>>> cellsByRow = Cells.breakCellsUpByRow(Multimaps.asMap(results));
+
+        NavigableMap<byte[], SortedMap<byte[], Set<Long>>> cellsByRow =
+                Cells.breakCellsUpByRow(Multimaps.asMap(results));
         if (range.isReverse()) {
             cellsByRow = cellsByRow.descendingMap();
         }
@@ -598,6 +587,185 @@ private TokenBackedBasicResultsPage<RowResult<Set<Long>>, byte[]> getTimestampsP
         return SimpleTokenBackedResultsPage.create(nextRow, finalResults, mayHaveMoreResults);
     }
 
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef, Iterable<byte[]> rows, ColumnRangeSelection columnRangeSelection, long timestamp) {
+        List<byte[]> rowList = ImmutableList.copyOf(rows);
+        Map<byte[], List<Map.Entry<Cell, Value>>> firstPage =
+                getFirstRowsColumnRangePage(tableRef, rowList, columnRangeSelection, timestamp);
+
+        Map<byte[], RowColumnRangeIterator> ret = Maps.newHashMapWithExpectedSize(rowList.size());
+        for (Entry<byte[], List<Map.Entry<Cell, Value>>> e : firstPage.entrySet()) {
+            List<Map.Entry<Cell, Value>> results = e.getValue();
+            if (results.isEmpty()) {
+                ret.put(e.getKey(), new LocalRowColumnRangeIterator(e.getValue().iterator()));
+                continue;
+            }
+            byte[] lastCol = results.get(results.size() - 1).getKey().getColumnName();
+            RowColumnRangeIterator firstPageIter = new LocalRowColumnRangeIterator(e.getValue().iterator());
+            if (isEndOfColumnRange(lastCol, columnRangeSelection.getEndCol())) {
+                ret.put(e.getKey(), firstPageIter);
+            } else {
+                byte[] nextCol = RangeRequests.nextLexicographicName(lastCol);
+                Iterator<Map.Entry<Cell, Value>> nextPagesIter = getRowColumnRange(tableRef, e.getKey(),
+                        new ColumnRangeSelection(
+                                nextCol,
+                                columnRangeSelection.getEndCol(),
+                                columnRangeSelection.getBatchHint()),
+                        timestamp);
+                ret.put(e.getKey(), new LocalRowColumnRangeIterator(Iterators.concat(firstPageIter, nextPagesIter)));
+            }
+        }
+        return ret;
+    }
+
+    private Iterator<Map.Entry<Cell, Value>> getRowColumnRange(
+            TableReference tableRef,
+            byte[] row,
+            ColumnRangeSelection columnRangeSelection,
+            long ts) {
+        List<byte[]> rowList = ImmutableList.of(row);
+        return ClosableIterators.wrap(new AbstractPagingIterable<
+                Entry<Cell, Value>,
+                TokenBackedBasicResultsPage<Entry<Cell, Value>, byte[]>>() {
+            @Override
+            protected TokenBackedBasicResultsPage<Entry<Cell, Value>, byte[]> getFirstPage() throws Exception {
+                return page(columnRangeSelection.getStartCol());
+            }
+
+            @Override
+            protected TokenBackedBasicResultsPage<Map.Entry<Cell, Value>, byte[]> getNextPage(
+                    TokenBackedBasicResultsPage<Map.Entry<Cell, Value>, byte[]> previous) throws Exception {
+                return page(previous.getTokenForNextPage());
+            }
+
+            TokenBackedBasicResultsPage<Map.Entry<Cell, Value>, byte[]> page(byte[] startCol) throws Exception {
+                ColumnRangeSelection range = new ColumnRangeSelection(
+                        startCol,
+                        columnRangeSelection.getEndCol(),
+                        columnRangeSelection.getBatchHint());
+                List<Map.Entry<Cell, Value>> nextPage = runRead(tableRef, table ->
+                        Iterables.getOnlyElement(extractRowColumnRangePage(table, range, ts, rowList).values()));
+                if (nextPage.isEmpty()) {
+                    return SimpleTokenBackedResultsPage.create(startCol, ImmutableList.<Entry<Cell, Value>>of(), false);
+                }
+                byte[] lastCol = nextPage.get(nextPage.size() - 1).getKey().getColumnName();
+                if (isEndOfColumnRange(lastCol, columnRangeSelection.getEndCol())) {
+                    return SimpleTokenBackedResultsPage.create(lastCol, nextPage, false);
+                }
+                byte[] nextCol = RangeRequests.nextLexicographicName(lastCol);
+                return SimpleTokenBackedResultsPage.create(nextCol, nextPage, true);
+            }
+
+        }.iterator());
+    }
+
+    private boolean isEndOfColumnRange(byte[] lastCol, byte[] endCol) {
+        return RangeRequests.isLastRowName(lastCol)
+                || Arrays.equals(RangeRequests.nextLexicographicName(lastCol), endCol);
+    }
+
+    private Map<byte[], List<Map.Entry<Cell, Value>>> getFirstRowsColumnRangePage(
+            TableReference tableRef,
+            List<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long ts) {
+        Stopwatch watch = Stopwatch.createStarted();
+        try {
+            return runRead(tableRef, table -> extractRowColumnRangePage(table, columnRangeSelection, ts, rows));
+        } finally {
+            log.info("Call to KVS.getFirstRowColumnRangePage on table {} took {} ms.",
+                    tableRef, watch.elapsed(TimeUnit.MILLISECONDS));
+        }
+    }
+
+    private Map<byte[], List<Map.Entry<Cell, Value>>> extractRowColumnRangePage(
+            DbReadTable table,
+            ColumnRangeSelection columnRangeSelection,
+            long ts,
+            List<byte[]> rows) {
+        Map<Sha256Hash, byte[]> hashesToBytes = Maps.newHashMapWithExpectedSize(rows.size());
+        Map<Sha256Hash, List<Cell>> cellsByRow = Maps.newHashMap();
+        for (byte[] row : rows) {
+            Sha256Hash rowHash = Sha256Hash.computeHash(row);
+            hashesToBytes.put(rowHash, row);
+            cellsByRow.put(rowHash, Lists.newArrayList());
+        }
+
+        boolean hasOverflow = table.hasOverflowValues();
+        Map<Cell, Value> values = Maps.newHashMap();
+        Map<Cell, OverflowValue> overflowValues = Maps.newHashMap();
+
+        try (ClosableIterator<AgnosticLightResultRow> iter = table.getRowsColumnRange(rows, ts, columnRangeSelection)) {
+            while (iter.hasNext()) {
+                AgnosticLightResultRow row = iter.next();
+                Cell cell = Cell.create(row.getBytes("row_name"), row.getBytes("col_name"));
+                Sha256Hash rowHash = Sha256Hash.computeHash(cell.getRowName());
+                cellsByRow.get(rowHash).add(cell);
+                Long overflowId = hasOverflow ? row.getLongObject("overflow") : null;
+                if (overflowId == null) {
+                    Value value = Value.create(row.getBytes("val"), row.getLong("ts"));
+                    Value oldValue = values.put(cell, value);
+                    if (oldValue != null && oldValue.getTimestamp() > value.getTimestamp()) {
+                        values.put(cell, oldValue);
+                    }
+                } else {
+                    OverflowValue ov = ImmutableOverflowValue.of(row.getLong("ts"), overflowId);
+                    OverflowValue oldOv = overflowValues.put(cell, ov);
+                    if (oldOv != null && oldOv.ts() > ov.ts()) {
+                        overflowValues.put(cell, oldOv);
+                    }
+                }
+            }
+        }
+
+        fillOverflowValues(table, overflowValues, values);
+
+        Map<byte[], List<Map.Entry<Cell, Value>>> results = Maps.newHashMapWithExpectedSize(rows.size());
+        for (Entry<Sha256Hash, List<Cell>> e : cellsByRow.entrySet()) {
+            List<Map.Entry<Cell, Value>> fullResults = Lists.newArrayListWithExpectedSize(e.getValue().size());
+            for (Cell c : e.getValue()) {
+                fullResults.add(Iterables.getOnlyElement(ImmutableMap.of(c, values.get(c)).entrySet()));
+            }
+            results.put(hashesToBytes.get(e.getKey()), fullResults);
+        }
+        return results;
+    }
+
+    private void fillOverflowValues(DbReadTable table,
+                                    Map<Cell, OverflowValue> overflowValues,
+                                    @Output Map<Cell, Value> values) {
+        Iterator<Entry<Cell, OverflowValue>> overflowIterator = overflowValues.entrySet().iterator();
+        while (overflowIterator.hasNext()) {
+            Entry<Cell, OverflowValue> entry = overflowIterator.next();
+            Value value = values.get(entry.getKey());
+            if (value != null && value.getTimestamp() > entry.getValue().ts()) {
+                overflowIterator.remove();
+            }
+        }
+
+        if (!overflowValues.isEmpty()) {
+            Map<Long, byte[]> resolvedOverflowValues = Maps.newHashMapWithExpectedSize(overflowValues.size());
+            try (ClosableIterator<AgnosticLightResultRow> overflowIter = table.getOverflow(overflowValues.values())) {
+                while (overflowIter.hasNext()) {
+                    AgnosticLightResultRow row = overflowIter.next();
+                    // QA-94468 LONG RAW typed columns ("val" in this case) must be retrieved first from the result set
+                    // see https://docs.oracle.com/cd/B19306_01/java.102/b14355/jstreams.htm#i1007581
+                    byte[] val = row.getBytes("val");
+                    long id = row.getLong("id");
+                    resolvedOverflowValues.put(id, val);
+                }
+            }
+            for (Entry<Cell, OverflowValue> entry : overflowValues.entrySet()) {
+                Cell cell = entry.getKey();
+                OverflowValue ov = entry.getValue();
+                byte[] val = resolvedOverflowValues.get(ov.id());
+                Preconditions.checkNotNull(val, "Failed to load overflow data: cell=%s, overflowId=%s", cell, ov.id());
+                values.put(cell, Value.create(val, ov.ts()));
+            }
+        }
+    }
+
     @Override
     public void truncateTable(TableReference tableRef) {
         runDdl(tableRef, new Function<DbDdlTable, Void>() {
@@ -621,7 +789,7 @@ public Void apply(DbDdlTable table) {
     }
 
     @Override
-    public void createTable(TableReference tableRef, final byte[] tableMetadata) {
+    public void createTable(TableReference tableRef, byte[] tableMetadata) {
         runDdl(tableRef, new Function<DbDdlTable, Void>() {
             @Override
             public Void apply(DbDdlTable table) {
@@ -661,7 +829,7 @@ public byte[] apply(DbMetadataTable table) {
     }
 
     @Override
-    public void putMetadataForTable(TableReference tableRef, final byte[] metadata) {
+    public void putMetadataForTable(TableReference tableRef, byte[] metadata) {
         runMetadata(tableRef, new Function<DbMetadataTable, Void>() {
             @Override
             public Void apply(DbMetadataTable table) {
@@ -689,7 +857,7 @@ public Map<TableReference, byte[]> apply(SqlConnection conn) {
     }
 
     @Override
-    public void addGarbageCollectionSentinelValues(TableReference tableRef, final Set<Cell> cells) {
+    public void addGarbageCollectionSentinelValues(TableReference tableRef, Set<Cell> cells) {
         runWrite(tableRef, new Function<DbWriteTable, Void>() {
             @Override
             public Void apply(DbWriteTable table) {
@@ -700,7 +868,7 @@ public Void apply(DbWriteTable table) {
     }
 
     @Override
-    public Multimap<Cell, Long> getAllTimestamps(TableReference tableRef, final Set<Cell> cells, final long timestamp) {
+    public Multimap<Cell, Long> getAllTimestamps(TableReference tableRef, Set<Cell> cells, long timestamp) {
         return runRead(tableRef, new Function<DbReadTable, Multimap<Cell, Long>>() {
             @Override
             @SuppressWarnings("deprecation")
@@ -804,8 +972,8 @@ private <T> T runWrite(TableReference tableRef, Function<DbWriteTable, T> runner
         }
     }
 
-    private <T> T runWriteForceAutocommit(final TableReference tableRef, final Function<DbWriteTable, T> runner) {
-        final ConnectionSupplier conns = new ConnectionSupplier(connections);
+    private <T> T runWriteForceAutocommit(TableReference tableRef, Function<DbWriteTable, T> runner) {
+        ConnectionSupplier conns = new ConnectionSupplier(connections);
         try {
             SqlConnection conn = conns.get();
             boolean autocommit;
@@ -827,30 +995,33 @@ private <T> T runWriteForceAutocommit(final TableReference tableRef, final Funct
     }
 
     /**
-     * Runs with a new connection, in a new thread so we don't reuse the connection we're getting from ReentrantManagedConnectionSupplier.
-     * Note that most of DbKvs reuses connections so unlike most other calls, this can block on getting a new connection if the pool is full.
+     * Runs with a new connection, in a new thread so we don't reuse the connection we're
+     * getting from ReentrantManagedConnectionSupplier.
+     * Note that most of DbKvs reuses connections so unlike most other calls,
+     * this can block on getting a new connection if the pool is full.
      * To avoid deadlocks or long pauses, use this only when necessary.
      */
-    private <T> T runWriteFreshConnection(final ConnectionSupplier conns, final TableReference tableRef, final Function<DbWriteTable, T> runner) {
+    private <T> T runWriteFreshConnection(
+            ConnectionSupplier conns, TableReference tableRef, Function<DbWriteTable, T> runner) {
         log.info("Running in a new thread to turn autocommit on for write");
-        final AtomicReference<T> result = Atomics.newReference();
-        Thread writeThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                SqlConnection freshConn = conns.getFresh();
+        AtomicReference<T> result = Atomics.newReference();
+        Thread writeThread = new Thread(() -> {
+            SqlConnection freshConn = conns.getFresh();
+            try {
+                result.set(runner.apply(dbTables.createWrite(
+                        internalTableName(tableRef),
+                        new ConnectionSupplier(Suppliers.ofInstance(freshConn)))));
+            } finally {
                 try {
-                    result.set(runner.apply(dbTables.createWrite(internalTableName(tableRef), new ConnectionSupplier(Suppliers.ofInstance(freshConn)))));
-                } finally {
-                    try {
-                        Connection c = freshConn.getUnderlyingConnection();
-                        if (c != null) {
-                            c.close();
-                        }
-                    } catch (SQLException e) {
-                        log.error("Failed to close db connection performing write with fresh connection.", e);
+                    Connection conn = freshConn.getUnderlyingConnection();
+                    if (conn != null) {
+                        conn.close();
                     }
+                } catch (SQLException e) {
+                    log.error("Failed to close db connection performing write with fresh connection.", e);
                 }
-            }});
+            }
+        });
         writeThread.start();
         try {
             writeThread.join();
@@ -860,4 +1031,9 @@ public void run() {
         return result.get();
     }
 
+    private static Integer getMaxRowsFromBatchHint(@Nullable Integer batchHint) {
+        return Optional.ofNullable(batchHint)
+                .map(x -> (int) (1.1 * x))
+                .orElse(100);
+    }
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java
index a8e7439b634..134c104efad 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbQueryFactory.java
@@ -16,16 +16,19 @@
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 
 public interface DbQueryFactory {
     FullQuery getLatestRowQuery(byte[] row, long ts, ColumnSelection columns, boolean includeValue);
     FullQuery getLatestRowsQuery(Iterable<byte[]> rows, long ts, ColumnSelection columns, boolean includeValue);
-    FullQuery getLatestRowsQuery(Collection<Map.Entry<byte[], Long>> rows, ColumnSelection columns, boolean includeValue);
+    FullQuery getLatestRowsQuery(
+            Collection<Map.Entry<byte[], Long>> rows, ColumnSelection columns, boolean includeValue);
 
     FullQuery getAllRowQuery(byte[] row, long ts, ColumnSelection columns, boolean includeValue);
     FullQuery getAllRowsQuery(Iterable<byte[]> rows, long ts, ColumnSelection columns, boolean includeValue);
@@ -42,4 +45,6 @@ public interface DbQueryFactory {
     FullQuery getRangeQuery(RangeRequest range, long ts, int maxRows);
     boolean hasOverflowValues();
     Collection<FullQuery> getOverflowQueries(Collection<OverflowValue> overflowIds);
+
+    FullQuery getRowsColumnRangeQuery(List<byte[]> row, long ts, ColumnRangeSelection columnRangeSelection);
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java
index b19eeebd89b..bb0f202a2e7 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/DbReadTable.java
@@ -16,24 +16,36 @@
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.nexus.db.sql.AgnosticLightResultRow;
 
 public interface DbReadTable {
-    ClosableIterator<AgnosticLightResultRow> getLatestRows(Iterable<byte[]> rows, ColumnSelection columns, long ts, boolean includeValue);
-    ClosableIterator<AgnosticLightResultRow> getLatestRows(Map<byte[], Long> rows, ColumnSelection columns, boolean includeValue);
-    ClosableIterator<AgnosticLightResultRow> getAllRows(Iterable<byte[]> rows, ColumnSelection columns, long ts, boolean includeValue);
-    ClosableIterator<AgnosticLightResultRow> getAllRows(Map<byte[], Long> rows, ColumnSelection columns, boolean includeValue);
+    ClosableIterator<AgnosticLightResultRow> getLatestRows(
+            Iterable<byte[]> rows, ColumnSelection columns, long ts, boolean includeValue);
+    ClosableIterator<AgnosticLightResultRow> getLatestRows(
+            Map<byte[], Long> rows, ColumnSelection columns, boolean includeValue);
+    ClosableIterator<AgnosticLightResultRow> getAllRows(
+            Iterable<byte[]> rows, ColumnSelection columns, long ts, boolean includeValue);
+    ClosableIterator<AgnosticLightResultRow> getAllRows(
+            Map<byte[], Long> rows, ColumnSelection columns, boolean includeValue);
+
     ClosableIterator<AgnosticLightResultRow> getLatestCells(Iterable<Cell> cells, long ts, boolean includeValue);
     ClosableIterator<AgnosticLightResultRow> getLatestCells(Map<Cell, Long> cells, boolean includeValue);
     ClosableIterator<AgnosticLightResultRow> getAllCells(Iterable<Cell> cells, long ts, boolean includeValue);
     ClosableIterator<AgnosticLightResultRow> getAllCells(Map<Cell, Long> cells, boolean includeValue);
-    ClosableIterator<AgnosticLightResultRow> getRange(RangeRequest range, long ts, int maxRows);
+
+    ClosableIterator<AgnosticLightResultRow> getRange(
+            RangeRequest range, long ts, int maxRows);
+    ClosableIterator<AgnosticLightResultRow> getRowsColumnRange(
+            List<byte[]> rows, long ts, ColumnRangeSelection columnRangeSelection);
+
     boolean hasOverflowValues();
     ClosableIterator<AgnosticLightResultRow> getOverflow(Collection<OverflowValue> overflowIds);
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java
index 1b9ba797414..f3ed83d4ed3 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FullQuery.java
@@ -28,13 +28,13 @@ public FullQuery(String query) {
         this.query = query;
     }
 
-    public FullQuery withArgs(Iterable<? extends Object> newArgs) {
-        Iterables.addAll(args, newArgs);
+    public FullQuery withArg(Object arg) {
+        this.args.add(arg);
         return this;
     }
 
-    public FullQuery withArg(Object arg) {
-        this.args.add(arg);
+    public FullQuery withArgs(Iterable<?> newArgs) {
+        Iterables.addAll(args, newArgs);
         return this;
     }
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FutureClosableIteratorTask.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FutureClosableIteratorTask.java
index 44a2bffe982..c3e89831da8 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FutureClosableIteratorTask.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/FutureClosableIteratorTask.java
@@ -60,9 +60,9 @@ protected void set(ClosableIterator<T> iterator) {
     }
 
     private void close() {
-        log.warn("Query was interrupted before a closable iterator was returned. " +
+        log.warn("Query was interrupted before a closable iterator was returned."
                 // and query-er did the responsible thing and interrupted us.
-                "closing resoures to prevent leaks.");
+                + " Closing resources to prevent leaks.");
         try {
             outcome.close();
         } catch (RuntimeException e) {
@@ -70,4 +70,4 @@ private void close() {
             throw e;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/LazyClosableIterator.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/LazyClosableIterator.java
index d319a19c75e..36aa0adb8ef 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/LazyClosableIterator.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/LazyClosableIterator.java
@@ -104,4 +104,4 @@ private ClosableIterator<T> getClosableIterator(Future<ClosableIterator<T>> futu
             throw Throwables.rewrapAndThrowUncheckedException(e.getCause());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java
index 77afc759142..4c94fc65070 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OracleDbTableFactory.java
@@ -70,14 +70,14 @@ public DbReadTable createRead(String tableName, ConnectionSupplier conns) {
         TableSize tableSize = getTableSize(conns, tableName);
         DbQueryFactory queryFactory;
         switch (tableSize) {
-        case OVERFLOW:
-            queryFactory = new OracleOverflowQueryFactory(tableName, config);
-            break;
-        case RAW:
-            queryFactory = new OracleRawQueryFactory(tableName, config);
-            break;
-        default:
-            throw new EnumConstantNotPresentException(TableSize.class, tableSize.name());
+            case OVERFLOW:
+                queryFactory = new OracleOverflowQueryFactory(tableName, config);
+                break;
+            case RAW:
+                queryFactory = new OracleRawQueryFactory(tableName, config);
+                break;
+            default:
+                throw new EnumConstantNotPresentException(TableSize.class, tableSize.name());
         }
         return new UnbatchedDbReadTable(conns, queryFactory);
     }
@@ -86,12 +86,12 @@ public DbReadTable createRead(String tableName, ConnectionSupplier conns) {
     public DbWriteTable createWrite(String tableName, ConnectionSupplier conns) {
         TableSize tableSize = getTableSize(conns, tableName);
         switch (tableSize) {
-        case OVERFLOW:
-            return new OracleOverflowWriteTable(tableName, conns, config);
-        case RAW:
-            return new SimpleDbWriteTable(tableName, conns, config);
-        default:
-            throw new EnumConstantNotPresentException(TableSize.class, tableSize.name());
+            case OVERFLOW:
+                return new OracleOverflowWriteTable(tableName, conns, config);
+            case RAW:
+                return new SimpleDbWriteTable(tableName, conns, config);
+            default:
+                throw new EnumConstantNotPresentException(TableSize.class, tableSize.name());
         }
     }
 
@@ -100,8 +100,9 @@ private TableSize getTableSize(final ConnectionSupplier conns, final String tabl
             return tableSizeByTableName.get(tableName, new Callable<TableSize>() {
                 @Override
                 public TableSize call() {
+                    String metadataTableName = config.metadataTable().getQualifiedName();
                     AgnosticResultSet results = conns.get().selectResultSetUnregisteredQuery(
-                            "SELECT table_size FROM " + config.metadataTable().getQualifiedName() + " WHERE table_name = ?",
+                            String.format("SELECT table_size FROM %s WHERE table_name = ?", metadataTableName),
                             tableName);
                     Preconditions.checkArgument(
                             !results.rows().isEmpty(),
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValue.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValue.java
index 87c04737c80..bff66a823b1 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValue.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/OverflowValue.java
@@ -15,36 +15,13 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
-public class OverflowValue {
-    public final long ts;
-    public final long id;
-    public OverflowValue(long ts, long id) {
-        this.ts = ts;
-        this.id = id;
-    }
+import org.immutables.value.Value;
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (int) (id ^ (id >>> 32));
-        result = prime * result + (int) (ts ^ (ts >>> 32));
-        return result;
-    }
+@Value.Immutable
+public interface OverflowValue {
+    @Value.Parameter
+    long ts();
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        OverflowValue other = (OverflowValue) obj;
-        if (id != other.id)
-            return false;
-        if (ts != other.ts)
-            return false;
-        return true;
-    }
-}
\ No newline at end of file
+    @Value.Parameter
+    long id();
+}
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SimpleDbWriteTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SimpleDbWriteTable.java
index e5c4cbd2910..90764036cab 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SimpleDbWriteTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SimpleDbWriteTable.java
@@ -67,10 +67,9 @@ public void put(Collection<Map.Entry<Cell, Value>> data) {
 
     private void put(List<Object[]> args) {
         try {
-            conns.get().insertManyUnregisteredQuery(
-                    "/* INSERT_ONE (" + tableName + ") */" +
-                    " INSERT INTO " + prefixedTableName() + " (row_name, col_name, ts, val) " +
-                    " VALUES (?, ?, ?, ?) ",
+            conns.get().insertManyUnregisteredQuery("/* INSERT_ONE (" + tableName + ") */"
+                    + " INSERT INTO " + prefixedTableName() + " (row_name, col_name, ts, val) "
+                    + " VALUES (?, ?, ?, ?) ",
                     args);
         } catch (PalantirSqlException e) {
             if (ExceptionCheck.isUniqueConstraintViolation(e)) {
@@ -92,14 +91,13 @@ public void putSentinels(Iterable<Cell> cells) {
             }
             while (true) {
                 try {
-                    conns.get().insertManyUnregisteredQuery(
-                            "/* INSERT_WHERE_NOT_EXISTS (" + tableName + ") */" +
-                            " INSERT INTO " + prefixedTableName() + " (row_name, col_name, ts, val) " +
-                            " SELECT ?, ?, ?, ? FROM DUAL" +
-                            " WHERE NOT EXISTS (SELECT * FROM " + prefixedTableName() + " WHERE" +
-                            " row_name = ? AND" +
-                            " col_name = ? AND" +
-                            " ts = ?)",
+                    conns.get().insertManyUnregisteredQuery("/* INSERT_WHERE_NOT_EXISTS (" + tableName + ") */"
+                            + " INSERT INTO " + prefixedTableName() + " (row_name, col_name, ts, val) "
+                            + " SELECT ?, ?, ?, ? FROM DUAL"
+                            + " WHERE NOT EXISTS (SELECT * FROM " + prefixedTableName() + " WHERE"
+                            + " row_name = ? AND"
+                            + " col_name = ? AND"
+                            + " ts = ?)",
                             args);
                     break;
                 } catch (PalantirSqlException e) {
@@ -120,13 +118,12 @@ public void delete(List<Entry<Cell, Long>> entries) {
             Cell cell = entry.getKey();
             args.add(new Object[] {cell.getRowName(), cell.getColumnName(), entry.getValue()});
         }
-        conns.get().updateManyUnregisteredQuery(
-                " /* DELETE_ONE (" + tableName + ") */ " +
-                " DELETE /*+ INDEX(m pk_" + prefixedTableName() + ") */ " +
-                " FROM " + prefixedTableName() + " m " +
-                " WHERE m.row_name = ? " +
-                "  AND m.col_name = ? " +
-                "  AND m.ts = ?",
+        conns.get().updateManyUnregisteredQuery(" /* DELETE_ONE (" + tableName + ") */ "
+                + " DELETE /*+ INDEX(m pk_" + prefixedTableName() + ") */ "
+                + " FROM " + prefixedTableName() + " m "
+                + " WHERE m.row_name = ? "
+                + "  AND m.col_name = ? "
+                + "  AND m.ts = ?",
                 args);
     }
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java
index 2980b8403aa..b046cee7081 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/SqlConnectionSupplier.java
@@ -22,11 +22,9 @@
 import com.palantir.nexus.db.sql.SqlConnection;
 
 public interface SqlConnectionSupplier extends Supplier<SqlConnection>, Closeable {
-
     @Override
-    public SqlConnection get();
+    SqlConnection get();
 
     @Override
-    public void close() throws PalantirSqlException;
-
+    void close() throws PalantirSqlException;
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableSize.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableSize.java
index ce7021150e0..adc6a913f13 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableSize.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TableSize.java
@@ -20,7 +20,7 @@ public enum TableSize {
 
     private final int id;
 
-    private TableSize(int id) {
+    TableSize(int id) {
         this.id = id;
     }
 
@@ -30,9 +30,12 @@ public int getId() {
 
     public static TableSize byId(int id) {
         switch (id) {
-        case 3: return RAW;
-        case 4: return OVERFLOW;
+            case 3:
+                return RAW;
+            case 4:
+                return OVERFLOW;
+            default:
+                throw new IllegalArgumentException("Unknown table size: " + id);
         }
-        throw new IllegalArgumentException("Unknown table size: " + id);
     }
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UnbatchedDbReadTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UnbatchedDbReadTable.java
index 185a1b03604..f6e7b6d1130 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UnbatchedDbReadTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/UnbatchedDbReadTable.java
@@ -25,7 +25,6 @@
 import com.palantir.nexus.db.sql.AgnosticLightResultSet;
 
 public class UnbatchedDbReadTable extends AbstractDbReadTable {
-
     protected UnbatchedDbReadTable(ConnectionSupplier conns,
                                    DbQueryFactory queryFactory) {
         super(conns, queryFactory);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java
index ed6e478992c..0e17d5fa31f 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleDdlTable.java
@@ -33,6 +33,8 @@
 
 public class OracleDdlTable implements DbDdlTable {
     private static final Logger log = LoggerFactory.getLogger(OracleDdlTable.class);
+    private static final String MIN_ORACLE_VERSION = "11.2.0.2.3";
+
     private final TableReference tableName;
     private final ConnectionSupplier conns;
     private final OracleDdlConfig config;
@@ -60,28 +62,28 @@ public void create(byte[] tableMetadata) {
         }
 
         executeIgnoringError(
-                "CREATE TABLE " + prefixedTableName() + " (" +
-                "  row_name   RAW(" + Cell.MAX_NAME_LENGTH + ") NOT NULL," +
-                "  col_name   RAW(" + Cell.MAX_NAME_LENGTH + ") NOT NULL," +
-                "  ts         NUMBER(20) NOT NULL," +
-                "  val        RAW(2000), " +
-                (needsOverflow ? "  overflow   NUMBER(38), " : "") +
-                "  CONSTRAINT pk_" + prefixedTableName() + " PRIMARY KEY (row_name, col_name, ts) " +
-                ") organization index compress overflow",
+                "CREATE TABLE " + prefixedTableName() + " ("
+                + "  row_name   RAW(" + Cell.MAX_NAME_LENGTH + ") NOT NULL,"
+                + "  col_name   RAW(" + Cell.MAX_NAME_LENGTH + ") NOT NULL,"
+                + "  ts         NUMBER(20) NOT NULL,"
+                + "  val        RAW(2000), "
+                + (needsOverflow ? "  overflow   NUMBER(38), " : "")
+                + "  CONSTRAINT pk_" + prefixedTableName() + " PRIMARY KEY (row_name, col_name, ts) "
+                + ") organization index compress overflow",
                 "ORA-00955");
         if (needsOverflow && config.overflowMigrationState() != OverflowMigrationState.UNSTARTED) {
             executeIgnoringError(
-                    "CREATE TABLE " + prefixedOverflowTableName() + " (" +
-                    "  id  NUMBER(38) NOT NULL, " +
-                    "  val BLOB NOT NULL," +
-                    "  CONSTRAINT pk_" + prefixedOverflowTableName() + " PRIMARY KEY (id)" +
-                    ")",
+                    "CREATE TABLE " + prefixedOverflowTableName() + " ("
+                    + "  id  NUMBER(38) NOT NULL, "
+                    + "  val BLOB NOT NULL,"
+                    + "  CONSTRAINT pk_" + prefixedOverflowTableName() + " PRIMARY KEY (id)"
+                    + ")",
                     "ORA-00955");
         }
         conns.get().insertOneUnregisteredQuery(
                 "INSERT INTO " + config.metadataTable().getQualifiedName() + " (table_name, table_size) VALUES (?, ?)",
                 tableName.getQualifiedName(),
-                (needsOverflow ? TableSize.OVERFLOW.getId() : TableSize.RAW.getId()));
+                needsOverflow ? TableSize.OVERFLOW.getId() : TableSize.RAW.getId());
     }
 
     @Override
@@ -89,7 +91,8 @@ public void drop() {
         executeIgnoringError("DROP TABLE " + prefixedTableName() + " PURGE", "ORA-00942");
         executeIgnoringError("DROP TABLE " + prefixedOverflowTableName() + " PURGE", "ORA-00942");
         conns.get().executeUnregisteredQuery(
-                "DELETE FROM " + config.metadataTable().getQualifiedName() + " WHERE table_name = ?", tableName.getQualifiedName());
+                "DELETE FROM " + config.metadataTable().getQualifiedName()
+                + " WHERE table_name = ?", tableName.getQualifiedName());
     }
 
     @Override
@@ -100,7 +103,6 @@ public void truncate() {
 
     @Override
     public void checkDatabaseVersion() {
-        String MIN_ORACLE_VERSION = "11.2.0.2.3";
         AgnosticResultSet result = conns.get().selectResultSetUnregisteredQuery(
                 "SELECT version FROM product_component_version where lower(product) like '%oracle%'");
         String version = result.get(0).getString("version");
@@ -109,7 +111,8 @@ public void checkDatabaseVersion() {
                     + version
                     + " of oracle. The minimum supported version is "
                     + MIN_ORACLE_VERSION
-                    + ". If you absolutely need to use an older version of oracle, please contact Palantir support for assistance.");
+                    + ". If you absolutely need to use an older version of oracle,"
+                    + " please contact Palantir support for assistance.");
         }
     }
 
@@ -130,12 +133,13 @@ public void compactInternally() {
             try {
                 conns.get().executeUnregisteredQuery("ALTER TABLE " + prefixedTableName() + " MOVE ONLINE");
             } catch (PalantirSqlException e) {
-                log.error("Tried to clean up " + tableName + " bloat after a sweep operation, "
-                        + "but underlying Oracle database or configuration does not support this "
-                        + "(Enterprise Edition that requires this user to be able to perform DDL operations) feature online. "
-                        + "Since this can't be automated in your configuration, good practice would be do to occasional offline manual maintenance "
-                        + "of rebuilding IOT tables to compensate for bloat. You can contact Palantir Support if you'd like more information. "
-                        + "Underlying error was: " + e.getMessage());
+                log.error("Tried to clean up " + tableName + " bloat after a sweep operation,"
+                        + " but underlying Oracle database or configuration does not support this"
+                        + " (Enterprise Edition that requires this user to be able to perform DDL operations)"
+                        + " feature online. Since this can't be automated in your configuration,"
+                        + " good practice would be do to occasional offline manual maintenance of rebuilding"
+                        + " IOT tables to compensate for bloat. You can contact Palantir Support if you'd"
+                        + " like more information. Underlying error was: " + e.getMessage());
             }
         }
     }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowQueryFactory.java
index eab1279dd8f..47db6845665 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowQueryFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowQueryFactory.java
@@ -27,7 +27,6 @@
 import com.palantir.db.oracle.JdbcHandler.ArrayHandler;
 
 public class OracleOverflowQueryFactory extends OracleQueryFactory {
-
     public OracleOverflowQueryFactory(String tableName,
                                       OracleDdlConfig config) {
         super(tableName, config);
@@ -47,41 +46,44 @@ public boolean hasOverflowValues() {
     public Collection<FullQuery> getOverflowQueries(Collection<OverflowValue> overflowIds) {
         List<Object[]> oraRows = Lists.newArrayListWithCapacity(overflowIds.size());
         for (OverflowValue overflowId : overflowIds) {
-            oraRows.add(new Object[] { null, null, overflowId.id });
+            oraRows.add(new Object[] { null, null, overflowId.id() });
         }
         ArrayHandler arg = config.jdbcHandler().createStructArray(
                 structArrayPrefix() + "CELL_TS",
                 structArrayPrefix() + "CELL_TS_TABLE", oraRows);
         switch (config.overflowMigrationState()) {
-        case UNSTARTED:
-            return ImmutableList.of(getOldOverflowQuery(arg));
-        case IN_PROGRESS:
-            return ImmutableList.of(getOldOverflowQuery(arg), getNewOverflowQuery(arg));
-        case FINISHING: // fall through
-        case FINISHED:
-            return ImmutableList.of(getNewOverflowQuery(arg));
-        default:
-            throw new EnumConstantNotPresentException(OverflowMigrationState.class, config.overflowMigrationState().name());
+            case UNSTARTED:
+                return ImmutableList.of(getOldOverflowQuery(arg));
+            case IN_PROGRESS:
+                return ImmutableList.of(getOldOverflowQuery(arg), getNewOverflowQuery(arg));
+            case FINISHING:
+            case FINISHED:
+                return ImmutableList.of(getNewOverflowQuery(arg));
+            default:
+                throw new EnumConstantNotPresentException(
+                        OverflowMigrationState.class, config.overflowMigrationState().name());
         }
     }
 
     private FullQuery getOldOverflowQuery(ArrayHandler arg) {
-        String query =
-                " /* SELECT_OVERFLOW */ " +
-                " SELECT /*+ USE_NL(t o) LEADING(t o) INDEX(o pk_" + config.singleOverflowTable() + ") */ " +
-                "   o.id, o.val " +
-                " FROM " + config.singleOverflowTable() + " o, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE t.max_ts = o.id ";
+        String query = " /* SELECT_OVERFLOW */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t o) LEADING(t o) INDEX(o pk_" + config.singleOverflowTable() + ") */ "
+                + "   o.id, o.val "
+                + " FROM " + config.singleOverflowTable() + " o, "
+                + "   TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE t.max_ts = o.id ";
         return new FullQuery(query).withArg(arg);
     }
 
     private FullQuery getNewOverflowQuery(ArrayHandler arg) {
-        String query =
-                " /* SELECT_OVERFLOW (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t o) LEADING(t o) INDEX(o pk_" + prefixedOverflowTableName() + ") */ " +
-                "   o.id, o.val " +
-                " FROM " + prefixedOverflowTableName() + " o, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE t.max_ts = o.id ";
+        String query = " /* SELECT_OVERFLOW (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t o) LEADING(t o) INDEX(o pk_" + prefixedOverflowTableName() + ") */ "
+                + "   o.id, o.val "
+                + " FROM " + prefixedOverflowTableName() + " o,"
+                + "   TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE t.max_ts = o.id ";
         return new FullQuery(query).withArg(arg);
     }
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java
index b7f10938c35..e5d78901e7f 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleOverflowWriteTable.java
@@ -65,7 +65,7 @@ public void put(Collection<Map.Entry<Cell, byte[]>> data, long ts) {
             } else {
                 long overflowId = config.overflowIds().get();
                 overflowArgs.add(new Object[] { overflowId, val });
-                args.add(new Object[] { cell.getRowName(), cell.getColumnName(), ts, null , overflowId });
+                args.add(new Object[] { cell.getRowName(), cell.getColumnName(), ts, null, overflowId });
             }
         }
         put(args, overflowArgs);
@@ -79,11 +79,15 @@ public void put(Collection<Map.Entry<Cell, Value>> data) {
             Cell cell = entry.getKey();
             Value val = entry.getValue();
             if (val.getContents().length <= 2000) {
-                args.add(new Object[] { cell.getRowName(), cell.getColumnName(), val.getTimestamp(), val.getContents(), null });
+                args.add(new Object[] {
+                        cell.getRowName(), cell.getColumnName(), val.getTimestamp(), val.getContents(), null
+                });
             } else {
                 long overflowId = config.overflowIds().get();
                 overflowArgs.add(new Object[] { overflowId, val.getContents() });
-                args.add(new Object[] { cell.getRowName(), cell.getColumnName(), val.getTimestamp(), null , overflowId });
+                args.add(new Object[] {
+                        cell.getRowName(), cell.getColumnName(), val.getTimestamp(), null, overflowId
+                });
             }
         }
         put(args, overflowArgs);
@@ -92,22 +96,19 @@ public void put(Collection<Map.Entry<Cell, Value>> data) {
     private void put(List<Object[]> args, List<Object[]> overflowArgs) {
         if (!overflowArgs.isEmpty()) {
             if (config.overflowMigrationState() == OverflowMigrationState.UNSTARTED) {
-                conns.get().insertManyUnregisteredQuery(
-                        "/* INSERT_OVERFLOW */" +
-                        " INSERT INTO " + config.singleOverflowTable() + " (id, val) VALUES (?, ?) ",
+                conns.get().insertManyUnregisteredQuery("/* INSERT_OVERFLOW */"
+                        + " INSERT INTO " + config.singleOverflowTable() + " (id, val) VALUES (?, ?) ",
                         overflowArgs);
             } else {
-                conns.get().insertManyUnregisteredQuery(
-                        "/* INSERT_OVERFLOW (" + tableName + ") */" +
-                        " INSERT INTO " + prefixedOverflowTableName() + " (id, val) VALUES (?, ?) ",
+                conns.get().insertManyUnregisteredQuery("/* INSERT_OVERFLOW (" + tableName + ") */"
+                        + " INSERT INTO " + prefixedOverflowTableName() + " (id, val) VALUES (?, ?) ",
                         overflowArgs);
             }
         }
         try {
-            conns.get().insertManyUnregisteredQuery(
-                    "/* INSERT_ONE (" + tableName + ") */" +
-                    " INSERT INTO " + prefixedTableName() + " (row_name, col_name, ts, val, overflow) " +
-                    " VALUES (?, ?, ?, ?, ?) ",
+            conns.get().insertManyUnregisteredQuery("/* INSERT_ONE (" + tableName + ") */"
+                    + " INSERT INTO " + prefixedTableName() + " (row_name, col_name, ts, val, overflow) "
+                    + " VALUES (?, ?, ?, ?, ?) ",
                     args);
         } catch (PalantirSqlException e) {
             if (ExceptionCheck.isUniqueConstraintViolation(e)) {
@@ -129,14 +130,15 @@ public void putSentinels(Iterable<Cell> cells) {
             }
             while (true) {
                 try {
-                    conns.get().insertManyUnregisteredQuery(
-                            "/* INSERT_WHERE_NOT_EXISTS (" + tableName + ") */" +
-                            " INSERT INTO " + prefixedTableName() + " (row_name, col_name, ts, val, overflow) " +
-                            " SELECT ?, ?, ?, ?, ? FROM DUAL" +
-                            " WHERE NOT EXISTS (SELECT * FROM " + prefixedTableName() + " WHERE" +
-                            " row_name = ? AND" +
-                            " col_name = ? AND" +
-                            " ts = ?)",
+                    conns.get().insertManyUnregisteredQuery("/* INSERT_WHERE_NOT_EXISTS (" + tableName + ") */"
+                            + " INSERT INTO " + prefixedTableName()
+                            + "   (row_name, col_name, ts, val, overflow)"
+                            + " SELECT ?, ?, ?, ?, ? FROM DUAL"
+                            + " WHERE NOT EXISTS ("
+                            + "   SELECT * FROM " + prefixedTableName()
+                            + "   WHERE row_name = ?"
+                            + "     AND col_name = ?"
+                            + "     AND ts = ?)",
                             args);
                     break;
                 } catch (PalantirSqlException e) {
@@ -157,50 +159,50 @@ public void delete(List<Entry<Cell, Long>> entries) {
             args.add(new Object[] {cell.getRowName(), cell.getColumnName(), entry.getValue()});
         }
         switch (config.overflowMigrationState()) {
-        case UNSTARTED:
-            deleteOverflow(config.singleOverflowTable(), args);
-            break;
-        case IN_PROGRESS:
-            deleteOverflow(config.singleOverflowTable(), args);
-            deleteOverflow(prefixedOverflowTableName(), args);
-            break;
-        case FINISHING: // fall through
-        case FINISHED:
-            deleteOverflow(prefixedOverflowTableName(), args);
-            break;
-        default:
-            throw new EnumConstantNotPresentException(OverflowMigrationState.class, config.overflowMigrationState().name());
+            case UNSTARTED:
+                deleteOverflow(config.singleOverflowTable(), args);
+                break;
+            case IN_PROGRESS:
+                deleteOverflow(config.singleOverflowTable(), args);
+                deleteOverflow(prefixedOverflowTableName(), args);
+                break;
+            case FINISHING: // fall through
+            case FINISHED:
+                deleteOverflow(prefixedOverflowTableName(), args);
+                break;
+            default:
+                throw new EnumConstantNotPresentException(
+                        OverflowMigrationState.class, config.overflowMigrationState().name());
         }
         SqlConnection conn = conns.get();
         try {
-            log.info("Got connection for delete on table {}: {}, autocommit={}", tableName, conn.getUnderlyingConnection(), conn.getUnderlyingConnection().getAutoCommit());
-        } catch (PalantirSqlException e) {
-            //
-        } catch (SQLException e) {
+            log.info("Got connection for delete on table {}: {}, autocommit={}",
+                    tableName,
+                    conn.getUnderlyingConnection(),
+                    conn.getUnderlyingConnection().getAutoCommit());
+        } catch (PalantirSqlException | SQLException e) {
             //
         }
-        conn.updateManyUnregisteredQuery(
-                " /* DELETE_ONE (" + tableName + ") */ " +
-                " DELETE /*+ INDEX(m pk_" + prefixedTableName() + ") */ " +
-                " FROM " + prefixedTableName() + " m " +
-                " WHERE m.row_name = ? " +
-                "  AND m.col_name = ? " +
-                "  AND m.ts = ?",
+        conn.updateManyUnregisteredQuery(" /* DELETE_ONE (" + tableName + ") */ "
+                + " DELETE /*+ INDEX(m pk_" + prefixedTableName() + ") */ "
+                + " FROM " + prefixedTableName() + " m "
+                + " WHERE m.row_name = ? "
+                + "  AND m.col_name = ? "
+                + "  AND m.ts = ?",
                 args);
     }
 
     private void deleteOverflow(String overflowTable, List<Object[]> args) {
-        conns.get().updateManyUnregisteredQuery(
-                " /* DELETE_ONE_OVERFLOW (" + tableName + ") */ " +
-                " DELETE /*+ INDEX(m pk_" + overflowTable + ") */ " +
-                "   FROM " + overflowTable + " m " +
-                "  WHERE m.id IN (SELECT /*+ INDEX(i pk_" + prefixedTableName() + ") */ " +
-                "                        i.overflow " +
-                "                   FROM " + prefixedTableName() + " i " +
-                "                  WHERE i.row_name = ? " +
-                "                    AND i.col_name = ? " +
-                "                    AND i.ts = ? " +
-                "                    AND i.overflow IS NOT NULL)",
+        conns.get().updateManyUnregisteredQuery(" /* DELETE_ONE_OVERFLOW (" + tableName + ") */ "
+                + " DELETE /*+ INDEX(m pk_" + overflowTable + ") */ "
+                + "   FROM " + overflowTable + " m "
+                + "  WHERE m.id IN (SELECT /*+ INDEX(i pk_" + prefixedTableName() + ") */ "
+                + "                        i.overflow "
+                + "                   FROM " + prefixedTableName() + " i "
+                + "                  WHERE i.row_name = ? "
+                + "                    AND i.col_name = ? "
+                + "                    AND i.ts = ? "
+                + "                    AND i.overflow IS NOT NULL)",
                 args);
     }
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java
index 3ff13176d61..6dbbce41ec8 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleQueryFactory.java
@@ -24,6 +24,7 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.dbkvs.OracleDdlConfig;
@@ -45,19 +46,26 @@ public FullQuery getLatestRowQuery(byte[] row,
                                        long ts,
                                        ColumnSelection columns,
                                        boolean includeValue) {
-        String query =
-                " /* GET_LATEST_ONE_ROW_INNER (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, max(m.ts) as ts " +
-                " FROM " + prefixedTableName() + " m " +
-                " WHERE m.row_name = ? " +
-                "   AND m.ts < ? " +
-                (columns.allColumnsSelected() ? "" :
-                    " AND EXISTS (SELECT /*+ NL_SJ */ 1 FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) WHERE row_name = m.col_name)") +
-                " GROUP BY m.row_name, m.col_name";
+        String query = " /* GET_LATEST_ONE_ROW_INNER (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, max(m.ts) as ts "
+                + " FROM " + prefixedTableName() + " m "
+                + " WHERE m.row_name = ? "
+                + "   AND m.ts < ? "
+                + (columns.allColumnsSelected() ? "" :
+                    " AND EXISTS ("
+                            + "SELECT "
+                            + "  /*+ NL_SJ */"
+                            + "  1"
+                            + " FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE))"
+                            + " WHERE row_name = m.col_name)")
+                + " GROUP BY m.row_name, m.col_name";
         query = wrapQueryWithIncludeValue("GET_LATEST_ONE_ROW", query, includeValue);
         FullQuery fullQuery = new FullQuery(query).withArgs(row, ts);
-        return columns.allColumnsSelected() ? fullQuery : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
+        return columns.allColumnsSelected()
+                ? fullQuery
+                : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
     }
 
     @Override
@@ -65,38 +73,52 @@ public FullQuery getLatestRowsQuery(Iterable<byte[]> rows,
                                         long ts,
                                         ColumnSelection columns,
                                         boolean includeValue) {
-        String query =
-                " /* GET_LATEST_ROWS_SINGLE_BOUND_INNER (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, max(m.ts) as ts " +
-                " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE m.row_name = t.row_name " +
-                "   AND m.ts < ? " +
-                (columns.allColumnsSelected() ? "" :
-                    " AND EXISTS (SELECT /*+ NL_SJ */ 1 FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) WHERE row_name = m.col_name) ") +
-                " GROUP BY m.row_name, m.col_name";
+        String query = " /* GET_LATEST_ROWS_SINGLE_BOUND_INNER (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, max(m.ts) as ts "
+                + " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE m.row_name = t.row_name "
+                + "   AND m.ts < ? "
+                + (columns.allColumnsSelected() ? "" :
+                    " AND EXISTS ("
+                            + "SELECT"
+                            + "  /*+ NL_SJ */"
+                            + "  1"
+                            + " FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE))"
+                            + " WHERE row_name = m.col_name) ")
+                + " GROUP BY m.row_name, m.col_name";
         query = wrapQueryWithIncludeValue("GET_LATEST_ROWS_SINGLE_BOUND", query, includeValue);
         FullQuery fullQuery = new FullQuery(query).withArgs(rowsToOracleArray(rows), ts);
-        return columns.allColumnsSelected() ? fullQuery : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
+        return columns.allColumnsSelected()
+                ? fullQuery
+                : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
     }
 
     @Override
     public FullQuery getLatestRowsQuery(Collection<Map.Entry<byte[], Long>> rows,
                                         ColumnSelection columns,
                                         boolean includeValue) {
-        String query =
-                " /* GET_LATEST_ROWS_MANY_BOUNDS_INNER (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, max(m.ts) as ts " +
-                " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE m.row_name = t.row_name " +
-                "   AND m.ts < t.max_ts " +
-                (columns.allColumnsSelected() ? "" :
-                    " AND EXISTS (SELECT /*+ NL_SJ */ 1 FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) WHERE row_name = m.col_name) ") +
-                " GROUP BY m.row_name, m.col_name";
+        String query = " /* GET_LATEST_ROWS_MANY_BOUNDS_INNER (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, max(m.ts) as ts "
+                + " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE m.row_name = t.row_name "
+                + "   AND m.ts < t.max_ts "
+                + (columns.allColumnsSelected() ? "" :
+                    " AND EXISTS ("
+                            + "SELECT"
+                            + "  /*+ NL_SJ */"
+                            + "  1"
+                            + " FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE))"
+                            + " WHERE row_name = m.col_name) ")
+                + " GROUP BY m.row_name, m.col_name";
         query = wrapQueryWithIncludeValue("GET_LATEST_ROWS_MANY_BOUNDS", query, includeValue);
         FullQuery fullQuery = new FullQuery(query).withArg(rowsAndTimestampsToOracleArray(rows));
-        return columns.allColumnsSelected() ? fullQuery : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
+        return columns.allColumnsSelected()
+                ? fullQuery
+                : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
     }
 
     @Override
@@ -104,17 +126,24 @@ public FullQuery getAllRowQuery(byte[] row,
                                     long ts,
                                     ColumnSelection columns,
                                     boolean includeValue) {
-        String query =
-                " /* GET_ALL_ONE_ROW (" + tableName + ") */ " +
-                " SELECT /*+ INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue) +
-                " FROM " + prefixedTableName() + " m " +
-                " WHERE m.row_name = ? " +
-                "   AND m.ts < ? " +
-                (columns.allColumnsSelected() ? "" :
-                    " AND EXISTS (SELECT /*+ NL_SJ */ 1 FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) WHERE row_name = m.col_name) ");
+        String query = " /* GET_ALL_ONE_ROW (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue)
+                + " FROM " + prefixedTableName() + " m "
+                + " WHERE m.row_name = ? "
+                + "   AND m.ts < ? "
+                + (columns.allColumnsSelected() ? "" :
+                    " AND EXISTS ("
+                            + "SELECT"
+                            + "  /*+ NL_SJ */"
+                            + "  1"
+                            + " FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE))"
+                            + " WHERE row_name = m.col_name) ");
         FullQuery fullQuery = new FullQuery(query).withArgs(row, ts);
-        return columns.allColumnsSelected() ? fullQuery : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
+        return columns.allColumnsSelected()
+                ? fullQuery
+                : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
     }
 
     @Override
@@ -122,117 +151,131 @@ public FullQuery getAllRowsQuery(Iterable<byte[]> rows,
                                      long ts,
                                      ColumnSelection columns,
                                      boolean includeValue) {
-        String query =
-                " /* GET_ALL_ROWS_SINGLE_BOUND (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue) +
-                " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE m.row_name = t.row_name " +
-                "   AND m.ts < ? " +
-                (columns.allColumnsSelected() ? "" :
-                    " AND EXISTS (SELECT /*+ NL_SJ */ 1 FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) WHERE row_name = m.col_name) ");
+        String query = " /* GET_ALL_ROWS_SINGLE_BOUND (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue)
+                + " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE m.row_name = t.row_name "
+                + "   AND m.ts < ? "
+                + (columns.allColumnsSelected() ? "" :
+                    " AND EXISTS ("
+                            + "SELECT"
+                            + "  /*+ NL_SJ */"
+                            + "  1"
+                            + " FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE))"
+                            + " WHERE row_name = m.col_name) ");
         FullQuery fullQuery = new FullQuery(query).withArgs(rowsToOracleArray(rows), ts);
-        return columns.allColumnsSelected() ? fullQuery : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
+        return columns.allColumnsSelected()
+                ? fullQuery
+                : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
     }
 
     @Override
     public FullQuery getAllRowsQuery(Collection<Map.Entry<byte[], Long>> rows,
                                      ColumnSelection columns,
                                      boolean includeValue) {
-        String query =
-                " /* GET_ALL_ROWS_MANY_BOUNDS (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue) +
-                " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE m.row_name = t.row_name " +
-                "   AND m.ts < t.max_ts " +
-                (columns.allColumnsSelected() ? "" :
-                    " AND EXISTS (SELECT /*+ NL_SJ */ 1 FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) WHERE row_name = m.col_name) ");
+        String query = " /* GET_ALL_ROWS_MANY_BOUNDS (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue)
+                + " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE m.row_name = t.row_name "
+                + "   AND m.ts < t.max_ts "
+                + (columns.allColumnsSelected() ? "" :
+                    " AND EXISTS ("
+                            + "SELECT"
+                            + "  /*+ NL_SJ */"
+                            + "  1"
+                            + " FROM TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE))"
+                            + " WHERE row_name = m.col_name) ");
         FullQuery fullQuery = new FullQuery(query).withArg(rowsAndTimestampsToOracleArray(rows));
-        return columns.allColumnsSelected() ? fullQuery : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
+        return columns.allColumnsSelected()
+                ? fullQuery
+                : fullQuery.withArg(rowsToOracleArray(columns.getSelectedColumns()));
     }
 
     @Override
     public FullQuery getLatestCellQuery(Cell cell, long ts, boolean includeValue) {
-        String query =
-                " /* GET_LATEST_ONE_CELLS_INNER (" + tableName + ") */ " +
-                " SELECT /*+ INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, max(m.ts) as ts " +
-                " FROM " + prefixedTableName() + " m " +
-                " WHERE m.row_name = ? " +
-                "   AND m.col_name = ? " +
-                "   AND m.ts < ? " +
-                " GROUP BY m.row_name, m.col_name";
+        String query = " /* GET_LATEST_ONE_CELLS_INNER (" + tableName + ") */ "
+                + " SELECT "
+                + "   /*+ INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, max(m.ts) as ts "
+                + " FROM " + prefixedTableName() + " m "
+                + " WHERE m.row_name = ? "
+                + "   AND m.col_name = ? "
+                + "   AND m.ts < ? "
+                + " GROUP BY m.row_name, m.col_name";
         query = wrapQueryWithIncludeValue("GET_LATEST_ONE_CELL", query, includeValue);
         return new FullQuery(query).withArgs(cell.getRowName(), cell.getColumnName(), ts);
     }
 
     @Override
     public FullQuery getLatestCellsQuery(Iterable<Cell> cells, long ts, boolean includeValue) {
-        String query =
-                " /* GET_LATEST_CELLS_SINGLE_BOUND_INNER (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, max(m.ts) as ts " +
-                " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE m.row_name = t.row_name " +
-                "   AND m.col_name = t.col_name " +
-                "   AND m.ts < ? " +
-                " GROUP BY m.row_name, m.col_name";
+        String query = " /* GET_LATEST_CELLS_SINGLE_BOUND_INNER (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, max(m.ts) as ts "
+                + " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE m.row_name = t.row_name "
+                + "   AND m.col_name = t.col_name "
+                + "   AND m.ts < ? "
+                + " GROUP BY m.row_name, m.col_name";
         query = wrapQueryWithIncludeValue("GET_LATEST_CELLS_SINGLE_BOUND", query, includeValue);
         return new FullQuery(query).withArgs(cellsToOracleArray(cells), ts);
     }
 
     @Override
     public FullQuery getLatestCellsQuery(Collection<Map.Entry<Cell, Long>> cells, boolean includeValue) {
-        String query =
-                " /* GET_LATEST_CELLS_MANY_BOUNDS_INNER (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, max(m.ts) as ts " +
-                " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE m.row_name = t.row_name " +
-                "   AND m.col_name = t.col_name " +
-                "   AND m.ts < t.max_ts " +
-                " GROUP BY m.row_name, m.col_name";
+        String query = " /* GET_LATEST_CELLS_MANY_BOUNDS_INNER (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, max(m.ts) as ts "
+                + " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE m.row_name = t.row_name "
+                + "   AND m.col_name = t.col_name "
+                + "   AND m.ts < t.max_ts "
+                + " GROUP BY m.row_name, m.col_name";
         query = wrapQueryWithIncludeValue("GET_LATEST_CELLS_MANY_BOUNDS", query, includeValue);
         return new FullQuery(query).withArg(cellsAndTimestampsToOracleArray(cells));
     }
 
     @Override
     public FullQuery getAllCellQuery(Cell cell, long ts, boolean includeValue) {
-        String query =
-                " /* GET_ALL_ONE_CELL (" + tableName + ") */ " +
-                " SELECT /*+ INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue) +
-                " FROM " + prefixedTableName() + " m " +
-                " WHERE m.row_name = ? " +
-                "   AND m.col_name = ? " +
-                "   AND m.ts < ? ";
+        String query = " /* GET_ALL_ONE_CELL (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue)
+                + " FROM " + prefixedTableName() + " m "
+                + " WHERE m.row_name = ? "
+                + "   AND m.col_name = ? "
+                + "   AND m.ts < ? ";
         return new FullQuery(query).withArgs(cell.getRowName(), cell.getColumnName(), ts);
     }
 
     @Override
     public FullQuery getAllCellsQuery(Iterable<Cell> cells, long ts, boolean includeValue) {
-        String query =
-                " /* GET_ALL_CELLS_SINGLE_BOUND (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue) +
-                " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE m.row_name = t.row_name " +
-                "   AND m.col_name = t.col_name " +
-                "   AND m.ts < ? ";
+        String query = " /* GET_ALL_CELLS_SINGLE_BOUND (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue)
+                + " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE m.row_name = t.row_name "
+                + "   AND m.col_name = t.col_name "
+                + "   AND m.ts < ? ";
         return new FullQuery(query).withArgs(cellsToOracleArray(cells), ts);
     }
 
     @Override
     public FullQuery getAllCellsQuery(Collection<Map.Entry<Cell, Long>> cells, boolean includeValue) {
-        String query =
-                " /* GET_ALL_CELLS_MANY_BOUNDS (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue) +
-                " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t " +
-                " WHERE m.row_name = t.row_name " +
-                "   AND m.col_name = t.col_name " +
-                "   AND m.ts < t.max_ts ";
+        String query = " /* GET_ALL_CELLS_MANY_BOUNDS (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(t m) CARDINALITY(t 1) CARDINALITY(m 10) INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "   m.row_name, m.col_name, m.ts" + getValueSubselect("m", includeValue)
+                + " FROM " + prefixedTableName() + " m, TABLE(CAST(? AS " + structArrayPrefix() + "CELL_TS_TABLE)) t "
+                + " WHERE m.row_name = t.row_name "
+                + "   AND m.col_name = t.col_name "
+                + "   AND m.ts < t.max_ts ";
         return new FullQuery(query).withArg(cellsAndTimestampsToOracleArray(cells));
     }
 
@@ -251,38 +294,79 @@ public FullQuery getRangeQuery(RangeRequest range, long ts, int maxRows) {
             args.add(end);
         }
         if (maxRows == 1) {
-            String query =
-                    " /* GET_RANGE_ONE_ROW (" + tableName + ") */ " +
-                    " SELECT /*+ INDEX(m pk_" + prefixedTableName() + ") */ " +
-                    (range.isReverse() ? "max" : "min") + "(m.row_name) as row_name " +
-                    " FROM " + prefixedTableName() + " m " +
-                    (bounds.isEmpty() ? "" : " WHERE  " + Joiner.on(" AND ").join(bounds));
+            String query = " /* GET_RANGE_ONE_ROW (" + tableName + ") */ "
+                    + " SELECT /*+ INDEX(m pk_" + prefixedTableName() + ") */ "
+                    + (range.isReverse() ? "max" : "min") + "(m.row_name) as row_name "
+                    + " FROM " + prefixedTableName() + " m "
+                    + (bounds.isEmpty() ? "" : " WHERE  " + Joiner.on(" AND ").join(bounds));
             return new FullQuery(query).withArgs(args);
         }
 
-        String query =
-                " /* GET_RANGE_ROWS (" + tableName + ") */ " +
-                " SELECT inner.row_name FROM " +
-                "   ( SELECT /*+ INDEX(m pk_" + prefixedTableName() + ") */ " +
-                "       DISTINCT m.row_name " +
-                "     FROM " + prefixedTableName() + " m " +
-                (bounds.isEmpty() ? "" : " WHERE  " + Joiner.on(" AND ").join(bounds)) +
-                "     ORDER BY m.row_name " + (range.isReverse() ? "DESC" : "ASC") +
-                "   ) inner WHERE rownum <= " + maxRows;
+        String query = " /* GET_RANGE_ROWS (" + tableName + ") */ "
+                + " SELECT inner.row_name FROM "
+                + "   ( SELECT /*+ INDEX(m pk_" + prefixedTableName() + ") */ "
+                + "       DISTINCT m.row_name "
+                + "     FROM " + prefixedTableName() + " m "
+                + (bounds.isEmpty() ? "" : " WHERE  " + Joiner.on(" AND ").join(bounds))
+                + "     ORDER BY m.row_name " + (range.isReverse() ? "DESC" : "ASC")
+                + "   ) inner WHERE rownum <= " + maxRows;
         return new FullQuery(query).withArgs(args);
     }
 
+    @Override
+    public FullQuery getRowsColumnRangeQuery(List<byte[]> rows, long ts, ColumnRangeSelection columnRangeSelection) {
+        List<String> subQueries = Lists.newArrayListWithCapacity(rows.size());
+        int argsPerRow = 2
+                + ((columnRangeSelection.getStartCol().length > 0) ? 1 : 0)
+                + ((columnRangeSelection.getEndCol().length > 0) ? 1 : 0);
+        List<Object> args = Lists.newArrayListWithCapacity(rows.size() * argsPerRow);
+        for (byte[] row : rows) {
+            FullQuery query = getRowsColumnRangeSubQuery(row, ts, columnRangeSelection);
+            subQueries.add(query.getQuery());
+            for (Object arg : query.getArgs()) {
+                args.add(arg);
+            }
+        }
+        String query = Joiner.on(") UNION ALL (").appendTo(new StringBuilder("("), subQueries).append(")")
+                .append(" ORDER BY wrap.row_name ASC, wrap.col_name ASC").toString();
+        return new FullQuery(query).withArgs(args);
+    }
+
+    private FullQuery getRowsColumnRangeSubQuery(byte[] row, long ts, ColumnRangeSelection columnRangeSelection) {
+        String query = " /* GET_ROWS_COLUMN_RANGE (" + tableName + ") */ "
+                + "SELECT * FROM ( SELECT m.row_name, m.col_name, max(m.ts) as ts"
+                + "   FROM " + prefixedTableName() + " m"
+                + "  WHERE m.row_name = ?"
+                + "    AND m.ts < ? "
+                + (columnRangeSelection.getStartCol().length > 0 ? " AND m.col_name >= ?" : "")
+                + (columnRangeSelection.getEndCol().length > 0 ? " AND m.col_name < ?" : "")
+                + " GROUP BY m.row_name, m.col_name"
+                + " ORDER BY m.col_name ASC ) WHERE rownum <= " + columnRangeSelection.getBatchHint();
+        FullQuery fullQuery = new FullQuery(wrapQueryWithIncludeValue("GET_ROWS_COLUMN_RANGE", query, true))
+                .withArg(row)
+                .withArg(ts);
+        if (columnRangeSelection.getStartCol().length > 0) {
+            fullQuery = fullQuery.withArg(columnRangeSelection.getStartCol());
+        }
+        if (columnRangeSelection.getEndCol().length > 0) {
+            fullQuery = fullQuery.withArg(columnRangeSelection.getEndCol());
+        }
+        return fullQuery;
+    }
+
     private String wrapQueryWithIncludeValue(String wrappedName, String query, boolean includeValue) {
         if (!includeValue) {
             return query;
         }
-        return " /* " + wrappedName + " (" + tableName + ") */ " +
-                " SELECT /*+ USE_NL(i wrap) LEADING(i wrap) NO_MERGE(i) NO_PUSH_PRED(i) INDEX(wrap pk_" + prefixedTableName() + ") */ " +
-                "        wrap.row_name, wrap.col_name, wrap.ts" + getValueSubselect("wrap", includeValue) +
-                " FROM " + prefixedTableName() + " wrap, ( " + query + " ) i " +
-                " WHERE wrap.row_name = i.row_name " +
-                "   AND wrap.col_name = i.col_name " +
-                "   AND wrap.ts = i.ts ";
+        return " /* " + wrappedName + " (" + tableName + ") */ "
+                + " SELECT"
+                + "   /*+ USE_NL(i wrap) LEADING(i wrap) NO_MERGE(i) NO_PUSH_PRED(i)"
+                + "       INDEX(wrap pk_" + prefixedTableName() + ") */ "
+                + "   wrap.row_name, wrap.col_name, wrap.ts" + getValueSubselect("wrap", includeValue)
+                + " FROM " + prefixedTableName() + " wrap, ( " + query + " ) i "
+                + " WHERE wrap.row_name = i.row_name "
+                + "   AND wrap.col_name = i.col_name "
+                + "   AND wrap.ts = i.ts ";
     }
 
     abstract String getValueSubselect(String tableAlias, boolean includeValue);
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleRawQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleRawQueryFactory.java
index a233a697dff..70d8d1e4877 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleRawQueryFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/oracle/OracleRawQueryFactory.java
@@ -22,7 +22,6 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.OverflowValue;
 
 public class OracleRawQueryFactory extends OracleQueryFactory {
-
     public OracleRawQueryFactory(String tableName, OracleDdlConfig config) {
         super(tableName, config);
     }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java
index 056744d35dd..abe1684ccd4 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresDdlTable.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl.postgres;
 
+import java.util.function.Predicate;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,10 +28,13 @@
 import com.palantir.atlasdb.keyvalue.dbkvs.impl.TableSize;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.AgnosticResultSet;
+import com.palantir.nexus.db.sql.ExceptionCheck;
 import com.palantir.util.VersionStrings;
 
 public class PostgresDdlTable implements DbDdlTable {
     private static final Logger log = LoggerFactory.getLogger(PostgresDdlTable.class);
+    private static final String MIN_POSTGRES_VERSION = "9.2";
+
     private final TableReference tableName;
     private final ConnectionSupplier conns;
     private final PostgresDdlConfig config;
@@ -49,26 +54,34 @@ public void create(byte[] tableMetadata) {
                 tableName.getQualifiedName())) {
             return;
         }
+
         executeIgnoringError(
-                "CREATE TABLE " + prefixedTableName() + " (" +
-                "  row_name   BYTEA NOT NULL," +
-                "  col_name   BYTEA NOT NULL," +
-                "  ts         INT8 NOT NULL," +
-                "  val        BYTEA," +
-                "  CONSTRAINT pk_" + prefixedTableName() + " PRIMARY KEY (row_name, col_name, ts) " +
-                ")",
+                String.format("CREATE TABLE %s ("
+                        + "  row_name   BYTEA NOT NULL,"
+                        + "  col_name   BYTEA NOT NULL,"
+                        + "  ts         INT8 NOT NULL,"
+                        + "  val        BYTEA,"
+                        + "  CONSTRAINT pk_%s PRIMARY KEY (row_name, col_name, ts) ",
+                        prefixedTableName(), prefixedTableName())
+                + ")",
                 "already exists");
-        conns.get().insertOneUnregisteredQuery(
-                "INSERT INTO " + config.metadataTable().getQualifiedName() + " (table_name, table_size) VALUES (?, ?)",
-                tableName.getQualifiedName(),
-                TableSize.RAW.getId());
+
+        ignoringError(() -> {
+            conns.get().insertOneUnregisteredQuery(
+                    String.format(
+                            "INSERT INTO %s (table_name, table_size) VALUES (?, ?)",
+                            config.metadataTable().getQualifiedName()),
+                    tableName.getQualifiedName(),
+                    TableSize.RAW.getId());
+        }, ExceptionCheck::isUniqueConstraintViolation);
     }
 
     @Override
     public void drop() {
         executeIgnoringError("DROP TABLE " + prefixedTableName(), "does not exist");
         conns.get().executeUnregisteredQuery(
-                "DELETE FROM " + config.metadataTable().getQualifiedName() + " WHERE table_name = ?", tableName.getQualifiedName());
+                String.format("DELETE FROM %s WHERE table_name = ?", config.metadataTable().getQualifiedName()),
+                tableName.getQualifiedName());
     }
 
     @Override
@@ -78,24 +91,13 @@ public void truncate() {
 
     @Override
     public void checkDatabaseVersion() {
-        String MIN_POSTGRES_VERSION = "9.2";
         AgnosticResultSet result = conns.get().selectResultSetUnregisteredQuery("SHOW server_version");
         String version = result.get(0).getString("server_version");
         if (!version.matches("^[\\.0-9]+$") || VersionStrings.compareVersions(version, MIN_POSTGRES_VERSION) < 0) {
-            log.error("Your key value service currently uses version " + version +
-                    " of postgres. The minimum supported version is " + MIN_POSTGRES_VERSION +
-                    ". If you absolutely need to use an older version of postgres, please contact Palantir support for assistance.");
-        }
-    }
-
-    private void executeIgnoringError(String sql, String errorToIgnore) {
-        try {
-            conns.get().executeUnregisteredQuery(sql);
-        } catch (PalantirSqlException e) {
-            if (!e.getMessage().contains(errorToIgnore)) {
-                log.error(e.getMessage(), e);
-                throw e;
-            }
+            log.error("Your key value service currently uses version " + version + " of postgres."
+                    + " The minimum supported version is " + MIN_POSTGRES_VERSION + "."
+                    + " If you absolutely need to use an older version of postgres,"
+                    + " please contact Palantir support for assistance.");
         }
     }
 
@@ -108,4 +110,19 @@ public void compactInternally() {
     private String prefixedTableName() {
         return config.tablePrefix() + DbKvs.internalTableName(tableName);
     }
+
+    private void executeIgnoringError(String sql, String errorToIgnore) {
+        ignoringError(() -> conns.get().executeUnregisteredQuery(sql), e -> e.getMessage().contains(errorToIgnore));
+    }
+
+    private static void ignoringError(Runnable fn, Predicate<PalantirSqlException> shouldIgnoreException) {
+        try {
+            fn.run();
+        } catch (PalantirSqlException e) {
+            if (!shouldIgnoreException.test(e)) {
+                log.error(e.getMessage(), e);
+                throw e;
+            }
+        }
+    }
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java
index 5d951942eed..d4c235df1bc 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresQueryFactory.java
@@ -23,6 +23,7 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.dbkvs.PostgresDdlConfig;
@@ -44,15 +45,14 @@ public FullQuery getLatestRowQuery(byte[] row,
                                        long ts,
                                        ColumnSelection columns,
                                        boolean includeValue) {
-        String query =
-                " /* GET_LATEST_ROW_INNER (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, max(m.ts) as ts " +
-                "   FROM " + prefixedTableName() + " m " +
-                "  WHERE m.row_name = ? " +
-                "    AND m.ts < ? " +
-                (columns.allColumnsSelected() ? "" :
-                    "    AND m.col_name IN " + nParams(Iterables.size(columns.getSelectedColumns()))) +
-                " GROUP BY m.row_name, m.col_name";
+        String query = " /* GET_LATEST_ROW_INNER (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, max(m.ts) as ts "
+                + "   FROM " + prefixedTableName() + " m "
+                + "  WHERE m.row_name = ? "
+                + "    AND m.ts < ? "
+                + (columns.allColumnsSelected() ? "" :
+                    "    AND m.col_name IN " + numParams(Iterables.size(columns.getSelectedColumns())))
+                + " GROUP BY m.row_name, m.col_name";
         query = wrapQueryWithIncludeValue("GET_LATEST_ROW", query, includeValue);
         FullQuery fullQuery = new FullQuery(query).withArgs(row, ts);
         return columns.allColumnsSelected() ? fullQuery : fullQuery.withArgs(columns.getSelectedColumns());
@@ -63,15 +63,14 @@ public FullQuery getLatestRowsQuery(Iterable<byte[]> rows,
                                         long ts,
                                         ColumnSelection columns,
                                         boolean includeValue) {
-        String query =
-                " /* GET_LATEST_ROWS_INNER (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, max(m.ts) as ts " +
-                "   FROM " + prefixedTableName() + " m " +
-                "  WHERE m.row_name IN " + nParams(Iterables.size(rows)) +
-                "    AND m.ts < ? " +
-                (columns.allColumnsSelected() ? "" :
-                    "    AND m.col_name IN " + nParams(Iterables.size(columns.getSelectedColumns()))) +
-                " GROUP BY m.row_name, m.col_name ";
+        String query = " /* GET_LATEST_ROWS_INNER (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, max(m.ts) as ts "
+                + "   FROM " + prefixedTableName() + " m "
+                + "  WHERE m.row_name IN " + numParams(Iterables.size(rows))
+                + "    AND m.ts < ? "
+                + (columns.allColumnsSelected() ? "" :
+                    "    AND m.col_name IN " + numParams(Iterables.size(columns.getSelectedColumns())))
+                + " GROUP BY m.row_name, m.col_name ";
         query = wrapQueryWithIncludeValue("GET_LATEST_ROW", query, includeValue);
         FullQuery fullQuery = new FullQuery(query).withArgs(rows).withArg(ts);
         return columns.allColumnsSelected() ? fullQuery : fullQuery.withArgs(columns.getSelectedColumns());
@@ -81,15 +80,15 @@ public FullQuery getLatestRowsQuery(Iterable<byte[]> rows,
     public FullQuery getLatestRowsQuery(Collection<Entry<byte[], Long>> rows,
                                         ColumnSelection columns,
                                         boolean includeValue) {
-        String query =
-                " /* GET_LATEST_ROWS_INNER (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, max(m.ts) as ts " +
-                "   FROM " + prefixedTableName() + " m, (VALUES " + nkParams(2, rows.size()) + ") t(row_name, ts) " +
-                "  WHERE m.row_name = t.row_name " +
-                "    AND m.ts < t.ts " +
-                (columns.allColumnsSelected() ? "" :
-                    "    AND m.col_name IN " + nParams(Iterables.size(columns.getSelectedColumns()))) +
-                " GROUP BY m.row_name, m.col_name ";
+        String query = " /* GET_LATEST_ROWS_INNER (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, max(m.ts) as ts "
+                + "   FROM " + prefixedTableName() + " m,"
+                + "     (VALUES " + groupOfNumParams(2, rows.size()) + ") t(row_name, ts) "
+                + "  WHERE m.row_name = t.row_name "
+                + "    AND m.ts < t.ts "
+                + (columns.allColumnsSelected() ? "" :
+                    "    AND m.col_name IN " + numParams(Iterables.size(columns.getSelectedColumns())))
+                + " GROUP BY m.row_name, m.col_name ";
         query = wrapQueryWithIncludeValue("GET_LATEST_ROW", query, includeValue);
         FullQuery fullQuery = addRowTsArgs(new FullQuery(query), rows);
         return columns.allColumnsSelected() ? fullQuery : fullQuery.withArgs(columns.getSelectedColumns());
@@ -100,14 +99,13 @@ public FullQuery getAllRowQuery(byte[] row,
                                     long ts,
                                     ColumnSelection columns,
                                     boolean includeValue) {
-        String query =
-                " /* GET_ALL_ROW (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ") +
-                "   FROM " + prefixedTableName() + " m " +
-                "  WHERE m.row_name = ? " +
-                "    AND m.ts < ? " +
-                (columns.allColumnsSelected() ? "" :
-                    "    AND m.col_name IN " + nParams(Iterables.size(columns.getSelectedColumns())));
+        String query = " /* GET_ALL_ROW (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ")
+                + "   FROM " + prefixedTableName() + " m "
+                + "  WHERE m.row_name = ? "
+                + "    AND m.ts < ? "
+                + (columns.allColumnsSelected() ? "" :
+                    "    AND m.col_name IN " + numParams(Iterables.size(columns.getSelectedColumns())));
         FullQuery fullQuery = new FullQuery(query).withArgs(row, ts);
         return columns.allColumnsSelected() ? fullQuery : fullQuery.withArgs(columns.getSelectedColumns());
     }
@@ -117,14 +115,13 @@ public FullQuery getAllRowsQuery(Iterable<byte[]> rows,
                                      long ts,
                                      ColumnSelection columns,
                                      boolean includeValue) {
-        String query =
-                " /* GET_ALL_ROWS (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ") +
-                "   FROM " + prefixedTableName() + " m " +
-                "  WHERE m.row_name IN " + nParams(Iterables.size(rows)) +
-                "    AND m.ts < ? " +
-                (columns.allColumnsSelected() ? "" :
-                    "    AND m.col_name IN " + nParams(Iterables.size(columns.getSelectedColumns())));
+        String query = " /* GET_ALL_ROWS (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ")
+                + "   FROM " + prefixedTableName() + " m "
+                + "  WHERE m.row_name IN " + numParams(Iterables.size(rows))
+                + "    AND m.ts < ? "
+                + (columns.allColumnsSelected() ? "" :
+                    "    AND m.col_name IN " + numParams(Iterables.size(columns.getSelectedColumns())));
         FullQuery fullQuery = new FullQuery(query).withArgs(rows).withArg(ts);
         return columns.allColumnsSelected() ? fullQuery : fullQuery.withArgs(columns.getSelectedColumns());
     }
@@ -133,94 +130,92 @@ public FullQuery getAllRowsQuery(Iterable<byte[]> rows,
     public FullQuery getAllRowsQuery(Collection<Entry<byte[], Long>> rows,
                                      ColumnSelection columns,
                                      boolean includeValue) {
-        String query =
-                " /* GET_ALL_ROWS (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ") +
-                "   FROM " + prefixedTableName() + " m, (VALUES " + nkParams(2, rows.size()) + ") t(row_name, ts) " +
-                "  WHERE m.row_name = t.row_name " +
-                "    AND m.ts < t.ts " +
-                (columns.allColumnsSelected() ? "" :
-                    "    AND m.col_name IN " + nParams(Iterables.size(columns.getSelectedColumns())));
+        String query = " /* GET_ALL_ROWS (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ")
+                + "   FROM " + prefixedTableName() + " m,"
+                + "     (VALUES " + groupOfNumParams(2, rows.size()) + ") t(row_name, ts) "
+                + "  WHERE m.row_name = t.row_name "
+                + "    AND m.ts < t.ts "
+                + (columns.allColumnsSelected() ? "" :
+                    "    AND m.col_name IN " + numParams(Iterables.size(columns.getSelectedColumns())));
         FullQuery fullQuery = addRowTsArgs(new FullQuery(query), rows);
         return columns.allColumnsSelected() ? fullQuery : fullQuery.withArgs(columns.getSelectedColumns());
     }
 
     @Override
     public FullQuery getLatestCellQuery(Cell cell, long ts, boolean includeValue) {
-        String query =
-                " /* GET_LATEST_CELL_INNER (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, max(m.ts) as ts " +
-                "   FROM " + prefixedTableName() + " m " +
-                "  WHERE m.row_name = ? " +
-                "    AND m.col_name = ? " +
-                "    AND m.ts < ? " +
-                " GROUP BY m.row_name, m.col_name " +
-                " LIMIT 1";
+        String query = " /* GET_LATEST_CELL_INNER (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, max(m.ts) as ts "
+                + "   FROM " + prefixedTableName() + " m "
+                + "  WHERE m.row_name = ? "
+                + "    AND m.col_name = ? "
+                + "    AND m.ts < ? "
+                + " GROUP BY m.row_name, m.col_name "
+                + " LIMIT 1";
         query = wrapQueryWithIncludeValue("GET_LATEST_CELL", query, includeValue);
         return new FullQuery(query).withArgs(cell.getRowName(), cell.getColumnName(), ts);
     }
 
     @Override
     public FullQuery getLatestCellsQuery(Iterable<Cell> cells, long ts, boolean includeValue) {
-        String query =
-                " /* GET_LATEST_CELLS_INNER (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, max(m.ts) as ts " +
-                "   FROM " + prefixedTableName() + " m, (VALUES " + nkParams(2, Iterables.size(cells)) + ") t(row_name, col_name) " +
-                "  WHERE m.row_name = t.row_name " +
-                "    AND m.col_name = t.col_name " +
-                "    AND m.ts < ? " +
-                " GROUP BY m.row_name, m.col_name ";
+        String query = " /* GET_LATEST_CELLS_INNER (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, max(m.ts) as ts "
+                + "   FROM " + prefixedTableName() + " m,"
+                + "    (VALUES " + groupOfNumParams(2, Iterables.size(cells)) + ") t(row_name, col_name) "
+                + "  WHERE m.row_name = t.row_name "
+                + "    AND m.col_name = t.col_name "
+                + "    AND m.ts < ? "
+                + " GROUP BY m.row_name, m.col_name ";
         query = wrapQueryWithIncludeValue("GET_LATEST_CELLS", query, includeValue);
         return addCellArgs(new FullQuery(query), cells).withArg(ts);
     }
 
     @Override
     public FullQuery getLatestCellsQuery(Collection<Entry<Cell, Long>> cells, boolean includeValue) {
-        String query =
-                " /* GET_LATEST_CELLS_INNER (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, max(m.ts) as ts " +
-                "   FROM " + prefixedTableName() + " m, (VALUES " + nkParams(3, Iterables.size(cells)) + ") t(row_name, col_name, ts) " +
-                "  WHERE m.row_name = t.row_name " +
-                "    AND m.col_name = t.col_name " +
-                "    AND m.ts < t.ts " +
-                " GROUP BY m.row_name, m.col_name ";
+        String query = " /* GET_LATEST_CELLS_INNER (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, max(m.ts) as ts "
+                + "   FROM " + prefixedTableName() + " m,"
+                + "     (VALUES " + groupOfNumParams(3, Iterables.size(cells)) + ") t(row_name, col_name, ts) "
+                + "  WHERE m.row_name = t.row_name "
+                + "    AND m.col_name = t.col_name "
+                + "    AND m.ts < t.ts "
+                + " GROUP BY m.row_name, m.col_name ";
         query = wrapQueryWithIncludeValue("GET_LATEST_CELLS", query, includeValue);
         return addCellTsArgs(new FullQuery(query), cells);
     }
 
     @Override
     public FullQuery getAllCellQuery(Cell cell, long ts, boolean includeValue) {
-        String query =
-                " /* GET_ALL_CELL (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ") +
-                "   FROM " + prefixedTableName() + " m " +
-                "  WHERE m.row_name = ? " +
-                "    AND m.col_name = ? " +
-                "    AND m.ts < ? ";
+        String query = " /* GET_ALL_CELL (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ")
+                + "   FROM " + prefixedTableName() + " m "
+                + "  WHERE m.row_name = ? "
+                + "    AND m.col_name = ? "
+                + "    AND m.ts < ? ";
         return new FullQuery(query).withArgs(cell.getRowName(), cell.getColumnName(), ts);
     }
 
     @Override
     public FullQuery getAllCellsQuery(Iterable<Cell> cells, long ts, boolean includeValue) {
-        String query =
-                " /* GET_ALL_CELLS (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ") +
-                "   FROM " + prefixedTableName() + " m, (VALUES " + nkParams(2, Iterables.size(cells)) + ") t(row_name, col_name) " +
-                "  WHERE m.row_name = t.row_name " +
-                "    AND m.col_name = t.col_name " +
-                "    AND m.ts < ? ";
+        String query = " /* GET_ALL_CELLS (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ")
+                + "   FROM " + prefixedTableName() + " m,"
+                + "     (VALUES " + groupOfNumParams(2, Iterables.size(cells)) + ") t(row_name, col_name) "
+                + "  WHERE m.row_name = t.row_name "
+                + "    AND m.col_name = t.col_name "
+                + "    AND m.ts < ? ";
         return addCellArgs(new FullQuery(query), cells).withArg(ts);
     }
 
     @Override
     public FullQuery getAllCellsQuery(Collection<Entry<Cell, Long>> cells, boolean includeValue) {
-        String query =
-                " /* GET_ALL_CELLS (" + tableName + ") */ " +
-                " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ") +
-                "   FROM " + prefixedTableName() + " m, (VALUES " + nkParams(3, Iterables.size(cells)) + ") t(row_name, col_name, ts) " +
-                "  WHERE m.row_name = t.row_name " +
-                "    AND m.col_name = t.col_name " +
-                "    AND m.ts < t.ts ";
+        String query = " /* GET_ALL_CELLS (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, m.ts" + (includeValue ? ", m.val " : " ")
+                + "   FROM " + prefixedTableName() + " m,"
+                + "     (VALUES " + groupOfNumParams(3, Iterables.size(cells)) + ") t(row_name, col_name, ts) "
+                + "  WHERE m.row_name = t.row_name "
+                + "    AND m.col_name = t.col_name "
+                + "    AND m.ts < t.ts ";
         return addCellTsArgs(new FullQuery(query), cells);
     }
 
@@ -238,12 +233,12 @@ public FullQuery getRangeQuery(RangeRequest range, long ts, int maxRows) {
             bounds.add(range.isReverse() ? "m.row_name > ?" : "m.row_name < ?");
             args.add(end);
         }
-        String query =
-                " /* GET_RANGE_ROWS (" + tableName + ") */ " +
-                " SELECT DISTINCT m.row_name " +
-                " FROM " + prefixedTableName() + " m " +
-                (bounds.isEmpty() ? "" : " WHERE  " + Joiner.on(" AND ").join(bounds)) +
-                " ORDER BY m.row_name " + (range.isReverse() ? "DESC" : "ASC") + " LIMIT " + maxRows;
+        String query = " /* GET_RANGE_ROWS (" + tableName + ") */ "
+                + " SELECT DISTINCT m.row_name "
+                + " FROM " + prefixedTableName() + " m "
+                + (bounds.isEmpty() ? "" : " WHERE  " + Joiner.on(" AND ").join(bounds))
+                + " ORDER BY m.row_name " + (range.isReverse() ? "DESC" : "ASC")
+                + " LIMIT " + maxRows;
         return new FullQuery(query).withArgs(args);
     }
 
@@ -257,14 +252,14 @@ public Collection<FullQuery> getOverflowQueries(Collection<OverflowValue> overfl
         throw new IllegalStateException("postgres tables don't have overflow fields");
     }
 
-    private String nParams(int numParams) {
-        StringBuilder builder = new StringBuilder(2*numParams + 1).append('(');
+    private String numParams(int numParams) {
+        StringBuilder builder = new StringBuilder(2 * numParams + 1).append('(');
         Joiner.on(',').appendTo(builder, Iterables.limit(Iterables.cycle('?'), numParams));
         return builder.append(')').toString();
     }
 
-    private String nkParams(int numParams, int numEntries) {
-        String params = nParams(numParams);
+    private String groupOfNumParams(int numParams, int numEntries) {
+        String params = numParams(numParams);
         return Joiner.on(',').join(Iterables.limit(Iterables.cycle(params.toString()), numEntries));
     }
 
@@ -272,12 +267,12 @@ private String wrapQueryWithIncludeValue(String wrappedName, String query, boole
         if (!includeValue) {
             return query;
         }
-        return " /* " + wrappedName + " (" + tableName + ") */ " +
-                " SELECT wrap.row_name, wrap.col_name, wrap.ts, wrap.val " +
-                " FROM " + prefixedTableName() + " wrap, ( " + query + " ) i " +
-                " WHERE wrap.row_name = i.row_name " +
-                "   AND wrap.col_name = i.col_name " +
-                "   AND wrap.ts = i.ts ";
+        return " /* " + wrappedName + " (" + tableName + ") */ "
+                + " SELECT wrap.row_name, wrap.col_name, wrap.ts, wrap.val "
+                + " FROM " + prefixedTableName() + " wrap, ( " + query + " ) i "
+                + " WHERE wrap.row_name = i.row_name "
+                + "   AND wrap.col_name = i.col_name "
+                + "   AND wrap.ts = i.ts ";
     }
 
     private FullQuery addRowTsArgs(FullQuery fullQuery, Iterable<Entry<byte[], Long>> rows) {
@@ -305,4 +300,45 @@ private FullQuery addCellTsArgs(FullQuery fullQuery, Collection<Entry<Cell, Long
     private String prefixedTableName() {
         return config.tablePrefix() + tableName;
     }
+
+    @Override
+    public FullQuery getRowsColumnRangeQuery(List<byte[]> rows, long ts, ColumnRangeSelection columnRangeSelection) {
+        List<String> subQueries = Lists.newArrayListWithCapacity(rows.size());
+        int argsPerRow = 2
+                + ((columnRangeSelection.getStartCol().length > 0) ? 1 : 0)
+                + ((columnRangeSelection.getEndCol().length > 0) ? 1 : 0);
+        List<Object> args = Lists.newArrayListWithCapacity(rows.size() * argsPerRow);
+        for (byte[] row : rows) {
+            FullQuery query = getRowsColumnRangeSubQuery(row, ts, columnRangeSelection);
+            subQueries.add(query.getQuery());
+            for (Object arg : query.getArgs()) {
+                args.add(arg);
+            }
+        }
+        String query = Joiner.on(") UNION ALL (").appendTo(new StringBuilder("("), subQueries).append(")")
+                .append(" ORDER BY wrap.row_name ASC, wrap.col_name ASC").toString();
+        return new FullQuery(query).withArgs(args);
+    }
+
+    private FullQuery getRowsColumnRangeSubQuery(byte[] row, long ts, ColumnRangeSelection columnRangeSelection) {
+        String query = " /* GET_ROWS_COLUMN_RANGE (" + tableName + ") */ "
+                + " SELECT m.row_name, m.col_name, max(m.ts) as ts"
+                + "   FROM " + prefixedTableName() + " m "
+                + "  WHERE m.row_name = ? "
+                + "    AND m.ts < ? "
+                + (columnRangeSelection.getStartCol().length > 0 ? " AND m.col_name >= ?" : "")
+                + (columnRangeSelection.getEndCol().length > 0 ? " AND m.col_name < ?" : "")
+                + " GROUP BY m.row_name, m.col_name"
+                + " ORDER BY m.col_name ASC LIMIT " + columnRangeSelection.getBatchHint();
+        FullQuery fullQuery = new FullQuery(wrapQueryWithIncludeValue("GET_ROWS_COLUMN_RANGE", query, true))
+                .withArg(row)
+                .withArg(ts);
+        if (columnRangeSelection.getStartCol().length > 0) {
+            fullQuery = fullQuery.withArg(columnRangeSelection.getStartCol());
+        }
+        if (columnRangeSelection.getEndCol().length > 0) {
+            fullQuery = fullQuery.withArg(columnRangeSelection.getEndCol());
+        }
+        return fullQuery;
+    }
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java
index 284d3fa1af1..6aa819d4be5 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/postgres/PostgresTableInitializer.java
@@ -46,16 +46,20 @@ public void createUtilityTables() {
     @Override
     public void createMetadataTable(String metadataTableName) {
         executeIgnoringError(
-                "CREATE TABLE " + metadataTableName + " (" +
-                        "  table_name VARCHAR(2000) NOT NULL," +
-                        "  table_size BIGINT NOT NULL," +
-                        "  value      BYTEA NULL," +
-                        "  CONSTRAINT pk_" + metadataTableName + " PRIMARY KEY (table_name) " +
-                        ")",
+                String.format(
+                        "CREATE TABLE %s ("
+                        + "  table_name VARCHAR(2000) NOT NULL,"
+                        + "  table_size BIGINT NOT NULL,"
+                        + "  value      BYTEA NULL,"
+                        + "  CONSTRAINT pk_%s PRIMARY KEY (table_name) "
+                        + ")",
+                        metadataTableName, metadataTableName),
                 "already exists");
 
         executeIgnoringError(
-                "CREATE UNIQUE INDEX unique_lower_case_" + metadataTableName + "_index ON " + metadataTableName + " (lower(table_name))",
+                String.format(
+                        "CREATE UNIQUE INDEX unique_lower_case_%s_index ON %s (lower(table_name))",
+                        metadataTableName, metadataTableName),
                 "already exists");
     }
 
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java
index 426987fcf08..9b5c7d4a47c 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/ranges/DbKvsGetRanges.java
@@ -33,6 +33,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Ordering;
+import com.google.common.collect.SortedSetMultimap;
 import com.google.common.collect.TreeMultimap;
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
@@ -65,24 +66,27 @@ public class DbKvsGetRanges {
     private static final OperationTimer logTimer = LoggingOperationTimer.create(log);
     private static final byte[] SMALLEST_NAME = Cells.createSmallestCellForRow(new byte[] {0}).getColumnName();
     private static final byte[] LARGEST_NAME = Cells.createLargestCellForRow(new byte[] {0}).getColumnName();
+
     private final DbKvs kvs;
     private final DdlConfig config;
     private final DBType dbType;
     private final Supplier<SqlConnection> connectionSupplier;
 
-    public DbKvsGetRanges(DbKvs kvs,
-                          DdlConfig config,
-                          DBType dbType,
-                          Supplier<SqlConnection> connectionSupplier) {
+    public DbKvsGetRanges(
+            DbKvs kvs,
+            DdlConfig config,
+            DBType dbType,
+            Supplier<SqlConnection> connectionSupplier) {
         this.kvs = kvs;
         this.config = config;
         this.dbType = dbType;
         this.connectionSupplier = connectionSupplier;
     }
 
-    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(final TableReference tableRef,
-                                                                                                           Iterable<RangeRequest> rangeRequests,
-                                                                                                           final long timestamp) {
+    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests,
+            long timestamp) {
         Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> results = Maps.newHashMap();
         for (List<RangeRequest> batch : Iterables.partition(rangeRequests, 500)) {
             results.putAll(getFirstPages(tableRef, batch, timestamp));
@@ -90,9 +94,10 @@ public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>
         return results;
     }
 
-    private Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstPages(TableReference tableRef,
-                                                                                                   List<RangeRequest> requests,
-                                                                                                   long timestamp) {
+    private Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstPages(
+            TableReference tableRef,
+            List<RangeRequest> requests,
+            long timestamp) {
         List<String> subQueries = Lists.newArrayList();
         List<Object> argsList = Lists.newArrayList();
         for (int i = 0; i < requests.size(); i++) {
@@ -120,13 +125,14 @@ private Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>
         }
     }
 
-    private Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstPagesFromDb(TableReference tableRef,
-                                                                                                         List<RangeRequest> requests,
-                                                                                                         long timestamp,
-                                                                                                         final SqlConnection conn,
-                                                                                                         String query,
-                                                                                                         Object[] args) {
-        TreeMultimap<Integer, byte[]> rowsForBatches = getRowsForBatches(conn, query, args);
+    private Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstPagesFromDb(
+            TableReference tableRef,
+            List<RangeRequest> requests,
+            long timestamp,
+            final SqlConnection conn,
+            String query,
+            Object[] args) {
+        SortedSetMultimap<Integer, byte[]> rowsForBatches = getRowsForBatches(conn, query, args);
         Map<Cell, Value> cells = kvs.getRows(tableRef, rowsForBatches.values(),
                 ColumnSelection.all(), timestamp);
         NavigableMap<byte[], SortedMap<byte[], Value>> cellsByRow = Cells.breakCellsUpByRow(cells);
@@ -134,9 +140,12 @@ private Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>
         return breakUpByBatch(requests, rowsForBatches, cellsByRow);
     }
 
-    private static TreeMultimap<Integer, byte[]> getRowsForBatches(SqlConnection c, String query, Object[] args) {
-        AgnosticResultSet results = c.selectResultSetUnregisteredQuery(query, args);
-        TreeMultimap<Integer, byte[]> ret = TreeMultimap.create(
+    private static SortedSetMultimap<Integer, byte[]> getRowsForBatches(
+            SqlConnection connection,
+            String query,
+            Object[] args) {
+        AgnosticResultSet results = connection.selectResultSetUnregisteredQuery(query, args);
+        SortedSetMultimap<Integer, byte[]> ret = TreeMultimap.create(
                 Ordering.natural(),
                 UnsignedBytes.lexicographicalComparator());
         for (AgnosticResultRow row : results.rows()) {
@@ -150,20 +159,13 @@ private static TreeMultimap<Integer, byte[]> getRowsForBatches(SqlConnection c,
         return ret;
     }
 
-    private Pair<String, List<Object>> getRangeQueryAndArgs(String tableName,
-                                                            byte[] startRow,
-                                                            byte[] endRow,
-                                                            boolean reverse,
-                                                            int numRowsToGet,
-                                                            int queryNum) {
-        if (startRow.length == 0) {
-            if (reverse) {
-                startRow = LARGEST_NAME;
-            } else {
-                startRow = SMALLEST_NAME;
-            }
-        }
-
+    private Pair<String, List<Object>> getRangeQueryAndArgs(
+            String tableName,
+            byte[] startRow,
+            byte[] endRow,
+            boolean reverse,
+            int numRowsToGet,
+            int queryNum) {
         String extraWhere;
         List<Object> args = Lists.newArrayList();
         args.add(queryNum);
@@ -172,7 +174,11 @@ private Pair<String, List<Object>> getRangeQueryAndArgs(String tableName,
         } else {
             extraWhere = " t.row_name >= ? ";
         }
-        args.add(startRow);
+        if (startRow.length > 0) {
+            args.add(startRow);
+        } else {
+            args.add(reverse ? LARGEST_NAME : SMALLEST_NAME);
+        }
 
         if (endRow.length > 0) {
             if (reverse) {
@@ -207,9 +213,10 @@ private Pair<String, List<Object>> getRangeQueryAndArgs(String tableName,
      * This tablehod expects the input to be sorted by rowname ASC for both rowsForBatches and
      * cellsByRow.
      */
-    private Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> breakUpByBatch(List<RangeRequest> requests,
-                                                                                                    TreeMultimap<Integer, byte[]> rowsForBatches,
-                                                                                                    NavigableMap<byte[], SortedMap<byte[], Value>>   cellsByRow) {
+    private Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> breakUpByBatch(
+            List<RangeRequest> requests,
+            SortedSetMultimap<Integer, byte[]> rowsForBatches,
+            NavigableMap<byte[], SortedMap<byte[], Value>>   cellsByRow) {
         Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> ret = Maps.newHashMap();
         for (int i = 0; i < requests.size(); i++) {
             RangeRequest request = requests.get(i);
@@ -220,7 +227,13 @@ private Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>
             SortedMap<byte[], SortedMap<byte[], Value>> cellsForBatch = Maps.filterKeys(
                     request.isReverse() ? cellsByRow.descendingMap() : cellsByRow,
                     Predicates.in(rowNames));
-            validateRowNames(cellsForBatch.keySet(), request.getStartInclusive(), request.getEndExclusive(), request.isReverse());
+
+            validateRowNames(
+                    cellsForBatch.keySet(),
+                    request.getStartInclusive(),
+                    request.getEndExclusive(),
+                    request.isReverse());
+
             IterableView<RowResult<Value>> rows = RowResults.viewOfMap(cellsForBatch);
             if (!request.getColumnNames().isEmpty()) {
                 rows = filterColumnSelection(rows, request);
@@ -250,20 +263,25 @@ private void validateRowNames(Iterable<byte[]> rows, byte[] startInclusive, byte
         for (byte[] row : rows) {
             if (reverse) {
                 AssertUtils.assertAndLog(startInclusive.length == 0
-                        || UnsignedBytes.lexicographicalComparator().compare(startInclusive, row) >= 0, "row was out of range");
+                        || UnsignedBytes.lexicographicalComparator().compare(startInclusive, row) >= 0,
+                        "row was out of range");
                 AssertUtils.assertAndLog(endExclusive.length == 0
-                        || UnsignedBytes.lexicographicalComparator().compare(row, endExclusive) > 0, "row was out of range");
+                        || UnsignedBytes.lexicographicalComparator().compare(row, endExclusive) > 0,
+                        "row was out of range");
             } else {
                 AssertUtils.assertAndLog(startInclusive.length == 0
-                        || UnsignedBytes.lexicographicalComparator().compare(startInclusive, row) <= 0, "row was out of range");
+                        || UnsignedBytes.lexicographicalComparator().compare(startInclusive, row) <= 0,
+                        "row was out of range");
                 AssertUtils.assertAndLog(endExclusive.length == 0
-                        || UnsignedBytes.lexicographicalComparator().compare(row, endExclusive) < 0, "row was out of range");
+                        || UnsignedBytes.lexicographicalComparator().compare(row, endExclusive) < 0,
+                        "row was out of range");
             }
         }
     }
 
-    private IterableView<RowResult<Value>> filterColumnSelection(IterableView<RowResult<Value>> rows,
-                                                                 final RangeRequest request) {
+    private IterableView<RowResult<Value>> filterColumnSelection(
+            IterableView<RowResult<Value>> rows,
+            RangeRequest request) {
         return rows.transform(RowResults.<Value>createFilterColumns(new Predicate<byte[]>() {
             @Override
             public boolean apply(byte[] col) {
@@ -283,7 +301,11 @@ private static void closeSql(SqlConnection conn) {
         }
     }
 
-    private String getSimpleRowSelectOneQueryPostgres(String tableName, String minMax, String extraWhere, String order) {
+    private String getSimpleRowSelectOneQueryPostgres(
+            String tableName,
+            String minMax,
+            String extraWhere,
+            String order) {
         return String.format(
                 SIMPLE_ROW_SELECT_ONE_POSTGRES_TEMPLATE,
                 tableName,
@@ -293,10 +315,11 @@ private String getSimpleRowSelectOneQueryPostgres(String tableName, String minMa
                 order);
     }
 
-    private String getSimpleRowSelectOneQueryOracle(String tableName,
-                                                    String minMax,
-                                                    String extraWhere,
-                                                    String order) {
+    private String getSimpleRowSelectOneQueryOracle(
+            String tableName,
+            String minMax,
+            String extraWhere,
+            String order) {
         return String.format(
                 SIMPLE_ROW_SELECT_ONE_ORACLE_TEMPLATE,
                 tableName,
@@ -311,25 +334,25 @@ private String prefixTableName(String tableName) {
     }
 
     private static final String SIMPLE_ROW_SELECT_TEMPLATE =
-            " /* SIMPLE_ROW_SELECT_TEMPLATE (%s) */ " +
-                    " SELECT /*+ INDEX(t pk_%s) */ " +
-                    "   DISTINCT row_name, ? as batch_num " +
-                    " FROM %s t " +
-                    " WHERE %s " +
-                    " ORDER BY row_name %s ";
+            " /* SIMPLE_ROW_SELECT_TEMPLATE (%s) */ "
+            + " SELECT /*+ INDEX(t pk_%s) */ "
+            + "   DISTINCT row_name, ? as batch_num "
+            + " FROM %s t "
+            + " WHERE %s "
+            + " ORDER BY row_name %s ";
 
     private static final String SIMPLE_ROW_SELECT_ONE_POSTGRES_TEMPLATE =
-            " /* SIMPLE_ROW_SELECT_ONE_TEMPLATE_PSQL (%s) */ " +
-                    " SELECT /*+ INDEX(t pk_%s) */ " +
-                    "   DISTINCT row_name, ? as batch_num " +
-                    " FROM %s t " +
-                    " WHERE %s " +
-                    " ORDER BY row_name %s LIMIT 1";
+            " /* SIMPLE_ROW_SELECT_ONE_TEMPLATE_PSQL (%s) */ "
+            + " SELECT /*+ INDEX(t pk_%s) */ "
+            + "   DISTINCT row_name, ? as batch_num "
+            + " FROM %s t "
+            + " WHERE %s "
+            + " ORDER BY row_name %s LIMIT 1";
 
     private static final String SIMPLE_ROW_SELECT_ONE_ORACLE_TEMPLATE =
-            " /* SIMPLE_ROW_SELECT_ONE_TEMPLATE_ORA (%s) */ " +
-                    " SELECT /*+ INDEX(t pk_%s) */ " +
-                    "   %s(row_name) as row_name, ? as batch_num " +
-                    " FROM %s t " +
-                    " WHERE %s";
+            " /* SIMPLE_ROW_SELECT_ONE_TEMPLATE_ORA (%s) */ "
+            + " SELECT /*+ INDEX(t pk_%s) */ "
+            + "   %s(row_name) as row_name, ? as batch_num "
+            + " FROM %s t "
+            + " WHERE %s";
 }
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java
index d1a4b94e3eb..1e61ab42b16 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/ConnectionDbTypes.java
@@ -24,11 +24,14 @@
 
 import com.palantir.nexus.db.DBType;
 
-public class ConnectionDbTypes {
-
+public final class ConnectionDbTypes {
     private static final Logger log = LoggerFactory.getLogger(ConnectionDbTypes.class);
 
-    public static DBType getDBType(Connection conn) {
+    private ConnectionDbTypes() {
+        // Utility class
+    }
+
+    public static DBType getDbType(Connection conn) {
         try {
             DatabaseMetaData metaData = conn.getMetaData();
             String driverName = metaData.getDriverName().toLowerCase();
diff --git a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java
index 0b1caded7da..af2aa56a18c 100644
--- a/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java
+++ b/atlasdb-dbkvs/src/main/java/com/palantir/atlasdb/keyvalue/dbkvs/timestamp/InDbTimestampBoundStore.java
@@ -43,7 +43,7 @@
 
 // TODO: switch to using ptdatabase sql running, which more gracefully
 // supports multiple db types.
-public final class InDbTimestampBoundStore implements TimestampBoundStore {
+public class InDbTimestampBoundStore implements TimestampBoundStore {
     private static final Logger log = LoggerFactory.getLogger(InDbTimestampBoundStore.class);
 
     private final ConnectionManager connManager;
@@ -64,8 +64,8 @@ public static InDbTimestampBoundStore create(ConnectionManager connManager, Tabl
     }
 
     public InDbTimestampBoundStore(ConnectionManager connManager, TableReference timestampTable) {
-        this.connManager = Preconditions.checkNotNull(connManager);
-        this.timestampTable = Preconditions.checkNotNull(timestampTable);
+        this.connManager = Preconditions.checkNotNull(connManager, "connectionManager is required");
+        this.timestampTable = Preconditions.checkNotNull(timestampTable, "timestampTable is required");
     }
 
     private void init() {
@@ -77,14 +77,14 @@ private void init() {
     }
 
     private interface Operation {
-        long run(Connection c, @Nullable Long oldLimit) throws SQLException;
+        long run(Connection connection, @Nullable Long oldLimit) throws SQLException;
     }
 
-    private long runOperation(final Operation o) {
+    private long runOperation(final Operation operation) {
         TransactionResult<Long> result = RetriableTransactions.run(connManager, new RetriableWriteTransaction<Long>() {
             @Override
-            public Long run(Connection c) throws SQLException {
-                Long oldLimit = readLimit(c);
+            public Long run(Connection connection) throws SQLException {
+                Long oldLimit = readLimit(connection);
                 if (currentLimit != null) {
                     if (oldLimit != null) {
                         if (currentLimit.equals(oldLimit)) {
@@ -92,44 +92,44 @@ public Long run(Connection c) throws SQLException {
                         } else {
                             // mismatch
                             throw new MultipleRunningTimestampServiceError(
-                                    "Timestamp limit changed underneath us (limit in memory: " + currentLimit +
-                                    ", limit in DB: " + oldLimit + "). This may indicate that " +
-                                    "another timestamp service is running against this database!  " +
-                                    "If you get this error check that your client.prefs in dispatch " +
-                                    "is configured correctly."
-                                    );
+                                    "Timestamp limit changed underneath us (limit in memory: " + currentLimit
+                                    + ", limit in DB: " + oldLimit + "). This may indicate that "
+                                    + "another timestamp service is running against this database!  "
+                                    + "If you get this error check that your client.prefs in dispatch "
+                                    + "is configured correctly.");
                         }
                     } else {
                         // disappearance
                         throw new IllegalStateException(
-                                "Unable to retrieve a timestamp when expected. " +
-                                        "You probably reseeded the database while the timestamp server was running. " +
-                                        "This deloyment is in a dangerous state and you should take down " +
-                                        "everything (all servers) and reseed the database again."
-                                );
+                                "Unable to retrieve a timestamp when expected. "
+                                + "You probably reseeded the database while the timestamp server was running. "
+                                + "This deloyment is in a dangerous state and you should take down "
+                                + "everything (all servers) and reseed the database again.");
                     }
                 } else {
                     // first read, no check to be done
                 }
-                return o.run(c, oldLimit);
+                return operation.run(connection, oldLimit);
             }
         });
         switch (result.getStatus()) {
-        case SUCCESSFUL:
-            currentLimit = result.getResultValue();
-            return currentLimit;
-        case UNKNOWN:
-            // Since the DB's state is unknown, the in-memory state can't be confirmed, so get rid of it.
-            currentLimit = null;
-            // Fall through to failure case, where exceptions are handled.
-        case FAILED:
-            Throwable error = result.getError();
-            if (error instanceof SQLException) {
-                throw PalantirSqlException.create((SQLException) error);
-            }
-            throw Throwables.rewrapAndThrowUncheckedException(error);
-        default:
-            throw new IllegalStateException("Unrecognized transaction status " + result.getStatus());
+            case SUCCESSFUL:
+                currentLimit = result.getResultValue();
+                return currentLimit;
+            case UNKNOWN:
+            case FAILED:
+                if (result.getStatus() == RetriableTransactions.TransactionStatus.UNKNOWN) {
+                    // Since the DB's state is unknown, the in-memory state can't be confirmed, so get rid of it.
+                    currentLimit = null;
+                }
+
+                Throwable error = result.getError();
+                if (error instanceof SQLException) {
+                    throw PalantirSqlException.create((SQLException) error);
+                }
+                throw Throwables.rewrapAndThrowUncheckedException(error);
+            default:
+                throw new IllegalStateException("Unrecognized transaction status " + result.getStatus());
         }
     }
 
@@ -137,13 +137,13 @@ public Long run(Connection c) throws SQLException {
     public synchronized long getUpperLimit() {
         return runOperation(new Operation() {
             @Override
-            public long run(Connection c, Long oldLimit) throws SQLException {
+            public long run(Connection connection, Long oldLimit) throws SQLException {
                 if (oldLimit != null) {
                     return oldLimit;
                 }
 
                 final long startVal = 10000;
-                createLimit(c, startVal);
+                createLimit(connection, startVal);
                 return startVal;
             }
         });
@@ -153,11 +153,11 @@ public long run(Connection c, Long oldLimit) throws SQLException {
     public synchronized void storeUpperLimit(final long limit) {
         runOperation(new Operation() {
             @Override
-            public long run(Connection c, Long oldLimit) throws SQLException {
+            public long run(Connection connection, Long oldLimit) throws SQLException {
                 if (oldLimit != null) {
-                    writeLimit(c, limit);
+                    writeLimit(connection, limit);
                 } else {
-                    createLimit(c, limit);
+                    createLimit(connection, limit);
                 }
 
                 return limit;
@@ -165,10 +165,10 @@ public long run(Connection c, Long oldLimit) throws SQLException {
         });
     }
 
-    private Long readLimit(Connection c) throws SQLException {
+    private Long readLimit(Connection connection) throws SQLException {
         String sql = "SELECT last_allocated FROM " + timestampTable.getQualifiedName() + " FOR UPDATE";
         QueryRunner run = new QueryRunner();
-        return run.query(c, sql, new ResultSetHandler<Long>() {
+        return run.query(connection, sql, new ResultSetHandler<Long>() {
             @Override
             public Long handle(ResultSet rs) throws SQLException {
                 if (rs.next()) {
@@ -180,28 +180,31 @@ public Long handle(ResultSet rs) throws SQLException {
         });
     }
 
-    private void writeLimit(Connection c, long limit) throws SQLException {
+    private void writeLimit(Connection connection, long limit) throws SQLException {
         String updateTs = "UPDATE " + timestampTable.getQualifiedName() + " SET last_allocated = ?";
-        try (PreparedStatement statement = c.prepareStatement(updateTs)) {
+        try (PreparedStatement statement = connection.prepareStatement(updateTs)) {
             statement.setLong(1, limit);
             statement.executeUpdate();
         }
     }
 
-    private void createLimit(Connection c, long limit) throws SQLException {
+    private void createLimit(Connection connection, long limit) throws SQLException {
         QueryRunner run = new QueryRunner();
-        run.update(c, "INSERT INTO " + timestampTable.getQualifiedName() + " (last_allocated) VALUES (?)", limit);
+        run.update(connection,
+                String.format("INSERT INTO %s (last_allocated) VALUES (?)", timestampTable.getQualifiedName()),
+                limit);
     }
 
-    private void createTimestampTable(Connection c) throws SQLException {
-        try (Statement statement = c.createStatement()) {
-            statement.execute("CREATE TABLE IF NOT EXISTS " + timestampTable.getQualifiedName() + " ( last_allocated int8 NOT NULL )");
+    private void createTimestampTable(Connection connection) throws SQLException {
+        try (Statement statement = connection.createStatement()) {
+            statement.execute(String.format("CREATE TABLE IF NOT EXISTS %s ( last_allocated int8 NOT NULL )",
+                    timestampTable.getQualifiedName()));
         }
     }
 
-    private DBType getDbType(Connection c) {
+    private DBType getDbType(Connection connection) {
         if (dbType == null) {
-            dbType = ConnectionDbTypes.getDBType(c);
+            dbType = ConnectionDbTypes.getDbType(connection);
         }
         return dbType;
     }
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/LazyClosableIteratorTest.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/LazyClosableIteratorTest.java
index 6d2ba1ddff7..b767a85722a 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/LazyClosableIteratorTest.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/LazyClosableIteratorTest.java
@@ -18,12 +18,10 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.io.Closeable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Queue;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -78,7 +76,7 @@ public void testInterruptsDontCauseLeaks() throws Exception {
 
         List<String> output = Lists.newArrayList();
         try {
-            while(iter.hasNext()) {
+            while (iter.hasNext()) {
                 output.add(iter.next());
             }
             assertTrue(Thread.interrupted()); // race didn't do the thing this time.
@@ -91,54 +89,42 @@ public void testInterruptsDontCauseLeaks() throws Exception {
         exec.awaitTermination(1, TimeUnit.SECONDS);
         assertEquals(opened, closed);
         assertTrue("output not in allowable state: " + output,
-                output.equals(Lists.newArrayList("0-1", "0-2", "1-1", "1-2")) ||
-                output.equals(Lists.newArrayList("0-1", "0-2")) ||
-                output.isEmpty());
+                output.equals(Lists.newArrayList("0-1", "0-2", "1-1", "1-2"))
+                || output.equals(Lists.newArrayList("0-1", "0-2"))
+                || output.isEmpty());
     }
 
     private FutureClosableIteratorTask<String> createInterruptTask(final Thread curThread,
             final Set<Integer> opened, final Set<Integer> closed) {
-        return new FutureClosableIteratorTask<String>(new Callable<ClosableIterator<String>>() {
-            @Override
-            public ClosableIterator<String> call() {
-                opened.add(-1);
-                curThread.interrupt();
-                try {
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    closed.add(-1);
-                }
-                throw new RuntimeException();
+        return new FutureClosableIteratorTask<>(() -> {
+            opened.add(-1);
+            curThread.interrupt();
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                closed.add(-1);
             }
+            throw new RuntimeException();
         });
     }
 
     private FutureClosableIteratorTask<String> createNewFutureTask(final int num,
             final Set<Integer> opened, final Set<Integer> closed) {
-        return new FutureClosableIteratorTask<String>(new Callable<ClosableIterator<String>>() {
-            @Override
-            public ClosableIterator<String> call() throws Exception {
-                final Iterator<String> iter = Iterators.forArray(num + "-1", num + "-2");
-                opened.add(num);
-                ClosableIterator<String> result = ClosableIterators.wrap(
-                        new AbstractIterator<String>() {
-                            @Override
-                            protected String computeNext() {
-                                if (iter.hasNext()) {
-                                    return iter.next();
-                                } else {
-                                    return endOfData();
-                                }
-                            }
-                        },
-                        new Closeable() {
-                            @Override
-                            public void close() {
-                                closed.add(num);
+        return new FutureClosableIteratorTask<>(() -> {
+            Iterator<String> iter = Iterators.forArray(num + "-1", num + "-2");
+            opened.add(num);
+            return ClosableIterators.wrap(
+                    new AbstractIterator<String>() {
+                        @Override
+                        protected String computeNext() {
+                            if (iter.hasNext()) {
+                                return iter.next();
+                            } else {
+                                return endOfData();
                             }
-                        });
-               return result;
-            }
+                        }
+                    },
+                    () -> closed.add(num));
         });
     }
 }
diff --git a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TestConfigLoading.java b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TestConfigLoading.java
index 29049de3452..4096cb18b95 100644
--- a/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TestConfigLoading.java
+++ b/atlasdb-dbkvs/src/test/java/com/palantir/atlasdb/keyvalue/dbkvs/impl/TestConfigLoading.java
@@ -15,16 +15,82 @@
  */
 package com.palantir.atlasdb.keyvalue.dbkvs.impl;
 
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThat;
+
 import java.io.File;
 import java.io.IOException;
+import java.util.Properties;
 
 import org.junit.Test;
 
+import com.palantir.atlasdb.config.AtlasDbConfig;
 import com.palantir.atlasdb.config.AtlasDbConfigs;
+import com.palantir.atlasdb.keyvalue.dbkvs.DbKeyValueServiceConfig;
+import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+import com.palantir.nexus.db.pool.config.ConnectionConfig;
 
 public class TestConfigLoading {
     @Test
     public void testLoadingConfig() throws IOException {
         AtlasDbConfigs.load(new File(getClass().getClassLoader().getResource("postgresTestConfig.yml").getFile()));
     }
+
+    @Test
+    public void testHikariSocketTimeout() throws IOException {
+        ConnectionConfig connectionConfig = getConnectionConfig();
+        verifyHikariProperty(connectionConfig, "socketTimeout", connectionConfig.getSocketTimeoutSeconds());
+    }
+
+    @Test
+    public void testHikariConnectTimeout() throws IOException {
+        ConnectionConfig connectionConfig = getConnectionConfig();
+        verifyHikariProperty(connectionConfig, "connectTimeout", connectionConfig.getConnectionTimeoutSeconds());
+    }
+
+    @Test
+    public void testHikariConnectionTimeout() throws IOException {
+        // Hikari uses "connectionTimeout" for how long the client will wait for a connection from the pool.
+        // In our parlance, this is checkoutTimeout
+        // Our connectionTimeout is instead translated to "connectTimeout", which is how long a connection
+        // can be open for.
+        ConnectionConfig connectionConfig = getConnectionConfig();
+        assertThat(connectionConfig.getHikariConfig().getConnectionTimeout(),
+                is((long) connectionConfig.getCheckoutTimeout()));
+    }
+
+    @Test
+    public void testHikariLoginTimeout() throws IOException {
+        ConnectionConfig connectionConfig = getConnectionConfig();
+        verifyHikariProperty(connectionConfig, "loginTimeout", connectionConfig.getConnectionTimeoutSeconds());
+    }
+
+    @Test
+    public void testPasswordIsMasked() throws IOException {
+        ConnectionConfig connectionConfig = getConnectionConfig();
+        assertThat(connectionConfig.getDbPassword().unmasked(), equalTo("testpassword"));
+        assertThat(connectionConfig.getHikariProperties().getProperty("password"), equalTo("testpassword"));
+        assertThat(connectionConfig.toString(), not(containsString("testpassword")));
+        assertThat(connectionConfig.toString(), containsString("REDACTED"));
+    }
+
+    private ConnectionConfig getConnectionConfig() throws IOException {
+        AtlasDbConfig config = AtlasDbConfigs.load(
+                new File(getClass().getClassLoader().getResource("postgresTestConfig.yml").getFile()));
+        KeyValueServiceConfig keyValueServiceConfig = config.keyValueService();
+        DbKeyValueServiceConfig dbkvsConfig = (DbKeyValueServiceConfig) keyValueServiceConfig;
+        return dbkvsConfig.connection();
+    }
+
+    private void verifyHikariProperty(ConnectionConfig connectionConfig, String property, int expectedValueSeconds) {
+        Properties hikariProps = connectionConfig.getHikariConfig().getDataSourceProperties();
+
+        assertThat(
+                String.format("Hikari property %s should be populated from connectionConfig", property),
+                Integer.valueOf(hikariProps.getProperty(property)),
+                is(expectedValueSeconds));
+    }
 }
diff --git a/atlasdb-dbkvs/src/test/resources/postgresTestConfig.yml b/atlasdb-dbkvs/src/test/resources/postgresTestConfig.yml
index c11cb5c9515..4d8a12c5f76 100644
--- a/atlasdb-dbkvs/src/test/resources/postgresTestConfig.yml
+++ b/atlasdb-dbkvs/src/test/resources/postgresTestConfig.yml
@@ -9,4 +9,6 @@ atlasdb:
       port: 1000
       dbName: test
       dbLogin: test
-      dbPassword: test
\ No newline at end of file
+      dbPassword: testpassword
+      connectionTimeoutSeconds: 5
+      socketTimeoutSeconds: 30
\ No newline at end of file
diff --git a/atlasdb-dropwizard-bundle/build.gradle b/atlasdb-dropwizard-bundle/build.gradle
new file mode 100644
index 00000000000..65ce8bab18b
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/build.gradle
@@ -0,0 +1,32 @@
+apply from: "../gradle/shared.gradle"
+
+dependencies {
+    compile(project(':atlasdb-cli')) {
+        exclude(module: 'log4j-over-slf4j')
+        exclude(module: 'jcl-over-slf4j')
+        exclude(module: 'json-simple')
+        exclude(module: 'metrics-core')
+        exclude(module: 'logback-core')
+        exclude(module: 'logback-classic')
+        exclude(module: 'joda-time')
+        exclude(module: 'snakeyaml')
+        exclude(module: 'hibernate-validator')
+        exclude(module: 'libthrift')
+        exclude(module: 'commons-cli')
+    }
+    compile project(':atlasdb-config')
+    compile project(':atlasdb-console')
+
+    compile group: 'io.dropwizard', name: 'dropwizard-core', version: libVersions.dropwizard
+
+    testCompile group: 'org.assertj', name: 'assertj-core', version: libVersions.assertj
+    testCompile group: 'org.mockito', name: 'mockito-core', version: libVersions.mockito
+}
+
+configurations.matching({ it.name in ['compile', 'runtime'] }).all {
+    resolutionStrategy {
+        force group: 'com.google.code.findbugs', name: 'jsr305', version: libVersions.jsr305
+        force group: 'org.apache.commons', name: 'commons-lang3', version: libVersions.commons_lang3
+        force group: 'org.slf4j', name: 'slf4j-api', version: libVersions.slf4j
+    }
+}
diff --git a/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/AtlasDbBundle.java b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/AtlasDbBundle.java
new file mode 100644
index 00000000000..2e92770d86a
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/AtlasDbBundle.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.dropwizard;
+
+import io.dropwizard.Configuration;
+import io.dropwizard.ConfiguredBundle;
+import io.dropwizard.setup.Bootstrap;
+import io.dropwizard.setup.Environment;
+
+public class AtlasDbBundle<T extends Configuration & AtlasDbConfigurationProvider> implements ConfiguredBundle<T> {
+    @Override
+    public void initialize(Bootstrap<?> bootstrap) {
+        Class<T> configurationClass = (Class<T>) bootstrap.getApplication().getConfigurationClass();
+        bootstrap.addCommand(new AtlasDbConfiguredCommand<T>(configurationClass));
+    }
+
+    @Override
+    public void run(T configuration, Environment environment) throws Exception {
+    }
+}
diff --git a/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/AtlasDbConfigurationProvider.java b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/AtlasDbConfigurationProvider.java
new file mode 100644
index 00000000000..1ba3c0e6feb
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/AtlasDbConfigurationProvider.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.dropwizard;
+
+import com.palantir.atlasdb.config.AtlasDbConfig;
+
+public interface AtlasDbConfigurationProvider {
+    AtlasDbConfig getAtlasDbConfig();
+}
diff --git a/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/AtlasDbConfiguredCommand.java b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/AtlasDbConfiguredCommand.java
new file mode 100644
index 00000000000..f711dc80e37
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/AtlasDbConfiguredCommand.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.dropwizard;
+
+import com.palantir.atlasdb.dropwizard.commands.AtlasDbCliCommand;
+import com.palantir.atlasdb.dropwizard.commands.AtlasDbCommand;
+import com.palantir.atlasdb.dropwizard.commands.AtlasDbConsoleCommand;
+
+import io.dropwizard.Configuration;
+import io.dropwizard.cli.ConfiguredCommand;
+import io.dropwizard.setup.Bootstrap;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+public class AtlasDbConfiguredCommand<T extends Configuration & AtlasDbConfigurationProvider>
+        extends ConfiguredCommand<T> {
+    private static final String COMMAND_NAME_ATTR = "subCommand";
+
+    private final Class<T> configurationClass;
+
+    private final AtlasDbCommand<T> consoleCommand;
+    private final AtlasDbCommand<T> cliCommand;
+
+    protected AtlasDbConfiguredCommand(Class<T> configurationClass) {
+        super("atlasdb", "Run AtlasDB tasks");
+
+        this.configurationClass = configurationClass;
+        this.consoleCommand = new AtlasDbConsoleCommand<>(configurationClass);
+        this.cliCommand = new AtlasDbCliCommand<>(configurationClass);
+    }
+
+    @Override
+    protected Class<T> getConfigurationClass() {
+        return configurationClass;
+    }
+
+    @Override
+    public void configure(Subparser subparser) {
+        Subparser parser = subparser.addSubparsers()
+                .addParser(consoleCommand.getName())
+                .setDefault(COMMAND_NAME_ATTR, consoleCommand.getName())
+                .description(consoleCommand.getDescription());
+        consoleCommand.configure(parser);
+
+        cliCommand.configure(subparser);
+    }
+
+    @Override
+    protected void run(Bootstrap<T> bootstrap, Namespace namespace, T configuration) throws Exception {
+        if (consoleCommand.getName().equals(namespace.getString(COMMAND_NAME_ATTR))) {
+            consoleCommand.run(bootstrap, namespace);
+        } else {
+            cliCommand.run(bootstrap, namespace);
+        }
+    }
+}
diff --git a/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCliCommand.java b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCliCommand.java
new file mode 100644
index 00000000000..5e6139345b5
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCliCommand.java
@@ -0,0 +1,188 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.dropwizard.commands;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.stream.Collectors;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
+import com.palantir.atlasdb.cli.AtlasCli;
+import com.palantir.atlasdb.config.AtlasDbConfig;
+import com.palantir.atlasdb.dropwizard.AtlasDbConfigurationProvider;
+
+import io.airlift.airline.Cli;
+import io.airlift.airline.OptionType;
+import io.airlift.airline.model.CommandGroupMetadata;
+import io.airlift.airline.model.CommandMetadata;
+import io.airlift.airline.model.OptionMetadata;
+import io.dropwizard.Configuration;
+import io.dropwizard.setup.Bootstrap;
+import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.Argument;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+public class AtlasDbCliCommand<T extends Configuration & AtlasDbConfigurationProvider> extends AtlasDbCommand<T> {
+    private static final String COMMAND_NAME_ATTR = "airlineSubCommand";
+    private static final Cli<Callable> CLI = AtlasCli.buildCli();
+
+    public AtlasDbCliCommand(Class<T> configurationClass) {
+        super(CLI.getMetadata().getName(), CLI.getMetadata().getDescription(), configurationClass);
+    }
+
+    @Override
+    public void configure(Subparser subparser) {
+        for (CommandMetadata subCommand : CLI.getMetadata().getDefaultGroupCommands()) {
+            addCommandToParser(subparser, subCommand, ImmutableList.of());
+        }
+
+        for (CommandGroupMetadata commandGroup : CLI.getMetadata().getCommandGroups()) {
+            Subparser parser = subparser.addSubparsers()
+                    .addParser(commandGroup.getName())
+                    .description(commandGroup.getDescription());
+            for (CommandMetadata subCommand : commandGroup.getCommands()) {
+                addCommandToParser(parser, subCommand, ImmutableList.of(commandGroup.getName()));
+            }
+        }
+    }
+
+    private void addCommandToParser(Subparser subparser, CommandMetadata subCommand, List<String> commandRoot) {
+        Subparser parser = subparser.addSubparsers()
+                .addParser(subCommand.getName())
+                .description(subCommand.getDescription())
+                .setDefault(COMMAND_NAME_ATTR, ImmutableList.builder()
+                        .addAll(commandRoot)
+                        .add(subCommand.getName())
+                        .build());
+
+        for (OptionMetadata option : Iterables.concat(subCommand.getCommandOptions(), subCommand.getGroupOptions())) {
+            addOptionToParser(parser, option);
+        }
+
+        super.configure(parser);
+    }
+
+    @VisibleForTesting
+    static void addOptionToParser(Subparser parser, OptionMetadata option) {
+        if (option.isHidden()) {
+            return;
+        }
+
+        List<String> sortedOptions = option.getOptions().stream()
+                .sorted((first, second) -> Integer.compareUnsigned(first.length(), second.length()))
+                .collect(Collectors.toList());
+
+        String longOption = Iterables.getLast(sortedOptions);
+
+        Argument arg = parser.addArgument(sortedOptions.toArray(new String[] {}))
+                .required(option.isRequired())
+                .help(option.getDescription())
+                .dest(longOption);
+
+        if (option.getArity() == 0) {
+            arg.action(Arguments.storeConst());
+            arg.setConst(AtlasDbCommandUtils.ZERO_ARITY_ARG_CONSTANT);
+        } else {
+            arg.nargs(option.getArity());
+        }
+    }
+
+    @Override
+    protected void run(Bootstrap<T> bootstrap, Namespace namespace, T configuration) throws Exception {
+        AtlasDbConfig cliConfiguration = AtlasDbCommandUtils.convertServerConfigToClientConfig(
+                configuration.getAtlasDbConfig());
+
+        Map<String, OptionType> optionTypes = getCliOptionTypes();
+
+        Map<String, Object> globalAttrs = Maps.filterKeys(namespace.getAttrs(),
+                key -> optionTypes.get(key) == OptionType.GLOBAL);
+        Map<String, Object> groupAttrs = Maps.filterKeys(namespace.getAttrs(),
+                key -> optionTypes.get(key) == OptionType.GROUP);
+        Map<String, Object> commandAttrs = Maps.filterKeys(namespace.getAttrs(),
+                key -> optionTypes.get(key) == OptionType.COMMAND);
+
+        Iterable<String> groups = Iterables.limit(namespace.getList(COMMAND_NAME_ATTR), 1);
+        Iterable<String> commands = Iterables.skip(namespace.getList(COMMAND_NAME_ATTR), 1);
+
+        List<String> offlineArg =
+                Objects.equals(namespace.getString("runCliOffline"), AtlasDbCommandUtils.ZERO_ARITY_ARG_CONSTANT)
+                        ? ImmutableList.of("--offline")
+                        : ImmutableList.of();
+
+        List<String> allArgs = ImmutableList.<String>builder()
+                .addAll(offlineArg)
+                .add("--inline-config")
+                .add(AtlasDbCommandUtils.serialiseConfiguration(cliConfiguration))
+                .addAll(AtlasDbCommandUtils.gatherPassedInArguments(globalAttrs))
+                .addAll(groups)
+                .addAll(AtlasDbCommandUtils.gatherPassedInArguments(groupAttrs))
+                .addAll(commands)
+                .addAll(AtlasDbCommandUtils.gatherPassedInArguments(commandAttrs))
+                .build();
+
+        CLI.parse(allArgs).call();
+    }
+
+    private static Map<String, OptionType> getCliOptionTypes() {
+        Map<String, OptionType> optionTypes = new HashMap<>();
+
+        for (CommandMetadata subCommand : CLI.getMetadata().getDefaultGroupCommands()) {
+            optionTypes.putAll(getOptionTypesForCommandMetadata(subCommand));
+        }
+
+        for (CommandGroupMetadata commandGroup : CLI.getMetadata().getCommandGroups()) {
+            for (CommandMetadata subCommand : commandGroup.getCommands()) {
+                optionTypes.putAll(getOptionTypesForCommandMetadata(subCommand));
+            }
+        }
+
+        return ImmutableMap.copyOf(optionTypes);
+    }
+
+    @VisibleForTesting
+    static Map<String, OptionType> getOptionTypesForCommandMetadata(CommandMetadata subCommand) {
+        Map<String, OptionType> optionTypes = new HashMap<>();
+        List<OptionMetadata> commandOptions = ImmutableList.<OptionMetadata>builder()
+                .addAll(subCommand.getCommandOptions())
+                .addAll(subCommand.getGroupOptions())
+                .addAll(subCommand.getGlobalOptions())
+                .build();
+
+        for (OptionMetadata option : commandOptions) {
+            if (option.isHidden()) {
+                continue;
+            }
+
+            List<String> sortedOptions = option.getOptions().stream()
+                    .sorted((first, second) -> Integer.compareUnsigned(first.length(), second.length()))
+                    .collect(Collectors.toList());
+
+            String longOption = Iterables.getLast(sortedOptions);
+
+            optionTypes.put(longOption, option.getOptionType());
+        }
+
+        return ImmutableMap.copyOf(optionTypes);
+    }
+}
diff --git a/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCommand.java b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCommand.java
new file mode 100644
index 00000000000..5ed6e1ca0f3
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCommand.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.dropwizard.commands;
+
+import com.palantir.atlasdb.dropwizard.AtlasDbConfigurationProvider;
+
+import io.dropwizard.Configuration;
+import io.dropwizard.cli.ConfiguredCommand;
+import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+public abstract class AtlasDbCommand<T extends Configuration & AtlasDbConfigurationProvider>
+        extends ConfiguredCommand<T> {
+    private final Class<T> configurationClass;
+
+    protected AtlasDbCommand(String name, String description, Class<T> configurationClass) {
+        super(name, description);
+
+        this.configurationClass = configurationClass;
+    }
+
+    @Override
+    protected Class<T> getConfigurationClass() {
+        return configurationClass;
+    }
+
+    @Override
+    public void configure(Subparser subparser) {
+        super.configure(subparser);
+
+        subparser.addArgument("--offline")
+                .help("run this cli offline")
+                .dest("runCliOffline")
+                .required(false)
+                .action(Arguments.storeConst())
+                .setConst(AtlasDbCommandUtils.ZERO_ARITY_ARG_CONSTANT);
+    }
+}
diff --git a/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCommandUtils.java b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCommandUtils.java
new file mode 100644
index 00000000000..bb85f97afef
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCommandUtils.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.palantir.atlasdb.dropwizard.commands;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
+import com.fasterxml.jackson.datatype.guava.GuavaModule;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.palantir.atlasdb.config.AtlasDbConfig;
+import com.palantir.atlasdb.config.ImmutableAtlasDbConfig;
+import com.palantir.atlasdb.config.ImmutableServerListConfig;
+import com.palantir.atlasdb.config.ServerListConfig;
+
+public final class AtlasDbCommandUtils {
+    public static final Object ZERO_ARITY_ARG_CONSTANT = "<ZERO ARITY ARG CONSTANT>";
+    private static final ObjectMapper OBJECT_MAPPER;
+
+    static {
+        YAMLFactory yamlFactory = new YAMLFactory();
+        yamlFactory.configure(YAMLGenerator.Feature.USE_NATIVE_TYPE_ID, false);
+        OBJECT_MAPPER = new ObjectMapper(yamlFactory);
+        OBJECT_MAPPER.registerModule(new GuavaModule());
+    }
+
+    private AtlasDbCommandUtils() {
+        // Static utility class
+    }
+
+    public static AtlasDbConfig convertServerConfigToClientConfig(AtlasDbConfig serverConfig) {
+        Preconditions.checkArgument(serverConfig.leader().isPresent(),
+                "Only server configurations with a leader block can be converted to client configurations");
+
+        ServerListConfig leaders = ImmutableServerListConfig.builder()
+                .servers(serverConfig.leader().get().leaders())
+                .build();
+
+        return ImmutableAtlasDbConfig.builder()
+                .from(serverConfig)
+                .leader(Optional.absent())
+                .lock(leaders)
+                .timestamp(leaders)
+                .build();
+    }
+
+    public static List<String> gatherPassedInArguments(Map<String, Object> allArgs) {
+        return allArgs.entrySet().stream()
+                .filter(entry -> entry.getKey().startsWith("--"))
+                .filter(entry -> entry.getValue() != null)
+                .flatMap(entry -> {
+                    if (entry.getValue() instanceof List) {
+                        return Stream.concat(Stream.of(entry.getKey()), ((List<String>) entry.getValue()).stream());
+                    } else if (entry.getValue().equals(ZERO_ARITY_ARG_CONSTANT)) {
+                        return Stream.of(entry.getKey());
+                    } else {
+                        return Stream.of(entry.getKey(), (String) entry.getValue());
+                    }
+                })
+                .collect(Collectors.toList());
+    }
+
+    public static String serialiseConfiguration(AtlasDbConfig cliConfiguration) throws JsonProcessingException {
+        return OBJECT_MAPPER.writeValueAsString(cliConfiguration);
+    }
+}
diff --git a/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbConsoleCommand.java b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbConsoleCommand.java
new file mode 100644
index 00000000000..51ee3544bab
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/src/main/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbConsoleCommand.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.dropwizard.commands;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.commons.cli.Option;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.config.AtlasDbConfig;
+import com.palantir.atlasdb.config.ImmutableAtlasDbConfig;
+import com.palantir.atlasdb.console.AtlasConsoleMain;
+import com.palantir.atlasdb.dropwizard.AtlasDbConfigurationProvider;
+
+import io.dropwizard.Configuration;
+import io.dropwizard.setup.Bootstrap;
+import net.sourceforge.argparse4j.inf.Argument;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+public class AtlasDbConsoleCommand<T extends Configuration & AtlasDbConfigurationProvider> extends AtlasDbCommand<T> {
+    public AtlasDbConsoleCommand(Class<T> configurationClass) {
+        super("console", "Open an AtlasDB console", configurationClass);
+    }
+
+    @Override
+    public void configure(Subparser subparser) {
+        for (Option option : (Collection<Option>) AtlasConsoleMain.OPTIONS.getOptions()) {
+            int numArgs = option.getArgs();
+            if (option.getOpt().equals("h")) {
+                continue;
+            }
+            Argument arg = subparser.addArgument("-" + option.getOpt(), "--" + option.getLongOpt())
+                    .required(option.isRequired())
+                    .help(option.getDescription())
+                    .dest("--" + option.getLongOpt());
+            if (numArgs == Option.UNLIMITED_VALUES) {
+                arg.nargs("+");
+            } else if (numArgs != Option.UNINITIALIZED) {
+                arg.nargs(numArgs);
+            }
+        }
+
+        super.configure(subparser);
+    }
+
+    @Override
+    protected void run(Bootstrap<T> bootstrap, Namespace namespace, T configuration) throws JsonProcessingException {
+        AtlasDbConfig cliConfiguration = AtlasDbCommandUtils.convertServerConfigToClientConfig(
+                configuration.getAtlasDbConfig());
+
+        // We do this here because there's no flag to connect to an offline
+        // cluster in atlasdb-console (since this is passed in through bind)
+        if (namespace.getAttrs().containsKey("runCliOffline")) {
+            cliConfiguration = ImmutableAtlasDbConfig.builder()
+                    .from(cliConfiguration)
+                    .leader(Optional.absent())
+                    .lock(Optional.absent())
+                    .timestamp(Optional.absent())
+                    .build();
+        }
+
+        List<String> allArgs = ImmutableList.<String>builder()
+                .add("--bind")
+                .add("dropwizardAtlasDb")
+                .add(AtlasDbCommandUtils.serialiseConfiguration(cliConfiguration))
+                .add("--evaluate")
+                .add("connectInline dropwizardAtlasDb")
+                .addAll(AtlasDbCommandUtils.gatherPassedInArguments(namespace.getAttrs()))
+                .build();
+
+        AtlasConsoleMain.main(allArgs.toArray(new String[] {}));
+    }
+}
diff --git a/atlasdb-dropwizard-bundle/src/test/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCliCommandTest.java b/atlasdb-dropwizard-bundle/src/test/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCliCommandTest.java
new file mode 100644
index 00000000000..d0bf94061bc
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/src/test/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCliCommandTest.java
@@ -0,0 +1,239 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.dropwizard.commands;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+import io.airlift.airline.OptionType;
+import io.airlift.airline.model.ArgumentsMetadata;
+import io.airlift.airline.model.CommandMetadata;
+import io.airlift.airline.model.OptionMetadata;
+import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.Argument;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+public class AtlasDbCliCommandTest {
+    private static final String GLOBAL_OPTION_LONG_NAME = "--global";
+    private static final String GLOBAL_OPTION_SHORT_NAME = "-g";
+    private static final OptionMetadata GLOBAL_OPTION =
+            createOption(OptionType.GLOBAL, ImmutableSet.of(GLOBAL_OPTION_SHORT_NAME, GLOBAL_OPTION_LONG_NAME));
+
+    private static final String GROUP_OPTION_NAME = "--group";
+    private static final OptionMetadata GROUP_OPTION =
+            createOption(OptionType.GROUP, ImmutableSet.of(GROUP_OPTION_NAME));
+
+    private static final String COMMAND_OPTION_NAME = "--command";
+    private static final OptionMetadata COMMAND_OPTION =
+            createOption(OptionType.COMMAND, ImmutableSet.of(COMMAND_OPTION_NAME));
+
+    // This is only used for passing in a valid field when creating an option
+    @SuppressWarnings("unused")
+    private String optionField;
+
+    @Test
+    public void commandOptionMapsToCommandType() {
+        Map<String, OptionType> expectedOptionsToCommandType = ImmutableMap.of(COMMAND_OPTION_NAME, OptionType.COMMAND);
+        Map<String, OptionType> actualOptionsToCommandType = AtlasDbCliCommand.getOptionTypesForCommandMetadata(
+                createCommand(ImmutableSet.of(), ImmutableSet.of(), ImmutableSet.of(COMMAND_OPTION)));
+
+        assertThat(actualOptionsToCommandType).isEqualTo(expectedOptionsToCommandType);
+    }
+
+    @Test
+    public void groupOptionMapsToGroupType() {
+        Map<String, OptionType> expectedOptionsToCommandType = ImmutableMap.of(GROUP_OPTION_NAME, OptionType.GROUP);
+        Map<String, OptionType> actualOptionsToCommandType = AtlasDbCliCommand.getOptionTypesForCommandMetadata(
+                createCommand(ImmutableSet.of(), ImmutableSet.of(GROUP_OPTION), ImmutableSet.of()));
+
+        assertThat(actualOptionsToCommandType).isEqualTo(expectedOptionsToCommandType);
+    }
+
+    @Test
+    public void globalOptionMapsToGlobalType() {
+        Map<String, OptionType> expectedOptionsToCommandType =
+                ImmutableMap.of(GLOBAL_OPTION_LONG_NAME, OptionType.GLOBAL);
+        Map<String, OptionType> actualOptionsToCommandType = AtlasDbCliCommand.getOptionTypesForCommandMetadata(
+                createCommand(ImmutableSet.of(GLOBAL_OPTION), ImmutableSet.of(), ImmutableSet.of()));
+
+        assertThat(actualOptionsToCommandType).isEqualTo(expectedOptionsToCommandType);
+    }
+
+    @Test
+    public void globalOptionMapsToLongOptionName() {
+        Map<String, OptionType> actualOptionsToCommandType = AtlasDbCliCommand.getOptionTypesForCommandMetadata(
+                createCommand(ImmutableSet.of(GLOBAL_OPTION), ImmutableSet.of(), ImmutableSet.of()));
+
+        assertThat(actualOptionsToCommandType).containsOnlyKeys(GLOBAL_OPTION_LONG_NAME);
+    }
+
+    @Test
+    public void helpIsSetOnArgument() {
+        String expectedDescription = "description";
+
+        OptionMetadata metadata = new OptionMetadata(
+                OptionType.COMMAND,
+                ImmutableSet.of("arg"),
+                "name",
+                expectedDescription,
+                0,
+                false,
+                false,
+                ImmutableSet.of(),
+                getOptionFields());
+        Argument argument = getArgumentMockFromAddOptionToParser(metadata, "arg");
+
+        verify(argument).help(expectedDescription);
+    }
+
+    @Test
+    public void requiredIsSetOnArgument() {
+        boolean expectedRequired = true;
+
+        OptionMetadata metadata = new OptionMetadata(
+                OptionType.COMMAND,
+                ImmutableSet.of("arg"),
+                "name",
+                "description",
+                0,
+                expectedRequired,
+                false,
+                ImmutableSet.of(),
+                getOptionFields());
+        Argument argument = getArgumentMockFromAddOptionToParser(metadata, "arg");
+
+        verify(argument).required(expectedRequired);
+    }
+
+    @Test
+    public void zeroArityConstantIsSetOnArgumentWhenThereArentAnyExpectedArguments() {
+        OptionMetadata metadata = new OptionMetadata(
+                OptionType.COMMAND,
+                ImmutableSet.of("arg"),
+                "name",
+                "description",
+                0,
+                false,
+                false,
+                ImmutableSet.of(),
+                getOptionFields());
+        Argument argument = getArgumentMockFromAddOptionToParser(metadata, "arg");
+
+        verify(argument).action(Arguments.storeConst());
+        verify(argument).setConst(AtlasDbCommandUtils.ZERO_ARITY_ARG_CONSTANT);
+    }
+
+    @Test
+    public void nargsIsSetOnArgumentWhenThereAreExpectedArguments() {
+        int expectedArity = 5;
+
+        OptionMetadata metadata = new OptionMetadata(
+                OptionType.COMMAND,
+                ImmutableSet.of("arg"),
+                "name",
+                "description",
+                expectedArity,
+                false,
+                false,
+                ImmutableSet.of(),
+                getOptionFields());
+        Argument argument = getArgumentMockFromAddOptionToParser(metadata, "arg");
+
+        verify(argument).nargs(5);
+    }
+
+    @Test
+    public void destIsSetToLongestArg() {
+        String expectedDest = "long string here";
+
+        OptionMetadata metadata = new OptionMetadata(
+                OptionType.COMMAND,
+                ImmutableSet.of("arg", "longer arg", expectedDest),
+                "name",
+                "description",
+                0,
+                false,
+                false,
+                ImmutableSet.of(),
+                getOptionFields());
+        Argument argument = getArgumentMockFromAddOptionToParser(metadata, "arg", "longer arg", expectedDest);
+
+        verify(argument).dest(expectedDest);
+    }
+
+    private static Argument getArgumentMockFromAddOptionToParser(OptionMetadata metadata, String... argNames) {
+        Subparser parser = mock(Subparser.class);
+        Argument argument = mock(Argument.class, (Answer<Object>) (invocation) -> {
+            Object mock = invocation.getMock();
+            if (invocation.getMethod().getReturnType().isInstance(mock)) {
+                return mock;
+            } else {
+                return Mockito.RETURNS_DEFAULTS.answer(invocation);
+            }
+        });
+        when(parser.addArgument(argNames))
+                .thenReturn(argument);
+        AtlasDbCliCommand.addOptionToParser(parser, metadata);
+
+        return argument;
+    }
+
+    private static CommandMetadata createCommand(
+            Iterable<OptionMetadata> globalOptions,
+            Iterable<OptionMetadata> groupOptions,
+            Iterable<OptionMetadata> commandOptions) {
+        return new CommandMetadata(
+                "test", "A test command", false,
+                globalOptions, groupOptions, commandOptions,
+                mock(ArgumentsMetadata.class),
+                ImmutableSet.of(), Void.class);
+    }
+
+    private static OptionMetadata createOption(OptionType optionType, Iterable<String> options) {
+        return new OptionMetadata(
+                optionType,
+                options,
+                "Option",
+                "Option",
+                0,
+                false,
+                false,
+                ImmutableSet.of(),
+                getOptionFields());
+    }
+
+    private static Set<Field> getOptionFields() {
+        try {
+            return ImmutableSet.of(AtlasDbCliCommandTest.class.getDeclaredField("optionField"));
+        } catch (NoSuchFieldException e) {
+            throw Throwables.propagate(e);
+        }
+    }
+}
diff --git a/atlasdb-dropwizard-bundle/src/test/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCommandUtilsTest.java b/atlasdb-dropwizard-bundle/src/test/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCommandUtilsTest.java
new file mode 100644
index 00000000000..4bee7c3e820
--- /dev/null
+++ b/atlasdb-dropwizard-bundle/src/test/java/com/palantir/atlasdb/dropwizard/commands/AtlasDbCommandUtilsTest.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.dropwizard.commands;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.config.AtlasDbConfig;
+import com.palantir.atlasdb.config.ImmutableAtlasDbConfig;
+import com.palantir.atlasdb.config.ImmutableLeaderConfig;
+import com.palantir.atlasdb.spi.KeyValueServiceConfig;
+
+public class AtlasDbCommandUtilsTest {
+    private static final String LOCAL_SERVER_NAME = "Local Server";
+    private static final AtlasDbConfig MINIMAL_LEADER_CONFIG = ImmutableAtlasDbConfig.builder()
+            .leader(ImmutableLeaderConfig.builder()
+                    .quorumSize(1)
+                    .addLeaders(LOCAL_SERVER_NAME)
+                    .localServer(LOCAL_SERVER_NAME)
+                    .build())
+            .keyValueService(mock(KeyValueServiceConfig.class))
+            .build();
+    private static final AtlasDbConfig MINIMAL_EMBEDDED_CONFIG = ImmutableAtlasDbConfig.builder()
+            .keyValueService(mock(KeyValueServiceConfig.class))
+            .build();
+
+    @Test
+    public void leaderBlockNoLongerExistsAfterConvertingConfig() {
+        AtlasDbConfig clientConfig = AtlasDbCommandUtils.convertServerConfigToClientConfig(MINIMAL_LEADER_CONFIG);
+
+        assertThat(clientConfig.leader().isPresent()).isFalse();
+    }
+
+    @Test
+    public void timestampBlockExistsAfterConvertingConfig() {
+        AtlasDbConfig clientConfig = AtlasDbCommandUtils.convertServerConfigToClientConfig(MINIMAL_LEADER_CONFIG);
+
+        assertThat(clientConfig.timestamp().isPresent()).isTrue();
+    }
+
+    @Test
+    public void timestampBlockContainsLeadersAfterConvertingConfig() {
+        AtlasDbConfig clientConfig = AtlasDbCommandUtils.convertServerConfigToClientConfig(MINIMAL_LEADER_CONFIG);
+
+        assertThat(clientConfig.timestamp().get().servers()).containsExactly(LOCAL_SERVER_NAME);
+    }
+
+    @Test
+    public void lockBlockExistsAfterConvertingConfig() {
+        AtlasDbConfig clientConfig = AtlasDbCommandUtils.convertServerConfigToClientConfig(MINIMAL_LEADER_CONFIG);
+
+        assertThat(clientConfig.lock().get().servers()).containsExactly(LOCAL_SERVER_NAME);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void conversionFailsWhenUsingEmbeddedServerConfig() {
+        AtlasDbCommandUtils.convertServerConfigToClientConfig(MINIMAL_EMBEDDED_CONFIG);
+    }
+
+    @Test
+    public void argumentsWithoutTwoHyphensAtTheBeginningAreFilteredOut() {
+        List<String> gatheredArgs = AtlasDbCommandUtils.gatherPassedInArguments(
+                ImmutableMap.of("unrelated-arg", "some-value"));
+
+        assertThat(gatheredArgs).isEmpty();
+    }
+
+    @Test
+    public void argumentsWhichHaveNullValuesAreFilteredOut() {
+        Map<String, Object> args = new HashMap<>();
+        args.put("--null-arg", null);
+
+        List<String> gatheredArgs = AtlasDbCommandUtils.gatherPassedInArguments(args);
+
+        assertThat(gatheredArgs).isEmpty();
+    }
+
+    @Test
+    public void argumentsWhichDontHaveNullValuesAreKept() {
+        List<String> gatheredArgs = AtlasDbCommandUtils.gatherPassedInArguments(
+                ImmutableMap.of("--non-null-arg", "123"));
+
+        assertThat(gatheredArgs).containsExactly("--non-null-arg", "123");
+    }
+
+    @Test
+    public void argumentsWhichAreListsAreInlined() {
+        List<String> gatheredArgs = AtlasDbCommandUtils.gatherPassedInArguments(
+                ImmutableMap.of("--list-arg", ImmutableList.of("123", "456")));
+
+        assertThat(gatheredArgs).containsExactly("--list-arg", "123", "456");
+    }
+
+    @Test
+    public void argumentsWithTheZeroArityStringHaveOnlyTheKeyKept() {
+        List<String> gatheredArgs = AtlasDbCommandUtils.gatherPassedInArguments(
+                ImmutableMap.of("--zero-arity-arg", AtlasDbCommandUtils.ZERO_ARITY_ARG_CONSTANT));
+
+        assertThat(gatheredArgs).containsExactly("--zero-arity-arg");
+    }
+}
diff --git a/atlasdb-dropwizard-tests/src/test/java/com/palantir/atlasdb/keyvalue/impl/partition/VersionedPartitionedKvsTest.java b/atlasdb-dropwizard-tests/src/test/java/com/palantir/atlasdb/keyvalue/impl/partition/VersionedPartitionedKvsTest.java
index 13a0d0e87a6..749448c56fa 100644
--- a/atlasdb-dropwizard-tests/src/test/java/com/palantir/atlasdb/keyvalue/impl/partition/VersionedPartitionedKvsTest.java
+++ b/atlasdb-dropwizard-tests/src/test/java/com/palantir/atlasdb/keyvalue/impl/partition/VersionedPartitionedKvsTest.java
@@ -26,7 +26,6 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -69,7 +68,6 @@
  * @author htarasiuk
  *
  */
-@Ignore
 public class VersionedPartitionedKvsTest extends AbstractAtlasDbKeyValueServiceTest {
 
     /**
@@ -198,7 +196,7 @@ public void testVersionTooOld() {
     @Test
     public void testMultiAddEndpoint() throws Exception {
         // This tests that the put function will block for long enough.
-        for (int i=0; i<100; ++i) {
+        for (int i=0; i<50; ++i) {
             testAddEndpoint();
             cleanupStuff();
         }
@@ -365,7 +363,7 @@ public void testGetRowsThrowsOnNotEnoughReads() {
     @Test
     public void testMultiRangeIteratorRetryTransparentlyOnVersionMismatch() throws Exception {
         // This tests that the put function will block for long enough.
-        for (int i=0; i<50; ++i) {
+        for (int i=0; i<25; ++i) {
             testRangeIteratorRetryTransparentlyOnVersionMismatch();
             cleanupStuff();
         }
@@ -405,7 +403,7 @@ public void testRangeIteratorRetryTransparentlyOnVersionMismatch() {
     @Test
     public void testMultiRangeWithHistoryIteratorRetryTransparentlyOnVersionMismatch() throws Exception {
         // This tests that the put function will block for long enough.
-        for (int i=0; i<50; ++i) {
+        for (int i=0; i<25; ++i) {
             testRangeWithHistoryIteratorRetryTransparentlyOnVersionMismatch();
             cleanupStuff();
         }
@@ -446,7 +444,7 @@ public void testRangeWithHistoryIteratorRetryTransparentlyOnVersionMismatch() {
     @Test
     public void testMultiRangeOfTimestampsIteratorRetryTransparentlyOnVersionMismatch() throws Exception {
         // This tests that the put function will block for long enough.
-        for (int i=0; i<50; ++i) {
+        for (int i=0; i<25; ++i) {
             testRangeOfTimestampsIteratorRetryTransparentlyOnVersionMismatch();
             cleanupStuff();
         }
diff --git a/atlasdb-dropwizard-tests/src/test/java/com/palantir/atlasdb/keyvalue/remoting/KeyValueServiceRemotingTest.java b/atlasdb-dropwizard-tests/src/test/java/com/palantir/atlasdb/keyvalue/remoting/KeyValueServiceRemotingTest.java
index b64dd9df721..3cb8d94620c 100644
--- a/atlasdb-dropwizard-tests/src/test/java/com/palantir/atlasdb/keyvalue/remoting/KeyValueServiceRemotingTest.java
+++ b/atlasdb-dropwizard-tests/src/test/java/com/palantir/atlasdb/keyvalue/remoting/KeyValueServiceRemotingTest.java
@@ -31,15 +31,23 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSortedMap;
+import com.google.common.collect.Iterables;
 import com.google.common.primitives.UnsignedBytes;
+import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.keyvalue.impl.AbstractAtlasDbKeyValueServiceTest;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import com.palantir.atlasdb.keyvalue.remoting.iterators.RemoteRowColumnRangeIterator;
 
 import io.dropwizard.testing.junit.DropwizardClientRule;
 
@@ -94,6 +102,33 @@ public void testSerialize() throws IOException {
         JavaType rowResultType = mapper.getTypeFactory().constructParametrizedType(RowResult.class, RowResult.class, Value.class);
         RowResult<Value> rowResultDeserialized = mapper.readValue(serializedRowResult, rowResultType);
         assertEquals(rowResult, rowResultDeserialized);
+
+        RemoteRowColumnRangeIterator rowColumnRangeIterator = new RemoteRowColumnRangeIterator(TableReference.create(Namespace.create("ns"), "test_table"),
+                new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1), 100L, true,
+                ImmutableList.copyOf(ImmutableMap.of(cell, value).entrySet()));
+        String serializedRowColumnRangeIterator = mapper.writeValueAsString(rowColumnRangeIterator);
+        RowColumnRangeIterator rowColumnRangeIteratorDeserialized = mapper.readValue(serializedRowColumnRangeIterator, RowColumnRangeIterator.class);
+        Assert.assertTrue(rowColumnRangeIteratorDeserialized instanceof RemoteRowColumnRangeIterator);
+        assertEquals(rowColumnRangeIterator, rowColumnRangeIteratorDeserialized);
+
+        rowColumnRangeIterator = new RemoteRowColumnRangeIterator(TableReference.create(Namespace.create("ns"), "test_table"),
+                new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1), 100L, false,
+                ImmutableList.of());
+        serializedRowColumnRangeIterator = mapper.writeValueAsString(rowColumnRangeIterator);
+        rowColumnRangeIteratorDeserialized = mapper.readValue(serializedRowColumnRangeIterator, RowColumnRangeIterator.class);
+        Assert.assertTrue(rowColumnRangeIteratorDeserialized instanceof RemoteRowColumnRangeIterator);
+        assertEquals(rowColumnRangeIterator, rowColumnRangeIteratorDeserialized);
+
+        Map<byte[], RowColumnRangeIterator> rowColumnRange = ImmutableMap.of(row, rowColumnRangeIterator);
+        String serializedRowColumnRange = mapper.writerFor(
+                mapper.getTypeFactory().constructMapType(Map.class, byte[].class, RemoteRowColumnRangeIterator.class))
+                .writeValueAsString(rowColumnRange);
+        Map<byte[], RowColumnRangeIterator> rowColumnRangeDeserialized
+                = mapper.readValue(serializedRowColumnRange,
+                mapper.getTypeFactory().constructMapType(Map.class, byte[].class, RowColumnRangeIterator.class));
+        assertEquals(1, rowColumnRangeDeserialized.size());
+        Assert.assertArrayEquals(row, Iterables.getOnlyElement(rowColumnRangeDeserialized.keySet()));
+        assertEquals(rowColumnRangeIterator, Iterables.getOnlyElement(rowColumnRangeDeserialized.values()));
     }
 
     @Test
diff --git a/atlasdb-ete-tests/Dockerfile b/atlasdb-ete-tests/Dockerfile
index 0228c1e827d..4fd2ccb9269 100644
--- a/atlasdb-ete-tests/Dockerfile
+++ b/atlasdb-ete-tests/Dockerfile
@@ -18,6 +18,6 @@ RUN for file in atlasdb-ete/*; do mv "$file" "atlasdb-ete/atlasdb-ete-snapshot";
 
 ADD docker/conf/ /atlasdb-ete/atlasdb-ete-snapshot/var/conf
 
-WORKDIR /atlasdb-ete/atlasdb-ete-snapshot/service/bin/
+WORKDIR /atlasdb-ete/atlasdb-ete-snapshot
 
-CMD echo "hello" #bash -c './init.sh console'
+CMD service/bin/init.sh console
diff --git a/atlasdb-ete-tests/build.gradle b/atlasdb-ete-tests/build.gradle
index 41a213f2d28..208cdf975cd 100644
--- a/atlasdb-ete-tests/build.gradle
+++ b/atlasdb-ete-tests/build.gradle
@@ -15,12 +15,15 @@ dependencies {
     compile project(':lock-impl')
     compile project(':leader-election-impl')
     compile project(':atlasdb-config')
+    compile project(':atlasdb-dropwizard-bundle')
     compile project(':atlasdb-hikari')
     compile project(':atlasdb-rocksdb')
 
     compile "io.dropwizard:dropwizard-core:" + libVersions.dropwizard
     compile 'com.google.dagger:dagger:2.0.2'
 
+    runtime project(':atlasdb-dbkvs')
+
     runtime(project(':atlasdb-cassandra')) {
         exclude(module:'log4j-over-slf4j')
         exclude(module:'jcl-over-slf4j')
@@ -32,11 +35,13 @@ dependencies {
         exclude(module:'snakeyaml')
         exclude(module:'hibernate-validator')
         exclude(module:'libthrift')
+        exclude(module:'commons-cli')
+        exclude(module:'jna')
     }
 
     compile 'org.apache.thrift:libthrift:' + libVersions.libthrift
 
-    processor 'org.immutables:value:2.0.21'
+    processor 'org.immutables:value:' + libVersions.immutables
     processor('com.google.dagger:dagger-compiler:2.0.2') {
         // We need to explicitly exclude these so that intellij does not label them as provided
         if(gradle.startParameter.taskNames.contains('idea')) {
@@ -61,6 +66,7 @@ configurations.matching({ it.name in ['compile', 'runtime'] }).all {
         force 'org.apache.thrift:libthrift:' + libVersions.libthrift
         force 'commons-codec:commons-codec:' + libVersions.commons_codec
         force 'org.hibernate:hibernate-validator:5.1.3.Final'
+        force 'commons-cli:commons-cli:1.2'
     }
 }
 
diff --git a/atlasdb-ete-tests/docker-compose.cassandra.yml b/atlasdb-ete-tests/docker-compose.cassandra.yml
new file mode 100644
index 00000000000..a9895e4c6fa
--- /dev/null
+++ b/atlasdb-ete-tests/docker-compose.cassandra.yml
@@ -0,0 +1,50 @@
+version: '2'
+
+services:
+  cassandra:
+    image: com.palantir.docker/atlas-cassandra:2.2-v0.1
+    ports:
+      - "9160"
+      - "9042"
+      - "7199"
+    environment:
+      - LOCAL_JMX=no
+
+  ete1:
+    build: .
+    command: bash -c 'cp var/conf/atlasdb-ete.cassandra.yml var/conf/atlasdb-ete.yml && dockerize -timeout 120s -wait tcp://cassandra:9160 && service/bin/init.sh console'
+    depends_on:
+      - cassandra
+    environment:
+      - ME=ete1
+    ports:
+      - "3828"
+
+  ete2:
+    build: .
+    command: bash -c 'cp var/conf/atlasdb-ete.cassandra.yml var/conf/atlasdb-ete.yml && dockerize -timeout 120s -wait tcp://cassandra:9160 && service/bin/init.sh console'
+    depends_on:
+      - cassandra
+    environment:
+      - ME=ete2
+    ports:
+      - "3828"
+
+  ete3:
+    build: .
+    command: bash -c 'cp var/conf/atlasdb-ete.cassandra.yml var/conf/atlasdb-ete.yml && dockerize -timeout 120s -wait tcp://cassandra:9160 && service/bin/init.sh console'
+    depends_on:
+      - cassandra
+    environment:
+      - ME=ete3
+    ports:
+      - "3828"
+
+  ete-cli:
+    build: .
+    entrypoint: [bash, -c, 'cp var/conf/atlasdb-ete.cassandra.yml var/conf/atlasdb-ete.yml && "$$@"', --]
+    command: exit
+    environment:
+      - ME=ete1
+    depends_on:
+      - ete1
diff --git a/atlasdb-ete-tests/docker-compose.dbkvs.yml b/atlasdb-ete-tests/docker-compose.dbkvs.yml
new file mode 100644
index 00000000000..afab588da7e
--- /dev/null
+++ b/atlasdb-ete-tests/docker-compose.dbkvs.yml
@@ -0,0 +1,50 @@
+version: '2'
+
+services:
+  postgres:
+    image: kiasaki/alpine-postgres
+    environment:
+       POSTGRES_PASSWORD: palantir
+       POSTGRES_USER: palantir
+       POSTGRES_DB: atlas
+    ports:
+      - "5432"
+
+  ete1:
+    build: .
+    command: bash -c 'cp var/conf/atlasdb-ete.dbkvs.yml var/conf/atlasdb-ete.yml && dockerize -timeout 120s -wait tcp://postgres:5432 && service/bin/init.sh console'
+    depends_on:
+      - postgres
+    environment:
+      - ME=ete1
+    ports:
+      - "3828"
+
+  ete2:
+    build: .
+    command: bash -c 'cp var/conf/atlasdb-ete.dbkvs.yml var/conf/atlasdb-ete.yml && dockerize -timeout 120s -wait tcp://postgres:5432 && service/bin/init.sh console'
+    depends_on:
+      - postgres
+    environment:
+      - ME=ete2
+    ports:
+      - "3828"
+
+  ete3:
+    build: .
+    command: bash -c 'cp var/conf/atlasdb-ete.dbkvs.yml var/conf/atlasdb-ete.yml && dockerize -timeout 120s -wait tcp://postgres:5432 && service/bin/init.sh console'
+    depends_on:
+      - postgres
+    environment:
+      - ME=ete3
+    ports:
+      - "3828"
+
+  ete-cli:
+    build: .
+    entrypoint: [bash, -c, 'cp var/conf/atlasdb-ete.dbkvs.yml var/conf/atlasdb-ete.yml && "$$@"', --]
+    command: exit
+    environment:
+      - ME=ete1
+    depends_on:
+      - ete1
diff --git a/atlasdb-ete-tests/docker-compose.no-leader.cassandra.yml b/atlasdb-ete-tests/docker-compose.no-leader.cassandra.yml
new file mode 100644
index 00000000000..2ece944e16f
--- /dev/null
+++ b/atlasdb-ete-tests/docker-compose.no-leader.cassandra.yml
@@ -0,0 +1,30 @@
+version: '2'
+
+services:
+  cassandra:
+    image: com.palantir.docker/atlas-cassandra:2.2-v0.1
+    ports:
+      - "9160"
+      - "9042"
+      - "7199"
+    environment:
+      - LOCAL_JMX=no
+
+  ete1:
+    build: .
+    command: bash -c 'cp var/conf/atlasdb-ete.no-leader.cassandra.yml var/conf/atlasdb-ete.yml && dockerize -timeout 120s -wait tcp://cassandra:9160 && service/bin/init.sh console'
+    depends_on:
+      - cassandra
+    environment:
+      - ME=ete1
+    ports:
+      - "3828"
+
+  ete-cli:
+    build: .
+    entrypoint: [bash, -c, 'cp var/conf/atlasdb-ete.no-leader.cassandra.client.yml var/conf/atlasdb-ete.yml && "$$@"', --]
+    command: exit
+    environment:
+      - ME=ete1
+    depends_on:
+      - ete1
diff --git a/atlasdb-ete-tests/docker-compose.yml b/atlasdb-ete-tests/docker-compose.yml
deleted file mode 100644
index e49ec189322..00000000000
--- a/atlasdb-ete-tests/docker-compose.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: '2'
-
-services:
-  cassandra:
-    image: com.palantir.docker/atlas-cassandra:2.2-v0.1
-    ports:
-      - "9160"
-      - "9042"
-      - "7199"
-    environment:
-      - LOCAL_JMX=no
-
-  ete1:
-    build: .
-    command: bash -c 'dockerize -timeout 120s -wait tcp://cassandra:9160 && ./init.sh console'
-    environment:
-      - ME=ete1
-    ports:
-      - "3828"
-
-  ete2:
-    build: .
-    command: bash -c 'dockerize -timeout 120s -wait tcp://ete1:3828 && ./init.sh console'
-    environment:
-      - ME=ete2
-    depends_on:
-      - ete1
-
-  ete3:
-    build: .
-    command: bash -c 'dockerize -timeout 120s -wait tcp://ete1:3828 && ./init.sh console'
-    environment:
-      - ME=ete3
-    depends_on:
-      - ete1
diff --git a/atlasdb-ete-tests/docker/conf/atlasdb-ete.yml b/atlasdb-ete-tests/docker/conf/atlasdb-ete.cassandra.yml
similarity index 100%
rename from atlasdb-ete-tests/docker/conf/atlasdb-ete.yml
rename to atlasdb-ete-tests/docker/conf/atlasdb-ete.cassandra.yml
diff --git a/atlasdb-ete-tests/docker/conf/atlasdb-ete.dbkvs.yml b/atlasdb-ete-tests/docker/conf/atlasdb-ete.dbkvs.yml
new file mode 100644
index 00000000000..282289a615d
--- /dev/null
+++ b/atlasdb-ete-tests/docker/conf/atlasdb-ete.dbkvs.yml
@@ -0,0 +1,33 @@
+server:
+  #rootPath: /api/*
+  #applicationContextPath: /
+  #adminContextPath: /
+  applicationConnectors:
+    - type: http
+      port: 3828
+  adminConnectors:
+    - type: http
+      port: 3829
+
+atlasdb:
+  keyValueService:
+    type: relational
+    ddl:
+      type: postgres
+    connection:
+      type: postgres
+      host: postgres
+      port: 5432
+      dbName: atlas
+      dbLogin: palantir
+      dbPassword: palantir
+
+  leader:
+    quorumSize: 2
+    learnerLogDir: var/data/paxosLog/learner1
+    acceptorLogDir: var/data/paxosLog/acceptor1
+    localServer: http://${ME}:3828
+    leaders:
+      - http://ete1:3828
+      - http://ete2:3828
+      - http://ete3:3828
diff --git a/atlasdb-ete-tests/docker/conf/atlasdb-ete.no-leader.cassandra.client.yml b/atlasdb-ete-tests/docker/conf/atlasdb-ete.no-leader.cassandra.client.yml
new file mode 100644
index 00000000000..dc9e0b75b20
--- /dev/null
+++ b/atlasdb-ete-tests/docker/conf/atlasdb-ete.no-leader.cassandra.client.yml
@@ -0,0 +1,36 @@
+server:
+  #rootPath: /api/*
+  #applicationContextPath: /
+  #adminContextPath: /
+  applicationConnectors:
+    - type: http
+      port: 3828
+  adminConnectors:
+    - type: http
+      port: 3829
+
+atlasdb:
+  keyValueService:
+    type: cassandra
+    servers:
+      - cassandra:9160
+    poolSize: 20
+    keyspace: atlasete
+    credentials:
+      username: cassandra
+      password: cassandra
+    ssl: false
+    replicationFactor: 1
+    mutationBatchCount: 10000
+    mutationBatchSizeBytes: 10000000
+    fetchBatchCount: 1000
+    safetyDisabled: false
+    autoRefreshNodes: false
+
+  leader:
+    quorumSize: 1
+    learnerLogDir: var/data/paxosLog/learner1
+    acceptorLogDir: var/data/paxosLog/acceptor1
+    localServer: http://ete1:3828
+    leaders:
+      - http://ete1:3828
diff --git a/atlasdb-ete-tests/docker/conf/atlasdb-ete.no-leader.cassandra.yml b/atlasdb-ete-tests/docker/conf/atlasdb-ete.no-leader.cassandra.yml
new file mode 100644
index 00000000000..60465f5a9f0
--- /dev/null
+++ b/atlasdb-ete-tests/docker/conf/atlasdb-ete.no-leader.cassandra.yml
@@ -0,0 +1,28 @@
+server:
+  #rootPath: /api/*
+  #applicationContextPath: /
+  #adminContextPath: /
+  applicationConnectors:
+    - type: http
+      port: 3828
+  adminConnectors:
+    - type: http
+      port: 3829
+
+atlasdb:
+  keyValueService:
+    type: cassandra
+    servers:
+      - cassandra:9160
+    poolSize: 20
+    keyspace: atlasete
+    credentials:
+      username: cassandra
+      password: cassandra
+    ssl: false
+    replicationFactor: 1
+    mutationBatchCount: 10000
+    mutationBatchSizeBytes: 10000000
+    fetchBatchCount: 1000
+    safetyDisabled: false
+    autoRefreshNodes: false
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java
index 009b314e9ca..9d88ffcbbd4 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteConfiguration.java
@@ -17,17 +17,19 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.palantir.atlasdb.config.AtlasDbConfig;
+import com.palantir.atlasdb.dropwizard.AtlasDbConfigurationProvider;
 
 import io.dropwizard.Configuration;
 
-public class AtlasDbEteConfiguration extends Configuration {
+public class AtlasDbEteConfiguration extends Configuration implements AtlasDbConfigurationProvider {
     private final AtlasDbConfig atlasdb;
 
     public AtlasDbEteConfiguration(@JsonProperty("atlasdb") AtlasDbConfig atlasdb) {
         this.atlasdb = atlasdb;
     }
 
-    public AtlasDbConfig getAtlasConfig() {
+    @Override
+    public AtlasDbConfig getAtlasDbConfig() {
         return atlasdb;
     }
 }
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java
index 15bdd6a566e..364cc188178 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/AtlasDbEteServer.java
@@ -15,10 +15,22 @@
  */
 package com.palantir.atlasdb;
 
+import java.util.Set;
+
+import javax.net.ssl.SSLSocketFactory;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.cas.CheckAndSetClient;
+import com.palantir.atlasdb.cas.CheckAndSetSchema;
 import com.palantir.atlasdb.cas.SimpleCheckAndSetResource;
+import com.palantir.atlasdb.dropwizard.AtlasDbBundle;
+import com.palantir.atlasdb.factory.TransactionManagers;
+import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.todo.SimpleTodoResource;
 import com.palantir.atlasdb.todo.TodoClient;
+import com.palantir.atlasdb.todo.TodoSchema;
+import com.palantir.atlasdb.transaction.api.TransactionManager;
 
 import io.dropwizard.Application;
 import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
@@ -27,6 +39,12 @@
 import io.dropwizard.setup.Environment;
 
 public class AtlasDbEteServer extends Application<AtlasDbEteConfiguration> {
+    private static final boolean DONT_SHOW_HIDDEN_TABLES = false;
+    private static final Optional<SSLSocketFactory> NO_SSL = Optional.absent();
+    private static final Set<Schema> ETE_SCHEMAS = ImmutableSet.of(
+            CheckAndSetSchema.getSchema(),
+            TodoSchema.getSchema());
+
     public static void main(String[] args) throws Exception {
         new AtlasDbEteServer().run(args);
     }
@@ -34,15 +52,14 @@ public static void main(String[] args) throws Exception {
     @Override
     public void initialize(Bootstrap<AtlasDbEteConfiguration> bootstrap) {
         enableEnvironmentVariablesInConfig(bootstrap);
+        bootstrap.addBundle(new AtlasDbBundle<>());
     }
 
     @Override
     public void run(AtlasDbEteConfiguration config, final Environment environment) throws Exception {
-        TodoClient todoClient = new TodoClient(config.getAtlasConfig(), environment.jersey());
-        environment.jersey().register(new SimpleTodoResource(todoClient));
-
-        CheckAndSetClient checkAndSetClient = new CheckAndSetClient(config.getAtlasConfig(), environment.jersey());
-        environment.jersey().register(new SimpleCheckAndSetResource(checkAndSetClient));
+        TransactionManager transactionManager = TransactionManagers.create(config.getAtlasDbConfig(), NO_SSL, ETE_SCHEMAS, environment.jersey()::register, DONT_SHOW_HIDDEN_TABLES);
+        environment.jersey().register(new SimpleTodoResource(new TodoClient(transactionManager)));
+        environment.jersey().register(new SimpleCheckAndSetResource(new CheckAndSetClient(transactionManager)));
     }
 
     private void enableEnvironmentVariablesInConfig(Bootstrap<AtlasDbEteConfiguration> bootstrap) {
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/CheckAndSetClient.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/CheckAndSetClient.java
index eaaecd3c2b2..b2485fa24fe 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/CheckAndSetClient.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/CheckAndSetClient.java
@@ -15,25 +15,14 @@
  */
 package com.palantir.atlasdb.cas;
 
-import javax.net.ssl.SSLSocketFactory;
-
 import com.google.common.base.Optional;
-import com.palantir.atlasdb.config.AtlasDbConfig;
-import com.palantir.atlasdb.factory.TransactionManagers;
-import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 
-import io.dropwizard.jersey.setup.JerseyEnvironment;
-
 public class CheckAndSetClient {
-    private static final boolean DONT_SHOW_HIDDEN_TABLES = false;
-    private static final Optional<SSLSocketFactory> NO_SSL = Optional.absent();
-
     private final TransactionManager transactionManager;
 
-    public CheckAndSetClient(AtlasDbConfig config, JerseyEnvironment environment) {
-        Schema schema = CheckAndSetSchema.getSchema();
-        transactionManager = TransactionManagers.create(config, NO_SSL, schema, environment::register, DONT_SHOW_HIDDEN_TABLES);
+    public CheckAndSetClient(TransactionManager transactionManager) {
+        this.transactionManager = transactionManager;
     }
 
     public Optional<Long> get() {
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/CheckAndSetSchema.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/CheckAndSetSchema.java
index cdc44b98cd3..0e05edf3e3e 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/CheckAndSetSchema.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/CheckAndSetSchema.java
@@ -49,7 +49,7 @@ public static Schema getSchema() {
     }
 
     public static void main(String[] args) throws Exception {
-        GENERATED_SCHEMA.renderTables(new File("atlasdb-ete-tests/src/main/java"));
+        GENERATED_SCHEMA.renderTables(new File("src/main/java"));
     }
 
     @Override
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetTable.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetTable.java
index b1b1c88a7f4..2ec4bee9d1d 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetTable.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/cas/generated/CheckAndSetTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -579,6 +581,20 @@ private static Multimap<CheckAndSetRow, CheckAndSetNamedColumnValue<?>> getRowMa
         return rowMap;
     }
 
+    @Override
+    public Map<CheckAndSetRow, BatchingVisitable<CheckAndSetNamedColumnValue<?>>> getRowsColumnRange(Iterable<CheckAndSetRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<CheckAndSetRow, BatchingVisitable<CheckAndSetNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            CheckAndSetRow row = CheckAndSetRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<CheckAndSetNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<CheckAndSetRowResult> getAllRowsUnordered() {
         return getAllRowsUnordered(ColumnSelection.all());
     }
@@ -631,6 +647,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -688,5 +706,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "IPCCVOtkZNu59oKM5g9JxA==";
+    static String __CLASS_HASH = "m8r+jB+WbBueDre5Y1+v7w==";
 }
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java
index fe460d60eb7..bcb1026b6eb 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoClient.java
@@ -21,33 +21,21 @@
 import java.util.Map;
 import java.util.Random;
 
-import javax.net.ssl.SSLSocketFactory;
-
-import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.palantir.atlasdb.config.AtlasDbConfig;
-import com.palantir.atlasdb.factory.TransactionManagers;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
-import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.table.description.ValueType;
-import com.palantir.atlasdb.transaction.impl.SerializableTransactionManager;
+import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.base.BatchingVisitable;
 
-import io.dropwizard.jersey.setup.JerseyEnvironment;
-
 public class TodoClient {
-    private static final boolean DONT_SHOW_HIDDEN_TABLES = false;
-    private static final Optional<SSLSocketFactory> NO_SSL = Optional.absent();
-
-    private final SerializableTransactionManager transactionManager;
+    private final TransactionManager transactionManager;
     private final Random random = new Random();
 
-    public TodoClient(AtlasDbConfig config, JerseyEnvironment environment) {
-        Schema schema = TodoSchema.getSchema();
-        transactionManager = TransactionManagers.create(config, NO_SSL, schema, environment::register, DONT_SHOW_HIDDEN_TABLES);
+    public TodoClient(TransactionManager transactionManager) {
+        this.transactionManager = transactionManager;
     }
 
     public void addTodo(Todo todo) {
diff --git a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java
index b305d1ba620..a5886f379a4 100644
--- a/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java
+++ b/atlasdb-ete-tests/src/main/java/com/palantir/atlasdb/todo/TodoSchema.java
@@ -31,7 +31,10 @@ public class TodoSchema implements AtlasSchema {
     public static final String TEXT_COLUMN = "text";
 
     private static Schema generateSchema() {
-        Schema schema = new Schema();
+        Schema schema = new Schema(
+                TodoSchema.class.getSimpleName(),
+                TodoSchema.class.getPackage().getName() + ".generated",
+                Namespace.DEFAULT_NAMESPACE);
 
         schema.addTableDefinition(TODO_TABLE, new TableDefinition() {{
             rowName();
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java
new file mode 100644
index 00000000000..b7e79d6d57a
--- /dev/null
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/EteSetup.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.ete;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import javax.net.ssl.SSLSocketFactory;
+
+import org.junit.rules.RuleChain;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableList;
+import com.palantir.atlasdb.http.AtlasDbHttpClients;
+import com.palantir.atlasdb.todo.TodoResource;
+import com.palantir.docker.compose.DockerComposeRule;
+import com.palantir.docker.compose.connection.Container;
+import com.palantir.docker.compose.connection.DockerPort;
+import com.palantir.docker.compose.connection.waiting.HealthCheck;
+import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
+import com.palantir.docker.compose.execution.DockerComposeRunArgument;
+import com.palantir.docker.compose.execution.DockerComposeRunOption;
+
+public class EteSetup {
+    private static final Gradle GRADLE_PREPARE_TASK = Gradle.ensureTaskHasRun(":atlasdb-ete-tests:prepareForEteTests");
+    private static final Optional<SSLSocketFactory> NO_SSL = Optional.absent();
+
+    private static final String FIRST_ETE_CONTAINER = "ete1";
+    private static final int ETE_PORT = 3828;
+
+    private static DockerComposeRule docker;
+
+    protected <T> T createClientToSingleNode(Class<T> clazz) {
+        return createClientFor(clazz, asPort(FIRST_ETE_CONTAINER));
+    }
+
+    protected <T> T createClientToMultipleNodes(Class<T> clazz, String... nodeNames) {
+        Collection<String> uris = ImmutableList.copyOf(nodeNames).stream()
+                .map(node -> asPort(node))
+                .map(port -> port.inFormat("http://$HOST:$EXTERNAL_PORT"))
+                .collect(Collectors.toList());
+
+        return AtlasDbHttpClients.createProxyWithFailover(NO_SSL, uris, clazz);
+    }
+
+    protected String runCommand(String command) throws IOException, InterruptedException {
+        return docker.run(
+                DockerComposeRunOption.options("-T"),
+                "ete-cli",
+                DockerComposeRunArgument.arguments("bash", "-c", command));
+    }
+
+    protected static RuleChain setupComposition(String name, String composeFile) {
+        docker = DockerComposeRule.builder()
+                .file(composeFile)
+                .waitingForService(FIRST_ETE_CONTAINER, toBeReady())
+                .saveLogsTo("container-logs/" + name)
+                .build();
+
+        return RuleChain
+                .outerRule(GRADLE_PREPARE_TASK)
+                .around(docker);
+    }
+
+    private DockerPort asPort(String node) {
+        return docker.containers().container(node).port(ETE_PORT);
+    }
+
+    private static <T> T createClientFor(Class<T> clazz, Container container) {
+        return createClientFor(clazz, container.portMappedInternallyTo(ETE_PORT));
+    }
+
+    private static <T> T createClientFor(Class<T> clazz, DockerPort port) {
+        String uri = port.inFormat("http://$HOST:$EXTERNAL_PORT");
+        return AtlasDbHttpClients.createProxy(NO_SSL, uri, clazz);
+    }
+
+    private static HealthCheck<Container> toBeReady() {
+        return (container) -> {
+            TodoResource todos = createClientFor(TodoResource.class, container);
+
+            return SuccessOrFailure.onResultOf(() -> {
+                todos.isHealthy();
+                return true;
+            });
+        };
+    }
+}
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java
deleted file mode 100644
index edb0f52c39f..00000000000
--- a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/TodoEteTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Copyright 2016 Palantir Technologies
- *
- * Licensed under the BSD-3 License (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://opensource.org/licenses/BSD-3-Clause
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.palantir.atlasdb.ete;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-
-import static com.google.common.base.Throwables.propagate;
-
-import javax.net.ssl.SSLSocketFactory;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-
-import com.google.common.base.Optional;
-import com.palantir.atlasdb.http.AtlasDbHttpClients;
-import com.palantir.atlasdb.todo.ImmutableTodo;
-import com.palantir.atlasdb.todo.Todo;
-import com.palantir.atlasdb.todo.TodoResource;
-import com.palantir.docker.compose.DockerComposition;
-import com.palantir.docker.compose.connection.Container;
-import com.palantir.docker.compose.connection.DockerPort;
-import com.palantir.docker.compose.connection.waiting.HealthCheck;
-import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
-
-public class TodoEteTest {
-    private static final Optional<SSLSocketFactory> NO_SSL = Optional.absent();
-    private static final int TODO_PORT = 3828;
-    private static final Todo TODO = ImmutableTodo.of("some stuff to do");
-
-    public static DockerComposition dockerComposition = DockerComposition.of("docker-compose.yml")
-            .waitingForService("ete1", toBeReady())
-            .saveLogsTo("container-logs")
-            .build();
-
-    private static HealthCheck<Container> toBeReady() {
-        return (container) -> {
-            TodoResource todos = createTodoClientFor(container);
-
-            return SuccessOrFailure.onResultOf(() -> {
-                todos.isHealthy();
-                return true;
-            });
-        };
-    }
-
-    public static Gradle gradle = Gradle.ensureTaskHasRun(":atlasdb-ete-tests:prepareForEteTests");
-
-    @ClassRule
-    public static RuleChain rules = RuleChain
-            .outerRule(gradle)
-            .around(dockerComposition);
-
-    @Test public void
-    shouldBeAbleToWriteAndListTodos() {
-        TodoResource todoClient = createTodoClient();
-
-        todoClient.addTodo(TODO);
-        assertThat(todoClient.getTodoList(), contains(TODO));
-    }
-
-    private TodoResource createTodoClient() {
-        try {
-            DockerPort port = dockerComposition.portOnContainerWithInternalMapping("ete1", TODO_PORT);
-            return createTodoClientFor(port);
-        } catch (Exception e) {
-            throw propagate(e);
-        }
-    }
-
-    private static TodoResource createTodoClientFor(Container container) {
-        return createTodoClientFor(container.portMappedInternallyTo(TODO_PORT));
-    }
-
-    private static TodoResource createTodoClientFor(DockerPort port) {
-        String uri = port.inFormat("http://$HOST:$EXTERNAL_PORT");
-        return AtlasDbHttpClients.createProxy(NO_SSL, uri, TodoResource.class);
-    }
-}
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/CassandraDropwizardEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/CassandraDropwizardEteTest.java
new file mode 100644
index 00000000000..d0728717675
--- /dev/null
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/CassandraDropwizardEteTest.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.ete.dropwizard;
+
+import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
+
+import com.palantir.atlasdb.ete.EteSetup;
+
+public class CassandraDropwizardEteTest extends DropwizardEteTest {
+    @ClassRule
+    public static final RuleChain COMPOSITION_SETUP = EteSetup.setupComposition("cassandra-ha", "docker-compose.cassandra.yml");
+}
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/CassandraNoLeaderDropwizardEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/CassandraNoLeaderDropwizardEteTest.java
new file mode 100644
index 00000000000..62ed9742904
--- /dev/null
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/CassandraNoLeaderDropwizardEteTest.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.ete.dropwizard;
+
+import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
+
+import com.palantir.atlasdb.ete.EteSetup;
+
+public class CassandraNoLeaderDropwizardEteTest extends DropwizardEteTest {
+    @ClassRule
+    public static final RuleChain COMPOSITION_SETUP = EteSetup.setupComposition("cassandra-no-leader", "docker-compose.no-leader.cassandra.yml");
+}
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/DbKvsDropwizardEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/DbKvsDropwizardEteTest.java
new file mode 100644
index 00000000000..f2d047300ab
--- /dev/null
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/DbKvsDropwizardEteTest.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.ete.dropwizard;
+
+import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
+
+import com.palantir.atlasdb.ete.EteSetup;
+
+public class DbKvsDropwizardEteTest extends DropwizardEteTest {
+    @ClassRule
+    public static final RuleChain COMPOSITION_SETUP = EteSetup.setupComposition("dbkvs", "docker-compose.dbkvs.yml");
+}
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/DropwizardEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/DropwizardEteTest.java
new file mode 100644
index 00000000000..36f24ac8263
--- /dev/null
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/dropwizard/DropwizardEteTest.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.ete.dropwizard;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.junit.Test;
+
+import com.palantir.atlasdb.ete.EteSetup;
+
+public abstract class DropwizardEteTest extends EteSetup {
+    private static final Pattern TIMESTAMP_REGEX = Pattern.compile("The Fresh timestamp is: (\\d+)");
+
+    @Test
+    public void multipleTimestampFetchesAreDifferent() throws IOException, InterruptedException {
+        int timestamp1 = fetchTimestamp();
+        int timestamp2 = fetchTimestamp();
+
+        assertThat(timestamp1).isLessThan(timestamp2);
+    }
+
+    @Test
+    public void sweepAllTablesDoesntError() throws IOException, InterruptedException {
+        runCommand("service/bin/atlasdb-ete atlasdb sweep -a var/conf/atlasdb-ete.yml");
+    }
+
+    @Test
+    public void consoleShouldLoadAndConnectToDb() throws IOException, InterruptedException {
+        String output = runCommand("echo | service/bin/atlasdb-ete atlasdb console var/conf/atlasdb-ete.yml");
+
+        assertThat(output).contains("//AtlasConsole started!");
+    }
+
+    private int fetchTimestamp() throws IOException, InterruptedException {
+        String timestampFetched = runCommand("service/bin/atlasdb-ete atlasdb timestamp fetch var/conf/atlasdb-ete.yml");
+
+        Matcher matcher = TIMESTAMP_REGEX.matcher(timestampFetched);
+        assertThat(matcher.find()).isTrue();
+
+        return Integer.parseInt(matcher.group(1));
+    }
+}
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/CassandraNoLeaderTodoEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/CassandraNoLeaderTodoEteTest.java
new file mode 100644
index 00000000000..47cb778da7a
--- /dev/null
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/CassandraNoLeaderTodoEteTest.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.ete.todo;
+
+import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
+
+import com.palantir.atlasdb.ete.EteSetup;
+import com.palantir.timestamp.TimestampService;
+
+public class CassandraNoLeaderTodoEteTest extends TodoEteTest {
+    @ClassRule
+    public static final RuleChain COMPOSITION_SETUP = EteSetup.setupComposition("cassandra-no-leader", "docker-compose.no-leader.cassandra.yml");
+
+    @Override
+    protected TimestampService createTimestampClient() {
+        return createClientToSingleNode(TimestampService.class);
+    }
+}
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/CassandraTodoEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/CassandraTodoEteTest.java
new file mode 100644
index 00000000000..33b815f9804
--- /dev/null
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/CassandraTodoEteTest.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.ete.todo;
+
+import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
+
+import com.palantir.atlasdb.ete.EteSetup;
+import com.palantir.timestamp.TimestampService;
+
+public class CassandraTodoEteTest extends TodoEteTest {
+    @ClassRule
+    public static final RuleChain COMPOSITION_SETUP = EteSetup.setupComposition("cassandra-ha", "docker-compose.cassandra.yml");
+
+    @Override
+    protected TimestampService createTimestampClient() {
+        return createClientToMultipleNodes(TimestampService.class, "ete1", "ete2", "ete3");
+    }
+}
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/DbKvsTodoEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/DbKvsTodoEteTest.java
new file mode 100644
index 00000000000..2b6292c7765
--- /dev/null
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/DbKvsTodoEteTest.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.ete.todo;
+
+import org.junit.ClassRule;
+import org.junit.rules.RuleChain;
+
+import com.palantir.atlasdb.ete.EteSetup;
+import com.palantir.timestamp.TimestampService;
+
+public class DbKvsTodoEteTest extends TodoEteTest {
+    @ClassRule
+    public static final RuleChain COMPOSITION_SETUP = EteSetup.setupComposition("dbkvs", "docker-compose.dbkvs.yml");
+
+    @Override
+    protected TimestampService createTimestampClient() {
+        return createClientToMultipleNodes(TimestampService.class, "ete1", "ete2", "ete3");
+    }
+}
diff --git a/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/TodoEteTest.java b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/TodoEteTest.java
new file mode 100644
index 00000000000..6e694af31c0
--- /dev/null
+++ b/atlasdb-ete-tests/src/test/java/com/palantir/atlasdb/ete/todo/TodoEteTest.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.ete.todo;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.nullValue;
+
+import org.junit.Test;
+
+import com.palantir.atlasdb.ete.EteSetup;
+import com.palantir.atlasdb.todo.ImmutableTodo;
+import com.palantir.atlasdb.todo.Todo;
+import com.palantir.atlasdb.todo.TodoResource;
+import com.palantir.timestamp.TimestampService;
+
+public abstract class TodoEteTest extends EteSetup {
+    private static final Todo TODO = ImmutableTodo.of("some stuff to do");
+
+    protected abstract TimestampService createTimestampClient();
+
+    @Test
+    public void shouldBeAbleToWriteAndListTodos() {
+        TodoResource todoClient = createClientToSingleNode(TodoResource.class);
+
+        todoClient.addTodo(TODO);
+        assertThat(todoClient.getTodoList(), contains(TODO));
+    }
+
+    @Test
+    public void
+    shouldExposeATimestampServer() {
+        TimestampService timestampClient = createTimestampClient();
+
+        assertThat(timestampClient.getFreshTimestamp(), is(not(nullValue())));
+    }
+}
diff --git a/atlasdb-exec/src/main/java/com/palantir/atlasdb/clis/RegenerateCodeForSchemas.java b/atlasdb-exec/src/main/java/com/palantir/atlasdb/clis/RegenerateCodeForSchemas.java
index 802796b9047..27d35dd7126 100644
--- a/atlasdb-exec/src/main/java/com/palantir/atlasdb/clis/RegenerateCodeForSchemas.java
+++ b/atlasdb-exec/src/main/java/com/palantir/atlasdb/clis/RegenerateCodeForSchemas.java
@@ -48,7 +48,7 @@ public static void main(String[] args) {
                     System.exit(1);
                 }
 
-                Path sourceDirLocation = location.resolve("../src");
+                Path sourceDirLocation = location.resolve("../src/main/java");
                 if (schema.getClass().getCanonicalName().contains("Test")) {
                     sourceDirLocation = location.resolve("../test-src");
                 }
diff --git a/atlasdb-hikari/build.gradle b/atlasdb-hikari/build.gradle
index 0a13cf69d23..a46e1d99f91 100644
--- a/atlasdb-hikari/build.gradle
+++ b/atlasdb-hikari/build.gradle
@@ -5,9 +5,9 @@ apply from: "../gradle/shared.gradle"
 dependencies {
   compile project(":atlasdb-jdbc")
 
-  compile "com.zaxxer:HikariCP:2.4.3"
+  compile(group: 'com.zaxxer', name: 'HikariCP', version: libVersions.hikariCP)
 
-  processor "org.immutables:value:2.0.21"
+  processor "org.immutables:value:" + libVersions.immutables
   processor "com.google.auto.service:auto-service:1.0-rc2"
 }
 
diff --git a/atlasdb-impl-shared/build.gradle b/atlasdb-impl-shared/build.gradle
index 3785a913510..bf9215e5bab 100644
--- a/atlasdb-impl-shared/build.gradle
+++ b/atlasdb-impl-shared/build.gradle
@@ -10,6 +10,7 @@ repositories {
 }
 
 libsDirName = file('build/artifacts')
+
 dependencies {
   compile(project(":atlasdb-client"))
   compile(project(":atlasdb-lock-api"))
@@ -17,6 +18,10 @@ dependencies {
   compile(project(":timestamp-impl"))
   compile(project(":atlasdb-commons"))
   compile(project(":lock-impl"))
-  processor 'org.immutables:value:2.0.21'
+
+  processor 'org.immutables:value:' + libVersions.immutables
   processor 'com.google.auto.service:auto-service:1.0-rc2'
+
+  testCompile group: 'org.assertj', name: 'assertj-core', version: libVersions.assertj
+  testCompile group: 'org.mockito', name: 'mockito-core', version: libVersions.mockito
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java
index 71c7d9acbf7..1165b3e70b3 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/AsyncPuncher.java
@@ -33,7 +33,7 @@
  *
  * @author jweel
  */
-public class AsyncPuncher implements Puncher {
+public final class AsyncPuncher implements Puncher {
     private static final Logger log = LoggerFactory.getLogger(AsyncPuncher.class);
     private static final long INVALID_TIMESTAMP = -1L;
 
@@ -89,9 +89,9 @@ public void shutdown() {
             Thread.currentThread().interrupt();
         }
         if (!shutdown) {
-            log.error("Failed to shutdown puncher in a timely manner. The puncher may attempt " +
-                    "to access a key value service after the key value service closes. This shouldn't " +
-                    "cause any problems, but may result in some scary looking error messages.");
+            log.error("Failed to shutdown puncher in a timely manner. The puncher may attempt"
+                    + " to access a key value service after the key value service closes. This shouldn't"
+                    + " cause any problems, but may result in some scary looking error messages.");
         }
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CachingPuncherStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CachingPuncherStore.java
index b1d9f4f6597..b2cfb217a11 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CachingPuncherStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CachingPuncherStore.java
@@ -27,12 +27,12 @@
  *
  * @author jweel
  */
-public class CachingPuncherStore implements PuncherStore {
+public final class CachingPuncherStore implements PuncherStore {
     private static final int CACHE_SIZE = 64000;
 
     public static CachingPuncherStore create(final PuncherStore puncherStore, long granularityMillis) {
         LoadingCache<Long, Long> timeMillisToTimestamp =
-                CacheBuilder.newBuilder().maximumSize(CACHE_SIZE).<Long, Long> build(
+                CacheBuilder.newBuilder().maximumSize(CACHE_SIZE).build(
                         new CacheLoader<Long, Long>() {
                             @Override
                             public Long load(Long timeMillis) throws Exception {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Cleaner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Cleaner.java
index 3b3e03b3895..c0b61784f07 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Cleaner.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Cleaner.java
@@ -34,7 +34,8 @@ public interface Cleaner extends Closeable {
      * @param cellToTableRefs Cells that were touched as part of the hard delete transaction
      * @param scrubTimestamp The start timestamp of the hard delete transaction whose
      *        cells need to be scrubbed; at the time queueCellsForScrubbing is called,
-     *        the hard delete transaction will be in the process of committing  @throws exceptions are simply propagated up if something goes wrong.
+     *        the hard delete transaction will be in the process of committing  @throws
+     *        exceptions are simply propagated up if something goes wrong.
      */
     void queueCellsForScrubbing(Multimap<Cell, TableReference> cellToTableRefs,
                                 long scrubTimestamp);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java
index 2741b265d71..48f6fcdf512 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/CleanupFollower.java
@@ -26,13 +26,12 @@
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.table.description.Schema;
-import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.Transaction.TransactionType;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
-import com.palantir.atlasdb.transaction.api.TransactionTask;
 
-public class CleanupFollower implements Follower {
+public final class CleanupFollower implements Follower {
     private final ImmutableMultimap<TableReference, OnCleanupTask> cleanupTasksByTable;
+
     public static CleanupFollower create(Iterable<Schema> schemas) {
         ImmutableMultimap.Builder<TableReference, OnCleanupTask> cleanupTasksByTable = ImmutableMultimap.builder();
         for (Schema schema : schemas) {
@@ -50,26 +49,26 @@ private CleanupFollower(Multimap<TableReference, OnCleanupTask> cleanupTasksByTa
     }
 
     @Override
-    public void run(TransactionManager txManager, TableReference tableRef, final Set<Cell> cells, final TransactionType transactionType) {
+    public void run(
+            TransactionManager txManager,
+            TableReference tableRef,
+            Set<Cell> cells,
+            TransactionType transactionType) {
         Collection<OnCleanupTask> nextTasks = cleanupTasksByTable.get(tableRef);
         while (!nextTasks.isEmpty()) {
             final Collection<OnCleanupTask> cleanupTasks = nextTasks;
-            nextTasks = txManager.runTaskWithRetry(new TransactionTask<Collection<OnCleanupTask>, RuntimeException>() {
-                @Override
-                public Collection<OnCleanupTask> execute(Transaction t) {
-                    Collection<OnCleanupTask> toRetry = Lists.newArrayList();
-                    Preconditions.checkArgument(
-                            transactionType == TransactionType.HARD_DELETE ||
-                            transactionType == TransactionType.AGGRESSIVE_HARD_DELETE);
-                    t.setTransactionType(transactionType);
-                    for (OnCleanupTask task : cleanupTasks) {
-                        boolean needsRetry = task.cellsCleanedUp(t, cells);
-                        if (needsRetry) {
-                            toRetry.add(task);
-                        }
+            nextTasks = txManager.runTaskWithRetry(tx -> {
+                Collection<OnCleanupTask> toRetry = Lists.newArrayList();
+                Preconditions.checkArgument(transactionType == TransactionType.HARD_DELETE
+                        || transactionType == TransactionType.AGGRESSIVE_HARD_DELETE);
+                tx.setTransactionType(transactionType);
+                for (OnCleanupTask task : cleanupTasks) {
+                    boolean needsRetry = task.cellsCleanedUp(tx, cells);
+                    if (needsRetry) {
+                        toRetry.add(task);
                     }
-                    return toRetry;
                 }
+                return toRetry;
             });
         }
     }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java
index 02815e5fd6d..d00286e3a41 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/DefaultCleanerBuilder.java
@@ -126,7 +126,8 @@ private Scrubber buildScrubber(Supplier<Long> unreadableTimestampSupplier,
 
     public Cleaner buildCleaner() {
         Puncher puncher = buildPuncher();
-        Supplier<Long> immutableTs = ImmutableTimestampSupplier.createMemoizedWithExpiration(lockService, timestampService, lockClient);
+        Supplier<Long> immutableTs = ImmutableTimestampSupplier
+                .createMemoizedWithExpiration(lockService, timestampService, lockClient);
         Scrubber scrubber = buildScrubber(puncher.getTimestampSupplier(), immutableTs);
         return new SimpleCleaner(
                 scrubber,
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java
index 65896c6cdce..96678c326d6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Follower.java
@@ -27,10 +27,16 @@
  */
 public interface Follower {
     /**
+     * Run the follower over the cells in a transaction.
+     *
      * @param tableRef the table being scrubbed / swept
      * @param cells ALL the actual cells being deleted (not just the ones passed in to scrub()!)
      * @param transactionType regular or aggressive hard delete
      */
     // TODO (ejin): Is passing a TransactionType really the cleanest approach here?
-    void run(TransactionManager txManager, TableReference tableRef, Set<Cell> cells, Transaction.TransactionType transactionType);
+    void run(
+            TransactionManager txManager,
+            TableReference tableRef,
+            Set<Cell> cells,
+            Transaction.TransactionType transactionType);
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java
index c624a70d4fc..1b68f33d660 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/GlobalClock.java
@@ -19,21 +19,21 @@
 import com.palantir.lock.RemoteLockService;
 
 /**
- * Clock implementation that delegates to a LockService
+ * Clock implementation that delegates to a LockService.
  *
  * @author jweel
  */
-public class GlobalClock implements Clock {
-    public static GlobalClock create(RemoteLockService lockService) {
-        return new GlobalClock(lockService);
-    }
-
+public final class GlobalClock implements Clock {
     private final RemoteLockService lockService;
 
     private GlobalClock(RemoteLockService lockService) {
         this.lockService = lockService;
     }
 
+    public static GlobalClock create(RemoteLockService lockService) {
+        return new GlobalClock(lockService);
+    }
+
     @Override
     public long getTimeMillis() {
         return lockService.currentTimeMillis();
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java
index f808d78786e..40ac7d66f04 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ImmutableTimestampSupplier.java
@@ -31,7 +31,7 @@
  * @author jweel
  *
  */
-public class ImmutableTimestampSupplier implements Supplier<Long> {
+public final class ImmutableTimestampSupplier implements Supplier<Long> {
     private static final long RELOAD_INTERVAL_MILLIS = 1000L;
 
     public static Supplier<Long> createMemoizedWithExpiration(RemoteLockService lockService,
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java
index 3930798479e..4f8c0f598bf 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/InMemoryPuncherStore.java
@@ -27,19 +27,18 @@
  *
  * @author jweel
  */
-class InMemoryPuncherStore implements PuncherStore {
-    // TODO (ejin): Use a KeyValueServicePuncherStore backed by an InMemoryKeyValueService
-    // for unit tests instead
+final class InMemoryPuncherStore implements PuncherStore {
+    // TODO (ejin): Use a KeyValueServicePuncherStore backed by an InMemoryKeyValueService for unit tests instead
     public static InMemoryPuncherStore create() {
         return new InMemoryPuncherStore();
     }
 
-    private InMemoryPuncherStore() {//
+    private InMemoryPuncherStore() {
     }
 
     private final NavigableMap<Long, Long> map = makeMap();
 
-    private final NavigableMap<Long, Long> makeMap() {
+    private NavigableMap<Long, Long> makeMap() {
         NavigableMap<Long, Long> map1 = Maps.newTreeMap();
         map1.put(Long.MIN_VALUE, Long.MIN_VALUE);
         return map1;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java
index a8b6f936d62..ecce6e927fb 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServicePuncherStore.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.atlasdb.cleaner;
 
+import java.nio.charset.StandardCharsets;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.palantir.atlasdb.AtlasDbConstants;
@@ -40,12 +42,13 @@
  *
  * @author jweel
  */
-public class KeyValueServicePuncherStore implements PuncherStore {
-    private static final byte[] COLUMN = "t".getBytes();
+public final class KeyValueServicePuncherStore implements PuncherStore {
+    private static final byte[] COLUMN = "t".getBytes(StandardCharsets.UTF_8);
 
     public static KeyValueServicePuncherStore create(KeyValueService keyValueService) {
         keyValueService.createTable(AtlasDbConstants.PUNCH_TABLE, new TableMetadata(
-                NameMetadataDescription.create(ImmutableList.of(new NameComponentDescription("time", ValueType.VAR_LONG, ValueByteOrder.DESCENDING))),
+                NameMetadataDescription.create(ImmutableList.of(
+                        new NameComponentDescription("time", ValueType.VAR_LONG, ValueByteOrder.DESCENDING))),
                 new ColumnMetadataDescription(ImmutableList.of(
                         new NamedColumnDescription("t", "t", ColumnValueDescription.forType(ValueType.VAR_LONG)))),
                         ConflictHandler.IGNORE_ALL).persistToBytes());
@@ -85,7 +88,7 @@ public Long get(Long timeMillis) {
             result.close();
         }
     }
-    
+
     @Override
     public long getMillisForTimestamp(long timestamp) {
         return getMillisForTimestamp(keyValueService, timestamp);
@@ -97,11 +100,11 @@ public static long getMillisForTimestamp(KeyValueService kvs, long timestamp) {
         // scan, which is fine because this table should be really small
         byte[] startRow = EncodingUtils.encodeUnsignedVarLong(Long.MAX_VALUE);
         EncodingUtils.flipAllBitsInPlace(startRow);
-        RangeRequest rangeRequest = 
+        RangeRequest rangeRequest =
                 RangeRequest.builder().startRowInclusive(startRow).batchHint(1).build();
-        ClosableIterator<RowResult<Value>> result = 
+        ClosableIterator<RowResult<Value>> result =
                 kvs.getRange(AtlasDbConstants.PUNCH_TABLE, rangeRequest, timestampExclusive);
-        
+
         try {
             if (result.hasNext()) {
                 byte[] encodedMillis = result.next().getRowName();
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java
index 1cbca8e7864..b93149e3576 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/KeyValueServiceScrubberStore.java
@@ -21,7 +21,7 @@
 import java.util.Map.Entry;
 import java.util.SortedMap;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
@@ -46,7 +46,6 @@
 import com.palantir.atlasdb.table.description.TableMetadata;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.ConflictHandler;
-import com.palantir.common.base.AbortingVisitor;
 import com.palantir.common.base.AbstractBatchingVisitable;
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.base.BatchingVisitableFromIterable;
@@ -60,15 +59,15 @@
  *
  * @author ejin
  */
-public class KeyValueServiceScrubberStore implements ScrubberStore {
-
+public final class KeyValueServiceScrubberStore implements ScrubberStore {
     private final KeyValueService keyValueService;
 
     public static ScrubberStore create(KeyValueService keyValueService) {
         keyValueService.createTable(AtlasDbConstants.SCRUB_TABLE, new TableMetadata(
                 NameMetadataDescription.create(ImmutableList.of(new NameComponentDescription("cell", ValueType.BLOB))),
                 new ColumnMetadataDescription(new DynamicColumnDescription(
-                        NameMetadataDescription.create(ImmutableList.of(new NameComponentDescription("name", ValueType.STRING))),
+                        NameMetadataDescription.create(ImmutableList.of(
+                                new NameComponentDescription("name", ValueType.STRING))),
                         ColumnValueDescription.forType(ValueType.STRING))),
                         ConflictHandler.IGNORE_ALL).persistToBytes());
         return new KeyValueServiceScrubberStore(keyValueService);
@@ -84,7 +83,10 @@ private KeyValueServiceScrubberStore(KeyValueService keyValueService) {
     }
 
     @Override
-    public void queueCellsForScrubbing(Multimap<Cell, TableReference> cellToTableRefs, long scrubTimestamp, int batchSize) {
+    public void queueCellsForScrubbing(
+            Multimap<Cell, TableReference> cellToTableRefs,
+            long scrubTimestamp,
+            int batchSize) {
         Map<Cell, byte[]> values = Maps.newHashMap();
         for (Map.Entry<Cell, Collection<TableReference>> entry : cellToTableRefs.asMap().entrySet()) {
             Cell cell = entry.getKey();
@@ -120,27 +122,31 @@ public void markCellsAsScrubbed(Multimap<Cell, Long> cellToScrubTimestamp, int b
     }
 
     @Override
-    public BatchingVisitable<SortedMap<Long, Multimap<TableReference, Cell>>> getBatchingVisitableScrubQueue(final int cellsToScrubBatchSize,
-                                                                                                             long maxScrubTimestamp /* exclusive */,
-                                                                                                             byte[] startRow,
-                                                                                                             byte[] endRow) {
-        ClosableIterator<RowResult<Value>> iterator = getIteratorToScrub(cellsToScrubBatchSize, maxScrubTimestamp, startRow, endRow);
+    public BatchingVisitable<SortedMap<Long, Multimap<TableReference, Cell>>> getBatchingVisitableScrubQueue(
+            int cellsToScrubBatchSize,
+            long maxScrubTimestamp /* exclusive */,
+            byte[] startRow,
+            byte[] endRow) {
+        ClosableIterator<RowResult<Value>> iterator =
+                getIteratorToScrub(cellsToScrubBatchSize, maxScrubTimestamp, startRow, endRow);
         final BatchingVisitable<RowResult<Value>> results = BatchingVisitableFromIterable.create(iterator);
-        return BatchingVisitableView.of(new AbstractBatchingVisitable<SortedMap<Long, Multimap<TableReference, Cell>>>() {
-            @Override
-            protected <K extends Exception> void batchAcceptSizeHint(int batchSizeHint,
-                                                                        final ConsistentVisitor<SortedMap<Long, Multimap<TableReference, Cell>>, K> v) throws K {
-                results.batchAccept(cellsToScrubBatchSize, new AbortingVisitor<List<RowResult<Value>>, K>() {
+        return BatchingVisitableView.of(
+                new AbstractBatchingVisitable<SortedMap<Long, Multimap<TableReference, Cell>>>() {
                     @Override
-                    public boolean visit(List<RowResult<Value>> batch) throws K {
-                        return v.visit(ImmutableList.of(transformRows(batch)));
+                    protected <K extends Exception> void batchAcceptSizeHint(
+                            int batchSizeHint,
+                            ConsistentVisitor<SortedMap<Long, Multimap<TableReference, Cell>>, K> visitor) throws K {
+                        results.batchAccept(cellsToScrubBatchSize, batch ->
+                                visitor.visit(ImmutableList.of(transformRows(batch))));
                     }
                 });
-            }
-        });
     }
 
-    private ClosableIterator<RowResult<Value>> getIteratorToScrub(int cellsToScrubBatchSize, long maxScrubTimestamp, byte[] startRow, byte[] endRow) {
+    private ClosableIterator<RowResult<Value>> getIteratorToScrub(
+            int cellsToScrubBatchSize,
+            long maxScrubTimestamp,
+            byte[] startRow,
+            byte[] endRow) {
         RangeRequest.Builder range = RangeRequest.builder();
         if (startRow != null) {
             range = range.startRowInclusive(startRow);
@@ -165,10 +171,11 @@ private SortedMap<Long, Multimap<TableReference, Cell>> transformRows(List<RowRe
                         PtBytes.toString(value.getContents()),
                         AtlasDbConstants.SCRUB_TABLE_SEPARATOR_CHAR);
                 if (!scrubTimestampToTableNameToCell.containsKey(scrubTimestamp)) {
-                    scrubTimestampToTableNameToCell.put(scrubTimestamp, HashMultimap.<TableReference, Cell>create());
+                    scrubTimestampToTableNameToCell.put(scrubTimestamp, HashMultimap.create());
                 }
                 for (String tableName : tableNames) {
-                    scrubTimestampToTableNameToCell.get(scrubTimestamp).put(TableReference.createUnsafe(tableName), cell);
+                    scrubTimestampToTableNameToCell.get(scrubTimestamp)
+                            .put(TableReference.createUnsafe(tableName), cell);
                 }
             }
         }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/NoOpCleaner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/NoOpCleaner.java
index cf050077779..6ac39382224 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/NoOpCleaner.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/NoOpCleaner.java
@@ -20,7 +20,7 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 
-final public class NoOpCleaner implements Cleaner {
+public final class NoOpCleaner implements Cleaner {
     public static final NoOpCleaner INSTANCE = new NoOpCleaner();
 
     @Override
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Puncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Puncher.java
index be7d053cb3c..97077d5eb08 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Puncher.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Puncher.java
@@ -25,12 +25,12 @@ public interface Puncher {
 
     /**
      * @return a timestamp smaller than the timestamp of any currently un-timed-out
-     *         transaction
+     *         transaction.
      */
     Supplier<Long> getTimestampSupplier();
 
     /**
-     * Releases resources associated with this Puncher (usually means thread pools)
+     * Releases resources associated with this Puncher (usually means thread pools).
      */
-    public void shutdown();
+    void shutdown();
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/PuncherStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/PuncherStore.java
index 057d8225206..c81d288474a 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/PuncherStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/PuncherStore.java
@@ -33,9 +33,9 @@ public interface PuncherStore {
      * Find the latest timestamp created at or before timeMillis.
      */
     Long get(Long timeMillis);
-    
+
     /**
-     * Get the time in millis for the greatest timestamp punched less than or equal to the given timestamp
+     * Get the time in millis for the greatest timestamp punched less than or equal to the given timestamp.
      */
     long getMillisForTimestamp(long timestamp);
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java
index 522531f7527..5abb2541cd7 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/Scrubber.java
@@ -63,7 +63,6 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.atlasdb.transaction.service.TransactionService;
-import com.palantir.common.base.AbortingVisitor;
 import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.base.BatchingVisitableView;
 import com.palantir.common.base.Throwables;
@@ -192,16 +191,18 @@ public void run() {
                         runBackgroundScrubTask(txManager);
 
                         long sleepDuration = backgroundScrubFrequencyMillisSupplier.get();
-                        log.info(String.format("Sleeping %d millis until next execution of scrub task", sleepDuration));
+                        log.info("Sleeping {} millis until next execution of scrub task", sleepDuration);
                         Thread.sleep(sleepDuration);
                     } catch (InterruptedException e) {
                         if (service.isShutdown()) {
                             break;
                         } else {
-                            log.error("Interrupted unexpectedly during background scrub task, but continuing anyway", e);
+                            log.error("Interrupted unexpectedly during background scrub task,"
+                                    + " but continuing anyway", e);
                         }
                     } catch (Throwable t) { // (authorized)
-                        log.error("Encountered the following error during background scrub task, but continuing anyway", t);
+                        log.error("Encountered the following error during background scrub task,"
+                                + " but continuing anyway", t);
                         numberOfAttempts++;
                         try {
                             Thread.sleep(RETRY_SLEEP_INTERVAL_IN_MILLIS);
@@ -237,7 +238,7 @@ private void runBackgroundScrubTask(final TransactionManager txManager) {
                     + ", unreadableTimestamp: " + unreadableTimestamp
                     + ", min: " + maxScrubTimestamp);
         }
-        final int batchSize = ((int) Math.ceil(batchSizeSupplier.get() * ((double) threadCount / readThreadCount)));
+        final int batchSize = (int) Math.ceil(batchSizeSupplier.get() * ((double) threadCount / readThreadCount));
 
         List<byte[]> rangeBoundaries = Lists.newArrayList();
         rangeBoundaries.add(PtBytes.EMPTY_BYTE_ARRAY);
@@ -253,40 +254,39 @@ private void runBackgroundScrubTask(final TransactionManager txManager) {
         for (int i = 0; i < rangeBoundaries.size() - 1; i++) {
             final byte[] startRow = rangeBoundaries.get(i);
             final byte[] endRow = rangeBoundaries.get(i + 1);
-            readerFutures.add(readerExec.submit(new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    BatchingVisitable<SortedMap<Long, Multimap<TableReference, Cell>>> scrubQueue =
-                            scrubberStore.getBatchingVisitableScrubQueue(batchSize, maxScrubTimestamp, startRow, endRow);
-                    // Take one at a time since we already batched them together in KeyValueServiceScrubberStore.
-                    BatchingVisitableView.of(scrubQueue).batchAccept(1, new AbortingVisitor<List<SortedMap<Long, Multimap<TableReference, Cell>>>, RuntimeException>() {
-                        @Override
-                        public boolean visit(List<SortedMap<Long, Multimap<TableReference, Cell>>> batch) {
-                            for (SortedMap<Long, Multimap<TableReference, Cell>> cells : batch) {
-                                // We may actually get more cells than the batch size. The batch size is used for pulling off the scrub queue,
-                                // and a single entry in the scrub queue may match multiple tables.
-                                // These will get broken down into smaller batches later on when we actually do deletes.
-                                int numCellsRead = scrubSomeCells(cells, txManager, maxScrubTimestamp);
-                                int totalRead = totalCellsRead.addAndGet(numCellsRead);
-                                if (log.isInfoEnabled()) {
-                                    log.info("Scrub task processed " + numCellsRead + " cells in a batch, total " + totalRead + " processed so far.");
-                                }
-                                if (!isScrubEnabled.get()) {
-                                    log.info("Stopping scrub for banned hours.");
-                                    break;
-                                }
-                            }
-                            return isScrubEnabled.get();
-                        }});
-                    return null;
-                }}));
+            readerFutures.add(readerExec.submit(() -> {
+                BatchingVisitable<SortedMap<Long, Multimap<TableReference, Cell>>> scrubQueue = scrubberStore
+                        .getBatchingVisitableScrubQueue(batchSize, maxScrubTimestamp, startRow, endRow);
+                // Take one at a time since we already batched them together in KeyValueServiceScrubberStore.
+                BatchingVisitableView.of(scrubQueue).batchAccept(1, batch -> {
+                    for (SortedMap<Long, Multimap<TableReference, Cell>> cells : batch) {
+                        // We may actually get more cells than the batch size. The batch size is used
+                        // for pulling off the scrub queue, and a single entry in the scrub queue may
+                        // match multiple tables. These will get broken down into smaller batches later
+                        // on when we actually do deletes.
+                        int numCellsRead = scrubSomeCells(cells, txManager, maxScrubTimestamp);
+                        int totalRead = totalCellsRead.addAndGet(numCellsRead);
+                        if (log.isInfoEnabled()) {
+                            log.info("Scrub task processed " + numCellsRead + " cells in a batch,"
+                                    + " total " + totalRead + " processed so far.");
+                        }
+                        if (!isScrubEnabled.get()) {
+                            log.info("Stopping scrub for banned hours.");
+                            break;
+                        }
+                    }
+                    return isScrubEnabled.get();
+                });
+                return null;
+            }));
         }
 
         for (Future<Void> readerFuture : readerFutures) {
             Futures.getUnchecked(readerFuture);
         }
 
-        log.info("Scrub background task running at timestamp " + maxScrubTimestamp + " processed a total of " + totalCellsRead.get() + " cells");
+        log.info("Scrub background task running at timestamp " + maxScrubTimestamp
+                + " processed a total of " + totalCellsRead.get() + " cells");
 
         log.info("Finished scrub task");
     }
@@ -319,45 +319,41 @@ public boolean visit(List<SortedMap<Long, Multimap<TableReference, Cell>>> batch
         }
 
         List<Future<Void>> scrubFutures = Lists.newArrayList();
-        for (List<Entry<TableReference, Cell>> batch : Iterables.partition(tableNameToCell.entries(), batchSizeSupplier.get())) {
+        for (List<Entry<TableReference, Cell>> batch :
+                Iterables.partition(tableNameToCell.entries(), batchSizeSupplier.get())) {
             final Multimap<TableReference, Cell> batchMultimap = HashMultimap.create();
             for (Entry<TableReference, Cell> e : batch) {
                 batchMultimap.put(e.getKey(), e.getValue());
             }
 
-            final Callable<Void> c =new Callable<Void>()  {
-                @Override
-                public Void call() throws Exception {
-                    if (log.isInfoEnabled()) {
-                        log.info("Scrubbing " + batchMultimap.size() + " cells immediately.");
-                    }
+            final Callable<Void> c = () -> {
+                if (log.isInfoEnabled()) {
+                    log.info("Scrubbing " + batchMultimap.size() + " cells immediately.");
+                }
 
-                    // Here we don't need to check scrub timestamps because we guarantee that scrubImmediately is called
-                    // AFTER the transaction commits
-                    scrubCells(txManager, batchMultimap, scrubTimestamp, TransactionType.AGGRESSIVE_HARD_DELETE);
+                // Here we don't need to check scrub timestamps because we guarantee that scrubImmediately is called
+                // AFTER the transaction commits
+                scrubCells(txManager, batchMultimap, scrubTimestamp, TransactionType.AGGRESSIVE_HARD_DELETE);
 
-                    Multimap<Cell, Long> cellToScrubTimestamp = HashMultimap.create();
+                Multimap<Cell, Long> cellToScrubTimestamp = HashMultimap.create();
 
-                    cellToScrubTimestamp = Multimaps.invertFrom(
-                            Multimaps.index(batchMultimap.values(), Functions.constant(scrubTimestamp)),
-                            cellToScrubTimestamp);
+                cellToScrubTimestamp = Multimaps.invertFrom(
+                        Multimaps.index(batchMultimap.values(), Functions.constant(scrubTimestamp)),
+                        cellToScrubTimestamp);
 
-                    scrubberStore.markCellsAsScrubbed(cellToScrubTimestamp, batchSizeSupplier.get());
+                scrubberStore.markCellsAsScrubbed(cellToScrubTimestamp, batchSizeSupplier.get());
 
-                    if (log.isInfoEnabled()) {
-                        log.info("Completed scrub immediately.");
-                    }
-                    return null;
+                if (log.isInfoEnabled()) {
+                    log.info("Completed scrub immediately.");
                 }
+                return null;
             };
             if (!inScrubThread.get()) {
-                scrubFutures.add(exec.submit(new Callable<Void>() {
-                    @Override
-                    public Void call() throws Exception {
-                        inScrubThread.set(true);
-                        c.call();
-                        return null;
-                    }}));
+                scrubFutures.add(exec.submit(() -> {
+                    inScrubThread.set(true);
+                    c.call();
+                    return null;
+                }));
             } else {
                 try {
                     c.call();
@@ -397,9 +393,9 @@ private long getCommitTimestampRollBackIfNecessary(long startTimestamp,
             try {
                 transactionService.putUnlessExists(startTimestamp, TransactionConstants.FAILED_COMMIT_TS);
             } catch (KeyAlreadyExistsException e) {
-                String msg = "Could not roll back transaction with start timestamp " + startTimestamp + "; either" +
-                        " it was already rolled back (by a different transaction), or it committed successfully" +
-                        " before we could roll it back.";
+                String msg = "Could not roll back transaction with start timestamp " + startTimestamp + "; either"
+                        + " it was already rolled back (by a different transaction), or it committed successfully"
+                        + " before we could roll it back.";
                 log.error("This isn't a bug but it should be very infrequent. " + msg,
                         new TransactionFailedRetriableException(msg, e));
             }
@@ -418,11 +414,14 @@ private long getCommitTimestampRollBackIfNecessary(long startTimestamp,
     }
 
     /**
+     * Scrubs some cells.
+     *
      * @return number of cells read from _scrub table
      */
-    private int scrubSomeCells(SortedMap<Long, Multimap<TableReference, Cell>> scrubTimestampToTableNameToCell, final TransactionManager txManager, long maxScrubTimestamp) {
-
-
+    private int scrubSomeCells(
+            SortedMap<Long, Multimap<TableReference, Cell>> scrubTimestampToTableNameToCell,
+            TransactionManager txManager,
+            long maxScrubTimestamp) {
         // Don't call expensive toString() if trace logging is off
         if (log.isTraceEnabled()) {
             log.trace("Attempting to scrub cells: " + scrubTimestampToTableNameToCell);
@@ -461,19 +460,18 @@ private int scrubSomeCells(SortedMap<Long, Multimap<TableReference, Cell>> scrub
                 // (we still remove it from the _scrub table with the call to markCellsAsScrubbed though),
                 // or else we could cause permanent data loss if the hard delete transaction failed after
                 // queuing cells to scrub but before successfully committing
-                for (final List<Entry<TableReference, Cell>> batch : Iterables.partition(tableNameToCell.entries(), batchSizeSupplier.get())) {
+                for (final List<Entry<TableReference, Cell>> batch :
+                        Iterables.partition(tableNameToCell.entries(), batchSizeSupplier.get())) {
                     final Multimap<TableReference, Cell> batchMultimap = HashMultimap.create();
                     for (Entry<TableReference, Cell> e : batch) {
                         batchMultimap.put(e.getKey(), e.getValue());
                     }
-                    scrubFutures.add(exec.submit(new Callable<Void>() {
-                        @Override
-                        public Void call() throws Exception {
-                            scrubCells(txManager, batchMultimap,
-                                    scrubTimestamp,
-                                    aggressiveScrub ? TransactionType.AGGRESSIVE_HARD_DELETE : TransactionType.HARD_DELETE);
-                            return null;
-                        }}));
+                    scrubFutures.add(exec.submit(() -> {
+                        scrubCells(txManager, batchMultimap,
+                                scrubTimestamp,
+                                aggressiveScrub ? TransactionType.AGGRESSIVE_HARD_DELETE : TransactionType.HARD_DELETE);
+                        return null;
+                    }));
                 }
             }
             toRemoveFromScrubQueue.putAll(scrubTimestamp, tableNameToCell.values());
@@ -484,7 +482,9 @@ public Void call() throws Exception {
         }
 
         Multimap<Cell, Long> cellToScrubTimestamp = HashMultimap.create();
-        scrubberStore.markCellsAsScrubbed(Multimaps.invertFrom(toRemoveFromScrubQueue, cellToScrubTimestamp), batchSizeSupplier.get());
+        scrubberStore.markCellsAsScrubbed(
+                Multimaps.invertFrom(toRemoveFromScrubQueue, cellToScrubTimestamp),
+                batchSizeSupplier.get());
 
         if (log.isTraceEnabled()) {
             log.trace("Finished scrubbing cells: " + scrubTimestampToTableNameToCell);
@@ -497,9 +497,9 @@ public Void call() throws Exception {
             }
             long minTimestamp = Collections.min(scrubTimestampToTableNameToCell.keySet());
             long maxTimestamp = Collections.max(scrubTimestampToTableNameToCell.keySet());
-            log.info("Finished scrubbing " + numCellsReadFromScrubTable + " cells at " +
-                    scrubTimestampToTableNameToCell.size() + " timestamps (" + minTimestamp + "..." +
-                    maxTimestamp + ") from tables " + tables);
+            log.info("Finished scrubbing " + numCellsReadFromScrubTable + " cells at "
+                    + scrubTimestampToTableNameToCell.size() + " timestamps (" + minTimestamp + "..."
+                    + maxTimestamp + ") from tables " + tables);
         }
 
         return numCellsReadFromScrubTable;
@@ -512,7 +512,8 @@ private void scrubCells(TransactionManager txManager,
         for (Entry<TableReference, Collection<Cell>> entry : tableNameToCells.asMap().entrySet()) {
             TableReference tableRef = entry.getKey();
             if (log.isInfoEnabled()) {
-                log.info("Attempting to immediately scrub " + entry.getValue().size() + " cells from table " + tableRef);
+                log.info("Attempting to immediately scrub " + entry.getValue().size()
+                        + " cells from table " + tableRef);
             }
             for (List<Cell> cells : Iterables.partition(entry.getValue(), batchSizeSupplier.get())) {
                 Multimap<Cell, Long> timestampsToDelete = HashMultimap.create(
@@ -566,9 +567,9 @@ public void shutdown() {
             Thread.currentThread().interrupt();
         }
         if (!shutdown) {
-            log.error("Failed to shutdown scrubber in a timely manner. The scrubber may attempt " +
-                    "to access a key value service after the key value service closes. This shouldn't " +
-                    "cause any problems, but may result in some scary looking error messages.");
+            log.error("Failed to shutdown scrubber in a timely manner. The scrubber may attempt"
+                    + " to access a key value service after the key value service closes. This shouldn't"
+                    + " cause any problems, but may result in some scary looking error messages.");
         }
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java
index d9235c3e5f2..5dd94eb8ad4 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/ScrubberStore.java
@@ -24,21 +24,20 @@
 
 /**
  * This is the underlying store used by the scrubber for keeping track in a persistent way of the
- * cells that need to be scrubbed
+ * cells that need to be scrubbed.
  *
  * @author ejin
  */
 public interface ScrubberStore {
-
     void queueCellsForScrubbing(Multimap<Cell, TableReference> cellToTableRefs, long scrubTimestamp, int batchSize);
 
     void markCellsAsScrubbed(Multimap<Cell, Long> cellToScrubTimestamp, int batchSize);
 
-    BatchingVisitable<SortedMap<Long, Multimap<TableReference, Cell>>> getBatchingVisitableScrubQueue(int cellsToScrubBatchSize,
-                                                                                                      long maxScrubTimestamp /* exclusive */,
-                                                                                                      byte[] startRow,
-                                                                                                      byte[] endRow);
+    BatchingVisitable<SortedMap<Long, Multimap<TableReference, Cell>>> getBatchingVisitableScrubQueue(
+            int cellsToScrubBatchSize,
+            long maxScrubTimestamp /* exclusive */,
+            byte[] startRow,
+            byte[] endRow);
 
     int getNumberRemainingScrubCells(int maxCellsToScan);
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java
index 757029eb712..4febfd90064 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/cleaner/SimplePuncher.java
@@ -25,7 +25,7 @@
  *
  * @author jweel
  */
-public class SimplePuncher implements Puncher {
+public final class SimplePuncher implements Puncher {
     public static SimplePuncher create(PuncherStore puncherStore,
                                        Clock clock,
                                        Supplier<Long> transactionReadTimeoutMillisSupplier) {
@@ -50,12 +50,7 @@ public void punch(long timestamp) {
 
     @Override
     public Supplier<Long> getTimestampSupplier() {
-        return new Supplier<Long>() {
-            @Override
-            public Long get() {
-                return puncherStore.get(clock.getTimeMillis() - transactionReadTimeoutMillisSupplier.get());
-            }
-        };
+        return () -> puncherStore.get(clock.getTimeMillis() - transactionReadTimeoutMillisSupplier.get());
     }
 
     @Override
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/NamespacedKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/NamespacedKeyValueService.java
index 7b6495d1be4..a26c2d3174f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/NamespacedKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/NamespacedKeyValueService.java
@@ -21,10 +21,12 @@
 
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -48,8 +50,18 @@ public interface NamespacedKeyValueService {
     TableMappingService getTableMapper();
 
     @Idempotent
-    Map<Cell, Value> getRows(TableReference tableRef, Iterable<byte[]> rows,
-                             ColumnSelection columnSelection,long timestamp);
+    Map<Cell, Value> getRows(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnSelection columnSelection,
+            long timestamp);
+
+    @Idempotent
+    Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp);
 
     @Idempotent
     Map<Cell, Value> get(TableReference tableRef, Map<Cell, Long> timestampByCell);
@@ -94,7 +106,8 @@ ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(TableReference table
                                                                 long timestamp);
 
     @Idempotent
-    Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(TableReference tableRef,
+    Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
             Iterable<RangeRequest> rangeRequests,
             long timestamp);
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractTableMappingService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractTableMappingService.java
index 8cd5c3f2b7e..a99d46f8e0d 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractTableMappingService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractTableMappingService.java
@@ -21,7 +21,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.Maps;
@@ -32,12 +32,12 @@
 
 public abstract class AbstractTableMappingService implements TableMappingService {
 
-    protected final AtomicReference<BiMap<TableReference, TableReference>> tableMap = new AtomicReference<BiMap<TableReference, TableReference>>();
+    protected final AtomicReference<BiMap<TableReference, TableReference>> tableMap = new AtomicReference<>();
 
     protected abstract BiMap<TableReference, TableReference> readTableMap();
 
     protected void updateTableMap() {
-        while(true) {
+        while (true) {
             BiMap<TableReference, TableReference> oldMap = tableMap.get();
             BiMap<TableReference, TableReference> newMap = readTableMap();
             if (tableMap.compareAndSet(oldMap, newMap)) {
@@ -57,13 +57,15 @@ public TableReference getMappedTableName(TableReference tableRef) {
             return tableMap.get().get(tableRef);
         } else {
             updateTableMap();
-            Validate.isTrue(tableMap.get().containsKey(tableRef), "Unable to resolve full name for table reference " + tableRef);
+            Validate.isTrue(tableMap.get().containsKey(tableRef),
+                    "Unable to resolve full name for table reference " + tableRef);
             return tableMap.get().get(tableRef);
         }
     }
 
     protected void validateShortName(TableReference tableRef, TableReference shortName) {
-        Validate.isTrue(Schemas.isTableNameValid(shortName.getQualifiedName()), "Table mapper has an invalid table name for table reference " + tableRef + ": " + shortName);
+        Validate.isTrue(Schemas.isTableNameValid(shortName.getQualifiedName()),
+                "Table mapper has an invalid table name for table reference " + tableRef + ": " + shortName);
     }
 
     private TableReference getFullTableName(TableReference shortTableName) {
@@ -71,7 +73,8 @@ private TableReference getFullTableName(TableReference shortTableName) {
             return tableMap.get().inverse().get(shortTableName);
         } else {
             updateTableMap();
-            Validate.isTrue(tableMap.get().containsValue(shortTableName), "Unable to resolve full name for table " + shortTableName);
+            Validate.isTrue(tableMap.get().containsValue(shortTableName),
+                    "Unable to resolve full name for table " + shortTableName);
             return tableMap.get().inverse().get(shortTableName);
         }
     }
@@ -85,7 +88,7 @@ public <T> Map<TableReference, T> mapToShortTableNames(Map<TableReference, T> to
         return newMap;
     }
 
-    private final ConcurrentHashMap<TableReference, Boolean> unmappedTables = new ConcurrentHashMap<TableReference, Boolean>();
+    private final ConcurrentHashMap<TableReference, Boolean> unmappedTables = new ConcurrentHashMap<>();
 
     @Override
     public Set<TableReference> mapToFullTableNames(Set<TableReference> tableRefs) {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/ClosableMergedIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/ClosableMergedIterator.java
index 2c16a7d9251..6f77163c57c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/ClosableMergedIterator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/ClosableMergedIterator.java
@@ -19,10 +19,11 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.google.common.base.Function;
 import com.google.common.collect.AbstractIterator;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
@@ -38,7 +39,9 @@
 import com.palantir.common.collect.IteratorUtils;
 import com.palantir.util.Pair;
 
-/* package */ class ClosableMergedIterator<T> extends AbstractIterator<RowResult<T>> implements ClosableIterator<RowResult<T>> {
+/* package */ class ClosableMergedIterator<T>
+        extends AbstractIterator<RowResult<T>>
+        implements ClosableIterator<RowResult<T>> {
     private final RangeRequest request;
     private final ClosableIterator<RowResult<T>> primaryIter;
     private final Function<RangeRequest, ClosableIterator<RowResult<T>>> secondaryResultProducer;
@@ -46,7 +49,7 @@
     private byte[] nextSecondaryStart;
     private boolean primaryCompleted = false;
 
-    public ClosableMergedIterator(RangeRequest request,
+    ClosableMergedIterator(RangeRequest request,
                                   ClosableIterator<RowResult<T>> primaryIter,
                                   Function<RangeRequest, ClosableIterator<RowResult<T>>> secondaryResultProducer) {
         this.request = request;
@@ -69,7 +72,7 @@ protected RowResult<T> computeNext() {
         List<RowResult<T>> batch = Lists.newArrayList(Iterators.limit(primaryIter, batchSize));
         byte[] secondaryEndRow;
         if (batch.size() == batchSize) {
-            secondaryEndRow = batch.get(batchSize-1).getRowName();
+            secondaryEndRow = Iterables.getLast(batch).getRowName();
             if (RangeRequests.isTerminalRow(request.isReverse(), secondaryEndRow)) {
                 secondaryEndRow = PtBytes.EMPTY_BYTE_ARRAY;
             } else {
@@ -81,10 +84,15 @@ protected RowResult<T> computeNext() {
             primaryCompleted = true;
         }
 
-        RangeRequest.Builder requestBuilder = request.getBuilder().startRowInclusive(nextSecondaryStart).endRowExclusive(secondaryEndRow);
+        RangeRequest.Builder requestBuilder = request.getBuilder()
+                .startRowInclusive(nextSecondaryStart)
+                .endRowExclusive(secondaryEndRow);
         nextSecondaryStart = secondaryEndRow;
         ClosableIterator<RowResult<T>> secondaryIter = secondaryResultProducer.apply(requestBuilder.build());
-        mergedIter = new ClosableMergedIterator.ClosableMergedBatchIterator<T>(batch.iterator(), secondaryIter, request.isReverse());
+        mergedIter = new ClosableMergedIterator.ClosableMergedBatchIterator<>(
+                batch.iterator(),
+                secondaryIter,
+                request.isReverse());
         if (!mergedIter.hasNext()) {
             return endOfData();
         }
@@ -101,9 +109,10 @@ private static class ClosableMergedBatchIterator<T> extends ForwardingClosableIt
         private final ClosableIterator<RowResult<T>> secondaryIter;
         private final Iterator<RowResult<T>> mergedIter;
 
-        public ClosableMergedBatchIterator(Iterator<RowResult<T>> primaryIter,
-                                           ClosableIterator<RowResult<T>> secondaryIter,
-                                           boolean isReversed) {
+        ClosableMergedBatchIterator(
+                Iterator<RowResult<T>> primaryIter,
+                ClosableIterator<RowResult<T>> secondaryIter,
+                boolean isReversed) {
             this.secondaryIter = secondaryIter;
             this.mergedIter = mergeIterators(primaryIter, secondaryIter, isReversed);
         }
@@ -138,11 +147,13 @@ public RowResult<T> apply(Pair<RowResult<T>, RowResult<T>> rows) {
                         for (Entry<byte[], T> entry : writeResult.getColumns().entrySet()) {
                             T readValue = readResult.getColumns().get(entry.getKey());
                             if (readValue instanceof Value) {
-                                long writeTimestamp = ((Value)entry.getValue()).getTimestamp();
-                                long readTimestamp = ((Value)readValue).getTimestamp();
+                                long writeTimestamp = ((Value) entry.getValue()).getTimestamp();
+                                long readTimestamp = ((Value) readValue).getTimestamp();
                                 if (writeTimestamp < readTimestamp) {
-                                    throw new IllegalArgumentException("The read only kvs has a row with timestamp " + writeTimestamp +
-                                            ", while the same row in the writing kvs has timestamp. " + readTimestamp);
+                                    throw new IllegalArgumentException("The read only kvs has a row with timestamp "
+                                            + writeTimestamp
+                                            + ", while the same row in the writing kvs has timestamp. "
+                                            + readTimestamp);
                                 }
                             }
                         }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KVTableMappingService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KVTableMappingService.java
index 6a5f31b32bc..cfe2a82d4c0 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KVTableMappingService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/KVTableMappingService.java
@@ -46,19 +46,22 @@
 
 public class KVTableMappingService extends AbstractTableMappingService {
     public static final TableMetadata NAMESPACE_TABLE_METADATA = new TableMetadata(
-        NameMetadataDescription.create(ImmutableList.of(
-                new NameComponentDescription("namespace", ValueType.VAR_STRING),
-                new NameComponentDescription("table_name", ValueType.STRING))),
-        new ColumnMetadataDescription(ImmutableList.of(
-            new NamedColumnDescription(AtlasDbConstants.NAMESPACE_SHORT_COLUMN_NAME, "short_name", ColumnValueDescription.forType(ValueType.STRING)))),
-        ConflictHandler.IGNORE_ALL);
+            NameMetadataDescription.create(ImmutableList.of(
+                    new NameComponentDescription("namespace", ValueType.VAR_STRING),
+                    new NameComponentDescription("table_name", ValueType.STRING))),
+            new ColumnMetadataDescription(ImmutableList.of(
+                    new NamedColumnDescription(
+                            AtlasDbConstants.NAMESPACE_SHORT_COLUMN_NAME,
+                            "short_name",
+                            ColumnValueDescription.forType(ValueType.STRING)))),
+            ConflictHandler.IGNORE_ALL);
 
     private final KeyValueService kv;
     private final Supplier<Long> uniqueLongSupplier;
 
     protected KVTableMappingService(KeyValueService kv, Supplier<Long> uniqueLongSupplier) {
-        this.kv = Preconditions.checkNotNull(kv);
-        this.uniqueLongSupplier = Preconditions.checkNotNull(uniqueLongSupplier);
+        this.kv = Preconditions.checkNotNull(kv, "kv must not be null");
+        this.uniqueLongSupplier = Preconditions.checkNotNull(uniqueLongSupplier, "uniqueLongSupplier must not be null");
     }
 
     public static KVTableMappingService create(KeyValueService kvs, Supplier<Long> uniqueLongSupplier) {
@@ -94,7 +97,8 @@ public TableReference addTable(TableReference tableRef) {
             return tableMap.get().get(tableRef);
         }
         Cell key = Cell.create(getBytesForTableRef(tableRef), AtlasDbConstants.NAMESPACE_SHORT_COLUMN_BYTES);
-        String shortName = AtlasDbConstants.NAMESPACE_PREFIX + Preconditions.checkNotNull(uniqueLongSupplier.get());
+        String shortName = AtlasDbConstants.NAMESPACE_PREFIX
+                + Preconditions.checkNotNull(uniqueLongSupplier.get(), "uniqueLongSupplier returned null");
         byte[] value = PtBytes.toBytes(shortName);
         try {
             kv.putUnlessExists(AtlasDbConstants.NAMESPACE_TABLE, ImmutableMap.of(key, value));
@@ -119,11 +123,15 @@ public void removeTable(TableReference tableRef) {
     @Override
     protected BiMap<TableReference, TableReference> readTableMap() {
         BiMap<TableReference, TableReference> ret = HashBiMap.create();
-        ClosableIterator<RowResult<Value>> range = kv.getRange(AtlasDbConstants.NAMESPACE_TABLE, RangeRequest.builder().build(), Long.MAX_VALUE);
+        ClosableIterator<RowResult<Value>> range = kv.getRange(
+                AtlasDbConstants.NAMESPACE_TABLE,
+                RangeRequest.builder().build(),
+                Long.MAX_VALUE);
         try {
             while (range.hasNext()) {
                 RowResult<Value> row = range.next();
-                String shortName = PtBytes.toString(row.getColumns().get(AtlasDbConstants.NAMESPACE_SHORT_COLUMN_BYTES).getContents());
+                String shortName = PtBytes.toString(row.getColumns()
+                        .get(AtlasDbConstants.NAMESPACE_SHORT_COLUMN_BYTES).getContents());
                 TableReference ref = getTableRefFromBytes(row.getRowName());
                 ret.put(ref, TableReference.createWithEmptyNamespace(shortName));
             }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/NamespaceMappingKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/NamespaceMappingKeyValueService.java
index b2dec42a5b4..e85485ea9b6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/NamespaceMappingKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/NamespaceMappingKeyValueService.java
@@ -25,10 +25,12 @@
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.NamespacedKeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -87,18 +89,33 @@ public Map<Cell, Value> getRows(TableReference tableRef, Iterable<byte[]> rows,
         return delegate().getRows(tableRef, rows, columnSelection, timestamp);
     }
 
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp) {
+        return delegate().getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+    }
+
     @Override
     public Map<Cell, Long> getLatestTimestamps(TableReference tableRef, Map<Cell, Long> timestampByCell) {
         return delegate().getLatestTimestamps(tableRef, timestampByCell);
     }
 
     @Override
-    public ClosableIterator<RowResult<Value>> getRange(TableReference tableRef, RangeRequest rangeRequest, long timestamp) {
+    public ClosableIterator<RowResult<Value>> getRange(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp) {
         return delegate().getRange(tableRef, rangeRequest, timestamp);
     }
 
     @Override
-    public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(TableReference tableRef, RangeRequest rangeRequest, long timestamp) {
+    public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp) {
         return delegate().getRangeOfTimestamps(tableRef, rangeRequest, timestamp);
     }
 
@@ -110,9 +127,10 @@ public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(TableReferenc
     }
 
     @Override
-    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(TableReference tableRef,
-                                                                                                           Iterable<RangeRequest> rangeRequests,
-                                                                                                           long timestamp) {
+    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests,
+            long timestamp) {
         return delegate().getFirstBatchForRanges(tableRef, rangeRequests, timestamp);
     }
 
@@ -203,7 +221,8 @@ public Collection<? extends KeyValueService> getDelegates() {
 
     @Override
     public void createTables(Map<TableReference, byte[]> tableRefToTableMetadata) {
-        Map<TableReference, byte[]> tableReferencesToTableMetadata = Maps.newHashMapWithExpectedSize(tableRefToTableMetadata.size());
+        Map<TableReference, byte[]> tableReferencesToTableMetadata =
+                Maps.newHashMapWithExpectedSize(tableRefToTableMetadata.size());
         for (Entry<TableReference, byte[]> tableToMetadata : tableRefToTableMetadata.entrySet()) {
             tableReferencesToTableMetadata.put(tableToMetadata.getKey(), tableToMetadata.getValue());
         }
@@ -212,7 +231,8 @@ public void createTables(Map<TableReference, byte[]> tableRefToTableMetadata) {
 
     @Override
     public void putMetadataForTables(Map<TableReference, byte[]> tableRefToMetadata) {
-        Map<TableReference, byte[]> tableReferencesToMetadata = Maps.newHashMapWithExpectedSize(tableRefToMetadata.size());
+        Map<TableReference, byte[]> tableReferencesToMetadata =
+                Maps.newHashMapWithExpectedSize(tableRefToMetadata.size());
         for (Entry<TableReference, byte[]> tableToMetadataEntry : tableRefToMetadata.entrySet()) {
             tableReferencesToMetadata.put(tableToMetadataEntry.getKey(), tableToMetadataEntry.getValue());
         }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/NamespacedKeyValueServices.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/NamespacedKeyValueServices.java
index a7eefc82338..af3139f1976 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/NamespacedKeyValueServices.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/NamespacedKeyValueServices.java
@@ -19,16 +19,16 @@
 import com.palantir.atlasdb.keyvalue.TableMappingService;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 
-/**
- * @author jweel
- */
-public class NamespacedKeyValueServices {
+public final class NamespacedKeyValueServices {
+    private NamespacedKeyValueServices() {
+        // Utility class
+    }
+
     public static KeyValueService wrapWithStaticNamespaceMappingKvs(KeyValueService keyValueService) {
         TableMappingService tableMap = StaticTableMappingService.create(keyValueService);
         NamespacedKeyValueService namespacedKeyValueService = TableRemappingKeyValueService.create(
                 keyValueService,
                 tableMap);
-        KeyValueService namespaceMappingKeyvalueService = NamespaceMappingKeyValueService.create(namespacedKeyValueService);
-        return namespaceMappingKeyvalueService;
+        return NamespaceMappingKeyValueService.create(namespacedKeyValueService);
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/StaticTableMappingService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/StaticTableMappingService.java
index 33eafac0801..04e92b387e7 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/StaticTableMappingService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/StaticTableMappingService.java
@@ -24,7 +24,7 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 
-public class StaticTableMappingService extends AbstractTableMappingService {
+public final class StaticTableMappingService extends AbstractTableMappingService {
     private final KeyValueService kv;
 
     public static TableMappingService create(KeyValueService kv) {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java
index 2bd0330510f..14040b1121f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableRemappingKeyValueService.java
@@ -30,18 +30,19 @@
 import com.palantir.atlasdb.keyvalue.NamespacedKeyValueService;
 import com.palantir.atlasdb.keyvalue.TableMappingService;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
 
-public class TableRemappingKeyValueService extends ForwardingObject implements
+public final class TableRemappingKeyValueService extends ForwardingObject implements
         NamespacedKeyValueService {
     public static TableRemappingKeyValueService create(KeyValueService delegate,
                                                        TableMappingService tableMapper) {
@@ -77,7 +78,8 @@ public void createTable(TableReference tableRef, byte[] tableMetadata) {
 
     @Override
     public void createTables(Map<TableReference, byte[]> tableReferencesToTableMetadata) {
-        Map<TableReference, byte[]> tableNameToTableMetadata= Maps.newHashMapWithExpectedSize(tableReferencesToTableMetadata.size());
+        Map<TableReference, byte[]> tableNameToTableMetadata =
+                Maps.newHashMapWithExpectedSize(tableReferencesToTableMetadata.size());
         for (Entry<TableReference, byte[]> tableEntry : tableReferencesToTableMetadata.entrySet()) {
             tableNameToTableMetadata.put(
                     tableMapper.addTable(tableEntry.getKey()),
@@ -113,7 +115,7 @@ public void dropTables(Set<TableReference> tableRefs) {
         // We're purposely updating the table mappings after all drops are complete
         for (TableReference tableRef : tableRefs) {
             // Handles the edge case of deleting _namespace when clearing the kvs
-            if (tableRef.getNamespace().equals(Namespace.EMPTY_NAMESPACE)
+            if (tableRef.getNamespace().isEmptyNamespace()
                     && tableRef.equals(AtlasDbConstants.NAMESPACE_TABLE)) {
                 break;
             }
@@ -144,9 +146,10 @@ public Collection<? extends KeyValueService> getDelegates() {
     }
 
     @Override
-    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(TableReference tableRef,
-                                                                                                           Iterable<RangeRequest> rangeRequests,
-                                                                                                           long timestamp) {
+    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests,
+            long timestamp) {
         return delegate().getFirstBatchForRanges(
                 tableMapper.getMappedTableName(tableRef),
                 rangeRequests,
@@ -216,6 +219,18 @@ public Map<Cell, Value> getRows(TableReference tableRef,
                 timestamp);
     }
 
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp) {
+        return delegate().getRowsColumnRange(tableMapper.getMappedTableName(tableRef),
+                rows,
+                columnRangeSelection,
+                timestamp);
+    }
+
     @Override
     public void initializeFromFreshInstance() {
         delegate.initializeFromFreshInstance();
@@ -239,7 +254,8 @@ public void putMetadataForTable(TableReference tableRef, byte[] metadata) {
 
     @Override
     public void putMetadataForTables(Map<TableReference, byte[]> tableReferencesToMetadata) {
-        Map<TableReference, byte[]> tableNameToMetadata = Maps.newHashMapWithExpectedSize(tableReferencesToMetadata.size());
+        Map<TableReference, byte[]> tableNameToMetadata =
+                Maps.newHashMapWithExpectedSize(tableReferencesToMetadata.size());
         for (Entry<TableReference, byte[]> tableEntry : tableReferencesToMetadata.entrySet()) {
             tableNameToMetadata.put(
                     tableMapper.getMappedTableName(tableEntry.getKey()),
@@ -287,4 +303,5 @@ public void truncateTables(Set<TableReference> tableRefs) {
     public void compactInternally(TableReference tableRef) {
         delegate().compactInternally(tableMapper.getMappedTableName(tableRef));
     }
+
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java
index 73e10702bc6..ca76bbba85f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TableSplittingKeyValueService.java
@@ -32,11 +32,13 @@
 import com.google.common.collect.SetMultimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -48,7 +50,7 @@
  *          Code also assumes that the more specific mapping (by table)
  *          trumps the more generic mapping (by namespace).
  */
-public class TableSplittingKeyValueService implements KeyValueService {
+public final class TableSplittingKeyValueService implements KeyValueService {
     public static TableSplittingKeyValueService create(List<KeyValueService> delegates,
                                                        Map<TableReference, KeyValueService> delegateByTable) {
         Map<Namespace, KeyValueService> delegateByNamespace = ImmutableMap.of();
@@ -72,8 +74,10 @@ public static TableSplittingKeyValueService create(List<KeyValueService> delegat
     private final Map<TableReference, KeyValueService> delegateByTable;
     private final Map<Namespace, KeyValueService> delegateByNamespace;
 
-    private TableSplittingKeyValueService(List<KeyValueService> delegates,
-                                         Map<TableReference, KeyValueService> delegateByTable, Map<Namespace, KeyValueService> delegateByNamespace) {
+    private TableSplittingKeyValueService(
+            List<KeyValueService> delegates,
+            Map<TableReference, KeyValueService> delegateByTable,
+            Map<Namespace, KeyValueService> delegateByNamespace) {
         this.delegates = ImmutableList.copyOf(delegates);
         this.delegateByTable = ImmutableMap.copyOf(delegateByTable);
         this.delegateByNamespace = ImmutableMap.copyOf(delegateByNamespace);
@@ -91,13 +95,13 @@ public void createTable(TableReference tableRef, byte[] tableMetadata) {
 
     @Override
     public void createTables(Map<TableReference, byte[]> tableNamesToTableMetadata) {
-        Map<KeyValueService, Map<TableReference, byte[]>> splitTableNamesToTableMetadata = groupByDelegate(tableNamesToTableMetadata);
-        for (KeyValueService delegate : splitTableNamesToTableMetadata.keySet()) {
-            delegate.createTables(splitTableNamesToTableMetadata.get(delegate));
-        }
+        Map<KeyValueService, Map<TableReference, byte[]>> splitTableNamesToTableMetadata =
+                groupByDelegate(tableNamesToTableMetadata);
+        splitTableNamesToTableMetadata.forEach(KeyValueService::createTables);
     }
 
-    private Map<KeyValueService, Map<TableReference, byte[]>> groupByDelegate(Map<TableReference, byte[]> tableRefsToTableMetadata) {
+    private Map<KeyValueService, Map<TableReference, byte[]>> groupByDelegate(
+            Map<TableReference, byte[]> tableRefsToTableMetadata) {
         Map<KeyValueService, Map<TableReference, byte[]>> splitTableNamesToTableMetadata = Maps.newHashMap();
         for (Entry<TableReference, byte[]> tableEntry : tableRefsToTableMetadata.entrySet()) {
             TableReference tableRef = tableEntry.getKey();
@@ -127,18 +131,18 @@ public void dropTable(TableReference tableRef) {
 
     @Override
     public void dropTables(Set<TableReference> tableRefs) {
-        Map<KeyValueService, Set<TableReference>> tablesByKVS = Maps.newHashMap();
+        Map<KeyValueService, Set<TableReference>> tablesByKvs = Maps.newHashMap();
         for (TableReference tableRef : tableRefs) {
             KeyValueService delegate = getDelegate(tableRef);
-            if (tablesByKVS.containsKey(delegate)) {
-                tablesByKVS.get(delegate).add(tableRef);
+            if (tablesByKvs.containsKey(delegate)) {
+                tablesByKvs.get(delegate).add(tableRef);
             } else {
                 Set<TableReference> tablesBelongingToThisDelegate = Sets.newHashSet(tableRef);
-                tablesByKVS.put(delegate, tablesBelongingToThisDelegate);
+                tablesByKvs.put(delegate, tablesBelongingToThisDelegate);
             }
         }
 
-        for (Entry<KeyValueService, Set<TableReference>> kvsEntry : tablesByKVS.entrySet()) {
+        for (Entry<KeyValueService, Set<TableReference>> kvsEntry : tablesByKvs.entrySet()) {
             kvsEntry.getKey().dropTables(kvsEntry.getValue());
         }
     }
@@ -195,9 +199,10 @@ public Collection<? extends KeyValueService> getDelegates() {
     }
 
     @Override
-    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(TableReference tableRef,
-                                                                                                           Iterable<RangeRequest> rangeRequests,
-                                                                                                           long timestamp) {
+    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests,
+            long timestamp) {
         return getDelegate(tableRef).getFirstBatchForRanges(tableRef, rangeRequests, timestamp);
     }
 
@@ -249,6 +254,15 @@ public Map<Cell, Value> getRows(TableReference tableRef,
         return getDelegate(tableRef).getRows(tableRef, rows, columnSelection, timestamp);
     }
 
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp) {
+        return getDelegate(tableRef).getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+    }
+
     @Override
     public void initializeFromFreshInstance() {
         for (KeyValueService delegate : delegates) {
@@ -285,10 +299,9 @@ public void putMetadataForTable(TableReference tableRef, byte[] metadata) {
 
     @Override
     public void putMetadataForTables(Map<TableReference, byte[]> tableRefToMetadata) {
-        Map<KeyValueService, Map<TableReference, byte[]>> splitTableNameToMetadata = groupByDelegate(tableRefToMetadata);
-        for (KeyValueService delegate : splitTableNameToMetadata.keySet()) {
-            delegate.putMetadataForTables(splitTableNameToMetadata.get(delegate));
-        }
+        Map<KeyValueService, Map<TableReference, byte[]>> splitTableNameToMetadata =
+                groupByDelegate(tableRefToMetadata);
+        splitTableNameToMetadata.forEach(KeyValueService::putMetadataForTables);
     }
 
     @Override
@@ -317,7 +330,7 @@ public void teardown() {
     }
 
     @Override
-    public void truncateTable(TableReference tableRef){
+    public void truncateTable(TableReference tableRef) {
         getDelegate(tableRef).truncateTable(tableRef);
     }
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/ThrowingKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/ThrowingKeyValueService.java
index fc4f602761c..cae7abfb7cb 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/ThrowingKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/ThrowingKeyValueService.java
@@ -21,10 +21,12 @@
 
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -43,11 +45,11 @@ public ThrowingKeyValueService(String errorMessage) {
         this.exception = new Exception("Provided for stack trace");
     }
 
-    public ThrowingKeyValueService(Exception e) {
-        this.errorMessage = "Unable to create a key value service with the given preferences. " +
-                "This error was captured and delayed until now when the key value service was used. " +
-                "Consult the AtlasDB documentation on CHANGING DATABASE CREDENTIALS AND OTHER PARAMETERS.";
-        this.exception = e;
+    public ThrowingKeyValueService(Exception ex) {
+        this.errorMessage = "Unable to create a key value service with the given preferences."
+                + " This error was captured and delayed until now when the key value service was used."
+                + " Consult the AtlasDB documentation on CHANGING DATABASE CREDENTIALS AND OTHER PARAMETERS.";
+        this.exception = ex;
     }
 
     public IllegalStateException throwEx() {
@@ -160,9 +162,10 @@ public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(TableReferenc
 
     @Override
     @Idempotent
-    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(TableReference tableRef,
-                                                                                                           Iterable<RangeRequest> rangeRequests,
-                                                                                                           long timestamp) {
+    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests,
+            long timestamp) {
         throw throwEx();
     }
 
@@ -234,4 +237,13 @@ public void putMetadataForTables(Map<TableReference, byte[]> tableRefToMetadata)
     public void compactInternally(TableReference tableRef) {
         throw throwEx();
     }
+
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp) {
+        throw throwEx();
+    }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TieredKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TieredKeyValueService.java
index 8515dcbb49d..233f797833d 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TieredKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/TieredKeyValueService.java
@@ -42,9 +42,11 @@
 import com.google.common.util.concurrent.Futures;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -56,7 +58,7 @@
 import com.palantir.util.paging.SimpleTokenBackedResultsPage;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
 
-public class TieredKeyValueService implements KeyValueService {
+public final class TieredKeyValueService implements KeyValueService {
     /**
      * We keep track of and report only the tables we're actually tiering
      * so the TieredKvsMover can know what tables need to be moved between
@@ -168,6 +170,23 @@ public Map<Cell, Value> getRows(final TableReference tableRef,
         return results;
     }
 
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp) {
+        if (isNotTiered(tableRef)) {
+            return primary.getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+        }
+        Map<byte[], RowColumnRangeIterator> primaryResults =
+                primary.getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+        Map<byte[], RowColumnRangeIterator> results =
+                Maps.newHashMap(secondary.getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp));
+        results.putAll(primaryResults);
+        return results;
+    }
+
     @Override
     public Map<Cell, Value> get(TableReference tableRef, Map<Cell, Long> timestampByCell) {
         if (isNotTiered(tableRef)) {
@@ -178,7 +197,8 @@ public Map<Cell, Value> get(TableReference tableRef, Map<Cell, Long> timestampBy
         if (primaryResults.size() == timestampByCell.size()) {
             results = primaryResults;
         } else {
-            Map<Cell, Long> missingCells = Maps.newHashMapWithExpectedSize(timestampByCell.size() - primaryResults.size());
+            Map<Cell, Long> missingCells =
+                    Maps.newHashMapWithExpectedSize(timestampByCell.size() - primaryResults.size());
             results = Maps.newHashMapWithExpectedSize(timestampByCell.size());
             for (Entry<Cell, Long> entry : timestampByCell.entrySet()) {
                 Value value = primaryResults.get(entry.getKey());
@@ -203,7 +223,8 @@ public Map<Cell, Long> getLatestTimestamps(TableReference tableRef, Map<Cell, Lo
         if (primaryResults.size() == timestampByCell.size()) {
             results = primaryResults;
         } else {
-            Map<Cell, Long> missingCells = Maps.newHashMapWithExpectedSize(timestampByCell.size() - primaryResults.size());
+            Map<Cell, Long> missingCells =
+                    Maps.newHashMapWithExpectedSize(timestampByCell.size() - primaryResults.size());
             results = Maps.newHashMapWithExpectedSize(timestampByCell.size());
             for (Entry<Cell, Long> entry : timestampByCell.entrySet()) {
                 Long timestamp = primaryResults.get(entry.getKey());
@@ -292,8 +313,8 @@ public void putUnlessExists(TableReference tableRef, Map<Cell, byte[]> values) {
             primary.putUnlessExists(tableRef, values);
             return;
         }
-        throw new UnsupportedOperationException("TieredKeyValueService does not " +
-                "support putUnlessExists on tiered tables. tableName=" + tableRef + ".");
+        throw new UnsupportedOperationException("TieredKeyValueService does not"
+                + " support putUnlessExists on tiered tables. tableName=" + tableRef + ".");
     }
 
     @Override
@@ -320,12 +341,8 @@ public ClosableIterator<RowResult<Value>> getRange(final TableReference tableRef
             return primary.getRange(tableRef, rangeRequest, timestamp);
         }
         ClosableIterator<RowResult<Value>> primaryIter = primary.getRange(tableRef, rangeRequest, timestamp);
-        return new ClosableMergedIterator<Value>(rangeRequest, primaryIter,
-                new Function<RangeRequest, ClosableIterator<RowResult<Value>>>() {
-                    @Override
-                    public ClosableIterator<RowResult<Value>> apply(RangeRequest request) {
-                        return secondary.getRange(tableRef, request, timestamp);
-                    }});
+        return new ClosableMergedIterator<>(rangeRequest, primaryIter,
+                request -> secondary.getRange(tableRef, request, timestamp));
     }
 
     @Override
@@ -335,13 +352,10 @@ public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(final TableRe
         if (isNotTiered(tableRef)) {
             return primary.getRangeOfTimestamps(tableRef, rangeRequest, timestamp);
         }
-        ClosableIterator<RowResult<Set<Long>>> primaryIter = primary.getRangeOfTimestamps(tableRef, rangeRequest, timestamp);
-        return new ClosableMergedIterator<Set<Long>>(rangeRequest, primaryIter,
-                new Function<RangeRequest, ClosableIterator<RowResult<Set<Long>>>>() {
-                    @Override
-                    public ClosableIterator<RowResult<Set<Long>>> apply(RangeRequest request) {
-                        return secondary.getRangeOfTimestamps(tableRef, request, timestamp);
-                    }});
+        ClosableIterator<RowResult<Set<Long>>> primaryIter =
+                primary.getRangeOfTimestamps(tableRef, rangeRequest, timestamp);
+        return new ClosableMergedIterator<>(rangeRequest, primaryIter,
+                request -> secondary.getRangeOfTimestamps(tableRef, request, timestamp));
     }
 
     @Override
@@ -351,13 +365,10 @@ public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(final TableRe
         if (isNotTiered(tableRef)) {
             return primary.getRangeWithHistory(tableRef, rangeRequest, timestamp);
         }
-        ClosableIterator<RowResult<Set<Value>>> primaryIter = primary.getRangeWithHistory(tableRef, rangeRequest, timestamp);
-        return new ClosableMergedIterator<Set<Value>>(rangeRequest, primaryIter,
-                new Function<RangeRequest, ClosableIterator<RowResult<Set<Value>>>>() {
-                    @Override
-                    public ClosableIterator<RowResult<Set<Value>>> apply(RangeRequest request) {
-                        return secondary.getRangeWithHistory(tableRef, request, timestamp);
-                    }});
+        ClosableIterator<RowResult<Set<Value>>> primaryIter =
+                primary.getRangeWithHistory(tableRef, rangeRequest, timestamp);
+        return new ClosableMergedIterator<>(rangeRequest, primaryIter,
+                request -> secondary.getRangeWithHistory(tableRef, request, timestamp));
     }
 
     @Override
@@ -374,7 +385,8 @@ public ClosableIterator<RowResult<Set<Value>>> apply(RangeRequest request) {
                 secondary.getFirstBatchForRanges(tableRef, rangeRequests, timestamp);
         Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> results =
                 Maps.newHashMapWithExpectedSize(primaryResults.size());
-        for (Entry<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> entry : primaryResults.entrySet()) {
+        for (Entry<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> entry :
+                primaryResults.entrySet()) {
             RangeRequest rangeRequest = entry.getKey();
             boolean isReversed = rangeRequest.isReverse();
             TokenBackedBasicResultsPage<RowResult<Value>, byte[]> primaryPage = entry.getValue();
@@ -382,7 +394,8 @@ public ClosableIterator<RowResult<Set<Value>>> apply(RangeRequest request) {
             boolean moreAvailable = primaryPage.moreResultsAvailable() || secondaryPage.moreResultsAvailable();
             byte[] pageToken = getNextPageToken(primaryPage, secondaryPage, isReversed);
             Predicate<RowResult<Value>> limiter = getLimitingPredicate(pageToken, isReversed, moreAvailable);
-            Iterable<RowResult<Value>> pageResults = getMergedPageResults(primaryPage, secondaryPage, limiter, isReversed);
+            Iterable<RowResult<Value>> pageResults =
+                    getMergedPageResults(primaryPage, secondaryPage, limiter, isReversed);
             results.put(rangeRequest, SimpleTokenBackedResultsPage.create(pageToken, pageResults, moreAvailable));
         }
         return results;
@@ -473,12 +486,12 @@ public RowResult<T> apply(Pair<RowResult<T>, RowResult<T>> rows) {
                         for (Entry<byte[], T> entry : primaryResult.getColumns().entrySet()) {
                             T secondaryValue = secondaryResult.getColumns().get(entry.getKey());
                             if (secondaryValue instanceof Value) {
-                                long primaryTimestamp = ((Value)entry.getValue()).getTimestamp();
-                                long secondaryTimestamp = ((Value)secondaryValue).getTimestamp();
+                                long primaryTimestamp = ((Value) entry.getValue()).getTimestamp();
+                                long secondaryTimestamp = ((Value) secondaryValue).getTimestamp();
                                 AssertUtils.assertAndLog(primaryTimestamp >= secondaryTimestamp,
-                                        "The secondary kvs has a row with timestamp %s, while the " +
-                                        "same row in the primary has timestamp %s. This should be " +
-                                        "extremely uncommon.",
+                                        "The secondary kvs has a row with timestamp %s, while the"
+                                        + " same row in the primary has timestamp %s. This should be"
+                                        + " extremely uncommon.",
                                         secondaryTimestamp, primaryTimestamp);
                             }
                         }
@@ -540,13 +553,8 @@ public void dropTables(Set<TableReference> tableRefs) {
         }
 
         List<Future<?>> futures = Lists.newArrayListWithExpectedSize(2);
-        for (final Entry<KeyValueService, Set<TableReference>> tableRefsPerKVS : tableRefsPerDelegate.entrySet()) {
-            futures.add(executor.submit(new Runnable() {
-                @Override
-                public void run() {
-                    tableRefsPerKVS.getKey().dropTables(tableRefsPerKVS.getValue());
-                }
-            }));
+        for (Entry<KeyValueService, Set<TableReference>> tableRefsPerKvs : tableRefsPerDelegate.entrySet()) {
+            futures.add(executor.submit(() -> tableRefsPerKvs.getKey().dropTables(tableRefsPerKvs.getValue())));
         }
 
         for (Future<?> future : futures) {
@@ -592,9 +600,7 @@ public void createTables(Map<TableReference, byte[]> tableRefToTableMetadata) {
             }
         }
 
-        for (KeyValueService kvs : delegateToTableMetadata.keySet()) {
-            kvs.createTables(delegateToTableMetadata.get(kvs));
-        }
+        delegateToTableMetadata.forEach(KeyValueService::createTables);
     }
 
     @Override
@@ -624,13 +630,14 @@ public void putMetadataForTable(final TableReference tableRef, final byte[] meta
 
     @Override
     public void putMetadataForTables(Map<TableReference, byte[]> tableRefToMetadata) {
-        Map<KeyValueService, Map<TableReference, byte[]>> delegateToTablenameToMetadata = Maps.newHashMapWithExpectedSize(2);
+        Map<KeyValueService, Map<TableReference, byte[]>> delegateToTablenameToMetadata =
+                Maps.newHashMapWithExpectedSize(2);
         for (Entry<TableReference, byte[]> tableEntry : tableRefToMetadata.entrySet()) {
             TableReference tableRef = tableEntry.getKey();
             byte[] metadata = tableEntry.getValue();
-            Map<TableReference, byte[]> splitTableToMetadata = ImmutableMap.of();
 
             // always place in primary
+            Map<TableReference, byte[]> splitTableToMetadata;
             if (delegateToTablenameToMetadata.containsKey(primary)) {
                 splitTableToMetadata = delegateToTablenameToMetadata.get(primary);
             } else {
@@ -649,9 +656,8 @@ public void putMetadataForTables(Map<TableReference, byte[]> tableRefToMetadata)
                 delegateToTablenameToMetadata.put(secondary, splitTableToMetadata);
             }
         }
-        for (KeyValueService kvs : delegateToTablenameToMetadata.keySet()) {
-            kvs.putMetadataForTables(delegateToTablenameToMetadata.get(kvs));
-        }
+
+        delegateToTablenameToMetadata.forEach(KeyValueService::putMetadataForTables);
     }
 
     @Override
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionMapProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionMapProvider.java
index 6dc0f2c6adf..c6ee8439a7d 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionMapProvider.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionMapProvider.java
@@ -48,7 +48,6 @@
  *
  */
 public class PartitionMapProvider {
-
     private static final Logger log = LoggerFactory.getLogger(PartitionMapProvider.class);
 
     private final ImmutableList<PartitionMapService> partitionMapProviders;
@@ -126,7 +125,9 @@ public DynamicPartitionMap getUpdatedMap() {
         }
     }
 
-    protected PartitionMapProvider(ImmutableList<PartitionMapService> partitionMapProviders, int partitionMapProvidersReadFactor) {
+    protected PartitionMapProvider(
+            ImmutableList<PartitionMapService> partitionMapProviders,
+            int partitionMapProvidersReadFactor) {
         this.partitionMapProviders = partitionMapProviders;
         this.partitionMapProvidersReadFactor = partitionMapProvidersReadFactor;
         updatePartitionMapFromSeedServers(true);
@@ -136,7 +137,8 @@ protected PartitionMapProvider(ImmutableList<PartitionMapService> partitionMapPr
      *
      * @param mustSucceed If set to <tt>true</tt>, will throw if less than quorum
      * seed servers responded.
-     * @return <tt>true</tt> if an update has taken place.
+     *
+     * @return <tt>true</tt> if an update has taken place
      */
     private boolean updatePartitionMapFromSeedServers(boolean mustSucceed) {
         int numSucc = 0;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedAtlasDbFactory.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedAtlasDbFactory.java
index 55714003729..9c6cbe2030e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedAtlasDbFactory.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedAtlasDbFactory.java
@@ -16,6 +16,8 @@
 package com.palantir.atlasdb.keyvalue.partition;
 
 import com.google.auto.service.AutoService;
+import com.google.common.base.Optional;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.spi.AtlasDbFactory;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
@@ -32,7 +34,9 @@ public String getType() {
     }
 
     @Override
-    public PartitionedKeyValueService createRawKeyValueService(KeyValueServiceConfig config) {
+    public PartitionedKeyValueService createRawKeyValueService(
+            KeyValueServiceConfig config,
+            Optional<LeaderConfig> leaderConfig) {
         AtlasDbVersion.ensureVersionReported();
         return PartitionedKeyValueService.create((PartitionedKeyValueConfiguration) config);
     }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedBoundStore.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedBoundStore.java
index 691d4c6f043..950982cdc5e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedBoundStore.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedBoundStore.java
@@ -17,11 +17,11 @@
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import javax.annotation.concurrent.GuardedBy;
 
-import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
@@ -41,16 +41,21 @@
 import com.palantir.timestamp.MultipleRunningTimestampServiceError;
 import com.palantir.timestamp.TimestampBoundStore;
 
-public class PartitionedBoundStore implements TimestampBoundStore, Closeable {
-
+public final class PartitionedBoundStore implements TimestampBoundStore, Closeable {
     private static final String ROW_AND_COLUMN_NAME = "ts";
     private static final long KV_TS = 0L;
-    private static final Cell TS_CELL = Cell.create(ROW_AND_COLUMN_NAME.getBytes(Charsets.UTF_8), ROW_AND_COLUMN_NAME.getBytes(Charsets.UTF_8));
+    private static final Cell TS_CELL = Cell.create(
+            ROW_AND_COLUMN_NAME.getBytes(StandardCharsets.UTF_8),
+            ROW_AND_COLUMN_NAME.getBytes(StandardCharsets.UTF_8));
     public static final TableMetadata TIMESTAMP_TABLE_METADATA = new TableMetadata(
-        NameMetadataDescription.create(ImmutableList.of(new NameComponentDescription("timestamp_name", ValueType.STRING))),
-        new ColumnMetadataDescription(ImmutableList.of(
-            new NamedColumnDescription(ROW_AND_COLUMN_NAME, "current_max_ts", ColumnValueDescription.forType(ValueType.FIXED_LONG)))),
-        ConflictHandler.IGNORE_ALL);
+            NameMetadataDescription.create(ImmutableList.of(
+                    new NameComponentDescription("timestamp_name", ValueType.STRING))),
+            new ColumnMetadataDescription(ImmutableList.of(
+                    new NamedColumnDescription(
+                            ROW_AND_COLUMN_NAME,
+                            "current_max_ts",
+                            ColumnValueDescription.forType(ValueType.FIXED_LONG)))),
+            ConflictHandler.IGNORE_ALL);
 
     private static final long INITIAL_VALUE = 10000L;
 
@@ -61,8 +66,6 @@ public static TimestampBoundStore create(KeyValueService kv) {
 
     @GuardedBy("this")
     private long currentLimit = -1;
-    @GuardedBy("this")
-    private Throwable lastWriteException = null;
     final KeyValueService kv;
 
     private PartitionedBoundStore(KeyValueService kv) {
@@ -71,18 +74,18 @@ private PartitionedBoundStore(KeyValueService kv) {
 
     @Override
     public synchronized long getUpperLimit() {
-        Map<Cell, Value> result = kv.get(AtlasDbConstants.TIMESTAMP_TABLE, ImmutableMap.of(TS_CELL, KV_TS+1));
+        Map<Cell, Value> result = kv.get(AtlasDbConstants.TIMESTAMP_TABLE, ImmutableMap.of(TS_CELL, KV_TS + 1));
         if (result.isEmpty()) {
             putValue(INITIAL_VALUE);
         }
-        result = kv.get(AtlasDbConstants.TIMESTAMP_TABLE, ImmutableMap.of(TS_CELL, KV_TS+1));
+        result = kv.get(AtlasDbConstants.TIMESTAMP_TABLE, ImmutableMap.of(TS_CELL, KV_TS + 1));
         currentLimit = getValueFromResult(result);
         return currentLimit;
     }
 
     @Override
     public synchronized void storeUpperLimit(long limit) throws MultipleRunningTimestampServiceError {
-        Map<Cell, Value> result = kv.get(AtlasDbConstants.TIMESTAMP_TABLE, ImmutableMap.of(TS_CELL, KV_TS+1));
+        Map<Cell, Value> result = kv.get(AtlasDbConstants.TIMESTAMP_TABLE, ImmutableMap.of(TS_CELL, KV_TS + 1));
         long oldValue = getValueFromResult(result);
         if (oldValue != currentLimit) {
             String msg = "Timestamp limit changed underneath us (limit in memory: " + currentLimit
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedKeyValueConstants.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedKeyValueConstants.java
index f9952bf1750..17586464ecb 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedKeyValueConstants.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedKeyValueConstants.java
@@ -15,8 +15,9 @@
  */
 package com.palantir.atlasdb.keyvalue.partition;
 
-public class PartitionedKeyValueConstants {
+public final class PartitionedKeyValueConstants {
     private PartitionedKeyValueConstants() {
+        // Utility class
     }
 
     // If you pass this value to endpoint constructor, a new
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedKeyValueService.java
index cfe3898b8f2..b2a3083b97b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/PartitionedKeyValueService.java
@@ -15,15 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.partition;
 
-import static com.palantir.atlasdb.keyvalue.partition.util.RequestCompletions.completeReadRequest;
-import static com.palantir.atlasdb.keyvalue.partition.util.RequestCompletions.completeWriteRequest;
-import static com.palantir.atlasdb.keyvalue.partition.util.RequestCompletions.retryUntilSuccess;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
@@ -33,10 +28,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Supplier;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList.Builder;
@@ -44,11 +37,13 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -67,6 +62,7 @@
 import com.palantir.atlasdb.keyvalue.partition.util.EndpointRequestExecutor.EndpointRequestCompletionService;
 import com.palantir.atlasdb.keyvalue.partition.util.MergeResults;
 import com.palantir.atlasdb.keyvalue.partition.util.PartitionedRangedIterator;
+import com.palantir.atlasdb.keyvalue.partition.util.RequestCompletions;
 import com.palantir.atlasdb.keyvalue.partition.util.RowResults;
 import com.palantir.atlasdb.keyvalue.remoting.RemotingPartitionMapService;
 import com.palantir.atlasdb.keyvalue.remoting.proxy.VersionCheckProxy;
@@ -74,7 +70,6 @@
 import com.palantir.common.annotation.NonIdempotent;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.util.Pair;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
 
 /**
@@ -103,62 +98,64 @@ public Map<Cell, Value> getRows(final TableReference tableRef, final Iterable<by
         return runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Map<Cell, Value>>() {
             @Override
             public Map<Cell, Value> apply(DynamicPartitionMap input) {
-                final Map<Cell, Value> overallResult = Maps.newHashMap();
-                final EndpointRequestCompletionService<Map<Cell, Value>> execSvc = EndpointRequestExecutor.newService(executor);
-                final QuorumTracker<Map<Cell, Value>, byte[]> tracker = QuorumTracker.of(
-                        rows, input.getReadRowsParameters(rows));
+                Map<Cell, Value> overallResult = Maps.newHashMap();
+                EndpointRequestCompletionService<Map<Cell, Value>> execSvc =
+                        EndpointRequestExecutor.newService(executor);
+                QuorumTracker<Map<Cell, Value>, byte[]> tracker =
+                        QuorumTracker.of(rows, input.getReadRowsParameters(rows));
 
                 // Schedule tasks for execution
-                input.runForRowsRead(tableRef.getQualifiedName(), rows, new Function<Pair<KeyValueService,Iterable<byte[]>>, Void>() {
-                    @Override
-                    public Void apply(final Pair<KeyValueService, Iterable<byte[]>> e) {
-                        Future<Map<Cell, Value>> future = execSvc.submit(new Callable<Map<Cell, Value>>() {
-                            @Override
-                            public Map<Cell, Value> call() throws Exception {
-                                return e.lhSide.getRows(tableRef, e.rhSide, columnSelection, timestamp);
-                            }
-                        }, e.lhSide);
-                        tracker.registerRef(future, e.rhSide);
-                        return null;
-                    }
+                input.runForRowsRead(tableRef.getQualifiedName(), rows, kvsAndRowsPair -> {
+                    Future<Map<Cell, Value>> future = execSvc.submit(() ->
+                            kvsAndRowsPair.lhSide.getRows(
+                                    tableRef, kvsAndRowsPair.rhSide, columnSelection, timestamp),
+                            kvsAndRowsPair.lhSide);
+                    tracker.registerRef(future, kvsAndRowsPair.rhSide);
+                    return null;
                 });
 
-                completeReadRequest(tracker, execSvc, MergeResults.newCellValueMapMerger(overallResult));
+                RequestCompletions.completeReadRequest(
+                        tracker,
+                        execSvc,
+                        MergeResults.newCellValueMapMerger(overallResult));
                 return overallResult;
             }
         });
     }
 
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp) {
+        return KeyValueServices.filterGetRowsToColumnRange(this, tableRef, rows, columnRangeSelection, timestamp);
+    }
+
     @Override
     @Idempotent
     public Map<Cell, Value> get(final TableReference tableRef, final Map<Cell, Long> timestampByCell) {
-        return runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Map<Cell, Value>>() {
-            @Override
-            public Map<Cell, Value> apply(@Nullable DynamicPartitionMap input) {
-                final EndpointRequestCompletionService<Map<Cell, Value>> execSvc = EndpointRequestExecutor.newService(executor);
-                final QuorumTracker<Map<Cell, Value>, Cell> tracker = QuorumTracker.of(
-                        timestampByCell.keySet(),
-                        input.getReadCellsParameters(timestampByCell.keySet()));
-                final Map<Cell, Value> globalResult = Maps.newHashMap();
-
-                // Schedule the tasks
-                input.runForCellsRead(tableRef.getQualifiedName(), timestampByCell, new Function<Pair<KeyValueService, Map<Cell, Long>>, Void>() {
-                    @Override
-                    public Void apply(final Pair<KeyValueService, Map<Cell, Long>> e) {
-                        Future<Map<Cell, Value>> future = execSvc.submit(new Callable<Map<Cell, Value>>() {
-                            @Override
-                            public Map<Cell, Value> call() throws Exception {
-                                return e.lhSide.get(tableRef, e.rhSide);
-                            }
-                        }, e.lhSide);
-                        tracker.registerRef(future, e.rhSide.keySet());
-                        return null;
-                    }
-                });
+        return runWithPartitionMapRetryable(partitionMap -> {
+            EndpointRequestCompletionService<Map<Cell, Value>> execSvc =
+                    EndpointRequestExecutor.newService(executor);
+            QuorumTracker<Map<Cell, Value>, Cell> tracker = QuorumTracker.of(
+                    timestampByCell.keySet(),
+                    partitionMap.getReadCellsParameters(timestampByCell.keySet()));
+            Map<Cell, Value> globalResult = Maps.newHashMap();
+
+            // Schedule the tasks
+            partitionMap.runForCellsRead(tableRef.getQualifiedName(), timestampByCell, kvsAndCellsPair -> {
+                Future<Map<Cell, Value>> future = execSvc.submit(() ->
+                        kvsAndCellsPair.lhSide.get(tableRef, kvsAndCellsPair.rhSide), kvsAndCellsPair.lhSide);
+                tracker.registerRef(future, kvsAndCellsPair.rhSide.keySet());
+                return null;
+            });
 
-                completeReadRequest(tracker, execSvc, MergeResults.newCellValueMapMerger(globalResult));
-                return globalResult;
-            }
+            RequestCompletions.completeReadRequest(
+                    tracker,
+                    execSvc,
+                    MergeResults.newCellValueMapMerger(globalResult));
+            return globalResult;
         });
     }
 
@@ -169,31 +166,25 @@ public Multimap<Cell, Long> getAllTimestamps(final TableReference tableRef,
                                                  final long timestamp)
             throws InsufficientConsistencyException {
 
-        return runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Multimap<Cell, Long>>() {
-            @Override
-            public Multimap<Cell, Long> apply(DynamicPartitionMap input) {
-                final EndpointRequestCompletionService<Multimap<Cell, Long>> execSvc = EndpointRequestExecutor.newService(executor);
-                final QuorumTracker<Multimap<Cell, Long>, Cell> tracker = QuorumTracker.of(
-                        cells,
-                        input.getReadCellsParameters(cells));
-                final Multimap<Cell, Long> globalResult = HashMultimap.create();
-                input.runForCellsRead(tableRef.getQualifiedName(), cells, new Function<Pair<KeyValueService, Set<Cell>>, Void>() {
-                    @Override @Nullable
-                    public Void apply(@Nullable final Pair<KeyValueService, Set<Cell>> e) {
-                        Future<Multimap<Cell, Long>> future = execSvc.submit(new Callable<Multimap<Cell, Long>>() {
-                            @Override
-                            public Multimap<Cell, Long> call() throws Exception {
-                                return e.lhSide.getAllTimestamps(tableRef, cells, timestamp);
-                            }
-                        }, e.lhSide);
-                        tracker.registerRef(future, e.rhSide);
-                        return null;
-                    }
-                });
+        return runWithPartitionMapRetryable(partitionMap -> {
+            EndpointRequestCompletionService<Multimap<Cell, Long>> execSvc =
+                    EndpointRequestExecutor.newService(executor);
+            QuorumTracker<Multimap<Cell, Long>, Cell> tracker = QuorumTracker.of(
+                    cells,
+                    partitionMap.getReadCellsParameters(cells));
+            final Multimap<Cell, Long> globalResult = HashMultimap.create();
+            partitionMap.runForCellsRead(tableRef.getQualifiedName(), cells, kvsAndCellsPair -> {
+                Future<Multimap<Cell, Long>> future = execSvc.submit(() ->
+                        kvsAndCellsPair.lhSide.getAllTimestamps(tableRef, cells, timestamp), kvsAndCellsPair.lhSide);
+                tracker.registerRef(future, kvsAndCellsPair.rhSide);
+                return null;
+            });
 
-                completeReadRequest(tracker, execSvc, MergeResults.newAllTimestampsMapMerger(globalResult));
-                return globalResult;
-            }
+            RequestCompletions.completeReadRequest(
+                    tracker,
+                    execSvc,
+                    MergeResults.newAllTimestampsMapMerger(globalResult));
+            return globalResult;
         });
     }
 
@@ -201,39 +192,35 @@ public Multimap<Cell, Long> call() throws Exception {
     @Idempotent
     public Map<Cell, Long> getLatestTimestamps(final TableReference tableRef,
                                                final Map<Cell, Long> timestampByCell) {
-        return runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Map<Cell, Long>>() {
-            @Override
-            public Map<Cell, Long> apply(DynamicPartitionMap input) {
-                final Map<Cell, Long> globalResult = Maps.newHashMap();
-                final QuorumTracker<Map<Cell, Long>, Cell> tracker = QuorumTracker.of(
-                        timestampByCell.keySet(),
-                        input.getReadCellsParameters(timestampByCell.keySet()));
-                final EndpointRequestCompletionService<Map<Cell, Long>> execSvc = EndpointRequestExecutor.newService(executor);
-                input.runForCellsRead(tableRef.getQualifiedName(), timestampByCell, new Function<Pair<KeyValueService, Map<Cell, Long>>, Void>() {
-                    @Override @Nullable
-                    public Void apply(@Nullable final Pair<KeyValueService, Map<Cell, Long>> e) {
-                        Future<Map<Cell, Long>> future = execSvc.submit(new Callable<Map<Cell, Long>>() {
-                            @Override
-                            public Map<Cell, Long> call() throws Exception {
-                                return e.lhSide.getLatestTimestamps(tableRef, e.rhSide);
-                            }
-                        }, e.lhSide);
-                        tracker.registerRef(future, e.rhSide.keySet());
-                        return null;
-                    }
-                });
+        return runWithPartitionMapRetryable(input -> {
+            final Map<Cell, Long> globalResult = Maps.newHashMap();
+            final QuorumTracker<Map<Cell, Long>, Cell> tracker = QuorumTracker.of(
+                    timestampByCell.keySet(),
+                    input.getReadCellsParameters(timestampByCell.keySet()));
+            final EndpointRequestCompletionService<Map<Cell, Long>> execSvc =
+                    EndpointRequestExecutor.newService(executor);
+            input.runForCellsRead(tableRef.getQualifiedName(), timestampByCell, kvsAndCellsPair -> {
+                Future<Map<Cell, Long>> future = execSvc.submit(() ->
+                        kvsAndCellsPair.lhSide.getLatestTimestamps(tableRef, kvsAndCellsPair.rhSide),
+                        kvsAndCellsPair.lhSide);
+                tracker.registerRef(future, kvsAndCellsPair.rhSide.keySet());
+                return null;
+            });
 
-                completeReadRequest(tracker, execSvc, MergeResults.newLatestTimestampMapMerger(globalResult));
-                return globalResult;
-            }
+            RequestCompletions.completeReadRequest(
+                    tracker,
+                    execSvc,
+                    MergeResults.newLatestTimestampMapMerger(globalResult));
+            return globalResult;
         });
     }
 
     @Override
     @Idempotent
-    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(TableReference tableRef,
-                                                                                                           Iterable<RangeRequest> rangeRequests,
-                                                                                                           long timestamp) {
+    public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
+            TableReference tableRef,
+            Iterable<RangeRequest> rangeRequests,
+            long timestamp) {
         return KeyValueServices.getFirstBatchForRangesUsingGetRange(this, tableRef, rangeRequests, timestamp);
     }
 
@@ -241,27 +228,16 @@ public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>
     @Override
     public ClosableIterator<RowResult<Value>> getRange(final TableReference tableRef,
             final RangeRequest rangeRequest, final long timestamp) {
-        return AutoRetryingClosableIterator.of(rangeRequest, new Function<RangeRequest, ClosableIterator<RowResult<Value>>>() {
-            @Override
-            public ClosableIterator<RowResult<Value>> apply(
-                    RangeRequest input) {
-                return invalidateOnVersionChangeIterator(getRangeInternal(tableRef, input, timestamp));
-            }
-        });
+        return AutoRetryingClosableIterator.of(rangeRequest, range ->
+                invalidateOnVersionChangeIterator(getRangeInternal(tableRef, range, timestamp)));
     }
 
     private ClosableIterator<RowResult<Value>> getRangeInternal(final TableReference tableRef,
                                                        final RangeRequest rangeRequest,
                                                        final long timestamp) {
 
-        final Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> services =
-                runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Multimap<ConsistentRingRangeRequest, KeyValueEndpoint>>() {
-            @Override
-            public Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> apply(
-                    DynamicPartitionMap input) {
-                return input.getServicesForRangeRead(tableRef.getQualifiedName(), rangeRequest);
-            }
-        });
+        final Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> services = runWithPartitionMapRetryable(
+                partitionMap -> partitionMap.getServicesForRangeRead(tableRef.getQualifiedName(), rangeRequest));
 
         return new PartitionedRangedIterator<Value>(services.keySet()) {
             @Override
@@ -277,43 +253,41 @@ public RowResult<Value> apply(DynamicPartitionMap input) {
             }
 
             @Override
-            protected Set<ClosablePeekingIterator<RowResult<Value>>> computeNextRange(final ConsistentRingRangeRequest range) {
+            protected Set<ClosablePeekingIterator<RowResult<Value>>> computeNextRange(
+                    ConsistentRingRangeRequest range) {
                 // This is NOT retryable
-                return runWithPartitionMap(new Function<DynamicPartitionMap, Set<ClosablePeekingIterator<RowResult<Value>>>>() {
-                    @Override
-                    public Set<ClosablePeekingIterator<RowResult<Value>>> apply(
-                            @Nullable DynamicPartitionMap input) {
-                        final Set<ClosablePeekingIterator<RowResult<Value>>> result = Sets.newHashSet();
-
-                        // We need at least one iterator for each range in order for the
-                        // quorum exception mechanism to work properly. If all iterator
-                        // requests failed we need to throw immediately to avoid silent failure.
-                        RuntimeException lastSuppressedException = null;
-
-                        for (KeyValueEndpoint vkve : services.get(range)) {
-                            try {
-                                ClosableIterator<RowResult<Value>> it = vkve.keyValueService().getRange(tableRef, range.get(), timestamp);
-                                result.add(ClosablePeekingIterator.of(it));
-                            } catch (ClientVersionTooOldException e) {
-                                throw e;
-                            } catch (RuntimeException e) {
-                                // If this failure is fatal for the range, the exception will be thrown when
-                                // retrieving data from the iterators.
-                                log.warn("Failed to getRange in table " + tableRef.getQualifiedName());
-
-                                // The only exception is if all iterators for given range fail.
-                                // In such case it will rethrow last encountered exception immediately.
-                                lastSuppressedException = e;
-                            }
+                return runWithPartitionMap(partitionMap -> {
+                    Set<ClosablePeekingIterator<RowResult<Value>>> result = Sets.newHashSet();
+
+                    // We need at least one iterator for each range in order for the
+                    // quorum exception mechanism to work properly. If all iterator
+                    // requests failed we need to throw immediately to avoid silent failure.
+                    RuntimeException lastSuppressedException = null;
+
+                    for (KeyValueEndpoint vkve : services.get(range)) {
+                        try {
+                            ClosableIterator<RowResult<Value>> it = vkve.keyValueService()
+                                    .getRange(tableRef, range.get(), timestamp);
+                            result.add(ClosablePeekingIterator.of(it));
+                        } catch (ClientVersionTooOldException e) {
+                            throw e;
+                        } catch (RuntimeException e) {
+                            // If this failure is fatal for the range, the exception will be thrown when
+                            // retrieving data from the iterators.
+                            log.warn("Failed to getRange in table " + tableRef.getQualifiedName());
+
+                            // The only exception is if all iterators for given range fail.
+                            // In such case it will rethrow last encountered exception immediately.
+                            lastSuppressedException = e;
                         }
+                    }
 
-                        // TODO: Do NOT throw it now. Perhaps this subrange will never
-                        // be reached by the client. (?)
-                        if (result.isEmpty()) {
-                            throw lastSuppressedException;
-                        }
-                        return result;
+                    // TODO: Do NOT throw it now. Perhaps this subrange will never
+                    // be reached by the client. (?)
+                    if (result.isEmpty()) {
+                        throw lastSuppressedException;
                     }
+                    return result;
                 });
             }
         };
@@ -322,56 +296,40 @@ public Set<ClosablePeekingIterator<RowResult<Value>>> apply(
     @Override
     public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(
             final TableReference tableRef, RangeRequest rangeRequest, final long timestamp) {
-        return AutoRetryingClosableIterator.of(rangeRequest, new Function<RangeRequest, ClosableIterator<RowResult<Set<Value>>>>() {
-            @Override
-            public ClosableIterator<RowResult<Set<Value>>> apply(
-                    RangeRequest input) {
-                return invalidateOnVersionChangeIterator(getRangeWithHistoryInternal(tableRef, input, timestamp));
-            }
-        });
+        return AutoRetryingClosableIterator.of(rangeRequest, range ->
+                invalidateOnVersionChangeIterator(getRangeWithHistoryInternal(tableRef, range, timestamp)));
     }
 
     private ClosableIterator<RowResult<Set<Value>>> getRangeWithHistoryInternal(final TableReference tableRef,
                                                                        final RangeRequest rangeRequest,
                                                                        final long timestamp) {
         final Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> services =
-                runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Multimap<ConsistentRingRangeRequest, KeyValueEndpoint>>() {
-                    @Override
-                    public Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> apply(
-                            DynamicPartitionMap input) {
-                        return input.getServicesForRangeRead(tableRef.getQualifiedName(), rangeRequest);
-                    }
-                });
+                runWithPartitionMapRetryable(partitionMap ->
+                        partitionMap.getServicesForRangeRead(tableRef.getQualifiedName(), rangeRequest));
 
         return new PartitionedRangedIterator<Set<Value>>(services.keySet()) {
             @Override
             public RowResult<Set<Value>> computeNext() {
                 Preconditions.checkState(hasNext());
                 // This is NOT retryable
-                return runWithPartitionMap(new Function<DynamicPartitionMap, RowResult<Set<Value>>>() {
-                    @Override
-                    public RowResult<Set<Value>> apply(DynamicPartitionMap input) {
-                        return RowResults.allResults(getRowIterator());
-                    }});
+                return runWithPartitionMap(partitionMap -> RowResults.allResults(getRowIterator()));
             }
 
             @Override
-            protected Set<ClosablePeekingIterator<RowResult<Set<Value>>>> computeNextRange(final ConsistentRingRangeRequest range) {
+            protected Set<ClosablePeekingIterator<RowResult<Set<Value>>>> computeNextRange(
+                    ConsistentRingRangeRequest range) {
                 // This is NOT retryable
-                return runWithPartitionMap(new Function<DynamicPartitionMap, Set<ClosablePeekingIterator<RowResult<Set<Value>>>>>() {
-                    @Override
-                    public Set<ClosablePeekingIterator<RowResult<Set<Value>>>> apply(DynamicPartitionMap input) {
-                        final Set<ClosablePeekingIterator<RowResult<Set<Value>>>> result = Sets.newHashSet();
-
-                        // This method has stronger consistency guarantees. It has to talk to all endpoints
-                        // and thus must throw immediately on any failure encountered.
-                        for (KeyValueEndpoint vkve : services.get(range)) {
-                            ClosableIterator<RowResult<Set<Value>>> it = vkve.keyValueService().getRangeWithHistory(
-                                    tableRef, range.get(), timestamp);
-                            result.add(ClosablePeekingIterator.of(it));
-                        }
-                        return result;
+                return runWithPartitionMap(partitionMap -> {
+                    Set<ClosablePeekingIterator<RowResult<Set<Value>>>> result = Sets.newHashSet();
+
+                    // This method has stronger consistency guarantees. It has to talk to all endpoints
+                    // and thus must throw immediately on any failure encountered.
+                    for (KeyValueEndpoint vkve : services.get(range)) {
+                        ClosableIterator<RowResult<Set<Value>>> it = vkve.keyValueService().getRangeWithHistory(
+                                tableRef, range.get(), timestamp);
+                        result.add(ClosablePeekingIterator.of(it));
                     }
+                    return result;
                 });
             }
         };
@@ -379,60 +337,46 @@ public Set<ClosablePeekingIterator<RowResult<Set<Value>>>> apply(DynamicPartitio
 
     @Override
     public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(
-            final TableReference tableRef, RangeRequest rangeRequest, final long timestamp)
-                    throws InsufficientConsistencyException {
-        return AutoRetryingClosableIterator.of(rangeRequest, new Function<RangeRequest, ClosableIterator<RowResult<Set<Long>>>>() {
-            @Override
-            public ClosableIterator<RowResult<Set<Long>>> apply(
-                    RangeRequest input) {
-                return invalidateOnVersionChangeIterator(getRangeOfTimestampsInternal(tableRef, input, timestamp));
-            }
-        });
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp)
+            throws InsufficientConsistencyException {
+        return AutoRetryingClosableIterator.of(rangeRequest, range ->
+                invalidateOnVersionChangeIterator(getRangeOfTimestampsInternal(tableRef, range, timestamp)));
     }
 
-    private ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestampsInternal(final TableReference tableRef,
-                                                                       final RangeRequest rangeRequest,
-                                                                       final long timestamp)
+    private ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestampsInternal(
+            TableReference tableRef,
+            RangeRequest rangeRequest,
+            long timestamp)
             throws InsufficientConsistencyException {
-        final Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> services =
-                runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Multimap<ConsistentRingRangeRequest, KeyValueEndpoint>>() {
-                    @Override
-                    public Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> apply(DynamicPartitionMap input) {
-                        return input.getServicesForRangeRead(tableRef.getQualifiedName(), rangeRequest);
-                    }
-                });
+        Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> services = runWithPartitionMapRetryable(range ->
+                range.getServicesForRangeRead(tableRef.getQualifiedName(), rangeRequest));
 
         return new PartitionedRangedIterator<Set<Long>>(services.keySet()) {
             @Override
             public RowResult<Set<Long>> computeNext() {
                 Preconditions.checkState(hasNext());
                 // This is NOT retryable
-                return runWithPartitionMap(new Function<DynamicPartitionMap, RowResult<Set<Long>>>() {
-                    @Override
-                    public RowResult<Set<Long>> apply(DynamicPartitionMap input) {
-                        return RowResults.allTimestamps(getRowIterator());
-                    }
-                });
+                return runWithPartitionMap(input -> RowResults.allTimestamps(getRowIterator()));
             }
 
             @Override
-            protected Set<ClosablePeekingIterator<RowResult<Set<Long>>>> computeNextRange(final ConsistentRingRangeRequest range) {
+            protected Set<ClosablePeekingIterator<RowResult<Set<Long>>>> computeNextRange(
+                    ConsistentRingRangeRequest range) {
                 // This is NOT retryable
-                return runWithPartitionMap(new Function<DynamicPartitionMap, Set<ClosablePeekingIterator<RowResult<Set<Long>>>>>() {
-                    @Override
-                    public Set<ClosablePeekingIterator<RowResult<Set<Long>>>> apply(DynamicPartitionMap input) {
-                        final Set<ClosablePeekingIterator<RowResult<Set<Long>>>> result = Sets.newHashSet();
-
-                        // This method has stronger consistency guarantees. It has to talk to all endpoints
-                        // and thus must throw immediately on any failure encountered.
-                        for (KeyValueEndpoint vkve : services.get(range)) {
-                            ClosableIterator<RowResult<Set<Long>>> it = vkve.keyValueService().getRangeOfTimestamps(
-                                    tableRef, range.get(), timestamp);
-                            result.add(ClosablePeekingIterator.of(it));
-                        }
-
-                        return result;
+                return runWithPartitionMap(partitionMap -> {
+                    final Set<ClosablePeekingIterator<RowResult<Set<Long>>>> result = Sets.newHashSet();
+
+                    // This method has stronger consistency guarantees. It has to talk to all endpoints
+                    // and thus must throw immediately on any failure encountered.
+                    for (KeyValueEndpoint vkve : services.get(range)) {
+                        ClosableIterator<RowResult<Set<Long>>> it = vkve.keyValueService().getRangeOfTimestamps(
+                                tableRef, range.get(), timestamp);
+                        result.add(ClosablePeekingIterator.of(it));
                     }
+
+                    return result;
                 });
             }
         };
@@ -441,31 +385,22 @@ public Set<ClosablePeekingIterator<RowResult<Set<Long>>>> apply(DynamicPartition
     // *** Write requests *************************************************************************
     @Override
     public void put(final TableReference tableRef, final Map<Cell, byte[]> values, final long timestamp) {
-        runWithPartitionMap(new Function<DynamicPartitionMap, Void>() {
-            @Override
-            public Void apply(DynamicPartitionMap input) {
-                final EndpointRequestCompletionService<Void> writeService = EndpointRequestExecutor.newService(executor);
-                final QuorumTracker<Void, Cell> tracker =
-                        QuorumTracker.of(values.keySet(), input.getWriteCellsParameters(values.keySet()));
-
-                input.runForCellsWrite(tableRef.getQualifiedName(), values, new Function<Pair<KeyValueService, Map<Cell, byte[]>>, Void>() {
-                    @Override
-                    public Void apply(final Pair<KeyValueService, Map<Cell, byte[]>> e) {
-                        Future<Void> future = writeService.submit(new Callable<Void>() {
-                            @Override
-                            public Void call() throws Exception {
-                                e.lhSide.put(tableRef, e.rhSide, timestamp);
-                                return null;
-                            }
-                        }, e.lhSide);
-                        tracker.registerRef(future, e.rhSide.keySet());
-                        return null;
-                    }
-                });
-
-                completeWriteRequest(tracker, writeService);
+        runWithPartitionMap(partitionMap -> {
+            EndpointRequestCompletionService<Void> writeService = EndpointRequestExecutor.newService(executor);
+            final QuorumTracker<Void, Cell> tracker =
+                    QuorumTracker.of(values.keySet(), partitionMap.getWriteCellsParameters(values.keySet()));
+
+            partitionMap.runForCellsWrite(tableRef.getQualifiedName(), values, kvsAndCellsPair -> {
+                Future<Void> future = writeService.submit(() -> {
+                    kvsAndCellsPair.lhSide.put(tableRef, kvsAndCellsPair.rhSide, timestamp);
+                    return null;
+                }, kvsAndCellsPair.lhSide);
+                tracker.registerRef(future, kvsAndCellsPair.rhSide.keySet());
                 return null;
-            }
+            });
+
+            RequestCompletions.completeWriteRequest(tracker, writeService);
+            return null;
         });
     }
 
@@ -482,27 +417,21 @@ public Void apply(final DynamicPartitionMap input) {
                         cellValues.entries(), input.getWriteEntriesParameters(cellValues));
                 final Semaphore semaphore = new Semaphore(EndpointRequestExecutor.MAX_TASKS_PER_ENDPOINT);
 
-                input.runForCellsWrite(tableRef.getQualifiedName(), cellValues, new Function<Pair<KeyValueService, Multimap<Cell, Value>>, Void>() {
-                    @Override
-                    public Void apply(final Pair<KeyValueService, Multimap<Cell, Value>> e) {
-                        Future<Void> future = execSvc.submit(new Callable<Void>() {
-                            @Override
-                            public Void call() throws Exception {
-                                semaphore.acquire();
-                                try {
-                                    e.lhSide.putWithTimestamps(tableRef, e.rhSide);
-                                } finally {
-                                    semaphore.release();
-                                }
-                                return null;
-                            }
-                        }, e.lhSide);
-                        tracker.registerRef(future, e.rhSide.entries());
+                input.runForCellsWrite(tableRef.getQualifiedName(), cellValues, kvsAndCellsPair -> {
+                    Future<Void> future = execSvc.submit(() -> {
+                        semaphore.acquire();
+                        try {
+                            kvsAndCellsPair.lhSide.putWithTimestamps(tableRef, kvsAndCellsPair.rhSide);
+                        } finally {
+                            semaphore.release();
+                        }
                         return null;
-                    }
+                    }, kvsAndCellsPair.lhSide);
+                    tracker.registerRef(future, kvsAndCellsPair.rhSide.entries());
+                    return null;
                 });
 
-                completeWriteRequest(tracker, execSvc);
+                RequestCompletions.completeWriteRequest(tracker, execSvc);
                 try {
                     semaphore.acquire(EndpointRequestExecutor.MAX_TASKS_PER_ENDPOINT);
                 } catch (InterruptedException e) {
@@ -516,39 +445,31 @@ public Void call() throws Exception {
     /**
      * This operation is not supported for <code>PartitionedKeyValueService</code>.
      *
+     * @deprecated This method is not supported. Please do not use.
      */
     @Override
     @Deprecated
-    public void putUnlessExists(final TableReference tableRef, final Map<Cell, byte[]> values)
+    public void putUnlessExists(TableReference tableRef, final Map<Cell, byte[]> values)
             throws KeyAlreadyExistsException {
         // TODO: This should eventually throw new UnsupportedOperationException().
         // For some testing purposes it does not do it now and calls putUnlessExists
         // on all relevant delegates which is NOT a correct solution!
-        runWithPartitionMap(new Function<DynamicPartitionMap, Void>() {
-            @Override
-            public Void apply(DynamicPartitionMap input) {
-                final EndpointRequestCompletionService<Void> writeService = EndpointRequestExecutor.newService(executor);
-                final QuorumTracker<Void, Cell> tracker = QuorumTracker.of(
-                        values.keySet(), quorumParameters.getWriteRequestParameters());
-
-                input.runForCellsWrite(tableRef.getQualifiedName(), values, new Function<Pair<KeyValueService, Map<Cell, byte[]>>, Void>() {
-                    @Override
-                    public Void apply(final Pair<KeyValueService, Map<Cell, byte[]>> e) {
-                        Future<Void> future = writeService.submit(new Callable<Void>() {
-                            @Override
-                            public Void call() throws Exception {
-                                e.lhSide.putUnlessExists(tableRef, e.rhSide);
-                                return null;
-                            }
-                        }, e.lhSide);
-                        tracker.registerRef(future, e.rhSide.keySet());
-                        return null;
-                    }
-                });
-
-                completeWriteRequest(tracker, writeService);
+        runWithPartitionMap(partitionMap -> {
+            EndpointRequestCompletionService<Void> writeService = EndpointRequestExecutor.newService(executor);
+            QuorumTracker<Void, Cell> tracker = QuorumTracker.of(
+                    values.keySet(), quorumParameters.getWriteRequestParameters());
+
+            partitionMap.runForCellsWrite(tableRef.getQualifiedName(), values, kvsAndCellsPair -> {
+                Future<Void> future = writeService.submit(() -> {
+                    kvsAndCellsPair.lhSide.putUnlessExists(tableRef, kvsAndCellsPair.rhSide);
+                    return null;
+                }, kvsAndCellsPair.lhSide);
+                tracker.registerRef(future, kvsAndCellsPair.rhSide.keySet());
                 return null;
-            }
+            });
+
+            RequestCompletions.completeWriteRequest(tracker, writeService);
+            return null;
         });
     }
 
@@ -562,22 +483,16 @@ public Void apply(DynamicPartitionMap input) {
                 final QuorumTracker<Void, Map.Entry<Cell, Long>> tracker = QuorumTracker.of(
                         keys.entries(), input.getWriteEntriesParameters(keys));
 
-                input.runForCellsWrite(tableRef.getQualifiedName(), keys, new Function<Pair<KeyValueService, Multimap<Cell, Long>>, Void>() {
-                    @Override
-                    public Void apply(final Pair<KeyValueService, Multimap<Cell, Long>> e) {
-                        final Future<Void> future = execSvc.submit(new Callable<Void>() {
-                            @Override
-                            public Void call() throws Exception {
-                                e.lhSide.delete(tableRef, e.rhSide);
-                                return null;
-                            }
-                        }, e.lhSide);
-                        tracker.registerRef(future, e.rhSide.entries());
+                input.runForCellsWrite(tableRef.getQualifiedName(), keys, kvsAndCellsPair -> {
+                    final Future<Void> future = execSvc.submit(() -> {
+                        kvsAndCellsPair.lhSide.delete(tableRef, kvsAndCellsPair.rhSide);
                         return null;
-                    }
+                    }, kvsAndCellsPair.lhSide);
+                    tracker.registerRef(future, kvsAndCellsPair.rhSide.entries());
+                    return null;
                 });
 
-                completeWriteRequest(tracker, execSvc);
+                RequestCompletions.completeWriteRequest(tracker, execSvc);
                 return null;
             }
         });
@@ -586,31 +501,22 @@ public Void call() throws Exception {
     @Override
     @Idempotent
     public void addGarbageCollectionSentinelValues(final TableReference tableRef, final Set<Cell> cells) {
-        runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Void>() {
-            @Override
-            public Void apply(DynamicPartitionMap input) {
-                final EndpointRequestCompletionService<Void> execSvc = EndpointRequestExecutor.newService(executor);
-                final QuorumTracker<Void, Cell> tracker = QuorumTracker.of(
-                        cells, input.getWriteCellsParameters(cells));
-
-                input.runForCellsWrite(tableRef.getQualifiedName(), cells, new Function<Pair<KeyValueService, Set<Cell>>, Void>() {
-                    @Override
-                    public Void apply(final Pair<KeyValueService, Set<Cell>> e) {
-                        Future<Void> future = execSvc.submit(new Callable<Void>() {
-                            @Override
-                            public Void call() throws Exception {
-                                e.lhSide.addGarbageCollectionSentinelValues(tableRef, e.rhSide);
-                                return null;
-                            }
-                        }, e.lhSide);
-                        tracker.registerRef(future, e.rhSide);
-                        return null;
-                    }
-                });
-
-                completeWriteRequest(tracker, execSvc);
+        runWithPartitionMapRetryable(partitionMap -> {
+            EndpointRequestCompletionService<Void> execSvc = EndpointRequestExecutor.newService(executor);
+            QuorumTracker<Void, Cell> tracker = QuorumTracker.of(
+                    cells, partitionMap.getWriteCellsParameters(cells));
+
+            partitionMap.runForCellsWrite(tableRef.getQualifiedName(), cells, kvsAndCellsPair -> {
+                Future<Void> future = execSvc.submit(() -> {
+                    kvsAndCellsPair.lhSide.addGarbageCollectionSentinelValues(tableRef, kvsAndCellsPair.rhSide);
+                    return null;
+                }, kvsAndCellsPair.lhSide);
+                tracker.registerRef(future, kvsAndCellsPair.rhSide);
                 return null;
-            }
+            });
+
+            RequestCompletions.completeWriteRequest(tracker, execSvc);
+            return null;
         });
     }
 
@@ -717,7 +623,7 @@ public Set<TableReference> getAllTableNames() {
         return runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Set<TableReference>>() {
             @Override
             public Set<TableReference> apply(@Nullable DynamicPartitionMap input) {
-                return retryUntilSuccess(
+                return RequestCompletions.retryUntilSuccess(
                         input.getDelegates().iterator(),
                         new Function<KeyValueService, Set<TableReference>>() {
                             @Override
@@ -738,7 +644,7 @@ public byte[] getMetadataForTable(final TableReference tableRef) {
         return runWithPartitionMapRetryable(new Function<DynamicPartitionMap, byte[]>() {
             @Override
             public byte[] apply(@Nullable DynamicPartitionMap input) {
-                return retryUntilSuccess(
+                return RequestCompletions.retryUntilSuccess(
                         input.getDelegates().iterator(),
                         new Function<KeyValueService, byte[]>() {
                             @Override
@@ -770,7 +676,7 @@ public Map<TableReference, byte[]> getMetadataForTables() {
         return runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Map<TableReference, byte[]>>() {
             @Override
             public Map<TableReference, byte[]> apply(@Nullable DynamicPartitionMap input) {
-                return retryUntilSuccess(
+                return RequestCompletions.retryUntilSuccess(
                         input.getDelegates().iterator(),
                         new Function<KeyValueService, Map<TableReference, byte[]>>() {
                             @Override
@@ -868,7 +774,9 @@ protected PartitionedKeyValueService(ExecutorService executor, QuorumParameters
         this.quorumParameters = quorumParameters;
     }
 
-    public static PartitionedKeyValueService create(QuorumParameters quorumParameters, List<PartitionMapService> mapServices) {
+    public static PartitionedKeyValueService create(
+            QuorumParameters quorumParameters,
+            List<PartitionMapService> mapServices) {
         ExecutorService executor = PTExecutors.newCachedThreadPool();
         return new PartitionedKeyValueService(executor, quorumParameters, ImmutableList.copyOf(mapServices), 1);
     }
@@ -884,31 +792,20 @@ public static PartitionedKeyValueService create(PartitionedKeyValueConfiguration
     }
 
     // *** Helper methods *************************************************************************
-    @VisibleForTesting @Deprecated
+
+    /**
+     * @deprecated Only for testing. Do not use.
+     */
+    @Deprecated
     public DynamicPartitionMapImpl getPartitionMap() {
-        return runWithPartitionMapRetryable(new Function<DynamicPartitionMap, DynamicPartitionMapImpl>() {
-            @Override
-            public DynamicPartitionMapImpl apply(DynamicPartitionMap input) {
-                return (DynamicPartitionMapImpl) input;
-            }
-        });
+        return runWithPartitionMapRetryable(partitionMap -> (DynamicPartitionMapImpl) partitionMap);
     }
 
     private long getMapVersion() {
-        return runWithPartitionMapRetryable(new Function<DynamicPartitionMap, Long>() {
-            @Override
-            public Long apply(DynamicPartitionMap input) {
-                return input.getVersion();
-            }
-        });
+        return runWithPartitionMapRetryable(DynamicPartitionMap::getVersion);
     }
 
     private <T> ClosableIterator<RowResult<T>> invalidateOnVersionChangeIterator(ClosableIterator<RowResult<T>> it) {
-        return VersionCheckProxy.invalidateOnVersionChangeProxy(it, new Supplier<Long>() {
-            @Override
-            public Long get() {
-                return getMapVersion();
-            }
-        });
+        return VersionCheckProxy.invalidateOnVersionChangeProxy(it, this::getMapVersion);
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/api/DynamicPartitionMap.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/api/DynamicPartitionMap.java
index 4c73860a188..abf30ae6212 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/api/DynamicPartitionMap.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/api/DynamicPartitionMap.java
@@ -31,7 +31,7 @@
  *
  * The usual add-endpoint workflow:
  * <ol>
- *  <li> retry {@link #addEndpoint(byte[], KeyValueEndpoint, String)} until succeeds
+ *  <li> retry {@link #addEndpoint(byte[], KeyValueEndpoint)} until succeeds
  *  <li> retry {@link #backfillAddedEndpoint(byte[])} untill succeeds
  *  <li> retry {@link #promoteAddedEndpoint(byte[])} until succeeds
  * </ol>
@@ -63,10 +63,6 @@ public interface DynamicPartitionMap extends PartitionMap {
      * It will return <code>false</code> if the preconditions were not
      * met and the request was rejected. It will return <code>true</code>
      * if the request was accepted.
-     *
-     * @param key
-     * @param kve
-     * @return
      */
     boolean addEndpoint(byte[] key, KeyValueEndpoint kve);
 
@@ -80,8 +76,6 @@ public interface DynamicPartitionMap extends PartitionMap {
      *
      * After completing this call you should promote your new endpoint
      * with {@link #promoteAddedEndpoint(byte[])}.
-     *
-     * @param key
      */
     void backfillAddedEndpoint(byte[] key);
 
@@ -95,8 +89,6 @@ public interface DynamicPartitionMap extends PartitionMap {
      *
      * After this call completes, the new endpoint is fully functional.
      * You might consider {@link #pushMapToEndpoints()} at this moment.
-     *
-     * @param key
      */
     void promoteAddedEndpoint(byte[] key);
 
@@ -115,11 +107,6 @@ public interface DynamicPartitionMap extends PartitionMap {
      * It will return <code>false</code> if the preconditions were not
      * met and the request was rejected. It will return <code>true</code>
      * if the request was accepted.
-     *
-     * @param key
-     * @param kvs
-     * @param rack
-     * @return
      */
     boolean removeEndpoint(byte[] key);
 
@@ -133,9 +120,6 @@ public interface DynamicPartitionMap extends PartitionMap {
      *
      * After completing this call you should promote your new endpoint
      * with {@link #promoteAddedEndpoint(byte[])}.
-     *
-     * @param key
-     *
      */
     void backfillRemovedEndpoint(byte[] key);
 
@@ -151,8 +135,6 @@ public interface DynamicPartitionMap extends PartitionMap {
      *
      * After this call completes, the removed endpoint can be taken down.
      * You might consider {@link #pushMapToEndpoints()} at this moment.
-     *
-     * @param key
      */
     void promoteRemovedEndpoint(byte[] key);
 
@@ -162,7 +144,7 @@ public interface DynamicPartitionMap extends PartitionMap {
      *
      * The initial version MUST be 0L!
      *
-     * @return Current version of the map.
+     * @return Current version of the map
      */
     long getVersion();
 
@@ -180,7 +162,7 @@ public interface DynamicPartitionMap extends PartitionMap {
     Map<Cell, QuorumRequestParameters> getReadCellsParameters(Set<Cell> cells);
     Map<Cell, QuorumRequestParameters> getWriteCellsParameters(Set<Cell> cells);
     <T> Map<Entry<Cell, T>, QuorumRequestParameters> getReadEntriesParameters(Map<Cell, T> entries);
-    <T> Map<Entry<Cell, T>, QuorumRequestParameters> getWriteEntriesParameters(Map<Cell, T> entries);
     <T> Map<Entry<Cell, T>, QuorumRequestParameters> getReadEntriesParameters(Multimap<Cell, T> entries);
+    <T> Map<Entry<Cell, T>, QuorumRequestParameters> getWriteEntriesParameters(Map<Cell, T> entries);
     <T> Map<Entry<Cell, T>, QuorumRequestParameters> getWriteEntriesParameters(Multimap<Cell, T> entries);
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/api/PartitionMap.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/api/PartitionMap.java
index ef6a8f9ad2b..064873b4220 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/api/PartitionMap.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/api/PartitionMap.java
@@ -31,10 +31,9 @@
 import com.palantir.atlasdb.keyvalue.partition.util.ConsistentRingRangeRequest;
 import com.palantir.util.Pair;
 
-@JsonSerialize(using=DynamicPartitionMapImpl.Serializer.class)
-@JsonDeserialize(using=DynamicPartitionMapImpl.Deserializer.class)
+@JsonSerialize(using = DynamicPartitionMapImpl.Serializer.class)
+@JsonDeserialize(using = DynamicPartitionMapImpl.Deserializer.class)
 public interface PartitionMap {
-
     /**
      * This will divide the <code>range</code> into subranges that are relevant to particular
      * endpoint sets. The returned endpoints might throw <code>VersionTooOldException</code> at
@@ -43,78 +42,63 @@ public interface PartitionMap {
      *
      * @see ClientVersionTooOldException
      *
-     * @param tableName
-     * @param range
      * @return The iteration order of entries is guaranteed to be non-descending. The sub-ranges
      * must be either equal or non-overlapping. The union of ranges must be a superset of the original
-     * <code>range</code>.
+     * <code>range</code>
      */
-    Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> getServicesForRangeRead(String tableName, RangeRequest range);
+    Multimap<ConsistentRingRangeRequest, KeyValueEndpoint> getServicesForRangeRead(
+            String tableName,
+            RangeRequest range);
 
     /**
      * The <code>task</code> will be executed for all relevant KeyValueServices. The right hand side argument
      * will contain the rows that are relevant to given KeyValueService.
-     *
-     * @param tableName
-     * @param rows
-     * @param task
      */
-    void runForRowsRead(String tableName, Iterable<byte[]> rows, Function<Pair<KeyValueService, Iterable<byte[]>>, Void> task);
+    void runForRowsRead(
+            String tableName, Iterable<byte[]> rows,
+            Function<Pair<KeyValueService, Iterable<byte[]>>, Void> task);
 
     /**
      * The <code>task</code> will be executed for all relevant KeyValueServices. The right hand side argument
      * will contain the cells that are relevant to given KeyValueService.
-     *
-     * @param tableName
-     * @param cells
-     * @param task
      */
     void runForCellsRead(String tableName, Set<Cell> cells, Function<Pair<KeyValueService, Set<Cell>>, Void> task);
 
     /**
      * The <code>task</code> will be executed for all relevant KeyValueServices. The right hand side argument
      * will contain a subset of entries with cells relevant to given KeyValueService.
-     *
-     * @param tableName
-     * @param cells
-     * @param task
      */
-    <T> void runForCellsRead(String tableName, Map<Cell, T> cells, Function<Pair<KeyValueService, Map<Cell, T>>, Void> task);
+    <T> void runForCellsRead(
+            String tableName,
+            Map<Cell, T> cells, Function<Pair<KeyValueService, Map<Cell, T>>, Void> task);
 
     /**
      * The <code>task</code> will be executed for all relevant KeyValueServices. The right hand side argument
      * will contain all the cells that are relevant to given KeyValueService.
-     *
-     * @param tableName
-     * @param cells
-     * @param task
      */
     void runForCellsWrite(String tableName, Set<Cell> cells, Function<Pair<KeyValueService, Set<Cell>>, Void> task);
 
     /**
      * The <code>task</code> will be executed for all relevant KeyValueServices. The right hand side argument
      * will contain a subset of entries with cells relevant to given KeyValueService.
-     *
-     * @param tableName
-     * @param cells
-     * @param task
      */
-    <T> void runForCellsWrite(String tableName, Map<Cell, T> cells, Function<Pair<KeyValueService, Map<Cell, T>>, Void> task);
+    <T> void runForCellsWrite(
+            String tableName,
+            Map<Cell, T> cells, Function<Pair<KeyValueService, Map<Cell, T>>, Void> task);
 
     /**
      * The <code>task</code> will be executed for all relevant KeyValueServices. The right hand side argument
      * will contain a subset of entries with cells relevant to given KeyValueService.
-     *
-     * @param tableName
-     * @param cells
-     * @param task
      */
-    <T> void runForCellsWrite(String tableName, Multimap<Cell, T> cells, Function<Pair<KeyValueService, Multimap<Cell, T>>, Void> task);
+    <T> void runForCellsWrite(
+            String tableName,
+            Multimap<Cell, T> cells,
+            Function<Pair<KeyValueService, Multimap<Cell, T>>, Void> task);
 
     /**
      * This will return the references to underlying endpoint key value services.
      *
-     * @return
+     * @return the references to underlying endpoint key value services
      */
     Set<? extends KeyValueService> getDelegates();
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/InMemoryKeyValueEndpoint.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/InMemoryKeyValueEndpoint.java
index e3ec98362af..025a6fedab1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/InMemoryKeyValueEndpoint.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/InMemoryKeyValueEndpoint.java
@@ -29,26 +29,23 @@
  * @author htarasiuk
  *
  */
-public class InMemoryKeyValueEndpoint implements KeyValueEndpoint {
-
-    transient final KeyValueService kvs;
-    transient final PartitionMapService pms;
-    transient final String rack;
+public final class InMemoryKeyValueEndpoint implements KeyValueEndpoint {
+    final transient KeyValueService kvs;
+    final transient PartitionMapService pms;
+    final transient String rack;
 
     private InMemoryKeyValueEndpoint(KeyValueService kvs, PartitionMapService pms, String rack) {
-        this.kvs = Preconditions.checkNotNull(kvs);
-        this.pms = Preconditions.checkNotNull(pms);
+        this.kvs = Preconditions.checkNotNull(kvs, "kvs cannot be null");
+        this.pms = Preconditions.checkNotNull(pms, "pms cannot be null");
         this.rack = KeyValueEndpoints.makeUniqueRackIfNoneSpecified(rack);
     }
 
     /**
+     * Creates an {@link InMemoryKeyValueEndpoint}.
      *
-     * @param kvs
-     * @param pms
      * @param rack Use <tt>PartitionedKeyValueConstants.NO_RACK</tt> if you want a unique
      * rack name to be created for this endpoint. Also see a convenience method
      * {@link #create(KeyValueService, PartitionMapService)}.
-     * @return
      */
     public static InMemoryKeyValueEndpoint create(KeyValueService kvs, PartitionMapService pms, String rack) {
         return new InMemoryKeyValueEndpoint(kvs, pms, rack);
@@ -59,9 +56,6 @@ public static InMemoryKeyValueEndpoint create(KeyValueService kvs, PartitionMapS
      * for this endpoint.
      * Equivalent to calling {@link #create(KeyValueService, PartitionMapService, String)}
      * with <tt>rack=PartitionedKeyValueConstants.NO_RACK</tt>.
-     * @param kvs
-     * @param pms
-     * @return
      */
     public static InMemoryKeyValueEndpoint create(KeyValueService kvs, PartitionMapService pms) {
         return create(kvs, pms, PartitionedKeyValueConstants.NO_RACK);
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/KeyValueEndpoint.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/KeyValueEndpoint.java
index 65cae905c02..70696d0936f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/KeyValueEndpoint.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/KeyValueEndpoint.java
@@ -29,16 +29,13 @@
  * @author htarasiuk
  *
  */
-@JsonSerialize(as=SimpleKeyValueEndpoint.class)
-@JsonDeserialize(as=SimpleKeyValueEndpoint.class)
+@JsonSerialize(as = SimpleKeyValueEndpoint.class)
+@JsonDeserialize(as = SimpleKeyValueEndpoint.class)
 public interface KeyValueEndpoint {
     KeyValueService keyValueService();
     PartitionMapService partitionMapService();
     String rack();
 
-    /**
-     * TODO: This should be replaced by a nicer solution eventually.
-     * @param clientVersionSupplier
-     */
+    // TODO: This should be replaced by a nicer solution eventually.
     void registerPartitionMapVersion(Supplier<Long> clientVersionSupplier);
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/KeyValueEndpoints.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/KeyValueEndpoints.java
index cc7fbe7409a..54aac57fa29 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/KeyValueEndpoints.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/KeyValueEndpoints.java
@@ -20,14 +20,15 @@
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.keyvalue.partition.PartitionedKeyValueConstants;
 
-public class KeyValueEndpoints {
+public final class KeyValueEndpoints {
     private KeyValueEndpoints() {
+        // Utility class
     }
 
     public static String makeUniqueRackIfNoneSpecified(String rack) {
         if (PartitionedKeyValueConstants.NO_RACK.equals(rack)) {
             return UUID.randomUUID().toString();
         }
-        return Preconditions.checkNotNull(rack);
+        return Preconditions.checkNotNull(rack, "Rack cannot be null");
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/SimpleKeyValueEndpoint.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/SimpleKeyValueEndpoint.java
index d50ba6d4c25..3cad905c340 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/SimpleKeyValueEndpoint.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/endpoint/SimpleKeyValueEndpoint.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.partition.endpoint;
 
+import java.util.Objects;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Preconditions;
@@ -38,7 +40,7 @@
  * @author htarasiuk
  *
  */
-public class SimpleKeyValueEndpoint implements KeyValueEndpoint {
+public final class SimpleKeyValueEndpoint implements KeyValueEndpoint {
 
     transient KeyValueService kvs;
     final transient PartitionMapService pms;
@@ -47,20 +49,18 @@ public class SimpleKeyValueEndpoint implements KeyValueEndpoint {
     @JsonProperty("rack") final String rack;
 
     private SimpleKeyValueEndpoint(String kvsUri, String pmsUri, String rack) {
-        this.kvsUri = Preconditions.checkNotNull(kvsUri);
-        this.pmsUri = Preconditions.checkNotNull(pmsUri);
+        this.kvsUri = Preconditions.checkNotNull(kvsUri, "kvsUri cannot be null");
+        this.pmsUri = Preconditions.checkNotNull(pmsUri, "pmgUri cannot be null");
         this.pms = RemotingPartitionMapService.createClientSide(pmsUri);
         this.rack = KeyValueEndpoints.makeUniqueRackIfNoneSpecified(rack);
     }
 
     /**
+     * Creates a new {@link SimpleKeyValueEndpoint}.
      *
-     * @param kvsUri
-     * @param pmsUri
      * @param rack Use <tt>PartitionedKeyValueConstants.NO_RACK</tt> if you want
      * to have a unique rack id created. A convenience method {@link #create(String, String)}
      * is also available.
-     * @return
      */
     @JsonCreator
     public static SimpleKeyValueEndpoint create(@JsonProperty("kvsUri") String kvsUri,
@@ -72,10 +72,6 @@ public static SimpleKeyValueEndpoint create(@JsonProperty("kvsUri") String kvsUr
     /**
      * Same as {@link #create(String, String, String)} but will automatically
      * create a unique rack id for this enpoint.
-     *
-     * @param kvsUri
-     * @param pmsUri
-     * @return
      */
     public static SimpleKeyValueEndpoint create(String kvsUri, String pmsUri) {
         return create(kvsUri, pmsUri, PartitionedKeyValueConstants.NO_RACK);
@@ -83,7 +79,7 @@ public static SimpleKeyValueEndpoint create(String kvsUri, String pmsUri) {
 
     @Override
     public KeyValueService keyValueService() {
-        return Preconditions.checkNotNull(kvs);
+        return Preconditions.checkNotNull(kvs, "kvs is not set");
     }
 
     @Override
@@ -111,41 +107,23 @@ public void registerPartitionMapVersion(Supplier<Long> clientVersionSupplier) {
         kvs = FillInUrlProxy.newFillInUrlProxy(kvs, pmsUri);
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((kvsUri == null) ? 0 : kvsUri.hashCode());
-        result = prime * result + ((pmsUri == null) ? 0 : pmsUri.hashCode());
-        result = prime * result + ((rack == null) ? 0 : rack.hashCode());
-        return result;
-    }
-
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
+        }
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
-        SimpleKeyValueEndpoint other = (SimpleKeyValueEndpoint) obj;
-        if (kvsUri == null) {
-            if (other.kvsUri != null)
-                return false;
-        } else if (!kvsUri.equals(other.kvsUri))
-            return false;
-        if (pmsUri == null) {
-            if (other.pmsUri != null)
-                return false;
-        } else if (!pmsUri.equals(other.pmsUri))
-            return false;
-        if (rack == null) {
-            if (other.rack != null)
-                return false;
-        } else if (!rack.equals(other.rack))
-            return false;
-        return true;
+        }
+        SimpleKeyValueEndpoint that = (SimpleKeyValueEndpoint) obj;
+        return Objects.equals(kvsUri, that.kvsUri)
+                && Objects.equals(pmsUri, that.pmsUri)
+                && Objects.equals(rack, that.rack);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kvsUri, pmsUri, rack);
     }
 
     @Override
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/exception/ClientVersionTooOldException.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/exception/ClientVersionTooOldException.java
index bef42dd32f9..2ff63c79501 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/exception/ClientVersionTooOldException.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/exception/ClientVersionTooOldException.java
@@ -39,21 +39,16 @@
  * @author htarasiuk
  *
  */
-@Immutable public class ClientVersionTooOldException extends VersionMismatchException {
-
+@Immutable
+public class ClientVersionTooOldException extends VersionMismatchException {
     private static final long serialVersionUID = 1L;
 
     private final String pmsUri;
 
-    /**
-     * Only use this if the pmsUri has been filled in.
-     *
-     * @return An updated version of the partion map; downloaded from the PartitionMapService
-     * associated with the KeyValueService that threw the original exception.
-     */
-    public DynamicPartitionMap getUpdatedMap() {
-    	return RemotingPartitionMapService.createClientSide(
-    			Preconditions.checkNotNull(pmsUri)).getMap();
+
+    public ClientVersionTooOldException() {
+        super(null);
+        this.pmsUri = null;
     }
 
     public ClientVersionTooOldException(String pmsUri) {
@@ -61,16 +56,22 @@ public ClientVersionTooOldException(String pmsUri) {
         // Palantir Throwables rewrapping logic will recreate the exception by
         // passing the getMessage() result to the single-argument constructor.
         super(pmsUri);
-    	this.pmsUri = Preconditions.checkNotNull(pmsUri);
+        this.pmsUri = Preconditions.checkNotNull(pmsUri, "pmsUri cannot be null");
     }
 
-    public ClientVersionTooOldException() {
-        super(null);
-    	this.pmsUri = null;
+    /**
+     * Only use this if the pmsUri has been filled in.
+     *
+     * @return An updated version of the partion map; downloaded from the PartitionMapService
+     * associated with the KeyValueService that threw the original exception.
+     */
+    public DynamicPartitionMap getUpdatedMap() {
+        return RemotingPartitionMapService.createClientSide(
+                Preconditions.checkNotNull(pmsUri, "pmsUri must not be null to get the updated map")).getMap();
     }
 
-	@Override
-	public String toString() {
-		return "ClientVersionTooOldException [pmsUri=" + pmsUri + "]";
-	}
+    @Override
+    public String toString() {
+        return "ClientVersionTooOldException [pmsUri=" + pmsUri + "]";
+    }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/exception/EndpointVersionTooOldException.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/exception/EndpointVersionTooOldException.java
index 7718a2a2fa5..334ef24990a 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/exception/EndpointVersionTooOldException.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/exception/EndpointVersionTooOldException.java
@@ -27,12 +27,11 @@
 
     /**
      * Only use if pmsUri has been filled in.
-     *
-     * @param map
      */
     public void pushNewMap(DynamicPartitionMap map) {
         RemotingPartitionMapService.createClientSide(
-                Preconditions.checkNotNull(pmsUri)).updateMapIfNewer(map);
+                Preconditions.checkNotNull(pmsUri, "pmsUri must be set to push a new map"))
+                .updateMapIfNewer(map);
     }
 
     public EndpointVersionTooOldException() {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/DynamicPartitionMapImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/DynamicPartitionMapImpl.java
index ee4dd57bcbf..55a54909a82 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/DynamicPartitionMapImpl.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/DynamicPartitionMapImpl.java
@@ -16,6 +16,7 @@
 package com.palantir.atlasdb.keyvalue.partition.map;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -23,6 +24,7 @@
 import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.NavigableSet;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -32,7 +34,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
 
-import org.apache.commons.lang.mutable.MutableLong;
+import org.apache.commons.lang3.mutable.MutableLong;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,7 +46,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Supplier;
@@ -162,8 +163,7 @@
  * Jackson notice: This class has custom serializer and deserializer.
  *
  */
-public class DynamicPartitionMapImpl implements DynamicPartitionMap {
-
+public final class DynamicPartitionMapImpl implements DynamicPartitionMap {
     private static final Logger log = LoggerFactory.getLogger(DynamicPartitionMapImpl.class);
     private static final int MAX_VALUE_SIZE = 1024 * 1024 * 1024;
 
@@ -171,25 +171,17 @@ public class DynamicPartitionMapImpl implements DynamicPartitionMap {
     private final CycleMap<byte[], EndpointWithStatus> ring;
     private final MutableLong version = new MutableLong(0L);
 
-    private transient final Set<KeyValueService> delegates;
-    private transient final ExecutorService executor;
+    private final transient Set<KeyValueService> delegates;
+    private final transient ExecutorService executor;
 
-    private transient final Supplier<Long> versionSupplier = new Supplier<Long>() {
-        @Override
-        public Long get() {
-            return version.longValue();
-        }
-    };
+    private final transient Supplier<Long> versionSupplier = () -> version.longValue();
 
     @GuardedBy("this")
     private long operationsInProgress;
 
-    /*** Creation ********************************************************************************/
+    /* Creation */
     /**
      * This is used for deserialization.
-     *
-     * @param quorumParameters
-     * @param ring
      */
     private DynamicPartitionMapImpl(QuorumParameters quorumParameters,
             CycleMap<byte[], EndpointWithStatus> ring, long version,
@@ -211,11 +203,17 @@ private DynamicPartitionMapImpl(QuorumParameters quorumParameters,
         }
     }
 
-    private DynamicPartitionMapImpl(QuorumParameters quorumParameters, NavigableMap<byte[], KeyValueEndpoint> ring, ExecutorService executor) {
+    private DynamicPartitionMapImpl(
+            QuorumParameters quorumParameters,
+            NavigableMap<byte[], KeyValueEndpoint> ring,
+            ExecutorService executor) {
         this(quorumParameters, toRing(ring), 0L, 0, executor);
     }
 
-    public static DynamicPartitionMapImpl create(QuorumParameters quorumParameters, NavigableMap<byte[], KeyValueEndpoint> ring, ExecutorService executor) {
+    public static DynamicPartitionMapImpl create(
+            QuorumParameters quorumParameters,
+            NavigableMap<byte[], KeyValueEndpoint> ring,
+            ExecutorService executor) {
         return new DynamicPartitionMapImpl(quorumParameters, ring, executor);
     }
 
@@ -245,39 +243,30 @@ public Void call() throws Exception {
         }
     }
 
-    /*** Creation helpers ***/
+    /* Creation helpers */
     /**
      * Supply the version of this partition map to all endpoints in the ring.
      *
-     * @param ring
-     * @return The same object as supplied ie. <code>ring</code>.
+     * @return The same object as supplied ie. <code>ring</code>
      */
-    private <T extends Map<byte[], EndpointWithStatus>> T buildRing(T ring) {
-        for (EndpointWithStatus e : ring.values()) {
+    private <T extends Map<byte[], EndpointWithStatus>> T buildRing(T ringToBuild) {
+        for (EndpointWithStatus e : ringToBuild.values()) {
             e.get().registerPartitionMapVersion(versionSupplier);
         }
-        return ring;
+        return ringToBuild;
     }
 
     /**
      * Convert bare endpoints to EndpointsWithNormalStatus.
-     *
-     * @param map
-     * @return
      */
-    private static CycleMap<byte[], EndpointWithStatus> toRing(NavigableMap<byte[], KeyValueEndpoint> map) {
-        NavigableMap<byte[], EndpointWithStatus> transformedMap = Maps.transformValues(map, new Function<KeyValueEndpoint, EndpointWithStatus>() {
-            @Override
-            public EndpointWithStatus apply(@Nullable KeyValueEndpoint input) {
-                return new EndpointWithNormalStatus(input);
-            }
-        });
+    private static CycleMap<byte[], EndpointWithStatus> toRing(NavigableMap<byte[], KeyValueEndpoint> ringMap) {
+        NavigableMap<byte[], EndpointWithStatus> transformedMap = Maps.transformValues(ringMap,
+                input -> new EndpointWithNormalStatus(input));
         // Make a mutable copy of the immutable result.
         return CycleMap.wrap(Maps.newTreeMap(transformedMap));
     }
 
-    /** Helper methods ***************************************************************************/
-    // This is the METHOD
+    /* Helper methods */
     private Set<KeyValueEndpoint> getServicesHavingRow(byte[] key, boolean isWrite) {
         Set<KeyValueEndpoint> result = Sets.newHashSet();
         Set<String> racksToBeExcluded = Sets.newHashSet();
@@ -323,9 +312,6 @@ private int numOfRacks() {
      * Useful for checking that after removing an endpoint
      * the ring still will be valid (before doing the actual
      * removal).
-     *
-     * @param key
-     * @return
      */
     private int numOfRacksWithoutEndpoint(@Nullable byte[] key) {
         final Set<String> racks = Sets.newHashSet();
@@ -337,15 +323,18 @@ private int numOfRacksWithoutEndpoint(@Nullable byte[] key) {
         return racks.size();
     }
 
-    private Map<KeyValueEndpoint, Set<Cell>> getServicesForCellsSet(String tableName, Set<Cell> cells, boolean isWrite) {
+    private Map<KeyValueEndpoint, Set<Cell>> getServicesForCellsSet(
+            String tableName,
+            Set<Cell> cells,
+            boolean isWrite) {
         Map<KeyValueEndpoint, Set<Cell>> result = Maps.newHashMap();
         for (Cell cell : cells) {
             Set<KeyValueEndpoint> services = getServicesHavingRow(cell.getRowName(), isWrite);
             for (KeyValueEndpoint kvs : services) {
                 if (!result.containsKey(kvs)) {
-                    result.put(kvs, Sets.<Cell> newHashSet());
+                    result.put(kvs, Sets.newHashSet());
                 }
-                assert result.get(kvs).contains(cell) == false;
+                assert !result.get(kvs).contains(cell);
                 result.get(kvs).add(cell);
             }
         }
@@ -355,14 +344,16 @@ private Map<KeyValueEndpoint, Set<Cell>> getServicesForCellsSet(String tableName
         return result;
     }
 
-    private <ValType> Map<KeyValueEndpoint, Map<Cell, ValType>> getServicesForCellsMap(String tableName,
-                                                                         Map<Cell, ValType> cellMap, boolean isWrite) {
-        Map<KeyValueEndpoint, Map<Cell, ValType>> result = Maps.newHashMap();
-        for (Map.Entry<Cell, ValType> e : cellMap.entrySet()) {
+    private <ValTypeT> Map<KeyValueEndpoint, Map<Cell, ValTypeT>> getServicesForCellsMap(
+            String tableName,
+            Map<Cell, ValTypeT> cellMap,
+            boolean isWrite) {
+        Map<KeyValueEndpoint, Map<Cell, ValTypeT>> result = Maps.newHashMap();
+        for (Map.Entry<Cell, ValTypeT> e : cellMap.entrySet()) {
             Set<KeyValueEndpoint> services = getServicesHavingRow(e.getKey().getRowName(), isWrite);
             for (KeyValueEndpoint kvs : services) {
                 if (!result.containsKey(kvs)) {
-                    result.put(kvs, Maps.<Cell, ValType> newHashMap());
+                    result.put(kvs, Maps.newHashMap());
                 }
                 assert !result.get(kvs).containsKey(e.getKey());
                 result.get(kvs).put(e.getKey(), e.getValue());
@@ -374,14 +365,16 @@ private <ValType> Map<KeyValueEndpoint, Map<Cell, ValType>> getServicesForCellsM
         return result;
     }
 
-    private <ValType> Map<KeyValueEndpoint, Multimap<Cell, ValType>> getServicesForCellsMultimap(String tableName,
-                                                                                                Multimap<Cell, ValType> cellMultimap, boolean isWrite) {
-        Map<KeyValueEndpoint, Multimap<Cell, ValType>> result = Maps.newHashMap();
-        for (Map.Entry<Cell, ValType> e : cellMultimap.entries()) {
+    private <ValTypeT> Map<KeyValueEndpoint, Multimap<Cell, ValTypeT>> getServicesForCellsMultimap(
+            String tableName,
+            Multimap<Cell, ValTypeT> cellMultimap,
+            boolean isWrite) {
+        Map<KeyValueEndpoint, Multimap<Cell, ValTypeT>> result = Maps.newHashMap();
+        for (Map.Entry<Cell, ValTypeT> e : cellMultimap.entries()) {
             Set<KeyValueEndpoint> services = getServicesHavingRow(e.getKey().getRowName(), isWrite);
             for (KeyValueEndpoint kvs : services) {
                 if (!result.containsKey(kvs)) {
-                    result.put(kvs, HashMultimap.<Cell, ValType> create());
+                    result.put(kvs, HashMultimap.create());
                 }
                 assert !result.get(kvs).containsEntry(e.getKey(), e.getValue());
                 result.get(kvs).put(e.getKey(), e.getValue());
@@ -462,53 +455,67 @@ private Map<KeyValueEndpoint, NavigableSet<byte[]>> getServicesForRowsRead(Strin
         return result;
     }
 
-    private static <T> void apply(final Entry<KeyValueEndpoint, ? extends T> entry, final Function<Pair<KeyValueService, T>, Void> task) {
-        task.apply(Pair.<KeyValueService, T>create(entry.getKey().keyValueService(), entry.getValue()));
+    private static <T> void apply(
+            Entry<KeyValueEndpoint, ? extends T> entry,
+            Function<Pair<KeyValueService, T>, Void> task) {
+        task.apply(Pair.create(entry.getKey().keyValueService(), entry.getValue()));
     }
 
     @Override
-    public void runForRowsRead(String tableName, Iterable<byte[]> rows,
-                               final Function<Pair<KeyValueService, Iterable<byte[]>>, Void> task) {
-        for (final Entry<KeyValueEndpoint, NavigableSet<byte[]>> e : getServicesForRowsRead(tableName, rows).entrySet()) {
+    public void runForRowsRead(
+            String tableName,
+            Iterable<byte[]> rows,
+            Function<Pair<KeyValueService, Iterable<byte[]>>, Void> task) {
+        for (Entry<KeyValueEndpoint, NavigableSet<byte[]>> e : getServicesForRowsRead(tableName, rows).entrySet()) {
             apply(e, task);
         }
     }
 
     @Override
-    public void runForCellsRead(String tableName, Set<Cell> cells,
-                                final Function<Pair<KeyValueService, Set<Cell>>, Void> task) {
-        for (final Entry<KeyValueEndpoint, Set<Cell>> e : getServicesForCellsSet(tableName, cells, false).entrySet()) {
+    public void runForCellsRead(
+            String tableName,
+            Set<Cell> cells,
+            Function<Pair<KeyValueService, Set<Cell>>, Void> task) {
+        for (Entry<KeyValueEndpoint, Set<Cell>> e : getServicesForCellsSet(tableName, cells, false).entrySet()) {
             apply(e, task);
         }
     }
 
     @Override
-    public <T> void runForCellsRead(String tableName, Map<Cell, T> cells,
-                                    final Function<Pair<KeyValueService, Map<Cell, T>>, Void> task) {
-        for (final Entry<KeyValueEndpoint, Map<Cell, T>> e : getServicesForCellsMap(tableName, cells, false).entrySet()) {
+    public <T> void runForCellsRead(
+            String tableName, Map<Cell, T> cells,
+            Function<Pair<KeyValueService, Map<Cell, T>>, Void> task) {
+        for (Entry<KeyValueEndpoint, Map<Cell, T>> e : getServicesForCellsMap(tableName, cells, false).entrySet()) {
             apply(e, task);
         }
     }
 
     @Override
-    public void runForCellsWrite(String tableName, Set<Cell> cells,
-                                 final Function<Pair<KeyValueService, Set<Cell>>, Void> task) {
-        for (final Entry<KeyValueEndpoint, Set<Cell>> e : getServicesForCellsSet(tableName, cells, true).entrySet()) {
+    public void runForCellsWrite(
+            String tableName,
+            Set<Cell> cells,
+            Function<Pair<KeyValueService, Set<Cell>>, Void> task) {
+        for (Entry<KeyValueEndpoint, Set<Cell>> e : getServicesForCellsSet(tableName, cells, true).entrySet()) {
             apply(e, task);
         }
     }
 
     @Override
-    public <T> void runForCellsWrite(String tableName, Multimap<Cell, T> cells,
-                                     final Function<Pair<KeyValueService, Multimap<Cell, T>>, Void> task) {
-        for (final Entry<KeyValueEndpoint, Multimap<Cell, T>> e : getServicesForCellsMultimap(tableName, cells, true).entrySet()) {
+    public <T> void runForCellsWrite(
+            String tableName,
+            Multimap<Cell, T> cells,
+            Function<Pair<KeyValueService, Multimap<Cell, T>>, Void> task) {
+        for (Entry<KeyValueEndpoint, Multimap<Cell, T>> e :
+                getServicesForCellsMultimap(tableName, cells, true).entrySet()) {
             apply(e, task);
         }
     }
 
     @Override
-    public <T> void runForCellsWrite(String tableName, Map<Cell, T> cells,
-                                     Function<Pair<KeyValueService, Map<Cell, T>>, Void> task) {
+    public <T> void runForCellsWrite(
+            String tableName,
+            Map<Cell, T> cells,
+            Function<Pair<KeyValueService, Map<Cell, T>>, Void> task) {
         for (Entry<KeyValueEndpoint, Map<Cell, T>> e : getServicesForCellsMap(tableName, cells, true).entrySet()) {
             apply(e, task);
         }
@@ -521,12 +528,9 @@ public Set<? extends KeyValueService> getDelegates() {
 
     /**
      * Copies rows within the specified range from all the tables.
-     * @param destKve
-     * @param srcKve
-     * @param rangeToCopy
      */
     private void copyData(KeyValueService destKvs, RangeRequest rangeToCopy) {
-        ImmutableList<PartitionMapService> mapServices = ImmutableList.<PartitionMapService> of(InMemoryPartitionMapService.create(this));
+        List<PartitionMapService> mapServices = ImmutableList.of(InMemoryPartitionMapService.create(this));
         PartitionedKeyValueService pkvs = PartitionedKeyValueService.create(quorumParameters, mapServices);
         for (TableReference tableRef : pkvs.getAllTableNames()) {
             // TODO: getRangeOfTimestamps?
@@ -554,8 +558,6 @@ private void copyData(KeyValueService destKvs, RangeRequest rangeToCopy) {
 
     /**
      * Deletes rows within the specified range from all the tables.
-     * @param kve
-     * @param rangeToDelete
      */
     private void deleteData(KeyValueService kvs, RangeRequest rangeToDelete) {
         for (TableReference tableRef : kvs.getAllTableNames()) {
@@ -584,10 +586,10 @@ private void deleteData(KeyValueService kvs, RangeRequest rangeToDelete) {
      *
      * @param kveKey Consider endpoint at this key.
      * @param isWrite Are we looking for write or read access?
-     * @return Ranges in order. The first element is the farthest range.
+     * @return Ranges in order. The first element is the farthest range
      */
     private List<RangeRequest> getRangesOperatedByKvs(byte[] kveKey, boolean isWrite) {
-        Preconditions.checkNotNull(ring.get(kveKey));
+        Preconditions.checkNotNull(ring.get(kveKey), "Cannot find the ring for the given key");
         List<RangeRequest> result = Lists.newArrayList();
 
         byte[] startRange = kveKey;
@@ -638,10 +640,7 @@ private List<RangeRequest> getRangesOperatedByKvs(byte[] kveKey, boolean isWrite
      * Note that this implementation supports at most one addEndpoint or removeEndpoint operation at
      * a time. This method will return <code>false</code> if such operation is already in progress.
      *
-     * @param key
-     * @param kve
-     * @param rack
-     * @return <code>true</code> if the operation has been accepted for execution, <code>false</code> otherwise.
+     * @return <code>true</code> if the operation has been accepted for execution, <code>false</code> otherwise
      * @throws RuntimeException if an update of a crucial endpoint fails.
      */
     @Override
@@ -657,7 +656,7 @@ public synchronized boolean addEndpoint(final byte[] key, final KeyValueEndpoint
         kve.partitionMapService().updateMap(this);
         kve.registerPartitionMapVersion(versionSupplier);
 
-        ImmutableList<PartitionMapService> mapServices = ImmutableList.<PartitionMapService> of(InMemoryPartitionMapService.create(this));
+        List<PartitionMapService> mapServices = ImmutableList.of(InMemoryPartitionMapService.create(this));
         PartitionedKeyValueService pkvs = PartitionedKeyValueService.create(quorumParameters, mapServices);
         for (TableReference tableRef : pkvs.getAllTableNames()) {
             byte[] metadata = kve.keyValueService().getMetadataForTable(tableRef);
@@ -769,13 +768,13 @@ public synchronized void promoteAddedEndpoint(byte[] key) {
 
         // First push the map to crucial endpoints
         // This is to ensure that no garbage is left behind
-        ring.put(key,  ring.get(key).asNormal());
+        ring.put(key, ring.get(key).asNormal());
         version.increment();
         operationsInProgress = 0;
 
         try {
             byte[] otherKey = key;
-            for (int i=0; i<quorumParameters.getReplicationFactor(); ++i) {
+            for (int i = 0; i < quorumParameters.getReplicationFactor(); ++i) {
                 otherKey = ring.nextKey(otherKey);
                 ring.get(otherKey).get().partitionMapService().updateMap(this);
             }
@@ -796,7 +795,7 @@ public synchronized void promoteAddedEndpoint(byte[] key) {
                 keyToRemove = ring.nextKey(keyToRemove);
             } else {
                 assert i + 1 < ranges.size();
-                assert ranges.get(i+1).getStartInclusive().length == 0;
+                assert ranges.get(i + 1).getStartInclusive().length == 0;
             }
         }
     }
@@ -816,8 +815,7 @@ public synchronized void promoteAddedEndpoint(byte[] key) {
      * Note that this implementation supports at most one addEndpoint or removeEndpoint operation at
      * a time. This method will return <code>false</code> if such operation is already in progress.
      *
-     * @param key
-     * @return <code>true</code> if the operation has been accepted for execution, <code>false</code> otherwise.
+     * @return <code>true</code> if the operation has been accepted for execution, <code>false</code> otherwise
      * @throws RuntimeException if an update of a crucial endpoint fails.
      */
     @Override
@@ -942,7 +940,7 @@ public synchronized void promoteRemovedEndpoint(byte[] key) {
         byte[] otherKey = key;
         try {
             // TODO: Shouldn't this be +1, or filter based on normal status?
-            for (int i=0; i<quorumParameters.getReplicationFactor(); ++i) {
+            for (int i = 0; i < quorumParameters.getReplicationFactor(); ++i) {
                 otherKey = ring.nextKey(otherKey);
                 ring.get(otherKey).get().partitionMapService().updateMap(this);
             }
@@ -980,27 +978,31 @@ public long getVersion() {
      * Directly set the version of this map to <code>version</code> without
      * any other side effects.
      *
-     * @param version
+     * @deprecated Do not use this. It is for test purposes only.
      */
-    @Deprecated @VisibleForTesting
-    public void setVersion(long version) {
-        this.version.setValue(version);
+    @Deprecated
+    public void setVersion(long newVersion) {
+        this.version.setValue(newVersion);
     }
 
-    /*** toString, hashCode and equals ***********************************************************/
     @Override
     public String toString() {
-        return "DynamicPartitionMapImpl (" + version +
-               "): QP=(" + quorumParameters.getReplicationFactor() +
-               "," + quorumParameters.getReadFactor() +
-               "," + quorumParameters.getWriteFactor() + ")\n" +
-               ringDescription();
+        return "DynamicPartitionMapImpl (" + version
+               + "): QP=(" + quorumParameters.getReplicationFactor()
+               + "," + quorumParameters.getReadFactor()
+               + "," + quorumParameters.getWriteFactor() + ")\n"
+               + ringDescription();
     }
 
     private String ringDescription() {
         StringBuilder builder = new StringBuilder();
         for (Entry<byte[], EndpointWithStatus> e : ring.entrySet()) {
-            builder.append(e.getValue().get() + " (" + statusDescription(e.getValue()) + ") @ " + Arrays.toString(e.getKey()) + "\n");
+            builder.append(e.getValue().get())
+                    .append(" (")
+                    .append(statusDescription(e.getValue()))
+                    .append(") @ ")
+                    .append(Arrays.toString(e.getKey()))
+                    .append("\n");
         }
         return builder.toString();
     }
@@ -1018,70 +1020,47 @@ private static String statusDescription(EndpointWithStatus ews) {
         throw new IllegalArgumentException("Unsupported EndpointWithStatus instance");
     }
 
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result
-                + (int) (operationsInProgress ^ (operationsInProgress >>> 32));
-        result = prime * result + ((quorumParameters == null) ? 0
-                : quorumParameters.hashCode());
-        result = prime * result + ((ring == null) ? 0 : ring.hashCode());
-        result = prime * result + ((version == null) ? 0 : version.hashCode());
-        return result;
-    }
-
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        DynamicPartitionMapImpl other = (DynamicPartitionMapImpl) obj;
-        if (operationsInProgress != other.operationsInProgress)
-            return false;
-        if (quorumParameters == null) {
-            if (other.quorumParameters != null)
-                return false;
-        } else if (!quorumParameters.equals(other.quorumParameters))
-            return false;
-        if (ring == null) {
-            if (other.ring != null)
-                return false;
-        } else if (!ring.equals(other.ring))
-            return false;
-        if (version == null) {
-            if (other.version != null)
-                return false;
-        } else if (!version.equals(other.version))
+        }
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
-        return true;
+        }
+        DynamicPartitionMapImpl that = (DynamicPartitionMapImpl) obj;
+        return operationsInProgress == that.operationsInProgress
+                && Objects.equals(quorumParameters, that.quorumParameters)
+                && Objects.equals(ring, that.ring)
+                && Objects.equals(version, that.version);
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(quorumParameters, ring, version, operationsInProgress);
+    }
 
-
-    /*** serialization and deserialization *******************************************************/
+    /* serialization and deserialization *******************************************************/
     public static class Serializer extends JsonSerializer<DynamicPartitionMapImpl> {
         private static final Serializer instance = new Serializer();
-        public static final Serializer instance() { return instance; }
 
-        @Override
-        public void serialize(DynamicPartitionMapImpl instance,
-                              JsonGenerator gen, SerializerProvider serializers) throws IOException,
-                JsonProcessingException {
+        public static Serializer instance() {
+            return instance;
+        }
 
+        @Override
+        public void serialize(DynamicPartitionMapImpl partitionMap, JsonGenerator gen, SerializerProvider serializers)
+                throws IOException {
             gen.writeStartObject();
-            gen.writeObjectField("quorumParameters", instance.quorumParameters);
-            gen.writeObjectField("version", instance.version.longValue());
-            gen.writeObjectField("operationsInProgress", instance.operationsInProgress);
+            gen.writeObjectField("quorumParameters", partitionMap.quorumParameters);
+            gen.writeObjectField("version", partitionMap.version.longValue());
+            gen.writeObjectField("operationsInProgress", partitionMap.operationsInProgress);
             gen.writeFieldName("ring");
             gen.writeStartArray();
-            for (Entry<byte[], EndpointWithStatus> entry : instance.ring.entrySet()) {
+            for (Entry<byte[], EndpointWithStatus> entry : partitionMap.ring.entrySet()) {
                 if (!(entry.getValue().get() instanceof SimpleKeyValueEndpoint)) {
-                    throw new IllegalArgumentException("DynamicPartitionMapImpl serialization is only supported with SimplKeyValueEndpoint endpoints!");
+                    throw new IllegalArgumentException("DynamicPartitionMapImpl serialization is only"
+                            + " supported with SimplKeyValueEndpoint endpoints!");
                 }
                 gen.writeStartObject();
                 gen.writeBinaryField("key", entry.getKey());
@@ -1093,15 +1072,17 @@ public void serialize(DynamicPartitionMapImpl instance,
         }
     }
 
-    public static class Deserializer extends JsonDeserializer<DynamicPartitionMapImpl>{
-        static final Deserializer instance = new Deserializer();
-        public static final Deserializer instance() { return instance; }
+    public static class Deserializer extends JsonDeserializer<DynamicPartitionMapImpl> {
+        private static final Deserializer instance = new Deserializer();
 
-        @Override
-        public DynamicPartitionMapImpl deserialize(JsonParser p, DeserializationContext ctxt)
-                throws IOException, JsonProcessingException {
+        public static Deserializer instance() {
+            return instance;
+        }
 
-            JsonNode root = p.getCodec().readTree(p);
+        @Override
+        public DynamicPartitionMapImpl deserialize(JsonParser parser, DeserializationContext context)
+                throws IOException {
+            JsonNode root = parser.getCodec().readTree(parser);
 
             long version = root.get("version").asLong();
             long operationsInProgress = root.get("operationsInProgress").asLong();
@@ -1128,33 +1109,47 @@ public DynamicPartitionMapImpl deserialize(JsonParser p, DeserializationContext
         }
     }
 
-    private static final Cell REPF_CELL = Cell.create("quorumParameters".getBytes(), "repf".getBytes());
-    private static final Cell READF_CELL = Cell.create("quorumParameters".getBytes(), "readf".getBytes());
-    private static final Cell WRITEF_CELL = Cell.create("quorumParameters".getBytes(), "writef".getBytes());
-    private static final Cell VERSION_CELL = Cell.create("version".getBytes(), "version".getBytes());
-    private static final Cell OPS_IN_PROGRESS_CELL = Cell.create("operations".getBytes(), "inProgress".getBytes());
+    private static final Cell REPF_CELL = Cell.create(
+            "quorumParameters".getBytes(StandardCharsets.UTF_8),
+            "repf".getBytes(StandardCharsets.UTF_8));
+    private static final Cell READF_CELL = Cell.create(
+            "quorumParameters".getBytes(StandardCharsets.UTF_8),
+            "readf".getBytes(StandardCharsets.UTF_8));
+    private static final Cell WRITEF_CELL = Cell.create(
+            "quorumParameters".getBytes(StandardCharsets.UTF_8),
+            "writef".getBytes(StandardCharsets.UTF_8));
+    private static final Cell VERSION_CELL = Cell.create(
+            "version".getBytes(StandardCharsets.UTF_8),
+            "version".getBytes(StandardCharsets.UTF_8));
+    private static final Cell OPS_IN_PROGRESS_CELL = Cell.create(
+            "operations".getBytes(StandardCharsets.UTF_8),
+            "inProgress".getBytes(StandardCharsets.UTF_8));
 
     public Map<Cell, byte[]> toTable() {
         try {
             Map<Cell, byte[]> result = Maps.newHashMap();
 
             // Store the quorum parameters
-            result.put(REPF_CELL, Integer.toString(quorumParameters.getReplicationFactor()).getBytes());
-            result.put(READF_CELL, Integer.toString(quorumParameters.getReadFactor()).getBytes());
-            result.put(WRITEF_CELL, Integer.toString(quorumParameters.getWriteFactor()).getBytes());
+            result.put(REPF_CELL, Integer.toString(quorumParameters.getReplicationFactor())
+                    .getBytes(StandardCharsets.UTF_8));
+            result.put(READF_CELL, Integer.toString(quorumParameters.getReadFactor())
+                    .getBytes(StandardCharsets.UTF_8));
+            result.put(WRITEF_CELL, Integer.toString(quorumParameters.getWriteFactor())
+                    .getBytes(StandardCharsets.UTF_8));
 
             // Store the map version
-            result.put(VERSION_CELL, Long.toString(version.longValue()).getBytes());
+            result.put(VERSION_CELL, Long.toString(version.longValue()).getBytes(StandardCharsets.UTF_8));
 
             // Store no of operations in progress
-            result.put(OPS_IN_PROGRESS_CELL, Long.toString(operationsInProgress).getBytes());
+            result.put(OPS_IN_PROGRESS_CELL, Long.toString(operationsInProgress).getBytes(StandardCharsets.UTF_8));
 
             // Store the map
             for (Entry<byte[], EndpointWithStatus> entry : ring.entrySet()) {
-                byte[] row = "map".getBytes();
+                byte[] row = "map".getBytes(StandardCharsets.UTF_8);
                 byte[] col = entry.getKey();
                 if (!(entry.getValue().get() instanceof SimpleKeyValueEndpoint)) {
-                    throw new IllegalArgumentException("DynamicPartitionMapImpl serialization is only supported with SimplKeyValueEndpoint endpoints!");
+                    throw new IllegalArgumentException("DynamicPartitionMapImpl serialization is only"
+                            + " supported with SimplKeyValueEndpoint endpoints!");
                 }
                 byte[] value = RemotingKeyValueService.kvsMapper().writeValueAsBytes(entry.getValue());
                 result.put(Cell.create(row, col), value);
@@ -1170,21 +1165,23 @@ public Map<Cell, byte[]> toTable() {
     public static DynamicPartitionMapImpl fromTable(Map<Cell, byte[]> table) {
         try {
 
-            int repf = Integer.parseInt(new String(table.get(REPF_CELL)));
-            int readf = Integer.parseInt(new String(table.get(READF_CELL)));
-            int writef = Integer.parseInt(new String(table.get(WRITEF_CELL)));
-            long version = Long.parseLong(new String(table.get(VERSION_CELL)));
-            long operationsInProgress = Long.parseLong(new String(table.get(OPS_IN_PROGRESS_CELL)));
+            int repf = Integer.parseInt(new String(table.get(REPF_CELL), StandardCharsets.UTF_8));
+            int readf = Integer.parseInt(new String(table.get(READF_CELL), StandardCharsets.UTF_8));
+            int writef = Integer.parseInt(new String(table.get(WRITEF_CELL), StandardCharsets.UTF_8));
+            long version = Long.parseLong(new String(table.get(VERSION_CELL), StandardCharsets.UTF_8));
+            long operationsInProgress =
+                    Long.parseLong(new String(table.get(OPS_IN_PROGRESS_CELL), StandardCharsets.UTF_8));
             QuorumParameters parameters = new QuorumParameters(repf, readf, writef);
             NavigableMap<byte[], EndpointWithStatus> ring =
                     Maps.newTreeMap(UnsignedBytes.lexicographicalComparator());
 
             for (Entry<Cell, byte[]> entry : table.entrySet()) {
-                if (!Arrays.equals(entry.getKey().getRowName(), "map".getBytes())) {
+                if (!Arrays.equals(entry.getKey().getRowName(), "map".getBytes(StandardCharsets.UTF_8))) {
                     continue;
                 }
                 byte[] key = entry.getKey().getColumnName();
-                EndpointWithStatus ews = RemotingKeyValueService.kvsMapper().readValue(entry.getValue(), EndpointWithStatus.class);
+                EndpointWithStatus ews = RemotingKeyValueService.kvsMapper()
+                        .readValue(entry.getValue(), EndpointWithStatus.class);
                 ring.put(key, ews);
             }
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/InKvsPartitionMapService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/InKvsPartitionMapService.java
index 79c2d1ab8f4..b5ca7ae9323 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/InKvsPartitionMapService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/InKvsPartitionMapService.java
@@ -32,7 +32,7 @@
 import com.palantir.common.base.ClosableIterator;
 
 /**
- * Only instances of {@code DynamicPartitionMapImpl} are supported by this implementation!
+ * Only instances of {@code DynamicPartitionMapImpl} are supported by this implementation.
  *
  * @author htarasiuk
  *
@@ -44,11 +44,11 @@ public final class InKvsPartitionMapService implements PartitionMapService {
     public static final TableReference PARTITION_MAP_TABLE = AtlasDbConstants.PARTITION_MAP_TABLE;
 
     private InKvsPartitionMapService(DynamicPartitionMapImpl partitionMap, KeyValueService storage) {
-    	this.storage = storage;
-    	storage.createTable(PARTITION_MAP_TABLE, AtlasDbConstants.GENERIC_TABLE_METADATA);
-    	if (partitionMap != null) {
-    	    updateMap(partitionMap);
-    	}
+        this.storage = storage;
+        storage.createTable(PARTITION_MAP_TABLE, AtlasDbConstants.GENERIC_TABLE_METADATA);
+        if (partitionMap != null) {
+            updateMap(partitionMap);
+        }
     }
 
     private InKvsPartitionMapService(KeyValueService storage) {
@@ -58,9 +58,6 @@ private InKvsPartitionMapService(KeyValueService storage) {
     /**
      * This can be used if the partition map has been previously stored to {@code storage}
      * or if you want to first create an empty service.
-     *
-     * @param storage
-     * @return
      */
     public static InKvsPartitionMapService create(KeyValueService storage) {
         return new InKvsPartitionMapService(storage);
@@ -69,31 +66,22 @@ public static InKvsPartitionMapService create(KeyValueService storage) {
     /**
      * This will put the {@code partitionMap} to {@code storage} overwriting any previous
      * values stored in the {@link #PARTITION_MAP_TABLE}.
-     *
-     * @param storage
-     * @param partitionMap
-     * @return
      */
     public static InKvsPartitionMapService create(KeyValueService storage, DynamicPartitionMapImpl partitionMap) {
-        Preconditions.checkNotNull(partitionMap);
+        Preconditions.checkNotNull(partitionMap, "partitionMap cannot be null");
         return new InKvsPartitionMapService(partitionMap, storage);
     }
 
     /**
      * This will use a newly created InMemoryKeyValueService to store the map.
-     *
-     * @param partitionMap
-     * @return
      */
     public static InKvsPartitionMapService createInMemory(DynamicPartitionMapImpl partitionMap) {
-        Preconditions.checkNotNull(partitionMap);
+        Preconditions.checkNotNull(partitionMap, "partitionMap cannot be null");
         return new InKvsPartitionMapService(partitionMap, new InMemoryKeyValueService(false));
     }
 
     /**
      * This will use a newly created InMemoryKeyValueService to store the map.
-     *
-     * @return
      */
     public static InKvsPartitionMapService createEmptyInMemory() {
         return new InKvsPartitionMapService(new InMemoryKeyValueService(false));
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/InMemoryPartitionMapService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/InMemoryPartitionMapService.java
index e83dce16824..08b12018c41 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/InMemoryPartitionMapService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/InMemoryPartitionMapService.java
@@ -23,8 +23,7 @@
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.keyvalue.partition.api.DynamicPartitionMap;
 
-public class InMemoryPartitionMapService implements PartitionMapService {
-
+public final class InMemoryPartitionMapService implements PartitionMapService {
     @GuardedBy("this")
     private DynamicPartitionMap partitionMap;
     private final ReadWriteLock lock = new ReentrantReadWriteLock(true);
@@ -34,7 +33,7 @@ private InMemoryPartitionMapService(DynamicPartitionMap partitionMap) {
     }
 
     public static InMemoryPartitionMapService create(DynamicPartitionMap partitionMap) {
-        return new InMemoryPartitionMapService(Preconditions.checkNotNull(partitionMap));
+        return new InMemoryPartitionMapService(Preconditions.checkNotNull(partitionMap, "partitionMap cannot be null"));
     }
 
     /**
@@ -50,7 +49,7 @@ public static InMemoryPartitionMapService createEmpty() {
     public synchronized DynamicPartitionMap getMap() {
         lock.readLock().lock();
         try {
-            return Preconditions.checkNotNull(partitionMap);
+            return Preconditions.checkNotNull(partitionMap, "Cannot get a null partitionMap");
         } finally {
             lock.readLock().unlock();
         }
@@ -67,24 +66,25 @@ public synchronized long getMapVersion() {
     }
 
     @Override
-    public synchronized void updateMap(DynamicPartitionMap partitionMap) {
+    public synchronized void updateMap(DynamicPartitionMap newPartitionMap) {
         lock.writeLock().lock();
         try {
-            this.partitionMap = Preconditions.checkNotNull(partitionMap);
+            partitionMap = Preconditions.checkNotNull(newPartitionMap, "Cannot set the partition map to null");
         } finally {
             lock.writeLock().unlock();
         }
     }
 
     @Override
-    public synchronized long updateMapIfNewer(DynamicPartitionMap partitionMap) {
-        lock.writeLock().lock();
+    public synchronized long updateMapIfNewer(DynamicPartitionMap newPartitionMap) {
+        Preconditions.checkNotNull(newPartitionMap, "Cannot set the partition map to null");
 
+        lock.writeLock().lock();
         try {
-            final long originalVersion = this.partitionMap == null ? -1L : this.partitionMap.getVersion();
+            long originalVersion = partitionMap == null ? -1 : partitionMap.getVersion();
 
-            if (partitionMap.getVersion() > originalVersion) {
-                this.partitionMap = Preconditions.checkNotNull(partitionMap);
+            if (newPartitionMap.getVersion() > originalVersion) {
+                partitionMap = newPartitionMap;
             }
             return originalVersion;
         } finally {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/PartitionMapService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/PartitionMapService.java
index 47b07a3ef6d..5a54abba90b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/PartitionMapService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/map/PartitionMapService.java
@@ -37,7 +37,6 @@
  */
 @Path("/partition-map")
 public interface PartitionMapService {
-
     @POST
     @Path("get-map")
     @Produces(MediaType.APPLICATION_JSON)
@@ -59,7 +58,6 @@ public interface PartitionMapService {
      * and update it if the provided map is newer than the stored map.
      * (No update takes place if the versions are equal.)
      *
-     * @param partitionMap
      * @return Version of the map that was stored in the service before
      * the operation. Negative if the service was "empty".
      * <tt>partitionMap</tt>.
@@ -68,5 +66,4 @@ public interface PartitionMapService {
     @Path("update-map-if-newer")
     @Consumes(MediaType.APPLICATION_JSON)
     long updateMapIfNewer(DynamicPartitionMap partitionMap);
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/quorum/QuorumParameters.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/quorum/QuorumParameters.java
index 5c0c70191e2..46e039e70d8 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/quorum/QuorumParameters.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/quorum/QuorumParameters.java
@@ -15,6 +15,8 @@
  */
 package com.palantir.atlasdb.keyvalue.partition.quorum;
 
+import java.util.Objects;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -23,36 +25,36 @@
 
 @Immutable
 public final class QuorumParameters {
-    final int replicationFactor;
-    final int readFactor;
-    final int writeFactor;
+    private final int replicationFactor;
+    private final int readFactor;
+    private final int writeFactor;
 
     @Immutable
-    public final static class QuorumRequestParameters {
-        final int replicationFator;
-        final int successFactor;
+    public static final class QuorumRequestParameters {
+        private final int replicationFactor;
+        private final int successFactor;
+
+        private QuorumRequestParameters(int replicationFactor, int successFactor) {
+            this.replicationFactor = replicationFactor;
+            this.successFactor = successFactor;
+        }
 
-        public int getReplicationFator() {
-            return replicationFator;
+        public int getReplicationFactor() {
+            return replicationFactor;
         }
 
         /**
-         * After this many successes a success can be concluded
+         * After this many successes a success can be concluded.
          */
         public int getSuccessFactor() {
             return successFactor;
         }
 
         /**
-         * After this many failures a failure can be concluded
+         * After this many failures a failure can be concluded.
          */
         public int getFailureFactor() {
-            return replicationFator - successFactor + 1;
-        }
-
-        private QuorumRequestParameters(int replicationFactor, int successFactor) {
-            this.replicationFator = replicationFactor;
-            this.successFactor = successFactor;
+            return replicationFactor - successFactor + 1;
         }
     }
 
@@ -99,32 +101,22 @@ public String toString() {
                 + readFactor + ", writeFactor=" + writeFactor + "]";
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + readFactor;
-        result = prime * result + replicationFactor;
-        result = prime * result + writeFactor;
-        return result;
-    }
-
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        QuorumParameters other = (QuorumParameters) obj;
-        if (readFactor != other.readFactor)
-            return false;
-        if (replicationFactor != other.replicationFactor)
-            return false;
-        if (writeFactor != other.writeFactor)
+        }
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
-        return true;
+        }
+        QuorumParameters that = (QuorumParameters) obj;
+        return replicationFactor == that.replicationFactor
+                && readFactor == that.readFactor
+                && writeFactor == that.writeFactor;
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(replicationFactor, readFactor, writeFactor);
+    }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/quorum/QuorumTracker.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/quorum/QuorumTracker.java
index 30dffe73700..abe9fae2db9 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/quorum/QuorumTracker.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/quorum/QuorumTracker.java
@@ -18,68 +18,69 @@
 import java.util.Map;
 import java.util.concurrent.Future;
 
-import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.keyvalue.partition.quorum.QuorumParameters.QuorumRequestParameters;
 import com.palantir.common.collect.Maps2;
 
-public class QuorumTracker<FutureReturnType, TrackingUnit> {
+public class QuorumTracker<FutureReturnT, TrackingUnitT> {
 
-    private final Map<TrackingUnit, Integer> numberOfRemainingSuccessesForSuccess;
-    private final Map<TrackingUnit, Integer> numberOfRemainingFailuresForFailure;
-    private final Map<Future<FutureReturnType>, Iterable<TrackingUnit>> unitsByReference;
+    private final Map<TrackingUnitT, Integer> numberOfRemainingSuccessesForSuccess;
+    private final Map<TrackingUnitT, Integer> numberOfRemainingFailuresForFailure;
+    private final Map<Future<FutureReturnT>, Iterable<TrackingUnitT>> unitsByReference;
     private boolean failure;
 
-    public QuorumTracker(Iterable<TrackingUnit> allTrackedUnits,
+    public QuorumTracker(Iterable<TrackingUnitT> allTrackedUnits,
                          QuorumRequestParameters quorumRequestParameters) {
-        numberOfRemainingFailuresForFailure = Maps2.createConstantValueMap(allTrackedUnits, quorumRequestParameters.getFailureFactor());
-        numberOfRemainingSuccessesForSuccess = Maps2.createConstantValueMap(allTrackedUnits, quorumRequestParameters.getSuccessFactor());
+        numberOfRemainingFailuresForFailure = Maps2.createConstantValueMap(
+                allTrackedUnits,
+                quorumRequestParameters.getFailureFactor());
+        numberOfRemainingSuccessesForSuccess = Maps2.createConstantValueMap(
+                allTrackedUnits,
+                quorumRequestParameters.getSuccessFactor());
         unitsByReference = Maps.newHashMap();
         failure = false;
     }
 
-    public QuorumTracker(Iterable<TrackingUnit> allTrackedUnits,
-                         Map<TrackingUnit, QuorumRequestParameters> quorumRequestParameters) {
-        numberOfRemainingFailuresForFailure = Maps.newHashMap(Maps.transformValues(quorumRequestParameters, new Function<QuorumRequestParameters, Integer>() {
-            @Override
-            public Integer apply(QuorumRequestParameters input) {
-                return input.getFailureFactor();
-            }
-        }));
-        numberOfRemainingSuccessesForSuccess = Maps.newHashMap(Maps.transformValues(quorumRequestParameters, new Function<QuorumRequestParameters, Integer> () {
-            @Override
-            public Integer apply(QuorumRequestParameters input) {
-                return input.getSuccessFactor();
-            }
-        }));
-        Preconditions.checkArgument(numberOfRemainingFailuresForFailure.keySet().equals(Sets.newHashSet(allTrackedUnits)));
-        Preconditions.checkArgument(numberOfRemainingSuccessesForSuccess.keySet().equals(Sets.newHashSet(allTrackedUnits)));
+    public QuorumTracker(Iterable<TrackingUnitT> allTrackedUnits,
+                         Map<TrackingUnitT, QuorumRequestParameters> quorumRequestParameters) {
+        numberOfRemainingFailuresForFailure = Maps.newHashMap(Maps.transformValues(quorumRequestParameters,
+                input -> input.getFailureFactor()));
+        numberOfRemainingSuccessesForSuccess = Maps.newHashMap(Maps.transformValues(quorumRequestParameters,
+                input -> input.getSuccessFactor()));
+        Preconditions.checkArgument(numberOfRemainingFailuresForFailure.keySet()
+                .equals(Sets.newHashSet(allTrackedUnits)));
+        Preconditions.checkArgument(numberOfRemainingSuccessesForSuccess.keySet()
+                .equals(Sets.newHashSet(allTrackedUnits)));
         unitsByReference = Maps.newHashMap();
         failure = false;
     }
 
+    /**
+     * Deprecated.
+     * @deprecated Use {@link #of(Iterable, Map)} instead
+     */
     @Deprecated
-    public static <FutureReturnType, TrackingUnit> QuorumTracker<FutureReturnType, TrackingUnit>
-            of(Iterable<TrackingUnit> allTrackedUnits,
+    public static <FutureReturnTypeT, TrackingUnitT> QuorumTracker<FutureReturnTypeT, TrackingUnitT>
+            of(Iterable<TrackingUnitT> allTrackedUnits,
                     QuorumRequestParameters quorumRequestParameters) {
-        return new QuorumTracker<FutureReturnType, TrackingUnit>(
+        return new QuorumTracker<>(
                 allTrackedUnits,
                 quorumRequestParameters);
     }
 
-    public static <FutureReturnType, TrackingUnit> QuorumTracker<FutureReturnType, TrackingUnit>
-            of(Iterable<TrackingUnit> allTrackedUnits,
-                    Map<TrackingUnit, QuorumRequestParameters> quorumRequestParameters) {
+    public static <FutureReturnTypeT, TrackingUnitT> QuorumTracker<FutureReturnTypeT, TrackingUnitT>
+            of(Iterable<TrackingUnitT> allTrackedUnits,
+                    Map<TrackingUnitT, QuorumRequestParameters> quorumRequestParameters) {
         return new QuorumTracker<>(allTrackedUnits, quorumRequestParameters);
     }
 
-    public void handleSuccess(Future<FutureReturnType> ref) {
+    public void handleSuccess(Future<FutureReturnT> ref) {
         Preconditions.checkState(!finished());
         Preconditions.checkArgument(unitsByReference.containsKey(ref));
 
-        for (TrackingUnit unit : unitsByReference.get(ref)) {
+        for (TrackingUnitT unit : unitsByReference.get(ref)) {
             if (numberOfRemainingSuccessesForSuccess.containsKey(unit)) {
                 int newValue = numberOfRemainingSuccessesForSuccess.get(unit) - 1;
                 if (newValue == 0) {
@@ -93,10 +94,10 @@ public void handleSuccess(Future<FutureReturnType> ref) {
         unregisterRef(ref);
     }
 
-    public void handleFailure(Future<FutureReturnType> ref) {
+    public void handleFailure(Future<FutureReturnT> ref) {
         Preconditions.checkState(!finished());
         Preconditions.checkArgument(unitsByReference.containsKey(ref));
-        for (TrackingUnit cell : unitsByReference.get(ref)) {
+        for (TrackingUnitT cell : unitsByReference.get(ref)) {
             if (numberOfRemainingFailuresForFailure.containsKey(cell)) {
                 int newValue = numberOfRemainingFailuresForFailure.get(cell) - 1;
                 if (newValue == 0) {
@@ -110,18 +111,18 @@ public void handleFailure(Future<FutureReturnType> ref) {
         unregisterRef(ref);
     }
 
-    public void registerRef(Future<FutureReturnType> ref, Iterable<TrackingUnit> items) {
+    public void registerRef(Future<FutureReturnT> ref, Iterable<TrackingUnitT> items) {
         Preconditions.checkState(!finished());
         unitsByReference.put(ref, items);
     }
 
-    public void unregisterRef(Future<FutureReturnType> ref) {
+    public void unregisterRef(Future<FutureReturnT> ref) {
         Preconditions.checkArgument(unitsByReference.containsKey(ref));
         unitsByReference.remove(ref);
     }
 
     public void cancel(boolean mayInterruptIfRunning) {
-        for (Future<FutureReturnType> f : unitsByReference.keySet()) {
+        for (Future<FutureReturnT> f : unitsByReference.keySet()) {
             f.cancel(mayInterruptIfRunning);
         }
     }
@@ -141,4 +142,4 @@ public boolean finished() {
     public boolean hasJobsRunning() {
         return !unitsByReference.isEmpty();
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/server/EndpointServer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/server/EndpointServer.java
index b44ef2f0127..e73e2e7d517 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/server/EndpointServer.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/server/EndpointServer.java
@@ -27,11 +27,13 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -52,28 +54,27 @@
  *
  */
 public class EndpointServer implements PartitionMapService, KeyValueService {
-
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
     private final KeyValueService kvsDelegate;
+    private final PartitionMapService pmsDelegate;
+
+    public EndpointServer(KeyValueService kvs, PartitionMapService pms) {
+        this.kvsDelegate = kvs;
+        this.pmsDelegate = pms;
+    }
+
     public KeyValueService kvs() {
         return kvsDelegate;
     }
 
-    private final PartitionMapService pmsDelegate;
     public PartitionMapService pms() {
         return pmsDelegate;
     }
 
-    final ReadWriteLock lock = new ReentrantReadWriteLock();
-
-    public EndpointServer(KeyValueService kvs, PartitionMapService pms) {
-        this.kvsDelegate = kvs;
-        this.pmsDelegate = pms;
-    }
-
-    private <T> T runPartitionMapReadOperation(Function<Void, T> c) {
+    private <T> T runPartitionMapReadOperation(Function<Void, T> operation) {
         try {
             lock.readLock().lockInterruptibly();
-            return c.apply(null);
+            return operation.apply(null);
         } catch (InterruptedException ex) {
             throw Throwables.throwUncheckedException(ex);
         } finally {
@@ -81,10 +82,10 @@ private <T> T runPartitionMapReadOperation(Function<Void, T> c) {
         }
     }
 
-    private <T> T runPartitionMapWriteOperation(Function<Void, T> c) {
+    private <T> T runPartitionMapWriteOperation(Function<Void, T> operation) {
         try {
             lock.writeLock().lockInterruptibly();
-            return c.apply(null);
+            return operation.apply(null);
         } catch (InterruptedException ex) {
             throw Throwables.throwUncheckedException(ex);
         } finally {
@@ -94,22 +95,12 @@ private <T> T runPartitionMapWriteOperation(Function<Void, T> c) {
 
     @Override
     public DynamicPartitionMap getMap() {
-        return runPartitionMapReadOperation(new Function<Void, DynamicPartitionMap>() {
-            @Override
-            public DynamicPartitionMap apply(Void input) {
-                return pms().getMap();
-            }
-        });
+        return runPartitionMapReadOperation(input -> pms().getMap());
     }
 
     @Override
     public long getMapVersion() {
-        return runPartitionMapReadOperation(new Function<Void, Long>() {
-            @Override
-            public Long apply(Void input) {
-                return pms().getMapVersion();
-            }
-        });
+        return runPartitionMapReadOperation(input -> pms().getMapVersion());
     }
 
     @Override
@@ -126,12 +117,7 @@ public Void apply(Void input) {
 
     @Override
     public long updateMapIfNewer(final DynamicPartitionMap partitionMap) {
-        return runPartitionMapWriteOperation(new Function<Void, Long>() {
-            @Override
-            public Long apply(Void input) {
-                return pms().updateMapIfNewer(partitionMap);
-            }
-        });
+        return runPartitionMapWriteOperation(input -> pms().updateMapIfNewer(partitionMap));
     }
 
     @Override
@@ -170,55 +156,45 @@ public Void apply(Void input) {
 
     @Override
     public Collection<? extends KeyValueService> getDelegates() {
-        return runPartitionMapReadOperation(new Function<Void, Collection<? extends KeyValueService>>() {
-            @Override
-            public Collection<? extends KeyValueService> apply(Void input) {
-                return kvs().getDelegates();
-            }
-        });
+        return runPartitionMapReadOperation(input -> kvs().getDelegates());
     }
 
     @Override
     @Idempotent
     public Map<Cell, Value> getRows(final TableReference tableRef, final Iterable<byte[]> rows,
                                     final ColumnSelection columnSelection, final long timestamp) {
-        return runPartitionMapReadOperation(new Function<Void, Map<Cell, Value>>() {
-            @Override
-            public Map<Cell, Value> apply(Void input) {
-                return kvs().getRows(tableRef, rows, columnSelection, timestamp);
-            }
-        });
+        return runPartitionMapReadOperation(input -> kvs().getRows(tableRef, rows, columnSelection, timestamp));
+    }
+
+    @Override
+    @Idempotent
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp) {
+        return runPartitionMapReadOperation(input ->
+                kvs().getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp));
     }
 
     @Override
     @Idempotent
     public Map<Cell, Value> get(final TableReference tableRef,
             final Map<Cell, Long> timestampByCell) {
-        return runPartitionMapReadOperation(new Function<Void, Map<Cell, Value>>() {
-            @Override
-            public Map<Cell, Value> apply(Void input) {
-                return kvs().get(tableRef, timestampByCell);
-            }
-
-        });
+        return runPartitionMapReadOperation(input -> kvs().get(tableRef, timestampByCell));
     }
 
     @Override
     @Idempotent
     public Map<Cell, Long> getLatestTimestamps(final TableReference tableRef,
             final Map<Cell, Long> timestampByCell) {
-        return runPartitionMapReadOperation(new Function<Void, Map<Cell, Long>>() {
-            @Override
-            public Map<Cell, Long> apply(Void input) {
-                return kvs().getLatestTimestamps(tableRef, timestampByCell);
-            }
-        });
+        return runPartitionMapReadOperation(input -> kvs().getLatestTimestamps(tableRef, timestampByCell));
     }
 
     @Override
     public void put(final TableReference tableRef, final Map<Cell, byte[]> values, final long timestamp)
             throws KeyAlreadyExistsException {
-        runPartitionMapReadOperation(new Function<Void, Void> () {
+        runPartitionMapReadOperation(new Function<Void, Void>() {
             @Override
             public Void apply(Void input) {
                 kvs().put(tableRef, values, timestamp);
@@ -231,7 +207,7 @@ public Void apply(Void input) {
     public void multiPut(
             final Map<TableReference, ? extends Map<Cell, byte[]>> valuesByTable,
             final long timestamp) throws KeyAlreadyExistsException {
-        runPartitionMapReadOperation(new Function<Void, Void> () {
+        runPartitionMapReadOperation(new Function<Void, Void>() {
             @Override
             public Void apply(Void input) {
                 kvs().multiPut(valuesByTable, timestamp);
@@ -244,7 +220,7 @@ public Void apply(Void input) {
     @NonIdempotent
     public void putWithTimestamps(final TableReference tableRef,
             final Multimap<Cell, Value> cellValues) throws KeyAlreadyExistsException {
-        runPartitionMapReadOperation(new Function<Void, Void> () {
+        runPartitionMapReadOperation(new Function<Void, Void>() {
             @Override
             public Void apply(Void input) {
                 kvs().putWithTimestamps(tableRef, cellValues);
@@ -256,7 +232,7 @@ public Void apply(Void input) {
     @Override
     public void putUnlessExists(final TableReference tableRef, final Map<Cell, byte[]> values)
             throws KeyAlreadyExistsException {
-        runPartitionMapReadOperation(new Function<Void, Void> () {
+        runPartitionMapReadOperation(new Function<Void, Void>() {
             @Override
             public Void apply(Void input) {
                 kvs().putUnlessExists(tableRef, values);
@@ -281,7 +257,7 @@ public Void apply(Void input) {
     @Idempotent
     public void truncateTable(final TableReference tableRef)
             throws InsufficientConsistencyException {
-        runPartitionMapReadOperation(new Function<Void, Void> () {
+        runPartitionMapReadOperation(new Function<Void, Void>() {
             @Override
             public Void apply(Void input) {
                 kvs().truncateTable(tableRef);
@@ -294,7 +270,7 @@ public Void apply(Void input) {
     @Idempotent
     public void truncateTables(final Set<TableReference> tableRefs)
             throws InsufficientConsistencyException {
-        runPartitionMapReadOperation(new Function<Void, Void> () {
+        runPartitionMapReadOperation(new Function<Void, Void>() {
             @Override
             public Void apply(Void input) {
                 kvs().truncateTables(tableRefs);
@@ -307,24 +283,14 @@ public Void apply(Void input) {
     @Idempotent
     public ClosableIterator<RowResult<Value>> getRange(final TableReference tableRef,
             final RangeRequest rangeRequest, final long timestamp) {
-        return runPartitionMapReadOperation(new Function<Void, ClosableIterator<RowResult<Value>>>() {
-            @Override
-            public ClosableIterator<RowResult<Value>> apply(Void input) {
-                return kvs().getRange(tableRef, rangeRequest, timestamp);
-            }
-        });
+        return runPartitionMapReadOperation(input -> kvs().getRange(tableRef, rangeRequest, timestamp));
     }
 
     @Override
     @Idempotent
     public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(
             final TableReference tableRef, final RangeRequest rangeRequest, final long timestamp) {
-        return runPartitionMapReadOperation(new Function<Void, ClosableIterator<RowResult<Set<Value>>>>() {
-            @Override
-            public ClosableIterator<RowResult<Set<Value>>> apply(Void input) {
-                return kvs().getRangeWithHistory(tableRef, rangeRequest, timestamp);
-            }
-        });
+        return runPartitionMapReadOperation(input -> kvs().getRangeWithHistory(tableRef, rangeRequest, timestamp));
     }
 
     @Override
@@ -332,12 +298,7 @@ public ClosableIterator<RowResult<Set<Value>>> apply(Void input) {
     public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(
             final TableReference tableRef, final RangeRequest rangeRequest, final long timestamp)
             throws InsufficientConsistencyException {
-        return runPartitionMapReadOperation(new Function<Void, ClosableIterator<RowResult<Set<Long>>>> () {
-            @Override
-            public ClosableIterator<RowResult<Set<Long>>> apply(Void input) {
-                return kvs().getRangeOfTimestamps(tableRef, rangeRequest, timestamp);
-            }
-        });
+        return runPartitionMapReadOperation(input -> kvs().getRangeOfTimestamps(tableRef, rangeRequest, timestamp));
     }
 
     @Override
@@ -345,12 +306,7 @@ public ClosableIterator<RowResult<Set<Long>>> apply(Void input) {
     public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> getFirstBatchForRanges(
             final TableReference tableRef, final Iterable<RangeRequest> rangeRequests,
             final long timestamp) {
-        return runPartitionMapReadOperation(new Function<Void, Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>>>() {
-            @Override
-            public Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> apply(Void input) {
-                return kvs().getFirstBatchForRanges(tableRef, rangeRequests, timestamp);
-            }
-        });
+        return runPartitionMapReadOperation(input -> kvs().getFirstBatchForRanges(tableRef, rangeRequests, timestamp));
     }
 
     @Override
@@ -382,7 +338,7 @@ public Void apply(Void input) {
     @Idempotent
     public void createTable(final TableReference tableRef, final byte[] tableMetadata)
             throws InsufficientConsistencyException {
-        runPartitionMapReadOperation(new Function<Void, Void> () {
+        runPartitionMapReadOperation(new Function<Void, Void>() {
             @Override
             public Void apply(Void input) {
                 kvs().createTable(tableRef, tableMetadata);
@@ -408,37 +364,24 @@ public Void apply(Void input) {
     @Override
     @Idempotent
     public Set<TableReference> getAllTableNames() {
-        return runPartitionMapReadOperation(new Function<Void, Set<TableReference>>() {
-            @Override
-            public Set<TableReference> apply(Void input) {
-                // TODO: Hack
-                Set<TableReference> ret = Sets.newHashSet(kvs().getAllTableNames());
-                ret.remove(InKvsPartitionMapService.PARTITION_MAP_TABLE);
-                return ret;
-            }
+        return runPartitionMapReadOperation(input -> {
+            // TODO: Hack
+            Set<TableReference> ret = Sets.newHashSet(kvs().getAllTableNames());
+            ret.remove(InKvsPartitionMapService.PARTITION_MAP_TABLE);
+            return ret;
         });
     }
 
     @Override
     @Idempotent
     public byte[] getMetadataForTable(final TableReference tableRef) {
-        return runPartitionMapReadOperation(new Function<Void, byte[]>() {
-            @Override
-            public byte[] apply(Void input) {
-                return kvs().getMetadataForTable(tableRef);
-            }});
+        return runPartitionMapReadOperation(input -> kvs().getMetadataForTable(tableRef));
     }
 
     @Override
     @Idempotent
     public Map<TableReference, byte[]> getMetadataForTables() {
-        return runPartitionMapReadOperation(new Function<Void, Map<TableReference, byte[]>>() {
-            @Override
-            public Map<TableReference, byte[]> apply(Void input) {
-                return kvs().getMetadataForTables();
-            }
-
-        });
+        return runPartitionMapReadOperation(input -> kvs().getMetadataForTables());
     }
 
     @Override
@@ -484,12 +427,7 @@ public Void apply(@Nullable Void input) {
     public Multimap<Cell, Long> getAllTimestamps(final TableReference tableRef,
             final Set<Cell> cells, final long timestamp)
             throws InsufficientConsistencyException {
-        return runPartitionMapReadOperation(new Function<Void, Multimap<Cell, Long>>() {
-            @Override
-            public Multimap<Cell, Long> apply(@Nullable Void input) {
-                return kvs().getAllTimestamps(tableRef, cells, timestamp);
-            }
-        });
+        return runPartitionMapReadOperation(input -> kvs().getAllTimestamps(tableRef, cells, timestamp));
     }
 
     @Override
@@ -502,5 +440,4 @@ public Void apply(@Nullable Void input) {
             }
         });
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/status/EndpointWithStatus.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/status/EndpointWithStatus.java
index c67f603ca24..e6d96f53e3a 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/status/EndpointWithStatus.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/status/EndpointWithStatus.java
@@ -16,6 +16,7 @@
 package com.palantir.atlasdb.keyvalue.partition.status;
 
 import java.util.Collection;
+import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -24,34 +25,8 @@
 import com.palantir.atlasdb.keyvalue.partition.endpoint.KeyValueEndpoint;
 
 
-@JsonTypeInfo(use=Id.CLASS, property="@class")
+@JsonTypeInfo(use = Id.CLASS, property = "@class")
 public abstract class EndpointWithStatus {
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((endpoint == null) ? 0 : endpoint.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        EndpointWithStatus other = (EndpointWithStatus) obj;
-        if (endpoint == null) {
-            if (other.endpoint != null)
-                return false;
-        } else if (!endpoint.equals(other.endpoint))
-            return false;
-        return true;
-    }
-
     @JsonProperty("endpoint")
     final KeyValueEndpoint endpoint;
 
@@ -70,10 +45,7 @@ public EndpointWithStatus(@JsonProperty("endpoint") KeyValueEndpoint endpoint) {
     public abstract boolean shouldCountForWrite();
 
     public boolean shouldUseFor(boolean write) {
-        if (write) {
-            return shouldUseForWrite();
-        }
-        return shouldUseForRead();
+        return write ? shouldUseForWrite() : shouldUseForRead();
     }
 
     public boolean shouldUseFor(boolean write, Collection<String> racksToBeExcluded) {
@@ -81,10 +53,7 @@ public boolean shouldUseFor(boolean write, Collection<String> racksToBeExcluded)
     }
 
     public boolean shouldCountFor(boolean write) {
-        if (write) {
-            return shouldCountForWrite();
-        }
-        return shouldCountForRead();
+        return write ? shouldCountForWrite() : shouldCountForRead();
     }
 
     public boolean shouldCountFor(boolean write, Collection<String> racksToBeExcluded) {
@@ -102,4 +71,21 @@ public EndpointWithJoiningStatus asJoining() {
     public EndpointWithNormalStatus asNormal() {
         return new EndpointWithNormalStatus(get());
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        EndpointWithStatus that = (EndpointWithStatus) obj;
+        return Objects.equals(endpoint, that.endpoint);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(endpoint);
+    }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/AutoRetryingClosableIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/AutoRetryingClosableIterator.java
index 9ddc95ab983..73b07f0dadb 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/AutoRetryingClosableIterator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/AutoRetryingClosableIterator.java
@@ -34,11 +34,8 @@
  * thus are not retried but instead cause a crash if version mismatch exception is thrown.
  *
  * @author htarasiuk
- *
- * @param <T>
  */
-public class AutoRetryingClosableIterator<T> implements ClosableIterator<RowResult<T>> {
-
+public final class AutoRetryingClosableIterator<T> implements ClosableIterator<RowResult<T>> {
     private static final Logger log = LoggerFactory.getLogger(AutoRetryingClosableIterator.class);
 
     private final RangeRequest originalRange;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/ConsistentRingRangeRequest.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/ConsistentRingRangeRequest.java
index 5782e80435d..2044992aa57 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/ConsistentRingRangeRequest.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/ConsistentRingRangeRequest.java
@@ -18,24 +18,30 @@
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.common.annotation.Immutable;
 
-@Immutable public class ConsistentRingRangeRequest {
+@Immutable
+public final class ConsistentRingRangeRequest {
     private final RangeRequest rangeRequest;
-    public RangeRequest get() {
-        return rangeRequest;
-    }
+
     private ConsistentRingRangeRequest(RangeRequest rangeRequest) {
         this.rangeRequest = rangeRequest;
     }
+
     public static ConsistentRingRangeRequest of(RangeRequest rangeRequest) {
         return new ConsistentRingRangeRequest(rangeRequest);
     }
+
+    public RangeRequest get() {
+        return rangeRequest;
+    }
+
     @Override
     public String toString() {
         return "CRRR=[" + rangeRequest + "]";
     }
+
     @Override
     public boolean equals(Object other) {
-        if (other instanceof ConsistentRingRangeRequest == false) {
+        if (!(other instanceof ConsistentRingRangeRequest)) {
             return false;
         }
         ConsistentRingRangeRequest otherCrrr = (ConsistentRingRangeRequest) other;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/ConsistentRingRangeRequests.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/ConsistentRingRangeRequests.java
index f4d8e31f145..081ee317839 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/ConsistentRingRangeRequests.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/ConsistentRingRangeRequests.java
@@ -22,9 +22,21 @@
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 
 
-public class ConsistentRingRangeRequests {
+public final class ConsistentRingRangeRequests {
+    private ConsistentRingRangeRequests() {
+        // Utility class
+    }
 
-     private static class ConsistentRingRangeRequestComparator implements Comparator<ConsistentRingRangeRequest> {
+    public static Comparator<ConsistentRingRangeRequest> getCompareByStartRow() {
+        return ConsistentRingRangeRequestComparator.instance();
+    }
+
+    private static class ConsistentRingRangeRequestComparator implements Comparator<ConsistentRingRangeRequest> {
+        private static final ConsistentRingRangeRequestComparator instance = new ConsistentRingRangeRequestComparator();
+
+        public static ConsistentRingRangeRequestComparator instance() {
+            return instance;
+        }
 
         @Override
         public int compare(ConsistentRingRangeRequest o1, ConsistentRingRangeRequest o2) {
@@ -51,22 +63,5 @@ public int compare(ConsistentRingRangeRequest o1, ConsistentRingRangeRequest o2)
             Preconditions.checkArgument(Math.signum(cmpStart) == Math.signum(cmpEnd));
             return cmpStart;
         }
-
-        private static ConsistentRingRangeRequestComparator instance;
-        public static ConsistentRingRangeRequestComparator instance() {
-            if (instance == null) {
-                ConsistentRingRangeRequestComparator ret = new ConsistentRingRangeRequestComparator();
-                instance = ret;
-            }
-            return instance;
-        }
-
-     }
-
-     public static Comparator<ConsistentRingRangeRequest> getCompareByStartRow() {
-         return ConsistentRingRangeRequestComparator.instance();
-     }
-
-     private ConsistentRingRangeRequests() {
-     }
+    }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/CycleMap.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/CycleMap.java
index 6ebd6f7b8a5..00a8db64986 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/CycleMap.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/CycleMap.java
@@ -20,7 +20,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ForwardingNavigableMap;
 
-public class CycleMap<K, V> extends ForwardingNavigableMap<K, V>{
+public final class CycleMap<K, V> extends ForwardingNavigableMap<K, V> {
     private final NavigableMap<K, V> backingMap;
 
     private CycleMap(NavigableMap<K, V> backingMap) {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/EndpointRequestExecutor.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/EndpointRequestExecutor.java
index 7d4dc4523d1..dfcc4286740 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/EndpointRequestExecutor.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/EndpointRequestExecutor.java
@@ -31,7 +31,8 @@
 import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 
-@ThreadSafe public class EndpointRequestExecutor {
+@ThreadSafe
+public final class EndpointRequestExecutor {
     // This is a SOFT limit and might be sometimes exceeded due to
     // race conditions.
     public static final int MAX_TASKS_PER_ENDPOINT = 32;
@@ -54,17 +55,21 @@ public interface EndpointRequestCompletionService<FutureReturnType> {
         Future<FutureReturnType> take() throws InterruptedException;
     }
 
-    public static <FutureReturnType> EndpointRequestCompletionService<FutureReturnType> newService(final ExecutorService executor) {
+    public static <FutureReturnTypeT> EndpointRequestCompletionService<FutureReturnTypeT> newService(
+            ExecutorService executor) {
         return instance.newServiceInternal(executor);
     }
 
-    private <FutureReturnType> EndpointRequestCompletionService<FutureReturnType> newServiceInternal(final ExecutorService executor) {
-        return new EndpointRequestCompletionService<FutureReturnType>() {
-            final ExecutorCompletionService<FutureReturnType> execSvc = new ExecutorCompletionService<>(executor);
+    private <FutureReturnTypeT> EndpointRequestCompletionService<FutureReturnTypeT> newServiceInternal(
+            ExecutorService executor) {
+        return new EndpointRequestCompletionService<FutureReturnTypeT>() {
+            final ExecutorCompletionService<FutureReturnTypeT> execSvc = new ExecutorCompletionService<>(executor);
 
             private <T> Future<T> registerTaskCompleted(Future<T> future) {
                 if (future != null) {
-                    KeyValueService kvs = Preconditions.checkNotNull(endpointByFuture.get(future));
+                    KeyValueService kvs = Preconditions.checkNotNull(
+                            endpointByFuture.get(future),
+                            "No endpoint for future");
                     endpointByFuture.remove(future);
                     numberOfTasksByEndpoint.remove(kvs);
                 }
@@ -72,11 +77,11 @@ private <T> Future<T> registerTaskCompleted(Future<T> future) {
             }
 
             @Override
-            public Future<FutureReturnType> submit(
-                    Callable<FutureReturnType> callable,
+            public Future<FutureReturnTypeT> submit(
+                    Callable<FutureReturnTypeT> callable,
                     KeyValueService kvs) {
 
-                final Future<FutureReturnType> ret;
+                final Future<FutureReturnTypeT> ret;
 
                 // Try not to exceed the MAX_TASKS_PER_ENDPOINT number.
                 //
@@ -88,11 +93,8 @@ public Future<FutureReturnType> submit(
                 // reject more than necessary.
                 if (numberOfTasksByEndpoint.count(kvs) > MAX_TASKS_PER_ENDPOINT) {
                     log.warn("Dropping task " + callable + " for kv service " + kvs + " due to queue overflow.");
-                    ret = execSvc.submit(new Callable<FutureReturnType>() {
-                        @Override
-                        public FutureReturnType call() throws Exception {
-                            throw new RuntimeException("This task has not been enqueued due to queue overflow!");
-                        }
+                    ret = execSvc.submit(() -> {
+                        throw new RuntimeException("This task has not been enqueued due to queue overflow!");
                     });
                 } else {
                     numberOfTasksByEndpoint.add(kvs);
@@ -103,7 +105,7 @@ public FutureReturnType call() throws Exception {
             }
 
             @Override
-            public Future<FutureReturnType> take() throws InterruptedException {
+            public Future<FutureReturnTypeT> take() throws InterruptedException {
                 return registerTaskCompleted(execSvc.take());
             }
         };
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/MergeResults.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/MergeResults.java
index 601ad248e8b..3facf4cc036 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/MergeResults.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/MergeResults.java
@@ -17,15 +17,16 @@
 
 import java.util.Map;
 
-import javax.annotation.Nullable;
-
 import com.google.common.base.Function;
 import com.google.common.collect.Multimap;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.Value;
 
 
-public class MergeResults {
+public final class MergeResults {
+    private MergeResults() {
+        // Utility class
+    }
 
     private static void mergeLatestTimestampMapIntoMap(Map<Cell, Long> globalResult,
                                                 Map<Cell, Long> partResult) {
@@ -38,12 +39,9 @@ private static void mergeLatestTimestampMapIntoMap(Map<Cell, Long> globalResult,
     }
 
     public static Function<Map<Cell, Long>, Void> newLatestTimestampMapMerger(final Map<Cell, Long> result) {
-        return new Function<Map<Cell,Long>, Void>() {
-            @Override
-            public Void apply(@Nullable Map<Cell, Long> input) {
-                mergeLatestTimestampMapIntoMap(result, input);
-                return null;
-            }
+        return input -> {
+            mergeLatestTimestampMapIntoMap(result, input);
+            return null;
         };
     }
 
@@ -57,13 +55,9 @@ private static void mergeAllTimestampsMapIntoMap(Multimap<Cell, Long> globalResu
     }
 
     public static Function<Multimap<Cell, Long>, Void> newAllTimestampsMapMerger(final Multimap<Cell, Long> result) {
-        return new Function<Multimap<Cell, Long>, Void>() {
-            @Override
-            public Void apply(@Nullable Multimap<Cell, Long> input) {
-                mergeAllTimestampsMapIntoMap(result, input);
-                return null;
-            }
-
+        return input -> {
+            mergeAllTimestampsMapIntoMap(result, input);
+            return null;
         };
     }
 
@@ -77,13 +71,9 @@ private static void mergeCellValueMapIntoMap(Map<Cell, Value> globalResult, Map<
     }
 
     public static Function<Map<Cell, Value>, Void> newCellValueMapMerger(final Map<Cell, Value> result) {
-        return new Function<Map<Cell, Value>, Void>() {
-            @Override
-            public Void apply(Map<Cell, Value> input) {
-                mergeCellValueMapIntoMap(result, input);
-                return null;
-            }
+        return input -> {
+            mergeCellValueMapIntoMap(result, input);
+            return null;
         };
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/PartitionedRangedIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/PartitionedRangedIterator.java
index 726fb99a781..252a976e9b1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/PartitionedRangedIterator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/PartitionedRangedIterator.java
@@ -31,13 +31,12 @@
 import com.palantir.common.base.ClosableIterator;
 
 public abstract class PartitionedRangedIterator<T> implements ClosableIterator<RowResult<T>> {
+    private final SortedSet<ConsistentRingRangeRequest> ranges;
 
-    final SortedSet<ConsistentRingRangeRequest> ranges;
-    Set<ClosablePeekingIterator<RowResult<T>>> currentRangeIterators;
-    Iterator<ConsistentRingRangeRequest> currentRange;
-    private PeekingIterator<RowResult<T>> rowIterator = Iterators.peekingIterator(Collections.<RowResult<T>>emptyIterator());
-    // Used to validate row ordering
-    private RowResult<T> cachedResult;
+    private Set<ClosablePeekingIterator<RowResult<T>>> currentRangeIterators;
+    private Iterator<ConsistentRingRangeRequest> currentRange;
+    private PeekingIterator<RowResult<T>> rowIterator = Iterators.peekingIterator(Collections.emptyIterator());
+    private RowResult<T> cachedResult; // Used to validate row ordering
 
     public PartitionedRangedIterator(Collection<ConsistentRingRangeRequest> ranges) {
         this.ranges = Sets.newTreeSet(ConsistentRingRangeRequests.getCompareByStartRow());
@@ -53,14 +52,14 @@ private void prepareNextRange() {
         closeCurrentRangeIterators();
         currentRangeIterators = computeNextRange(newRange);
         Preconditions.checkState(!currentRangeIterators.isEmpty());
-        rowIterator = Iterators.<RowResult<T>>peekingIterator(Iterators.mergeSorted(
+        rowIterator = Iterators.peekingIterator(Iterators.mergeSorted(
                 currentRangeIterators,
-                RowResult.<T>getOrderingByRowName()));
+                RowResult.getOrderingByRowName()));
     }
 
     protected abstract Set<ClosablePeekingIterator<RowResult<T>>> computeNextRange(ConsistentRingRangeRequest range);
 
-    private final void prepareNextElement() {
+    private void prepareNextElement() {
         while (!getRowIterator().hasNext() && currentRange.hasNext()) {
             prepareNextRange();
         }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/RequestCompletions.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/RequestCompletions.java
index 982c58cd680..1878987985c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/RequestCompletions.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/RequestCompletions.java
@@ -32,37 +32,34 @@
 import com.palantir.atlasdb.keyvalue.partition.util.EndpointRequestExecutor.EndpointRequestCompletionService;
 import com.palantir.common.base.Throwables;
 
-public class RequestCompletions {
-
+public final class RequestCompletions {
     private static final Logger log = LoggerFactory.getLogger(RequestCompletions.class);
 
+    private RequestCompletions() {
+        // Utility class
+    }
+
     // These exceptions should be thrown immediately
-    private static boolean isNonInterceptableException(Throwable e) {
-        return
-                e instanceof ClientVersionTooOldException ||
-                e instanceof EndpointVersionTooOldException ||
-                e instanceof KeyAlreadyExistsException;
+    private static boolean isNonInterceptableException(Throwable ex) {
+        return ex instanceof ClientVersionTooOldException
+                || ex instanceof EndpointVersionTooOldException
+                || ex instanceof KeyAlreadyExistsException;
     }
 
     /**
      * This will block until success or failure of the request can be concluded.
      * In case of failure it will rethrow the last encountered exception.
-     *
-     * @param tracker
-     * @param execSvc
-     * @param mergeFunction
      */
-    private static <TrackingUnit, FutureReturnType> void completeRequest(
-            QuorumTracker<FutureReturnType, TrackingUnit> tracker,
-            EndpointRequestCompletionService<FutureReturnType> execSvc,
-            Function<FutureReturnType, Void> mergeFunction) {
-
+    private static <TrackingUnitT, FutureReturnTypeT> void completeRequest(
+            QuorumTracker<FutureReturnTypeT, TrackingUnitT> tracker,
+            EndpointRequestCompletionService<FutureReturnTypeT> execSvc,
+            Function<FutureReturnTypeT, Void> mergeFunction) {
         try {
             // Wait until we can conclude success or failure
             while (!tracker.finished()) {
-                Future<FutureReturnType> future = execSvc.take();
+                Future<FutureReturnTypeT> future = execSvc.take();
                 try {
-                    FutureReturnType result = future.get();
+                    FutureReturnTypeT result = future.get();
                     mergeFunction.apply(result);
                     tracker.handleSuccess(future);
                 } catch (ExecutionException e) {
@@ -82,16 +79,11 @@ private static <TrackingUnit, FutureReturnType> void completeRequest(
     /**
      * In case of read request we can cancel all remaining threads as soon as completeRequests
      * returns - it means that either success or failure has been concluded.
-     *
-     * @param tracker
-     * @param execSvc
-     * @param mergeFunction
      */
-    public static <TrackingUnit, FutureReturnType> void completeReadRequest(
-            QuorumTracker<FutureReturnType, TrackingUnit> tracker,
-            EndpointRequestCompletionService<FutureReturnType> execSvc,
-            Function<FutureReturnType, Void> mergeFunction) {
-
+    public static <TrackingUnitT, FutureReturnTypeT> void completeReadRequest(
+            QuorumTracker<FutureReturnTypeT, TrackingUnitT> tracker,
+            EndpointRequestCompletionService<FutureReturnTypeT> execSvc,
+            Function<FutureReturnTypeT, Void> mergeFunction) {
         try {
             completeRequest(tracker, execSvc, mergeFunction);
         } finally {
@@ -104,16 +96,12 @@ public static <TrackingUnit, FutureReturnType> void completeReadRequest(
      * concluded.
      * Otherwise we just return as soon as success is concluded but we leave other write
      * tasks running in the background.
-     *
-     * @param tracker
-     * @param execSvc
      */
-    public static <TrackingUnit> void completeWriteRequest(
-            final QuorumTracker<Void, TrackingUnit> tracker,
+    public static <TrackingUnitT> void completeWriteRequest(
+            final QuorumTracker<Void, TrackingUnitT> tracker,
             final EndpointRequestCompletionService<Void> execSvc) {
-
         try {
-            completeRequest(tracker, execSvc, Functions.<Void> identity());
+            completeRequest(tracker, execSvc, Functions.identity());
         } catch (RuntimeException e) {
             tracker.cancel(true);
             throw e;
@@ -123,13 +111,8 @@ public static <TrackingUnit> void completeWriteRequest(
     /**
      * Keep applying the function <code>fun</code> to items retrieved from <code>iterator</code> until no
      * exception is thrown. Return the result if <code>fun</code>.
-     *
-     * @param iterator
-     * @param fun
-     * @return
      */
     public static <T, U, V extends Iterator<? extends U>> T retryUntilSuccess(V iterator, Function<U, T> fun) {
-
         Preconditions.checkArgument(iterator.hasNext());
 
         while (iterator.hasNext()) {
@@ -153,5 +136,4 @@ public static <T, U, V extends Iterator<? extends U>> T retryUntilSuccess(V iter
 
         throw new RuntimeException("This should never happen!");
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/RowResults.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/RowResults.java
index a26dc40da85..0f2bf80bf5b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/RowResults.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/partition/util/RowResults.java
@@ -31,10 +31,12 @@
 import com.palantir.atlasdb.keyvalue.partition.quorum.QuorumParameters;
 import com.palantir.common.base.Throwables;
 
-public class RowResults {
+public final class RowResults {
+    private RowResults() {
+        // Utility class
+    }
 
     public static Map<Cell, Value> getNewestValue(RowResult<Value> row) {
-
         Map<Cell, Value> result = Maps.newHashMap();
 
         for (Map.Entry<Cell, Value> e : row.getCells()) {
@@ -46,7 +48,6 @@ public static Map<Cell, Value> getNewestValue(RowResult<Value> row) {
         }
 
         return result;
-
     }
 
     /*
@@ -112,7 +113,7 @@ public static RowResult<Set<Value>> allResults(PeekingIterator<RowResult<Set<Val
             for (Map.Entry<Cell, Set<Value>> e : kvsResult.getCells()) {
                 final byte[] col = e.getKey().getColumnName();
                 if (!result.containsKey(col)) {
-                    result.put(col, Sets.<Value> newHashSet());
+                    result.put(col, Sets.newHashSet());
                 }
                 result.get(col).addAll(e.getValue());
             }
@@ -142,11 +143,11 @@ public static RowResult<Set<Long>> allTimestamps(PeekingIterator<RowResult<Set<L
             RowResult<Set<Long>> kvsResult = it.next();
             for (Map.Entry<Cell, Set<Long>> e : kvsResult.getCells()) {
                 if (!result.containsKey(e.getKey().getColumnName())) {
-                    result.put(e.getKey().getColumnName(), Sets.<Long> newHashSet());
+                    result.put(e.getKey().getColumnName(), Sets.newHashSet());
                 }
                 result.get(e.getKey().getColumnName()).addAll(e.getValue());
             }
         }
         return RowResult.create(row, result);
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/ClientVersionTooOldExceptionMapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/ClientVersionTooOldExceptionMapper.java
index 3a43a027249..73c7f1396fc 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/ClientVersionTooOldExceptionMapper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/ClientVersionTooOldExceptionMapper.java
@@ -21,10 +21,13 @@
 import com.palantir.atlasdb.keyvalue.partition.exception.ClientVersionTooOldException;
 
 
-public class ClientVersionTooOldExceptionMapper implements ExceptionMapper<ClientVersionTooOldException> {
+public final class ClientVersionTooOldExceptionMapper implements ExceptionMapper<ClientVersionTooOldException> {
+    private static final ClientVersionTooOldExceptionMapper instance = new ClientVersionTooOldExceptionMapper();
+
+    private ClientVersionTooOldExceptionMapper() {
+        // singleton
+    }
 
-    private ClientVersionTooOldExceptionMapper() {}
-    private static ClientVersionTooOldExceptionMapper instance = new ClientVersionTooOldExceptionMapper();
     public static ClientVersionTooOldExceptionMapper instance() {
         return instance;
     }
@@ -33,5 +36,4 @@ public static ClientVersionTooOldExceptionMapper instance() {
     public Response toResponse(ClientVersionTooOldException exception) {
         return Response.noContent().status(410).build();
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/EndpointVersionTooOldExceptionMapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/EndpointVersionTooOldExceptionMapper.java
index 882d42bf684..9829f716193 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/EndpointVersionTooOldExceptionMapper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/EndpointVersionTooOldExceptionMapper.java
@@ -20,9 +20,13 @@
 
 import com.palantir.atlasdb.keyvalue.partition.exception.EndpointVersionTooOldException;
 
-public class EndpointVersionTooOldExceptionMapper implements ExceptionMapper<EndpointVersionTooOldException> {
-
+public final class EndpointVersionTooOldExceptionMapper implements ExceptionMapper<EndpointVersionTooOldException> {
     private static final EndpointVersionTooOldExceptionMapper instance = new EndpointVersionTooOldExceptionMapper();
+
+    private EndpointVersionTooOldExceptionMapper() {
+        // singleton
+    }
+
     public static EndpointVersionTooOldExceptionMapper instance() {
         return instance;
     }
@@ -31,5 +35,4 @@ public static EndpointVersionTooOldExceptionMapper instance() {
     public Response toResponse(EndpointVersionTooOldException exception) {
         return Response.noContent().status(406).build();
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/InsufficientConsistencyExceptionMapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/InsufficientConsistencyExceptionMapper.java
index 6e216a20c88..a5efc150ccc 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/InsufficientConsistencyExceptionMapper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/InsufficientConsistencyExceptionMapper.java
@@ -20,11 +20,14 @@
 
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 
-public class InsufficientConsistencyExceptionMapper implements
+public final class InsufficientConsistencyExceptionMapper implements
         ExceptionMapper<InsufficientConsistencyException> {
 
-    private final static InsufficientConsistencyExceptionMapper instance = new InsufficientConsistencyExceptionMapper();
-    private InsufficientConsistencyExceptionMapper() { }
+    private static final InsufficientConsistencyExceptionMapper instance = new InsufficientConsistencyExceptionMapper();
+
+    private InsufficientConsistencyExceptionMapper() {
+        // singleton
+    }
 
     public static InsufficientConsistencyExceptionMapper instance() {
         return instance;
@@ -33,10 +36,9 @@ public static InsufficientConsistencyExceptionMapper instance() {
     @Override
     public Response toResponse(InsufficientConsistencyException exception) {
         return Response
-        		.status(503)
-        		.entity("Insufficient consistency!")
-        		.header(feign.Util.RETRY_AFTER, "0")
-        		.build();
+                .status(503)
+                .entity("Insufficient consistency!")
+                .header(feign.Util.RETRY_AFTER, "0")
+                .build();
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/KeyAlreadyExistsExceptionMapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/KeyAlreadyExistsExceptionMapper.java
index 2142a98ee35..d48e0a6134c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/KeyAlreadyExistsExceptionMapper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/KeyAlreadyExistsExceptionMapper.java
@@ -20,9 +20,12 @@
 
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 
-public class KeyAlreadyExistsExceptionMapper implements ExceptionMapper<KeyAlreadyExistsException> {
-    private final static KeyAlreadyExistsExceptionMapper instance = new KeyAlreadyExistsExceptionMapper();
-    private KeyAlreadyExistsExceptionMapper() { }
+public final class KeyAlreadyExistsExceptionMapper implements ExceptionMapper<KeyAlreadyExistsException> {
+    private static final KeyAlreadyExistsExceptionMapper instance = new KeyAlreadyExistsExceptionMapper();
+
+    private KeyAlreadyExistsExceptionMapper() {
+        // singleton
+    }
 
     public static KeyAlreadyExistsExceptionMapper instance() {
         return instance;
@@ -31,9 +34,8 @@ public static KeyAlreadyExistsExceptionMapper instance() {
     @Override
     public Response toResponse(KeyAlreadyExistsException exception) {
         return Response
-        		.status(409)
-        		.entity("Key already exists!")
-        		.build();
+                .status(409)
+                .entity("Key already exists!")
+                .build();
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/KeyValueServiceErrorDecoder.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/KeyValueServiceErrorDecoder.java
index bf1011ad985..adc6f0cf73f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/KeyValueServiceErrorDecoder.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/KeyValueServiceErrorDecoder.java
@@ -26,11 +26,13 @@
 import feign.codec.ErrorDecoder;
 
 public final class KeyValueServiceErrorDecoder implements ErrorDecoder {
-
     private static final ErrorDecoder defaultDecoder = new ErrorDecoder.Default();
     private static final KeyValueServiceErrorDecoder instance = new KeyValueServiceErrorDecoder();
 
-    private KeyValueServiceErrorDecoder() {}
+    private KeyValueServiceErrorDecoder() {
+        // singleton
+    }
+
     public static KeyValueServiceErrorDecoder instance() {
         return instance;
     }
@@ -53,5 +55,4 @@ public Exception decode(String methodKey, Response response) {
         }
         return defaultDecoder.decode(methodKey, response);
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/OctetStreamDelegateDecoder.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/OctetStreamDelegateDecoder.java
index 2f148c1afc7..f9ab3846d2f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/OctetStreamDelegateDecoder.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/OctetStreamDelegateDecoder.java
@@ -28,7 +28,7 @@
 import feign.codec.DecodeException;
 import feign.codec.Decoder;
 
-final class OctetStreamDelegateDecoder implements Decoder {
+public final class OctetStreamDelegateDecoder implements Decoder {
     private final Decoder delegate;
 
     public OctetStreamDelegateDecoder(Decoder delegate) {
@@ -36,14 +36,13 @@ public OctetStreamDelegateDecoder(Decoder delegate) {
     }
 
     @Override
-    public Object decode(feign.Response response, Type type) throws IOException,
-            DecodeException, FeignException {
+    public Object decode(feign.Response response, Type type) throws IOException, DecodeException, FeignException {
         Collection<String> contentTypes = response.headers().get(HttpHeaders.CONTENT_TYPE);
         if (contentTypes != null
-            && contentTypes.size() == 1
-            && Iterables.getOnlyElement(contentTypes, "").equals(MediaType.APPLICATION_OCTET_STREAM)) {
+                && contentTypes.size() == 1
+                && Iterables.getOnlyElement(contentTypes, "").equals(MediaType.APPLICATION_OCTET_STREAM)) {
             if (response.body() == null || response.body().length() == null) {
-              return null;
+                return null;
             }
             byte[] data = new byte[response.body().length()];
             int bytesRead = 0;
@@ -60,4 +59,4 @@ public Object decode(feign.Response response, Type type) throws IOException,
         }
         return delegate.decode(response, type);
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/RemotingKeyValueService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/RemotingKeyValueService.java
index 716627d49a1..335e1ffe626 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/RemotingKeyValueService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/RemotingKeyValueService.java
@@ -15,10 +15,10 @@
  */
 package com.palantir.atlasdb.keyvalue.remoting;
 
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
-import javax.annotation.Nullable;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,9 +29,12 @@
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterators;
+import com.google.common.collect.Maps;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -39,6 +42,7 @@
 import com.palantir.atlasdb.keyvalue.partition.map.DynamicPartitionMapImpl;
 import com.palantir.atlasdb.keyvalue.remoting.iterators.HistoryRangeIterator;
 import com.palantir.atlasdb.keyvalue.remoting.iterators.RangeIterator;
+import com.palantir.atlasdb.keyvalue.remoting.iterators.RemoteRowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.remoting.iterators.TimestampsRangeIterator;
 import com.palantir.atlasdb.keyvalue.remoting.iterators.ValueRangeIterator;
 import com.palantir.atlasdb.keyvalue.remoting.outofband.OutboxShippingInterceptor;
@@ -61,22 +65,45 @@
 import feign.jackson.JacksonEncoder;
 import feign.jaxrs.JAXRSContract;
 
-public class RemotingKeyValueService extends ForwardingKeyValueService {
+public final class RemotingKeyValueService extends ForwardingKeyValueService {
     private static final Logger log = LoggerFactory.getLogger(RemotingKeyValueService.class);
-    private final static ServiceContext<KeyValueService> serviceContext = ExecutorInheritableServiceContext.create();
+    private static final ServiceContext<KeyValueService> serviceContext = ExecutorInheritableServiceContext.create();
+    private static final SimpleModule kvsModule = new SimpleModule();
+    private static final ObjectMapper kvsMapper = new ObjectMapper();
 
     private final KeyValueService delegate;
 
+    static {
+        kvsModule.addKeyDeserializer(Cell.class, CellAsKeyDeserializer.instance());
+        kvsModule.addKeyDeserializer(byte[].class, BytesAsKeyDeserializer.instance());
+        kvsModule.addKeySerializer(Cell.class, SaneAsKeySerializer.instance());
+        kvsModule.addKeySerializer(byte[].class, SaneAsKeySerializer.instance());
+        kvsModule.addSerializer(RowResult.class, RowResultSerializer.instance());
+        kvsModule.addDeserializer(RowResult.class, RowResultDeserializer.instance());
+        kvsModule.addSerializer(DynamicPartitionMapImpl.class, DynamicPartitionMapImpl.Serializer.instance());
+        kvsModule.addDeserializer(DynamicPartitionMapImpl.class, DynamicPartitionMapImpl.Deserializer.instance());
+        kvsModule.addAbstractTypeMapping(RowColumnRangeIterator.class, RemoteRowColumnRangeIterator.class);
+
+        kvsMapper.registerModule(kvsModule);
+        kvsMapper.registerModule(new GuavaModule());
+    }
+
+
     public static ServiceContext<KeyValueService> getServiceContext() {
         return serviceContext;
     }
 
+    public static SimpleModule kvsModule() {
+        return kvsModule;
+    }
+
+    public static ObjectMapper kvsMapper() {
+        return kvsMapper;
+    }
+
     /**
      * This is to inject the local KVS instance reference into the context.
      * It is used by the range iterators to download additional pages of data.
-     *
-     * @param remoteService
-     * @return
      */
     private static KeyValueService createClientSideInternal(final KeyValueService remoteService) {
         return new ForwardingKeyValueService() {
@@ -114,7 +141,7 @@ public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(TableReferenc
         };
     }
 
-    public enum LONG_HOLDER implements RemoteContextType<Long> {
+    public enum LongContextType implements RemoteContextType<Long> {
         PM_VERSION {
             @Override
             public Class<Long> getValueType() {
@@ -123,7 +150,7 @@ public Class<Long> getValueType() {
         }
     }
 
-    public enum STRING_HOLDER implements RemoteContextType<String> {
+    public enum StringContextType implements RemoteContextType<String> {
         PMS_URI {
             @Override
             public Class<String> getValueType() {
@@ -137,12 +164,11 @@ public Class<String> getValueType() {
      * that supports empty byte arrays, exceptions and sends the partition map version out-of-band
      * automatically.
      *
-     * @param uri
      * @param localVersionSupplier The version of local partition map to be sent out-of-band.
-     * @return
      */
     public static KeyValueService createClientSide(String uri, Supplier<Long> localVersionSupplier) {
-        ServiceContext<Long> outboxVersionCtx = RemoteContextHolder.OUTBOX.getProviderForKey(LONG_HOLDER.PM_VERSION);
+        ServiceContext<Long> outboxVersionCtx = RemoteContextHolder.OUTBOX
+                .getProviderForKey(LongContextType.PM_VERSION);
 
         KeyValueService remotingKvs = Feign.builder()
                 .encoder(new OctetStreamDelegateEncoder(new JacksonEncoder(kvsMapper())))
@@ -162,9 +188,8 @@ public static KeyValueService createClientSide(String uri, Supplier<Long> localV
     /**
      * This will convert the range iterators to serializable page-based versions and will
      * ensure that the partition map version of the client and of the server are compatible.
-     * @param delegate
-     * @param serverVersionSupplier Use <code>Suppliers.<Long>ofInstance(-1L)</code> if you want to disable version check.
-     * @return
+     * @param serverVersionSupplier Use <code>Suppliers.&lt;Long&gt;ofInstance(-1L)</code>
+     *                              if you want to disable version check.
      */
     public static KeyValueService createServerSide(KeyValueService delegate, Supplier<Long> serverVersionSupplier) {
         final KeyValueService versionCheckingKvs = VersionCheckProxy.newProxyInstance(delegate, serverVersionSupplier);
@@ -184,67 +209,59 @@ protected KeyValueService delegate() {
     public RangeIterator<Value> getRange(final TableReference tableRef,
                                          final RangeRequest range,
                                          final long timestamp) {
-        return transformIterator(tableRef, range, timestamp, super.getRange(tableRef, range, timestamp),
-            new Function<Pair<Boolean, ImmutableList<RowResult<Value>>>, RangeIterator<Value>>() {
-                @Override @Nullable
-                public RangeIterator<Value> apply(@Nullable Pair<Boolean, ImmutableList<RowResult<Value>>> input) {
-                    return new ValueRangeIterator(tableRef, range, timestamp, input.lhSide, input.rhSide);
-                }
-            });
+        return transformIterator(
+                range,
+                super.getRange(tableRef, range, timestamp),
+                input -> new ValueRangeIterator(tableRef, range, timestamp, input.lhSide, input.rhSide));
     }
 
     @Override
     public RangeIterator<Set<Value>> getRangeWithHistory(final TableReference tableRef,
                                                          final RangeRequest rangeRequest,
                                                          final long timestamp) {
-        return transformIterator(tableRef, rangeRequest, timestamp, super.getRangeWithHistory(tableRef, rangeRequest, timestamp),
-            new Function<Pair<Boolean, ImmutableList<RowResult<Set<Value>>>>, RangeIterator<Set<Value>>>(){
-                @Override @Nullable
-                public RangeIterator<Set<Value>> apply(@Nullable Pair<Boolean, ImmutableList<RowResult<Set<Value>>>> input) {
-                    return new HistoryRangeIterator(tableRef, rangeRequest, timestamp, input.lhSide, input.rhSide);
-                }
-            });
+        return transformIterator(
+                rangeRequest,
+                super.getRangeWithHistory(tableRef, rangeRequest, timestamp),
+                input -> new HistoryRangeIterator(tableRef, rangeRequest, timestamp, input.lhSide, input.rhSide));
     }
 
     @Override
     public RangeIterator<Set<Long>> getRangeOfTimestamps(final TableReference tableRef,
                                                          final RangeRequest rangeRequest,
                                                          final long timestamp) {
-        return transformIterator(tableRef, rangeRequest, timestamp, super.getRangeOfTimestamps(tableRef, rangeRequest, timestamp),
-            new Function<Pair<Boolean, ImmutableList<RowResult<Set<Long>>>>, RangeIterator<Set<Long>>>() {
-                @Override @Nullable
-                public RangeIterator<Set<Long>> apply(@Nullable Pair<Boolean, ImmutableList<RowResult<Set<Long>>>> input) {
-                    return new TimestampsRangeIterator(tableRef, rangeRequest, timestamp, input.lhSide, input.rhSide);
-                }
-            });
+        return transformIterator(
+                rangeRequest,
+                super.getRangeOfTimestamps(tableRef, rangeRequest, timestamp),
+                input -> new TimestampsRangeIterator(tableRef, rangeRequest, timestamp, input.lhSide, input.rhSide));
     }
 
-    private static final SimpleModule kvsModule = new SimpleModule(); static {
-        kvsModule.addKeyDeserializer(Cell.class, CellAsKeyDeserializer.instance());
-        kvsModule.addKeyDeserializer(byte[].class, BytesAsKeyDeserializer.instance());
-        kvsModule.addKeySerializer(Cell.class, SaneAsKeySerializer.instance());
-        kvsModule.addKeySerializer(byte[].class, SaneAsKeySerializer.instance());
-        kvsModule.addSerializer(RowResult.class, RowResultSerializer.instance());
-        kvsModule.addDeserializer(RowResult.class, RowResultDeserializer.instance());
-        kvsModule.addSerializer(DynamicPartitionMapImpl.class, DynamicPartitionMapImpl.Serializer.instance());
-        kvsModule.addDeserializer(DynamicPartitionMapImpl.class, DynamicPartitionMapImpl.Deserializer.instance());
-    }
-    private static final ObjectMapper kvsMapper = new ObjectMapper(); static {
-        kvsMapper.registerModule(kvsModule);
-        kvsMapper.registerModule(new GuavaModule());
-    }
-    public static SimpleModule kvsModule() {
-        return kvsModule;
-    }
-    public static ObjectMapper kvsMapper() {
-        return kvsMapper;
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp) {
+        Map<byte[], RowColumnRangeIterator> rowsColumnRange =
+                super.getRowsColumnRange(tableRef, rows, columnRangeSelection, timestamp);
+        Map<byte[], RowColumnRangeIterator> transformed = Maps.transformValues(rowsColumnRange, it -> {
+            List<Map.Entry<Cell, Value>> page =
+                    ImmutableList.copyOf(Iterators.limit(it, columnRangeSelection.getBatchHint()));
+            return new RemoteRowColumnRangeIterator(
+                    tableRef,
+                    columnRangeSelection,
+                    timestamp,
+                    it.hasNext(),
+                    page);
+        });
+        return transformed;
     }
 
     // This method transforms an iterator into paging iterator that can be
     // sent over-the-wire in json.
-    private static <T> RangeIterator<T> transformIterator(TableReference tableRef, RangeRequest range,
-                                                   long timestamp, ClosableIterator<RowResult<T>> closableIterator,
-                                                   Function<Pair<Boolean, ImmutableList<RowResult<T>>>, RangeIterator<T>> resultSupplier) {
+    private static <T> RangeIterator<T> transformIterator(
+            RangeRequest range,
+            ClosableIterator<RowResult<T>> closableIterator,
+            Function<Pair<Boolean, ImmutableList<RowResult<T>>>, RangeIterator<T>> resultSupplier) {
         try {
             int pageSize = range.getBatchHint() != null ? range.getBatchHint() : 100;
             if (pageSize == 1) {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/RemotingPartitionMapService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/RemotingPartitionMapService.java
index db54f15b502..b8699b77ac1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/RemotingPartitionMapService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/RemotingPartitionMapService.java
@@ -22,7 +22,10 @@
 import feign.jackson.JacksonEncoder;
 import feign.jaxrs.JAXRSContract;
 
-public class RemotingPartitionMapService {
+public final class RemotingPartitionMapService {
+    private RemotingPartitionMapService() {
+        // Utility class
+    }
 
     public static PartitionMapService createClientSide(String uri) {
         return Feign.builder()
@@ -31,5 +34,4 @@ public static PartitionMapService createClientSide(String uri) {
                 .contract(new JAXRSContract())
                 .target(PartitionMapService.class, uri);
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/HistoryRangeIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/HistoryRangeIterator.java
index c53808fd0f6..5623b19e480 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/HistoryRangeIterator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/HistoryRangeIterator.java
@@ -29,18 +29,22 @@
 
 public class HistoryRangeIterator extends RangeIterator<Set<Value>> {
     @JsonCreator
-    public HistoryRangeIterator(@JsonProperty("tableRef") TableReference tableRef,
-                                @JsonProperty("range") RangeRequest range,
-                                @JsonProperty("timestamp") long timestamp,
-                                @JsonProperty("hasNext") boolean hasNext,
-                                @JsonProperty("page") ImmutableList<RowResult<Set<Value>>> page) {
+    public HistoryRangeIterator(
+            @JsonProperty("tableRef") TableReference tableRef,
+            @JsonProperty("range") RangeRequest range,
+            @JsonProperty("timestamp") long timestamp,
+            @JsonProperty("hasNext") boolean hasNext,
+            @JsonProperty("page") ImmutableList<RowResult<Set<Value>>> page) {
         super(tableRef, range, timestamp, hasNext, page);
     }
 
     @Override
-    protected ClosableIterator<RowResult<Set<Value>>> getMoreRows(KeyValueService kvs, TableReference tableRef,
-                                                                  RangeRequest newRange, long timestamp) {
-        return kvs.getRangeWithHistory(tableRef, newRange, timestamp);
+    protected ClosableIterator<RowResult<Set<Value>>> getMoreRows(
+            KeyValueService kvs,
+            TableReference tableReference,
+            RangeRequest newRange,
+            long newTimestamp) {
+        return kvs.getRangeWithHistory(tableReference, newRange, newTimestamp);
     }
 
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/RangeIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/RangeIterator.java
index 161b6021c6d..4dce7106b54 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/RangeIterator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/RangeIterator.java
@@ -19,6 +19,7 @@
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
@@ -28,7 +29,6 @@
 import com.palantir.common.base.ClosableIterator;
 
 public abstract class RangeIterator<T> implements ClosableIterator<RowResult<T>> {
-
     @JsonProperty("tableRef")
     final TableReference tableRef;
 
@@ -65,7 +65,7 @@ public RowResult<T> next() {
         }
 
         // Download more results from the server
-        RowResult<T> lastResult = page.get(page.size()-1);
+        RowResult<T> lastResult = Iterables.getLast(page);
         byte[] newStart = RangeRequests.getNextStartRow(range.isReverse(), lastResult.getRowName());
 
         RangeRequest newRange = range.getBuilder().startRowInclusive(newStart).build();
@@ -85,7 +85,11 @@ public RowResult<T> next() {
         }
     }
 
-    protected abstract ClosableIterator<RowResult<T>> getMoreRows(KeyValueService kvs, TableReference tableRef, RangeRequest newRange, long timestamp);
+    protected abstract ClosableIterator<RowResult<T>> getMoreRows(
+            KeyValueService kvs,
+            TableReference tableReference,
+            RangeRequest newRange,
+            long newTimestamp);
 
     private void swapWithNewRows(RangeIterator<T> other) {
         hasNext = other.hasNext;
@@ -145,7 +149,8 @@ public int hashCode() {
 
     static <T> RangeIterator<T> validateIsRangeIterator(ClosableIterator<RowResult<T>> it) {
         if (!(it instanceof RangeIterator)) {
-            throw new IllegalArgumentException("The server-side kvs must be wrapper with RemotingKeyValueService.createServerSide()");
+            throw new IllegalArgumentException(
+                    "The server-side kvs must be wrapper with RemotingKeyValueService.createServerSide()");
         }
         return (RangeIterator<T>) it;
     }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/RemoteRowColumnRangeIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/RemoteRowColumnRangeIterator.java
new file mode 100644
index 00000000000..ba3fb195261
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/RemoteRowColumnRangeIterator.java
@@ -0,0 +1,172 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.keyvalue.remoting.iterators;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.atlasdb.keyvalue.remoting.RemotingKeyValueService;
+
+public class RemoteRowColumnRangeIterator implements RowColumnRangeIterator {
+    @JsonProperty("tableRef")
+    final TableReference tableRef;
+    @JsonProperty("columnRangeSelection")
+    final ColumnRangeSelection columnRangeSelection;
+    @JsonProperty("timestamp")
+    final long timestamp;
+    @JsonProperty("hasNext")
+    boolean hasNext;
+    @JsonProperty("page")
+    List<Map.Entry<Cell, Value>> page;
+    int position = 0;
+
+    @JsonCreator
+    public RemoteRowColumnRangeIterator(@JsonProperty("tableRef") TableReference tableRef,
+                                        @JsonProperty("columnRangeSelection") ColumnRangeSelection columnRangeSelection,
+                                        @JsonProperty("timestamp") long timestamp,
+                                        @JsonProperty("hasNext") boolean hasNext,
+                                        @JsonProperty("page") List<Map.Entry<Cell, Value>> page) {
+        this.tableRef = tableRef;
+        this.columnRangeSelection = columnRangeSelection;
+        this.timestamp = timestamp;
+        this.hasNext = hasNext;
+        if (page == null) {
+            this.page = ImmutableList.of();
+        } else {
+            this.page = page;
+        }
+        if (this.page.isEmpty() && hasNext) {
+            throw new IllegalStateException(
+                    "Attempting to create a row column page claiming to have more results available while having"
+                    + " no results in the current page.");
+        }
+    }
+
+    @Override
+    public Map.Entry<Cell, Value> next() {
+        Preconditions.checkState(hasNext());
+
+        if (position < page.size()) {
+            return page.get(position++);
+        }
+
+        // Download more results from the server
+        KeyValueService keyValueService = RemotingKeyValueService.getServiceContext().get();
+        if (keyValueService == null) {
+            throw new IllegalStateException(
+                    "This remote keyvalue service needs to be wrapped with RemotingKeyValueService.createClientSide!");
+        }
+
+        Cell lastCell = page.get(page.size() - 1).getKey();
+        byte[] row = lastCell.getRowName();
+        Preconditions.checkArgument(!RangeRequests.isLastRowName(lastCell.getColumnName()));
+        byte[] nextCol = RangeRequests.nextLexicographicName(lastCell.getColumnName());
+        RemoteRowColumnRangeIterator result = getMoreRows(keyValueService, tableRef, row, nextCol);
+        swapWithNewRows(validateIsRangeIterator(result));
+
+        if (position < page.size()) {
+            return page.get(position++);
+        } else {
+            throw new IllegalStateException();
+        }
+    }
+
+    protected RemoteRowColumnRangeIterator getMoreRows(
+            KeyValueService kvs,
+            TableReference table,
+            byte[] row,
+            byte[] nextCol) {
+        ColumnRangeSelection newColumnRange = new ColumnRangeSelection(
+                nextCol,
+                columnRangeSelection.getEndCol(),
+                columnRangeSelection.getBatchHint());
+        Map<byte[], RowColumnRangeIterator> result = kvs.getRowsColumnRange(
+                table,
+                ImmutableList.of(row),
+                newColumnRange,
+                timestamp);
+        if (result.isEmpty()) {
+            new RemoteRowColumnRangeIterator(table, columnRangeSelection, timestamp, false, ImmutableList.of());
+        }
+        RowColumnRangeIterator it = Iterables.getOnlyElement(result.values());
+        List<Map.Entry<Cell, Value>> pageToReturn =
+                ImmutableList.copyOf(Iterators.limit(it, columnRangeSelection.getBatchHint()));
+        return new RemoteRowColumnRangeIterator(table, columnRangeSelection, timestamp, it.hasNext(), pageToReturn);
+    }
+
+    private void swapWithNewRows(RemoteRowColumnRangeIterator other) {
+        hasNext = other.hasNext;
+        page = other.page;
+        position = 0;
+    }
+
+    @Override
+    public boolean hasNext() {
+        if (position < page.size()) {
+            return true;
+        }
+        return hasNext;
+    }
+
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    static RemoteRowColumnRangeIterator validateIsRangeIterator(RowColumnRangeIterator it) {
+        if (!(it instanceof RemoteRowColumnRangeIterator)) {
+            throw new IllegalArgumentException(
+                    "The server-side kvs must be wrapper with RemotingKeyValueService.createServerSide()");
+        }
+        return (RemoteRowColumnRangeIterator) it;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        RemoteRowColumnRangeIterator that = (RemoteRowColumnRangeIterator) obj;
+        return timestamp == that.timestamp
+                && hasNext == that.hasNext
+                && position == that.position
+                && Objects.equals(tableRef, that.tableRef)
+                && Objects.equals(columnRangeSelection, that.columnRangeSelection)
+                && Objects.equals(page, that.page);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(tableRef, columnRangeSelection, timestamp, hasNext, page, position);
+    }
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/TimestampsRangeIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/TimestampsRangeIterator.java
index f593ec86c05..1531742be70 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/TimestampsRangeIterator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/TimestampsRangeIterator.java
@@ -28,17 +28,21 @@
 
 public class TimestampsRangeIterator extends RangeIterator<Set<Long>> {
     @JsonCreator
-    public TimestampsRangeIterator(@JsonProperty("tableRef") TableReference tableRef,
-                                   @JsonProperty("range") RangeRequest range,
-                                   @JsonProperty("timestamp") long timestamp,
-                                   @JsonProperty("hasNext") boolean hasNext,
-                                   @JsonProperty("page") ImmutableList<RowResult<Set<Long>>> page) {
+    public TimestampsRangeIterator(
+            @JsonProperty("tableRef") TableReference tableRef,
+            @JsonProperty("range") RangeRequest range,
+            @JsonProperty("timestamp") long timestamp,
+            @JsonProperty("hasNext") boolean hasNext,
+            @JsonProperty("page") ImmutableList<RowResult<Set<Long>>> page) {
         super(tableRef, range, timestamp, hasNext, page);
     }
 
     @Override
-    protected ClosableIterator<RowResult<Set<Long>>> getMoreRows(KeyValueService kvs, TableReference tableRef,
-                                                                 RangeRequest newRange, long timestamp) {
-        return kvs.getRangeOfTimestamps(tableRef, newRange, timestamp);
+    protected ClosableIterator<RowResult<Set<Long>>> getMoreRows(
+            KeyValueService kvs,
+            TableReference tableReference,
+            RangeRequest newRange,
+            long newTimestamp) {
+        return kvs.getRangeOfTimestamps(tableReference, newRange, newTimestamp);
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/ValueRangeIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/ValueRangeIterator.java
index 60abfb49331..a889206ccfc 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/ValueRangeIterator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/iterators/ValueRangeIterator.java
@@ -27,17 +27,21 @@
 
 public class ValueRangeIterator extends RangeIterator<Value> {
     @JsonCreator
-    public ValueRangeIterator(@JsonProperty("tableRef") TableReference tableRef,
-                              @JsonProperty("range") RangeRequest range,
-                              @JsonProperty("timestamp") long timestamp,
-                              @JsonProperty("hasNext") boolean hasNext,
-                              @JsonProperty("page") ImmutableList<RowResult<Value>> page) {
+    public ValueRangeIterator(
+            @JsonProperty("tableRef") TableReference tableRef,
+            @JsonProperty("range") RangeRequest range,
+            @JsonProperty("timestamp") long timestamp,
+            @JsonProperty("hasNext") boolean hasNext,
+            @JsonProperty("page") ImmutableList<RowResult<Value>> page) {
         super(tableRef, range, timestamp, hasNext, page);
     }
 
     @Override
-    protected ClosableIterator<RowResult<Value>> getMoreRows(KeyValueService kvs, TableReference tableRef,
-                                                             RangeRequest newRange, long timestamp) {
-        return kvs.getRange(tableRef, newRange, timestamp);
+    protected ClosableIterator<RowResult<Value>> getMoreRows(
+            KeyValueService kvs,
+            TableReference tableReference,
+            RangeRequest newRange,
+            long newTimestamp) {
+        return kvs.getRange(tableReference, newRange, newTimestamp);
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/outofband/InboxPopulatingContainerRequestFilter.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/outofband/InboxPopulatingContainerRequestFilter.java
index 3a13a9897b9..7cac2d5b076 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/outofband/InboxPopulatingContainerRequestFilter.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/outofband/InboxPopulatingContainerRequestFilter.java
@@ -45,7 +45,9 @@ public InboxPopulatingContainerRequestFilter(ObjectMapper mapper, ClassLoader cl
 
     @Override
     public void filter(ContainerRequestContext requestContext) throws IOException {
-        AbstractWritableServiceContext<Map<RemoteContextType<?>, Object>> holderContext = (AbstractWritableServiceContext<Map<RemoteContextType<?>, Object>>) RemoteContextHolder.INBOX.getHolderContext();
+        AbstractWritableServiceContext<Map<RemoteContextType<?>, Object>> holderContext =
+                (AbstractWritableServiceContext<Map<RemoteContextType<?>, Object>>) RemoteContextHolder.INBOX
+                        .getHolderContext();
         if (!requestContext.getHeaders().containsKey(OutboxShippingInterceptor.CONTEXT_HEADER_NAME)) {
             holderContext.set(null);
             return;
@@ -75,4 +77,4 @@ public void filter(ContainerRequestContext requestContext) throws IOException {
         }
         holderContext.set(map);
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/outofband/OutboxShippingInterceptor.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/outofband/OutboxShippingInterceptor.java
index d4f7f5783e9..c62a8e914a1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/outofband/OutboxShippingInterceptor.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/outofband/OutboxShippingInterceptor.java
@@ -52,4 +52,4 @@ public void apply(RequestTemplate template) {
             throw Throwables.throwUncheckedException(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/proxy/FillInUrlProxy.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/proxy/FillInUrlProxy.java
index eb557c07fe6..03d8929e3f9 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/proxy/FillInUrlProxy.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/proxy/FillInUrlProxy.java
@@ -45,10 +45,9 @@
  * @author htarasiuk
  *
  */
-public class FillInUrlProxy<T> extends AbstractInvocationHandler {
-
-    final T delegate;
-    final String pmsUri;
+public final class FillInUrlProxy<T> extends AbstractInvocationHandler {
+    private final T delegate;
+    private final String pmsUri;
 
     private FillInUrlProxy(T delegate, String pmsUri) {
         this.delegate = delegate;
@@ -74,7 +73,9 @@ public static KeyValueService newFillInUrlProxy(KeyValueService delegate, String
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> ClosableIterator<RowResult<T>> newFillInUrlProxy(ClosableIterator<RowResult<T>> delegate, String pmsUri) {
+    public static <T> ClosableIterator<RowResult<T>> newFillInUrlProxy(
+            ClosableIterator<RowResult<T>> delegate,
+            String pmsUri) {
         FillInUrlProxy<ClosableIterator<RowResult<T>>> itHandler = new FillInUrlProxy<>(delegate, pmsUri);
         return (ClosableIterator<RowResult<T>>) Proxy.newProxyInstance(
                 ClosableIterator.class.getClassLoader(), new Class<?>[] { ClosableIterator.class }, itHandler);
@@ -87,7 +88,7 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
         } catch (InvocationTargetException e) {
             Throwable cause = e.getCause();
             if (cause instanceof ClientVersionTooOldException) {
-            	throw new ClientVersionTooOldException(pmsUri);
+                throw new ClientVersionTooOldException(pmsUri);
             }
             if (cause instanceof EndpointVersionTooOldException) {
                 throw new EndpointVersionTooOldException(pmsUri);
@@ -137,5 +138,4 @@ public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(
         }
 
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/proxy/VersionCheckProxy.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/proxy/VersionCheckProxy.java
index 75ec189cd86..fe598a9e959 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/proxy/VersionCheckProxy.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/proxy/VersionCheckProxy.java
@@ -36,8 +36,8 @@
 import com.palantir.atlasdb.keyvalue.impl.ForwardingKeyValueService;
 import com.palantir.atlasdb.keyvalue.partition.exception.ClientVersionTooOldException;
 import com.palantir.atlasdb.keyvalue.partition.exception.EndpointVersionTooOldException;
-import com.palantir.atlasdb.keyvalue.remoting.RemotingKeyValueService.LONG_HOLDER;
-import com.palantir.atlasdb.keyvalue.remoting.RemotingKeyValueService.STRING_HOLDER;
+import com.palantir.atlasdb.keyvalue.remoting.RemotingKeyValueService.LongContextType;
+import com.palantir.atlasdb.keyvalue.remoting.RemotingKeyValueService.StringContextType;
 import com.palantir.common.base.ClosableIterator;
 import com.palantir.common.supplier.RemoteContextHolder;
 import com.palantir.common.supplier.ServiceContext;
@@ -51,13 +51,13 @@
  *
  * @see ClientVersionTooOldException
  * @see RemoteContextHolder
- * @see LONG_HOLDER
- * @see STRING_HOLDER
+ * @see LongContextType
+ * @see StringContextType
  *
  * @author htarasiuk
  *
  */
-public class VersionCheckProxy<T> extends AbstractInvocationHandler {
+public final class VersionCheckProxy<T> extends AbstractInvocationHandler {
     private static final Logger log = LoggerFactory.getLogger(VersionCheckProxy.class);
     private final Supplier<Long> serverVersionProvider;
     private final Supplier<Long> clientVersionProvider;
@@ -80,7 +80,9 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
         // Only check the version for appropriate methods
         if (!isMethodVersionExempt(method)) {
             Long clientVersion = clientVersionProvider.get();
-            Long serverVersion = Preconditions.checkNotNull(serverVersionProvider.get());
+            Long serverVersion = Preconditions.checkNotNull(
+                    serverVersionProvider.get(),
+                    "serverVersion cannot be null");
             if (serverVersion < 0L) {
                 // In this case the version check is simply disabled.
                 assert clientVersion == null || clientVersion < 0;
@@ -108,16 +110,24 @@ protected Object handleInvocation(Object proxy, Method method, Object[] args) th
      * This proxy checks the client version based on the out-of-band data that came with this request.
      *
      * @param delegate key value service delegate
-     * @param serverVersionProvider Use <code>Suppliers.<Long>ofInstance(-1L)</code> to disable version check. In
+     * @param serverVersionProvider Use <code>Suppliers.&lt;Long&gt;ofInstance(-1L)</code> to disable version check. In
      * such case this proxy is just a no-op.
      * @return proxied key value service
      */
     public static KeyValueService newProxyInstance(KeyValueService delegate, Supplier<Long> serverVersionProvider) {
-        ServiceContext<Long> remoteVersionClientCtx = RemoteContextHolder.INBOX.getProviderForKey(LONG_HOLDER.PM_VERSION);
-        KeyValueService kvsWithVersionCheckIterators = new KeyValueServiceWithVersionCheckingIterators(delegate, serverVersionProvider);
-        VersionCheckProxy<KeyValueService> vcp = new VersionCheckProxy<>(serverVersionProvider, remoteVersionClientCtx, kvsWithVersionCheckIterators);
+        ServiceContext<Long> remoteVersionClientCtx = RemoteContextHolder.INBOX
+                .getProviderForKey(LongContextType.PM_VERSION);
+        KeyValueService kvsWithVersionCheckIterators = new KeyValueServiceWithVersionCheckingIterators(
+                delegate,
+                serverVersionProvider);
+        VersionCheckProxy<KeyValueService> vcp = new VersionCheckProxy<>(
+                serverVersionProvider,
+                remoteVersionClientCtx,
+                kvsWithVersionCheckIterators);
         return (KeyValueService) Proxy.newProxyInstance(
-                KeyValueService.class.getClassLoader(), new Class<?>[] { KeyValueService.class }, vcp);
+                KeyValueService.class.getClassLoader(),
+                new Class<?>[] { KeyValueService.class },
+                vcp);
     }
 
     /**
@@ -130,7 +140,9 @@ public static KeyValueService newProxyInstance(KeyValueService delegate, Supplie
      * @return proxied closeable iterator
      */
     @SuppressWarnings("unchecked")
-    public static <T> ClosableIterator<RowResult<T>> invalidateOnVersionChangeProxy(ClosableIterator<RowResult<T>> delegate, Supplier<Long> currentVersionProvider) {
+    public static <T> ClosableIterator<RowResult<T>> invalidateOnVersionChangeProxy(
+            ClosableIterator<RowResult<T>> delegate,
+            Supplier<Long> currentVersionProvider) {
         VersionCheckProxy<ClosableIterator<RowResult<T>>> vcp = new VersionCheckProxy<>(
                 currentVersionProvider, Suppliers.ofInstance(currentVersionProvider.get()), delegate);
         return (ClosableIterator<RowResult<T>>) Proxy.newProxyInstance(
@@ -138,7 +150,6 @@ public static <T> ClosableIterator<RowResult<T>> invalidateOnVersionChangeProxy(
     }
 
     public static class KeyValueServiceWithVersionCheckingIterators extends ForwardingKeyValueService {
-
         private final KeyValueService delegate;
         private final Supplier<Long> serverVersionSupplier;
 
@@ -156,21 +167,25 @@ protected KeyValueService delegate() {
         @Override
         public ClosableIterator<RowResult<Value>> getRange(TableReference tableRef,
                                                            RangeRequest rangeRequest, long timestamp) {
-            return invalidateOnVersionChangeProxy(super.getRange(tableRef, rangeRequest, timestamp), serverVersionSupplier);
+            return invalidateOnVersionChangeProxy(
+                    super.getRange(tableRef, rangeRequest, timestamp),
+                    serverVersionSupplier);
         }
 
         @Override
         public ClosableIterator<RowResult<Set<Value>>> getRangeWithHistory(
                 TableReference tableRef, RangeRequest rangeRequest, long timestamp) {
-            return invalidateOnVersionChangeProxy(super.getRangeWithHistory(tableRef, rangeRequest, timestamp), serverVersionSupplier);
+            return invalidateOnVersionChangeProxy(
+                    super.getRangeWithHistory(tableRef, rangeRequest, timestamp),
+                    serverVersionSupplier);
         }
 
         @Override
         public ClosableIterator<RowResult<Set<Long>>> getRangeOfTimestamps(
                 TableReference tableRef, RangeRequest rangeRequest, long timestamp) {
-            return invalidateOnVersionChangeProxy(super.getRangeOfTimestamps(tableRef, rangeRequest, timestamp), serverVersionSupplier);
+            return invalidateOnVersionChangeProxy(
+                    super.getRangeOfTimestamps(tableRef, rangeRequest, timestamp),
+                    serverVersionSupplier);
         }
-
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/BytesAsKeyDeserializer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/BytesAsKeyDeserializer.java
index 0f5236ce5ce..1110a1c8b06 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/BytesAsKeyDeserializer.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/BytesAsKeyDeserializer.java
@@ -17,24 +17,25 @@
 
 import java.io.IOException;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.KeyDeserializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public final class BytesAsKeyDeserializer extends KeyDeserializer {
+    private static final BytesAsKeyDeserializer instance = new BytesAsKeyDeserializer();
 
     private final ObjectMapper mapper = new ObjectMapper();
-    private final static BytesAsKeyDeserializer instance = new BytesAsKeyDeserializer();
 
-    @Override
-    public Object deserializeKey(String key, DeserializationContext ctxt) throws IOException,
-            JsonProcessingException {
-        return mapper.readValue(key, byte[].class);
+    private BytesAsKeyDeserializer() {
+        // singleton
     }
 
     public static BytesAsKeyDeserializer instance() {
         return instance;
     }
 
+    @Override
+    public Object deserializeKey(String key, DeserializationContext ctxt) throws IOException {
+        return mapper.readValue(key, byte[].class);
+    }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/CellAsKeyDeserializer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/CellAsKeyDeserializer.java
index cae86b538cd..c5712995b08 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/CellAsKeyDeserializer.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/CellAsKeyDeserializer.java
@@ -17,24 +17,26 @@
 
 import java.io.IOException;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.KeyDeserializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 
 public final class CellAsKeyDeserializer extends KeyDeserializer {
+    private static final CellAsKeyDeserializer instance = new CellAsKeyDeserializer();
 
     private final ObjectMapper mapper = new ObjectMapper();
-    private CellAsKeyDeserializer() { }
-    private static final CellAsKeyDeserializer instance = new CellAsKeyDeserializer();
+
+    private CellAsKeyDeserializer() {
+        // singleton
+    }
+
     public static CellAsKeyDeserializer instance() {
         return instance;
     }
 
     @Override
-    public Object deserializeKey(String key, DeserializationContext ctxt) throws IOException,
-            JsonProcessingException {
+    public Object deserializeKey(String key, DeserializationContext ctxt) throws IOException {
         return mapper.readValue(key, Cell.class);
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/RowResultDeserializer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/RowResultDeserializer.java
index 7f8ad0c4d2d..4682c39af5b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/RowResultDeserializer.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/RowResultDeserializer.java
@@ -21,7 +21,6 @@
 import java.util.SortedMap;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -33,28 +32,36 @@
 
 @SuppressWarnings("rawtypes")
 public final class RowResultDeserializer extends JsonDeserializer<RowResult> {
+    private static final RowResultDeserializer instance = new RowResultDeserializer();
+
+    private RowResultDeserializer() {
+        // singleton
+    }
+
+    public static RowResultDeserializer instance() {
+        return instance;
+    }
 
     @Override
-    public RowResult deserialize(JsonParser p, DeserializationContext ctxt) throws IOException,
-            JsonProcessingException {
-        JsonNode node = p.getCodec().readTree(p);
+    public RowResult deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+        JsonNode node = parser.getCodec().readTree(parser);
 
         int type = node.get("type").asInt();
         byte[] row = node.get("row").binaryValue();
 
         switch (type) {
-        case RowResultSerializer.VALUE_TYPE_ID:
-            return RowResult.create(row, deserializeWithValue(node, ctxt));
-        case RowResultSerializer.TIMESTAMPS_SET_TYPE_ID:
-            return RowResult.create(row, deserializeWithTimestamps(node, ctxt));
-        case RowResultSerializer.VALUES_SET_TYPE_ID:
-            return RowResult.create(row, deserializeWithValuesSet(node, ctxt));
+            case RowResultSerializer.VALUE_TYPE_ID:
+                return RowResult.create(row, deserializeWithValue(node));
+            case RowResultSerializer.TIMESTAMPS_SET_TYPE_ID:
+                return RowResult.create(row, deserializeWithTimestamps(node));
+            case RowResultSerializer.VALUES_SET_TYPE_ID:
+                return RowResult.create(row, deserializeWithValuesSet(node));
+            default:
+                throw new IllegalArgumentException("Invalid RowResult type!");
         }
-
-        throw new IllegalArgumentException("Invalid RowResult type!");
     }
 
-    private SortedMap<byte[], Value> deserializeWithValue(JsonNode node, DeserializationContext ctxt) throws IOException {
+    private SortedMap<byte[], Value> deserializeWithValue(JsonNode node) throws IOException {
         SortedMap<byte[], Value> result = Maps.newTreeMap(UnsignedBytes.lexicographicalComparator());
         Iterator<JsonNode> it = node.get("columns").elements();
         while (it.hasNext()) {
@@ -67,8 +74,7 @@ private SortedMap<byte[], Value> deserializeWithValue(JsonNode node, Deserializa
         return result;
     }
 
-    private SortedMap<byte[], Set<Long>> deserializeWithTimestamps(JsonNode node,
-                                                                   DeserializationContext ctxt) throws IOException {
+    private SortedMap<byte[], Set<Long>> deserializeWithTimestamps(JsonNode node) throws IOException {
         SortedMap<byte[], Set<Long>> result = Maps.newTreeMap(UnsignedBytes.lexicographicalComparator());
         Iterator<JsonNode> it = node.get("columns").elements();
         while (it.hasNext()) {
@@ -86,9 +92,7 @@ private SortedMap<byte[], Set<Long>> deserializeWithTimestamps(JsonNode node,
         return result;
     }
 
-    private SortedMap<byte[], Set<Value>> deserializeWithValuesSet(JsonNode node,
-                                                                   DeserializationContext ctxt)
-            throws IOException {
+    private SortedMap<byte[], Set<Value>> deserializeWithValuesSet(JsonNode node) throws IOException {
         SortedMap<byte[], Set<Value>> result = Maps.newTreeMap(UnsignedBytes.lexicographicalComparator());
         Iterator<JsonNode> it = node.get("columns").elements();
         while (it.hasNext()) {
@@ -106,10 +110,4 @@ private SortedMap<byte[], Set<Value>> deserializeWithValuesSet(JsonNode node,
         }
         return result;
     }
-
-    private static final RowResultDeserializer instance = new RowResultDeserializer();
-    public static RowResultDeserializer instance() {
-        return instance;
-    }
-    private RowResultDeserializer() {}
-}
\ No newline at end of file
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/RowResultSerializer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/RowResultSerializer.java
index 18cc42960d6..a539a849996 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/RowResultSerializer.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/RowResultSerializer.java
@@ -20,7 +20,6 @@
 import java.util.Set;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
@@ -33,28 +32,37 @@
  */
 @SuppressWarnings("rawtypes")
 public final class RowResultSerializer extends JsonSerializer<RowResult> {
-
     static final int VALUE_TYPE_ID = 0;
     static final int TIMESTAMPS_SET_TYPE_ID = 1;
     static final int VALUES_SET_TYPE_ID = 2;
 
-    @SuppressWarnings("unchecked") @Override
-    public void serialize(RowResult value, JsonGenerator gen, SerializerProvider serializers)
-            throws IOException, JsonProcessingException {
+    private static final RowResultSerializer instance = new RowResultSerializer();
+
+    private RowResultSerializer() {
+        // singleton
+    }
+
+    public static RowResultSerializer instance() {
+        return instance;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public void serialize(RowResult value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
         if (!value.getColumns().entrySet().isEmpty()) {
             Object firstObject = ((Entry) value.getColumns().entrySet().iterator().next()).getValue();
             if (firstObject instanceof Value) {
-                serializeWithValue(value, gen, serializers);
+                serializeWithValue(value, gen);
                 return;
             } else if (firstObject instanceof Set<?>) {
                 Set<?> set = (Set<?>) firstObject;
                 if (!set.isEmpty()) {
                     Object firstSetObject = set.iterator().next();
                     if (firstSetObject instanceof Long) {
-                        serializeWithTimestampsSet(value, gen, serializers);
+                        serializeWithTimestampsSet(value, gen);
                         return;
                     } else if (firstSetObject instanceof Value) {
-                        serializeWithValuesSet(value, gen, serializers);
+                        serializeWithValuesSet(value, gen);
                         return;
                     }
                 }
@@ -62,10 +70,10 @@ public void serialize(RowResult value, JsonGenerator gen, SerializerProvider ser
             throw new UnsupportedOperationException("Invalid RowResult type!");
         }
         // Does not matter since no templated objects are in there.
-        serializeWithValue(value, gen, serializers);
+        serializeWithValue(value, gen);
     }
 
-    private void serializeWithValue(RowResult<Value> value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+    private void serializeWithValue(RowResult<Value> value, JsonGenerator gen) throws IOException {
         gen.writeStartObject();
         gen.writeNumberField("type", VALUE_TYPE_ID);
         gen.writeBinaryField("row", value.getRowName());
@@ -82,9 +90,7 @@ private void serializeWithValue(RowResult<Value> value, JsonGenerator gen, Seria
         gen.writeEndObject();
     }
 
-    private void serializeWithTimestampsSet(RowResult<Set<Long>> value,
-                                            JsonGenerator gen,
-                                            SerializerProvider serializers) throws IOException {
+    private void serializeWithTimestampsSet(RowResult<Set<Long>> value, JsonGenerator gen) throws IOException {
         gen.writeStartObject();
         gen.writeNumberField("type", TIMESTAMPS_SET_TYPE_ID);
         gen.writeBinaryField("row", value.getRowName());
@@ -105,9 +111,7 @@ private void serializeWithTimestampsSet(RowResult<Set<Long>> value,
         gen.writeEndObject();
     }
 
-    private void serializeWithValuesSet(RowResult<Set<Value>> value,
-                                        JsonGenerator gen,
-                                        SerializerProvider serializers) throws IOException {
+    private void serializeWithValuesSet(RowResult<Set<Value>> value, JsonGenerator gen) throws IOException {
         gen.writeStartObject();
         gen.writeNumberField("type", VALUES_SET_TYPE_ID);
         gen.writeBinaryField("row", value.getRowName());
@@ -130,10 +134,4 @@ private void serializeWithValuesSet(RowResult<Set<Value>> value,
         gen.writeEndArray();
         gen.writeEndObject();
     }
-
-    private static RowResultSerializer instance = new RowResultSerializer();
-    public static RowResultSerializer instance() {
-        return instance;
-    }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/SaneAsKeySerializer.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/SaneAsKeySerializer.java
index a51d80dce0e..7a649f55d4b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/SaneAsKeySerializer.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/keyvalue/remoting/serialization/SaneAsKeySerializer.java
@@ -18,7 +18,6 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializerProvider;
@@ -31,17 +30,20 @@
  *
  */
 public final class SaneAsKeySerializer extends JsonSerializer<Object> {
+    private static final SaneAsKeySerializer instance = new SaneAsKeySerializer();
 
     private final ObjectMapper mapper = new ObjectMapper();
-    private SaneAsKeySerializer() { }
-    private static final SaneAsKeySerializer instance = new SaneAsKeySerializer();
+
+    private SaneAsKeySerializer() {
+        // singleton
+    }
+
     public static SaneAsKeySerializer instance() {
         return instance;
     }
 
     @Override
-    public void serialize(Object value, JsonGenerator gen, SerializerProvider serializers)
-            throws IOException, JsonProcessingException {
+    public void serialize(Object value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
         gen.writeFieldName(mapper.writeValueAsString(value));
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java
index 6282ac73d19..aad1ae29b1a 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbConfig.java
@@ -22,12 +22,10 @@
 @JsonTypeName(InMemoryAtlasDbConfig.TYPE)
 @AutoService(KeyValueServiceConfig.class)
 public final class InMemoryAtlasDbConfig implements KeyValueServiceConfig {
-
     public static final String TYPE = "memory";
 
     @Override
-    public final String type() {
+    public String type() {
         return TYPE;
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java
index eb572e28405..066acd02cc6 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/memory/InMemoryAtlasDbFactory.java
@@ -16,15 +16,16 @@
 package com.palantir.atlasdb.memory;
 
 import com.google.auto.service.AutoService;
+import com.google.common.base.Optional;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.cleaner.Cleaner;
 import com.palantir.atlasdb.cleaner.CleanupFollower;
 import com.palantir.atlasdb.cleaner.DefaultCleanerBuilder;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.TableMappingService;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
-import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.NamespaceMappingKeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.StaticTableMappingService;
@@ -68,7 +69,9 @@ public String getType() {
     }
 
     @Override
-    public InMemoryKeyValueService createRawKeyValueService(KeyValueServiceConfig config) {
+    public InMemoryKeyValueService createRawKeyValueService(
+            KeyValueServiceConfig config,
+            Optional<LeaderConfig> leaderConfig) {
         AtlasDbVersion.ensureVersionReported();
         return new InMemoryKeyValueService(false);
     }
@@ -81,12 +84,12 @@ public TimestampService createTimestampService(KeyValueService rawKvs) {
 
     public static SerializableTransactionManager createInMemoryTransactionManager(AtlasSchema schema) {
         AtlasDbVersion.ensureVersionReported();
-        return createInMemoryTransactionManagerInternal(schema.getLatestSchema(), schema.getNamespace());
+        return createInMemoryTransactionManagerInternal(schema.getLatestSchema());
     }
 
-    private static SerializableTransactionManager createInMemoryTransactionManagerInternal(Schema schema, Namespace namespace) {
+    private static SerializableTransactionManager createInMemoryTransactionManagerInternal(Schema schema) {
         TimestampService ts = new InMemoryTimestampService();
-        KeyValueService keyValueService = createTableMappingKv(ts);
+        KeyValueService keyValueService = createTableMappingKv();
 
         Schemas.createTablesAndIndexes(schema, keyValueService);
         TransactionTables.createTables(keyValueService);
@@ -105,7 +108,13 @@ public boolean isStandaloneServer() {
         SweepStrategyManager sweepStrategyManager = SweepStrategyManagers.createDefault(keyValueService);
 
         CleanupFollower follower = CleanupFollower.create(schema);
-        Cleaner cleaner = new DefaultCleanerBuilder(keyValueService, lock, ts, client, ImmutableList.of(follower), transactionService).buildCleaner();
+        Cleaner cleaner = new DefaultCleanerBuilder(
+                keyValueService,
+                lock,
+                ts,
+                client,
+                ImmutableList.of(follower),
+                transactionService).buildCleaner();
         SerializableTransactionManager ret = new SerializableTransactionManager(
                 keyValueService,
                 ts,
@@ -120,7 +129,7 @@ public boolean isStandaloneServer() {
         return ret;
     }
 
-    private static KeyValueService createTableMappingKv(final TimestampService ts) {
+    private static KeyValueService createTableMappingKv() {
         KeyValueService kv = new InMemoryKeyValueService(false);
         TableMappingService mapper = getMapper(kv);
         return NamespaceMappingKeyValueService.create(TableRemappingKeyValueService.create(kv, mapper));
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java
index 4491bdba37f..6588b84dcca 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrator.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.schema;
 
 
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -101,8 +100,8 @@ private void processMessage(String string, KvsMigrationMessageLevel level) {
         KeyValueServiceMigrators.processMessage(messageProcessor, string, level);
     }
 
-    private void processMessage(String string, Throwable t, KvsMigrationMessageLevel level) {
-        KeyValueServiceMigrators.processMessage(messageProcessor, string, t, level);
+    private void processMessage(String string, Throwable ex, KvsMigrationMessageLevel level) {
+        KeyValueServiceMigrators.processMessage(messageProcessor, string, ex, level);
     }
 
     /**
@@ -141,7 +140,7 @@ private Set<TableReference> getCreatableTableNames(KeyValueService kvs) {
          * KVS, even if they don't get populated. That's why this method is subtly different from
          * getMigratableTableNames().
          */
-        HashSet<TableReference> tableNames = Sets.newHashSet(kvs.getAllTableNames());
+        Set<TableReference> tableNames = Sets.newHashSet(kvs.getAllTableNames());
         tableNames.removeAll(AtlasDbConstants.ATOMIC_TABLES);
         tableNames.removeAll(unmigratableTables);
         return tableNames;
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrators.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrators.java
index b0f21f56829..99492b4db1f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrators.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceMigrators.java
@@ -18,7 +18,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.HashSet;
 import java.util.Set;
 
 import com.google.common.collect.Sets;
@@ -28,11 +27,17 @@
 import com.palantir.atlasdb.schema.KeyValueServiceMigrator.KvsMigrationMessageLevel;
 import com.palantir.atlasdb.schema.KeyValueServiceMigrator.KvsMigrationMessageProcessor;
 
-public class KeyValueServiceMigrators {
+public final class KeyValueServiceMigrators {
+    private KeyValueServiceMigrators() {
+        // Utility class
+    }
+
     /**
      * Tables that are eligible for migration.
      */
-    public static Set<TableReference> getMigratableTableNames(KeyValueService kvs, Set<TableReference> unmigratableTables) {
+    public static Set<TableReference> getMigratableTableNames(
+            KeyValueService kvs,
+            Set<TableReference> unmigratableTables) {
         /*
          * Not all tables can be migrated. We run by default with a table-splitting KVS that pins
          * certain tables to always be in the legacy DB KVS (because that one supports
@@ -40,25 +45,32 @@ public static Set<TableReference> getMigratableTableNames(KeyValueService kvs, S
          * tables that are not controlled by the transaction table should not be
          * migrated.
          */
-        HashSet<TableReference> tableNames = Sets.newHashSet(kvs.getAllTableNames());
+        Set<TableReference> tableNames = Sets.newHashSet(kvs.getAllTableNames());
         tableNames.removeAll(AtlasDbConstants.hiddenTables);
         tableNames.removeAll(unmigratableTables);
         return tableNames;
     }
 
-    public static void processMessage(KvsMigrationMessageProcessor messageProcessor, String string, KvsMigrationMessageLevel level) {
+    public static void processMessage(
+            KvsMigrationMessageProcessor messageProcessor,
+            String string,
+            KvsMigrationMessageLevel level) {
         messageProcessor.processMessage(string, level);
     }
 
-    public static void processMessage(KvsMigrationMessageProcessor messageProcessor, String string, Throwable t, KvsMigrationMessageLevel level) {
-        String outputString = getThrowableMessage(string, t);
+    public static void processMessage(
+            KvsMigrationMessageProcessor messageProcessor,
+            String string,
+            Throwable ex,
+            KvsMigrationMessageLevel level) {
+        String outputString = getThrowableMessage(string, ex);
         processMessage(messageProcessor, outputString, level);
     }
 
-    private static String getThrowableMessage(String string, Throwable t) {
+    private static String getThrowableMessage(String string, Throwable ex) {
         Writer result = new StringWriter();
         PrintWriter writer = new PrintWriter(result);
-        t.printStackTrace(writer); // (authorized)
+        ex.printStackTrace(writer); // (authorized)
         return string + "\n" + result.toString();
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java
index bc7566fd2d0..b40e45d7379 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/schema/KeyValueServiceValidator.java
@@ -83,11 +83,13 @@ private int getBatchSize(TableReference table) {
     }
 
     public void validate(boolean logOnly) {
-        Set<TableReference> tables = KeyValueServiceMigrators.getMigratableTableNames(validationFromKvs, unmigratableTables);
+        Set<TableReference> tables = KeyValueServiceMigrators
+                .getMigratableTableNames(validationFromKvs, unmigratableTables);
         try {
             validateTables(tables);
         } catch (Throwable t) {
-            KeyValueServiceMigrators.processMessage(messageProcessor, "Validation failed.", t, KvsMigrationMessageLevel.ERROR);
+            KeyValueServiceMigrators.processMessage(messageProcessor,
+                    "Validation failed.", t, KvsMigrationMessageLevel.ERROR);
             if (!logOnly) {
                 Throwables.throwUncheckedException(t);
             }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeper.java
index f2fc58f1edf..8af2b2cc576 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeper.java
@@ -16,6 +16,6 @@
 package com.palantir.atlasdb.sweep;
 
 public interface BackgroundSweeper extends Runnable {
-    public void runInBackground();
-    public void shutdown();
+    void runInBackground();
+    void shutdown();
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java
index a7c48826d9c..d4d51206a58 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/BackgroundSweeperImpl.java
@@ -57,7 +57,6 @@
 import com.palantir.atlasdb.schema.generated.SweepProgressTable.SweepProgressRowResult;
 import com.palantir.atlasdb.schema.generated.SweepTableFactory;
 import com.palantir.atlasdb.transaction.api.LockAwareTransactionManager;
-import com.palantir.atlasdb.transaction.api.RuntimeTransactionTask;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionReadSentinelBehavior;
 import com.palantir.atlasdb.transaction.impl.TxTask;
@@ -83,7 +82,8 @@ public class BackgroundSweeperImpl implements BackgroundSweeper {
     private Thread daemon;
 
     // weights one month of no sweeping with the same priority as about 100000 expected cells to sweep.
-    private static final double MILLIS_SINCE_SWEEP_PRIORITY_WEIGHT = 100000.0 / TimeUnit.MILLISECONDS.convert(30, TimeUnit.DAYS);
+    private static final double MILLIS_SINCE_SWEEP_PRIORITY_WEIGHT =
+            100_000.0 / TimeUnit.MILLISECONDS.convert(30, TimeUnit.DAYS);
 
 
     public BackgroundSweeperImpl(LockAwareTransactionManager txManager,
@@ -137,9 +137,9 @@ public void run() {
                     if (checkAndRepairTableDrop()) {
                         log.error("The table being swept by the background sweeper was dropped, moving on...");
                     } else {
-                        log.error("The background sweep job failed unexpectedly with a batch size of " +
-                                ((int) (batchSizeMultiplier * sweepBatchSize.get())) +
-                                ". Attempting to continue with a lower batch size...", e);
+                        log.error("The background sweep job failed unexpectedly with a batch size of "
+                                + ((int) (batchSizeMultiplier * sweepBatchSize.get()))
+                                + ". Attempting to continue with a lower batch size...", e);
                         batchSizeMultiplier = Math.min(batchSizeMultiplier / 2, 1.0f / sweepBatchSize.get());
                     }
                 }
@@ -160,18 +160,16 @@ public void run() {
     }
 
     @VisibleForTesting
-    public boolean runOnce() {
-        SweepProgressRowResult progress = txManager.runTaskWithRetry(
-                new RuntimeTransactionTask<SweepProgressRowResult>() {
-            @Override
-            public SweepProgressRowResult execute(Transaction t) {
-                SweepProgressTable progressTable = tableFactory.getSweepProgressTable(t);
-                SweepProgressRowResult result = progressTable.getRow(SweepProgressRow.of(0)).orNull();
-                if (result == null) {
-                    result = chooseNextTableToSweep(new SweepTransaction(t, sweepRunner.getSweepTimestamp(SweepStrategy.CONSERVATIVE)));
-                }
-                return result;
+    boolean runOnce() {
+        SweepProgressRowResult progress = txManager.runTaskWithRetry(tx -> {
+            SweepProgressTable progressTable = tableFactory.getSweepProgressTable(tx);
+            SweepProgressRowResult result = progressTable.getRow(SweepProgressRow.of(0)).orNull();
+            if (result == null) {
+                result = chooseNextTableToSweep(new SweepTransaction(
+                        tx,
+                        sweepRunner.getSweepTimestamp(SweepStrategy.CONSERVATIVE)));
             }
+            return result;
         });
         if (progress == null) {
             // Don't change this log statement. It's parsed by test automation code.
@@ -181,8 +179,13 @@ public SweepProgressRowResult execute(Transaction t) {
         int batchSize = Math.max(1, (int) (sweepBatchSize.get() * batchSizeMultiplier));
         Stopwatch watch = Stopwatch.createStarted();
         try {
-            SweepResults results = sweepRunner.run(TableReference.createUnsafe(progress.getFullTableName()), batchSize, progress.getStartRow());
-            log.debug("Swept {} unique cells from {} starting at {} and performed {} deletions in {} ms up to timestamp {}.",
+            SweepResults results = sweepRunner.run(TableReference.createUnsafe(
+                    progress.getFullTableName()),
+                    batchSize,
+                    progress.getStartRow());
+            log.debug("Swept {} unique cells from {} starting at {}"
+                    + " and performed {} deletions in {} ms"
+                    + " up to timestamp {}.",
                     results.getCellsExamined(), progress.getFullTableName(),
                     progress.getStartRow() == null ? "0" : PtBytes.encodeHexString(progress.getStartRow()),
                     results.getCellsDeleted(), watch.elapsed(TimeUnit.MILLISECONDS), results.getSweptTimestamp());
@@ -190,17 +193,19 @@ public SweepProgressRowResult execute(Transaction t) {
             return true;
         } catch (RuntimeException e) {
             // Error logged at a higher log level above.
-            log.debug("Failed to sweep {} with batch size {} starting from row {}", progress.getFullTableName(), batchSize,
+            log.debug("Failed to sweep {} with batch size {} starting from row {}",
+                    progress.getFullTableName(),
+                    batchSize,
                     progress.getStartRow() == null ? "0" : PtBytes.encodeHexString(progress.getStartRow()));
             throw e;
         }
     }
 
     @Nullable
-    private SweepProgressRowResult chooseNextTableToSweep(SweepTransaction t) {
+    private SweepProgressRowResult chooseNextTableToSweep(SweepTransaction tx) {
         Set<TableReference> allTables = Sets.difference(kvs.getAllTableNames(), AtlasDbConstants.hiddenTables);
-        SweepPriorityTable oldPriorityTable = tableFactory.getSweepPriorityTable(t);
-        SweepPriorityTable newPriorityTable = tableFactory.getSweepPriorityTable(t.delegate());
+        SweepPriorityTable oldPriorityTable = tableFactory.getSweepPriorityTable(tx);
+        SweepPriorityTable newPriorityTable = tableFactory.getSweepPriorityTable(tx.delegate());
 
         // We read priorities from the past because we should prioritize based on what the sweeper will
         // actually be able to sweep. We read priorities from the present to make sure we don't repeatedly
@@ -214,11 +219,11 @@ private SweepProgressRowResult chooseNextTableToSweep(SweepTransaction t) {
                                 Function.identity()
                         )
                 );
-        TableReference tableRef = getTableToSweep(t, allTables, oldPriorities, newPrioritiesByTableName);
+        TableReference tableRef = getTableToSweep(tx, allTables, oldPriorities, newPrioritiesByTableName);
         if (tableRef == null) {
             return null;
         }
-        RowResult<byte[]> rawResult = RowResult.<byte[]>create(SweepProgressRow.of(0).persistToBytes(),
+        RowResult<byte[]> rawResult = RowResult.create(SweepProgressRow.of(0).persistToBytes(),
                 ImmutableSortedMap.<byte[], byte[]>orderedBy(UnsignedBytes.lexicographicalComparator())
                     .put(SweepProgressTable.SweepProgressNamedColumn.FULL_TABLE_NAME.getShortName(),
                          SweepProgressTable.FullTableName.of(tableRef.getQualifiedName()).persistValue())
@@ -229,7 +234,7 @@ private SweepProgressRowResult chooseNextTableToSweep(SweepTransaction t) {
     }
 
     @Nullable
-    private TableReference getTableToSweep(SweepTransaction t,
+    private TableReference getTableToSweep(SweepTransaction tx,
                                    Set<TableReference> allTables,
                                    List<SweepPriorityRowResult> oldPriorities,
                                    Map<TableReference, SweepPriorityRowResult> newPrioritiesByTableName) {
@@ -255,13 +260,14 @@ private TableReference getTableToSweep(SweepTransaction t,
         }
 
         // Clean up rows for tables that no longer exist.
-        tableFactory.getSweepPriorityTable(t.delegate()).delete(toDelete);
+        tableFactory.getSweepPriorityTable(tx.delegate()).delete(toDelete);
 
         return toSweep;
     }
 
     private double getSweepPriority(SweepPriorityRowResult oldPriority, SweepPriorityRowResult newPriority) {
-        Stream<String> hiddenTableFullNames = AtlasDbConstants.hiddenTables.stream().map(tableRef -> tableRef.getQualifiedName());
+        Stream<String> hiddenTableFullNames = AtlasDbConstants.hiddenTables.stream()
+                .map(tableRef -> tableRef.getQualifiedName());
         if (hiddenTableFullNames.anyMatch(Predicate.isEqual(newPriority.getRowName().getFullTableName()))) {
             // Never sweep hidden tables
             return 0.0;
@@ -281,8 +287,8 @@ private double getSweepPriority(SweepPriorityRowResult oldPriority, SweepPriorit
         double estimatedCellsToSweep = previousEfficacy * writeCount;
         long millisSinceSweep = System.currentTimeMillis() - oldPriority.getLastSweepTime();
 
-        if (writeCount <= 100 + cellsExamined / 100 &&
-                TimeUnit.DAYS.convert(millisSinceSweep, TimeUnit.MILLISECONDS) < 180) {
+        if (writeCount <= 100 + cellsExamined / 100
+                && TimeUnit.DAYS.convert(millisSinceSweep, TimeUnit.MILLISECONDS) < 180) {
             // Not worth the effort if fewer than 1% of cells are new and we've swept in the last 6 months.
             return 0.0;
         }
@@ -298,7 +304,12 @@ private void saveSweepResults(final SweepProgressRowResult progress,
         final long cellsExamined = fromNullable(progress.getCellsExamined()) + results.getCellsExamined();
         final long minimumSweptTimestamp = results.getSweptTimestamp();
         if (results.getNextStartRow().isPresent()) {
-            saveIntermediateSweepResults(progress, results.getNextStartRow().get(), cellsDeleted, cellsExamined, minimumSweptTimestamp);
+            saveIntermediateSweepResults(
+                    progress,
+                    results.getNextStartRow().get(),
+                    cellsDeleted,
+                    cellsExamined,
+                    minimumSweptTimestamp);
             return;
         }
 
@@ -326,8 +337,8 @@ private void saveIntermediateSweepResults(final SweepProgressRowResult progress,
                                               final long minimumSweptTimestamp) {
         txManager.runTaskWithRetry(new TxTask() {
             @Override
-            public Void execute(Transaction t) {
-                SweepProgressTable progressTable = tableFactory.getSweepProgressTable(t);
+            public Void execute(Transaction tx) {
+                SweepProgressTable progressTable = tableFactory.getSweepProgressTable(tx);
                 SweepProgressRow row = SweepProgressRow.of(0);
                 progressTable.putFullTableName(row, progress.getFullTableName());
                 progressTable.putStartRow(row, nextStartRow);
@@ -337,7 +348,7 @@ public Void execute(Transaction t) {
                     // This is the first set of results being written for this table.
                     progressTable.putMinimumSweptTimestamp(row, minimumSweptTimestamp);
 
-                    SweepPriorityTable priorityTable = tableFactory.getSweepPriorityTable(t);
+                    SweepPriorityTable priorityTable = tableFactory.getSweepPriorityTable(tx);
                     SweepPriorityRow priorityRow = SweepPriorityRow.of(progress.getFullTableName());
                     priorityTable.putWriteCount(priorityRow, 0L);
                 }
@@ -352,8 +363,8 @@ private void saveFinalSweepResults(final SweepProgressRowResult progress,
                                        final long minimumSweptTimestamp) {
         txManager.runTaskWithRetry(new TxTask() {
             @Override
-            public Void execute(Transaction t) {
-                SweepPriorityTable priorityTable = tableFactory.getSweepPriorityTable(t);
+            public Void execute(Transaction tx) {
+                SweepPriorityTable priorityTable = tableFactory.getSweepPriorityTable(tx);
                 SweepPriorityRow row = SweepPriorityRow.of(progress.getFullTableName());
                 priorityTable.putCellsDeleted(row, cellsDeleted);
                 priorityTable.putCellsExamined(row, cellsExamined);
@@ -372,25 +383,22 @@ public Void execute(Transaction t) {
 
     /**
      * Check whether the table being swept was dropped. If so, stop sweeping it and move on.
-     * @return Whether the table being swept was dropped.
+     * @return Whether the table being swept was dropped
      */
     private boolean checkAndRepairTableDrop() {
         try {
-            Set<String> tables = kvs.getAllTableNames().stream().map(tableRef -> tableRef.getQualifiedName()).collect(Collectors.toSet());
-            SweepProgressRowResult result = txManager.runTaskReadOnly(
-                    new RuntimeTransactionTask<SweepProgressRowResult>() {
-                @Override
-                public SweepProgressRowResult execute(Transaction t) {
-                    return tableFactory.getSweepProgressTable(t).getRow(SweepProgressRow.of(0L)).orNull();
-                }
-            });
+            Set<String> tables = kvs.getAllTableNames().stream()
+                    .map(tableRef -> tableRef.getQualifiedName()).collect(Collectors.toSet());
+            SweepProgressRowResult result = txManager.runTaskReadOnly(t ->
+                    tableFactory.getSweepProgressTable(t).getRow(SweepProgressRow.of(0L)).orNull());
             if (result == null || tables.contains(result.getFullTableName())) {
                 return false;
             }
             kvs.truncateTable(tableFactory.getSweepProgressTable(null).getTableRef());
             return true;
         } catch (RuntimeException e) {
-            log.error("Failed to check whether the table being swept was dropped. Continuing under the assumption that it wasn't...", e);
+            log.error("Failed to check whether the table being swept was dropped."
+                    + " Continuing under the assumption that it wasn't...", e);
             return false;
         }
     }
@@ -399,7 +407,8 @@ private long fromNullable(Long num) {
         return num == null ? 0L : num.longValue();
     }
 
-    private Optional<LockRefreshToken> lockOrRefresh(Optional<LockRefreshToken> previousLocks) throws InterruptedException {
+    private Optional<LockRefreshToken> lockOrRefresh(Optional<LockRefreshToken> previousLocks)
+            throws InterruptedException {
         if (previousLocks.isPresent()) {
             LockRefreshToken refreshToken = previousLocks.get();
             Set<LockRefreshToken> refreshedTokens = txManager.getLockService()
@@ -435,7 +444,7 @@ public synchronized void shutdown() {
     private static class SweepTransaction extends UnmodifiableTransaction {
         private final long sweepTimestamp;
 
-        public SweepTransaction(Transaction delegate, long sweepTimestamp) {
+        SweepTransaction(Transaction delegate, long sweepTimestamp) {
             super(delegate);
             this.sweepTimestamp = sweepTimestamp;
         }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsAndSentinels.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsAndSentinels.java
new file mode 100644
index 00000000000..f0240c0ef97
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/CellsAndSentinels.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ * <p>
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://opensource.org/licenses/BSD-3-Clause
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.sweep;
+
+import java.util.Set;
+
+import org.immutables.value.Value;
+
+import com.google.common.collect.Multimap;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+
+@Value.Immutable
+public abstract class CellsAndSentinels {
+    public static CellsAndSentinels of(Multimap<Cell, Long> startTimestampsToSweepPerCell, Set<Cell> sentinelsToAdd) {
+        return ImmutableCellsAndSentinels.builder()
+                .startTimestampsToSweepPerCell(startTimestampsToSweepPerCell)
+                .sentinelsToAdd(sentinelsToAdd)
+                .build();
+    }
+
+    public abstract Multimap<Cell, Long> startTimestampsToSweepPerCell();
+    public abstract Set<Cell> sentinelsToAdd();
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/NoOpSweepTaskRunner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/NoOpSweepTaskRunner.java
index 346ce6ae160..8003b5ec34f 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/NoOpSweepTaskRunner.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/NoOpSweepTaskRunner.java
@@ -20,10 +20,9 @@
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
 
 public class NoOpSweepTaskRunner implements SweepTaskRunner {
-
     @Override
     public SweepResults run(TableReference tableRef, int batchSize, byte[] startRow) {
-        return SweepResults.createEmptySweepResult(getSweepTimestamp(null));
+        return SweepResults.createEmptySweepResult(getSweepTimestamp(SweepStrategy.NOTHING));
     }
 
     @Override
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/StartTsToCommitTsCacheLoader.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/StartTsToCommitTsCacheLoader.java
new file mode 100644
index 00000000000..317dc072b1f
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/StartTsToCommitTsCacheLoader.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.sweep;
+
+import org.apache.commons.lang3.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.cache.CacheLoader;
+import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
+import com.palantir.atlasdb.transaction.api.TransactionFailedRetriableException;
+import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import com.palantir.atlasdb.transaction.service.TransactionService;
+
+public class StartTsToCommitTsCacheLoader extends CacheLoader<Long, Long> {
+    private static final Logger log = LoggerFactory.getLogger(StartTsToCommitTsCacheLoader.class);
+
+    private final TransactionService transactionService;
+
+    public StartTsToCommitTsCacheLoader(TransactionService transactionService) {
+        this.transactionService = transactionService;
+    }
+
+    @Override
+    public Long load(Long startTs) {
+        Long commitTs = transactionService.get(startTs);
+
+        if (commitTs != null) {
+            return commitTs;
+        }
+
+        // Roll back this transaction (note that rolling back arbitrary transactions
+        // can never cause correctness issues, only liveness issues)
+        try {
+            // TODO: carrino: use the batched version of putUnlessExists when it is available.
+            transactionService.putUnlessExists(startTs, TransactionConstants.FAILED_COMMIT_TS);
+        } catch (KeyAlreadyExistsException e) {
+            String msg = "Could not roll back transaction with start timestamp " + startTs + "; either"
+                    + " it was already rolled back (by a different transaction), or it committed successfully"
+                    + " before we could roll it back.";
+            log.warn("This isn't a bug but it should be very infrequent. " + msg,
+                    new TransactionFailedRetriableException(msg, e));
+        }
+
+        commitTs = transactionService.get(startTs);
+        return Validate.notNull(commitTs, "commitTs should not be null");
+    }
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java
index 4e8f856707a..2d3e17637fd 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunner.java
@@ -22,6 +22,6 @@
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
 
 public interface SweepTaskRunner {
-    public SweepResults run(TableReference tableRef, int batchSize, @Nullable byte[] startRow);
-    public long getSweepTimestamp(SweepStrategy sweepStrategy);
+    SweepResults run(TableReference tableRef, int batchSize, @Nullable byte[] startRow);
+    long getSweepTimestamp(SweepStrategy sweepStrategy);
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunnerImpl.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunnerImpl.java
index add1a0bbdb6..5fab975cafc 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunnerImpl.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/SweepTaskRunnerImpl.java
@@ -16,21 +16,26 @@
 package com.palantir.atlasdb.sweep;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.annotation.Nullable;
 
-import org.apache.commons.lang.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Supplier;
-import com.google.common.collect.HashMultimap;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
@@ -40,8 +45,8 @@
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cleaner.Follower;
+import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
-import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
@@ -50,16 +55,16 @@
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
+import com.palantir.atlasdb.sweep.sweepers.ConservativeSweeper;
+import com.palantir.atlasdb.sweep.sweepers.NothingSweeper;
+import com.palantir.atlasdb.sweep.sweepers.Sweeper;
+import com.palantir.atlasdb.sweep.sweepers.ThoroughSweeper;
 import com.palantir.atlasdb.transaction.api.Transaction.TransactionType;
-import com.palantir.atlasdb.transaction.api.TransactionFailedRetriableException;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.atlasdb.transaction.impl.SweepStrategyManager;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 import com.palantir.atlasdb.transaction.service.TransactionService;
-import com.palantir.common.annotation.Modified;
-import com.palantir.common.annotation.Output;
 import com.palantir.common.base.ClosableIterator;
-import com.palantir.common.base.ClosableIterators;
 
 /**
  * Sweeps one individual table.
@@ -68,7 +73,6 @@
  */
 public class SweepTaskRunnerImpl implements SweepTaskRunner {
     private static final Logger log = LoggerFactory.getLogger(SweepTaskRunnerImpl.class);
-    private static final Set<Long> invalidTimestamps = ImmutableSet.of(Value.INVALID_VALUE_TIMESTAMP);
 
     private final TransactionManager txManager;
     private final KeyValueService keyValueService;
@@ -95,17 +99,17 @@ public SweepTaskRunnerImpl(TransactionManager txManager,
     }
 
     @Override
-    public SweepResults run(TableReference tableRef, int batchSize, @Nullable byte[] startRow) {
-        Preconditions.checkNotNull(tableRef);
+    public SweepResults run(TableReference tableRef, int batchSize, @Nullable byte[] nullableStartRow) {
+        Preconditions.checkNotNull(tableRef, "tableRef cannot be null");
         Preconditions.checkState(!AtlasDbConstants.hiddenTables.contains(tableRef));
 
         if (tableRef.getQualifiedName().startsWith(AtlasDbConstants.NAMESPACE_PREFIX)) {
-                // this happens sometimes; I think it's because some places in the code can
-                // start this sweeper without doing the full normally ordered KVSModule startup.
-                // I did check and sweep.stats did contain the FQ table name for all of the tables,
-                // so it is at least broken in some way that still allows namespaced tables to eventually be swept.
-                log.warn("The sweeper should not be run on tables passed through namespace mapping.");
-                return SweepResults.createEmptySweepResult(0L);
+            // this happens sometimes; I think it's because some places in the code can
+            // start this sweeper without doing the full normally ordered KVSModule startup.
+            // I did check and sweep.stats did contain the FQ table name for all of the tables,
+            // so it is at least broken in some way that still allows namespaced tables to eventually be swept.
+            log.warn("The sweeper should not be run on tables passed through namespace mapping.");
+            return SweepResults.createEmptySweepResult(0L);
         }
         if (keyValueService.getMetadataForTable(tableRef).length == 0) {
             log.warn("The sweeper tried to sweep table '{}', but the table does not exist. Skipping table.", tableRef);
@@ -123,93 +127,104 @@ public SweepResults run(TableReference tableRef, int batchSize, @Nullable byte[]
         // (1) force old readers to abort (if they read a garbage collection sentinel), or
         // (2) force old writers to retry (note that we must roll back any uncommitted transactions that
         //     we encounter
-        SweepStrategy sweepStrategy = sweepStrategyManager.get().get(tableRef);
-        if (sweepStrategy == null) {
-            sweepStrategy = SweepStrategy.CONSERVATIVE;
-        } else if (sweepStrategy == SweepStrategy.NOTHING) {
-            // This sweep strategy makes transaction table truncation impossible
-            return SweepResults.createEmptySweepResult(0L);
-        }
-        if (startRow == null) {
-            startRow = new byte[0];
-        }
-        RangeRequest rangeRequest = RangeRequest.builder().startRowInclusive(startRow).batchHint(batchSize).build();
+        SweepStrategy sweepStrategy = sweepStrategyManager.get().getOrDefault(tableRef, SweepStrategy.CONSERVATIVE);
 
-        long sweepTimestamp = getSweepTimestamp(sweepStrategy);
+        byte[] startRow = MoreObjects.firstNonNull(nullableStartRow, PtBytes.EMPTY_BYTE_ARRAY);
+        RangeRequest range = RangeRequest.builder()
+                .startRowInclusive(startRow)
+                .batchHint(batchSize)
+                .build();
 
-        ClosableIterator<RowResult<Value>> valueResults;
-        if (sweepStrategy == SweepStrategy.CONSERVATIVE) {
-            valueResults = ClosableIterators.wrap(ImmutableList.<RowResult<Value>>of().iterator());
-        } else {
-            valueResults = keyValueService.getRange(tableRef, rangeRequest, sweepTimestamp);
-        }
+        Sweeper sweeper = getSweeperFor(sweepStrategy);
 
-        ClosableIterator<RowResult<Set<Long>>> rowResults =
-                keyValueService.getRangeOfTimestamps(tableRef, rangeRequest, sweepTimestamp);
+        long sweepTs = sweeper.getSweepTimestamp();
 
-        try {
-            List<RowResult<Set<Long>>> rowResultTimestamps = ImmutableList.copyOf(Iterators.limit(rowResults, batchSize));
+        try (ClosableIterator<RowResult<Value>> valueResults = sweeper.getValues(tableRef, range, sweepTs);
+             ClosableIterator<RowResult<Set<Long>>> rowResults = sweeper.getCellTimestamps(tableRef, range, sweepTs)) {
+            List<RowResult<Set<Long>>> rowResultTimestamps =
+                    ImmutableList.copyOf(Iterators.limit(rowResults, batchSize));
             PeekingIterator<RowResult<Value>> peekingValues = Iterators.peekingIterator(valueResults);
-            Set<Cell> sentinelsToAdd = Sets.newHashSet();
-            Multimap<Cell, Long> rowTimestamps = getTimestampsFromRowResults(rowResultTimestamps, sweepStrategy);
-            Multimap<Cell, Long> cellTsPairsToSweep = getCellTsPairsToSweep(rowTimestamps, peekingValues, sweepTimestamp, sweepStrategy, sentinelsToAdd);
-            sweepCells(tableRef, cellTsPairsToSweep, sentinelsToAdd);
+
+            Multimap<Cell, Long> rowTimestamps = getTimestampsFromRowResults(rowResultTimestamps, sweeper);
+            CellsAndSentinels cellsAndSentinels = getStartTimestampsPerRowToSweep(
+                    rowTimestamps, peekingValues, sweepTs, sweeper);
+
+            Multimap<Cell, Long> startTimestampsToSweepPerCell = cellsAndSentinels.startTimestampsToSweepPerCell();
+            sweepCells(tableRef, startTimestampsToSweepPerCell, cellsAndSentinels.sentinelsToAdd());
+
             byte[] nextRow = rowResultTimestamps.size() < batchSize ? null :
                 RangeRequests.getNextStartRow(false, Iterables.getLast(rowResultTimestamps).getRowName());
-            return new SweepResults(nextRow, rowResultTimestamps.size(), cellTsPairsToSweep.size(), sweepTimestamp);
-        } finally {
-            rowResults.close();
-            valueResults.close();
+            return new SweepResults(nextRow, rowResultTimestamps.size(), startTimestampsToSweepPerCell.size(), sweepTs);
+        }
+    }
+
+    private Sweeper getSweeperFor(SweepStrategy sweepStrategy) {
+        switch (sweepStrategy) {
+            case NOTHING:
+                return new NothingSweeper();
+            case CONSERVATIVE:
+                return new ConservativeSweeper(
+                        keyValueService,
+                        immutableTimestampSupplier,
+                        unreadableTimestampSupplier);
+            case THOROUGH:
+                return new ThoroughSweeper(
+                        keyValueService,
+                        immutableTimestampSupplier);
+            default:
+                throw new IllegalArgumentException("Unknown sweep strategy: " + sweepStrategy);
         }
     }
 
     @Override
     public long getSweepTimestamp(SweepStrategy sweepStrategy) {
-        if (sweepStrategy == SweepStrategy.CONSERVATIVE) {
-            return Math.min(unreadableTimestampSupplier.get(), immutableTimestampSupplier.get());
-        } else {
-            return immutableTimestampSupplier.get();
-        }
+        return getSweeperFor(sweepStrategy).getSweepTimestamp();
     }
 
-    private Multimap<Cell, Long> getTimestampsFromRowResults(List<RowResult<Set<Long>>> cellsToSweep,
-                                                             SweepStrategy sweepStrategy) {
-        Multimap<Cell, Long> cellTsMappings = HashMultimap.create();
+    @VisibleForTesting
+    static Multimap<Cell, Long> getTimestampsFromRowResults(List<RowResult<Set<Long>>> cellsToSweep, Sweeper sweeper) {
+        Set<Long> timestampsToIgnore = sweeper.getTimestampsToIgnore();
+        ImmutableMultimap.Builder<Cell, Long> cellTsMappings = ImmutableMultimap.builder();
         for (RowResult<Set<Long>> rowResult : cellsToSweep) {
             for (Map.Entry<Cell, Set<Long>> entry : rowResult.getCells()) {
-                if (sweepStrategy == SweepStrategy.CONSERVATIVE) {
-                    cellTsMappings.putAll(entry.getKey(), Sets.difference(entry.getValue(), invalidTimestamps));
-                } else {
-                    cellTsMappings.putAll(entry.getKey(), entry.getValue());
-                }
+                cellTsMappings.putAll(entry.getKey(), Sets.difference(entry.getValue(), timestampsToIgnore));
             }
         }
-        return cellTsMappings;
+        return cellTsMappings.build();
     }
 
-    private Multimap<Cell, Long> getCellTsPairsToSweep(Multimap<Cell, Long> cellTsMappings,
-                                                       PeekingIterator<RowResult<Value>> values,
-                                                       long sweepTimestamp,
-                                                       SweepStrategy sweepStrategy,
-                                                       @Output Set<Cell> sentinelsToAdd) {
-        Multimap<Cell, Long> cellTsMappingsToSweep = HashMultimap.create();
+    @VisibleForTesting
+    CellsAndSentinels getStartTimestampsPerRowToSweep(
+            Multimap<Cell, Long> startTimestampsPerCell,
+            PeekingIterator<RowResult<Value>> values,
+            long sweepTimestamp,
+            Sweeper sweeper) {
+        ImmutableMultimap.Builder<Cell, Long> startTimestampsToSweepPerCell = ImmutableMultimap.builder();
+        ImmutableSet.Builder<Cell> sentinelsToAdd = ImmutableSet.builder();
+
+        LoadingCache<Long, Long> startTsToCommitTs = CacheBuilder.newBuilder()
+                .build(new StartTsToCommitTsCacheLoader(transactionService));
+
+        // Needed because calling transactionService.get(<EMPTY>) is weird (it logs that it is empty too).
+        if (!startTimestampsPerCell.isEmpty()) {
+            startTsToCommitTs.putAll(transactionService.get(startTimestampsPerCell.values()));
+        }
 
-        Map<Long, Long> startTsToCommitTs = transactionService.get(cellTsMappings.values());
-        for (Map.Entry<Cell, Collection<Long>> entry : cellTsMappings.asMap().entrySet()) {
+        for (Map.Entry<Cell, Collection<Long>> entry : startTimestampsPerCell.asMap().entrySet()) {
             Cell cell = entry.getKey();
             Collection<Long> timestamps = entry.getValue();
             boolean sweepLastCommitted = isLatestValueEmpty(cell, values);
-            Iterable<? extends Long> timestampsToSweep = getTimestampsToSweep(
+            TimestampsAndSentinels timestampsAndSentinels = getTimestampsToSweep(
                     cell,
                     timestamps,
                     startTsToCommitTs,
-                    sentinelsToAdd,
                     sweepTimestamp,
                     sweepLastCommitted,
-                    sweepStrategy);
-            cellTsMappingsToSweep.putAll(entry.getKey(), timestampsToSweep);
+                    sweeper);
+            startTimestampsToSweepPerCell.putAll(cell, timestampsAndSentinels.timestamps());
+            sentinelsToAdd.addAll(timestampsAndSentinels.sentinelsToAdd());
         }
-        return cellTsMappingsToSweep;
+        return CellsAndSentinels.of(startTimestampsToSweepPerCell.build(), sentinelsToAdd.build());
     }
 
     private boolean isLatestValueEmpty(Cell cell, PeekingIterator<RowResult<Value>> values) {
@@ -228,19 +243,19 @@ private boolean isLatestValueEmpty(Cell cell, PeekingIterator<RowResult<Value>>
         return false;
     }
 
-    private Set<Long> getTimestampsToSweep(Cell cell,
-                                           Collection<Long> timestamps /* start timestamps */,
-                                           @Modified Map<Long, Long> startTsToCommitTs,
-                                           @Output Set<Cell> sentinelsToAdd,
-                                           long sweepTimestamp,
-                                           boolean sweepLastCommitted,
-                                           SweepStrategy sweepStrategy) {
-        Set<Long> uncommittedTimestamps = Sets.newHashSet();
-        SortedSet<Long> committedTimestampsToSweep = Sets.newTreeSet();
+    private TimestampsAndSentinels getTimestampsToSweep(
+            Cell cell,
+            Collection<Long> startTimestamps,
+            LoadingCache<Long, Long> startTsToCommitTs,
+            long sweepTimestamp,
+            boolean sweepLastCommitted,
+            Sweeper sweeper) {
+        Set<Long> uncommittedTimestamps = new HashSet<>();
+        SortedSet<Long> commitedTssToSweep = new TreeSet<>();
         long maxStartTs = TransactionConstants.FAILED_COMMIT_TS;
         boolean maxStartTsIsCommitted = false;
-        for (long startTs : timestamps) {
-            long commitTs = ensureCommitTimestampExists(startTs, startTsToCommitTs);
+        for (long startTs : startTimestamps) {
+            long commitTs = startTsToCommitTs.getUnchecked(startTs);
 
             if (startTs > maxStartTs && commitTs < sweepTimestamp) {
                 maxStartTs = startTs;
@@ -252,54 +267,28 @@ private Set<Long> getTimestampsToSweep(Cell cell,
             // (2) their start timestamp is NOT the greatest possible start timestamp
             //     passing condition (1)
             if (commitTs > 0 && commitTs < sweepTimestamp) {
-                committedTimestampsToSweep.add(startTs);
+                commitedTssToSweep.add(startTs);
             } else if (commitTs == TransactionConstants.FAILED_COMMIT_TS) {
                 uncommittedTimestamps.add(startTs);
             }
         }
 
-        if (committedTimestampsToSweep.isEmpty()) {
-            return uncommittedTimestamps;
-        }
+        Set<Long> sweepTimestamps = commitedTssToSweep.isEmpty() || (sweepLastCommitted && maxStartTsIsCommitted)
+                ? Sets.union(uncommittedTimestamps, commitedTssToSweep)
+                : Sets.union(uncommittedTimestamps, commitedTssToSweep.subSet(0L, commitedTssToSweep.last()));
 
-        if (sweepStrategy == SweepStrategy.CONSERVATIVE && committedTimestampsToSweep.size() > 1) {
-            // We need to add a sentinel if we are removing a committed value
-            sentinelsToAdd.add(cell);
-        }
+        Set<Cell> sentinelsToAdd = (sweeper.shouldAddSentinels() && commitedTssToSweep.size() > 1)
+                ? ImmutableSet.of(cell) // We need to add a sentinel if we are removing a committed value
+                : ImmutableSet.of();
 
-        if (sweepLastCommitted && maxStartTsIsCommitted) {
-            return Sets.union(uncommittedTimestamps, committedTimestampsToSweep);
-        }
-        return Sets.union(
-                uncommittedTimestamps,
-                committedTimestampsToSweep.subSet(0L, committedTimestampsToSweep.last()));
-    }
-
-    private long ensureCommitTimestampExists(Long startTs, @Modified Map<Long, Long> startTsToCommitTs) {
-        Long commitTs = startTsToCommitTs.get(startTs);
-        if (commitTs == null) {
-            // Roll back this transaction (note that rolling back arbitrary transactions
-            // can never cause correctness issues, only liveness issues)
-            try {
-                // TODO: carrino: use the batched version of putUnlessExists when it is available.
-                transactionService.putUnlessExists(startTs, TransactionConstants.FAILED_COMMIT_TS);
-            } catch (KeyAlreadyExistsException e) {
-                String msg = "Could not roll back transaction with start timestamp " + startTs + "; either" +
-                        " it was already rolled back (by a different transaction), or it committed successfully" +
-                        " before we could roll it back.";
-                log.error("This isn't a bug but it should be very infrequent. " + msg,
-                        new TransactionFailedRetriableException(msg, e));
-            }
-            commitTs = transactionService.get(startTs);
-            Validate.notNull(commitTs);
-            startTsToCommitTs.put(startTs, commitTs);
-        }
-        return commitTs;
+        return TimestampsAndSentinels.of(sweepTimestamps, sentinelsToAdd);
     }
 
-    private void sweepCells(TableReference tableRef,
-                            Multimap<Cell, Long> cellTsPairsToSweep,
-                            Set<Cell> sentinelsToAdd) {
+    @VisibleForTesting
+    void sweepCells(
+            TableReference tableRef,
+            Multimap<Cell, Long> cellTsPairsToSweep,
+            Set<Cell> sentinelsToAdd) {
         if (cellTsPairsToSweep.isEmpty()) {
             return;
         }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TimestampsAndSentinels.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TimestampsAndSentinels.java
new file mode 100644
index 00000000000..b9f1fa1f001
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/TimestampsAndSentinels.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ * <p>
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://opensource.org/licenses/BSD-3-Clause
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.sweep;
+
+import java.util.Set;
+
+import org.immutables.value.Value;
+
+import com.palantir.atlasdb.keyvalue.api.Cell;
+
+@Value.Immutable
+public abstract class TimestampsAndSentinels {
+    public static TimestampsAndSentinels of(Set<Long> timestamps, Set<Cell> sentinelsToAdd) {
+        return ImmutableTimestampsAndSentinels.builder()
+                .timestamps(timestamps)
+                .sentinelsToAdd(sentinelsToAdd)
+                .build();
+    }
+
+    public abstract Set<Long> timestamps();
+    public abstract Set<Cell> sentinelsToAdd();
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/ConservativeSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/ConservativeSweeper.java
new file mode 100644
index 00000000000..46087069ab4
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/ConservativeSweeper.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ * <p>
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://opensource.org/licenses/BSD-3-Clause
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.sweep.sweepers;
+
+import java.util.Set;
+
+import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.common.base.ClosableIterator;
+import com.palantir.common.base.ClosableIterators;
+
+public class ConservativeSweeper implements Sweeper {
+    private final KeyValueService keyValueService;
+    private final Supplier<Long> immutableTimestampSupplier;
+    private final Supplier<Long> unreadableTimestampSupplier;
+
+    public ConservativeSweeper(
+            KeyValueService keyValueService,
+            Supplier<Long> immutableTimestampSupplier,
+            Supplier<Long> unreadableTimestampSupplier) {
+        this.keyValueService = keyValueService;
+        this.immutableTimestampSupplier = immutableTimestampSupplier;
+        this.unreadableTimestampSupplier = unreadableTimestampSupplier;
+    }
+
+    @Override
+    public long getSweepTimestamp() {
+        return Math.min(unreadableTimestampSupplier.get(), immutableTimestampSupplier.get());
+    }
+
+    @Override
+    public ClosableIterator<RowResult<Value>> getValues(TableReference table, RangeRequest range, long maxTimestamp) {
+        return ClosableIterators.emptyImmutableClosableIterator();
+    }
+
+    @Override
+    public ClosableIterator<RowResult<Set<Long>>> getCellTimestamps(
+            TableReference table,
+            RangeRequest range,
+            long maxTimestamp) {
+        return keyValueService.getRangeOfTimestamps(table, range, maxTimestamp);
+    }
+
+    @Override
+    public Set<Long> getTimestampsToIgnore() {
+        return ImmutableSet.of(Value.INVALID_VALUE_TIMESTAMP);
+    }
+
+    @Override
+    public boolean shouldAddSentinels() {
+        return true;
+    }
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/NothingSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/NothingSweeper.java
new file mode 100644
index 00000000000..358d9fceeb4
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/NothingSweeper.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ * <p>
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://opensource.org/licenses/BSD-3-Clause
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.sweep.sweepers;
+
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.common.base.ClosableIterator;
+import com.palantir.common.base.ClosableIterators;
+
+public class NothingSweeper implements Sweeper {
+    @Override
+    public long getSweepTimestamp() {
+        return 0;
+    }
+
+    @Override
+    public ClosableIterator<RowResult<Value>> getValues(TableReference table, RangeRequest range, long maxTimestamp) {
+        return ClosableIterators.emptyImmutableClosableIterator();
+    }
+
+    @Override
+    public ClosableIterator<RowResult<Set<Long>>> getCellTimestamps(
+            TableReference table,
+            RangeRequest range,
+            long maxTimestamp) {
+        return ClosableIterators.emptyImmutableClosableIterator();
+    }
+
+    @Override
+    public Set<Long> getTimestampsToIgnore() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public boolean shouldAddSentinels() {
+        return false;
+    }
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/Sweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/Sweeper.java
new file mode 100644
index 00000000000..c09bd664518
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/Sweeper.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ * <p>
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://opensource.org/licenses/BSD-3-Clause
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.sweep.sweepers;
+
+import java.util.Set;
+
+import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.common.base.ClosableIterator;
+
+public interface Sweeper {
+    long getSweepTimestamp();
+
+    ClosableIterator<RowResult<Value>> getValues(TableReference table, RangeRequest range, long maxTimestamp);
+
+    ClosableIterator<RowResult<Set<Long>>> getCellTimestamps(
+            TableReference table,
+            RangeRequest range,
+            long maxTimestamp);
+
+    Set<Long> getTimestampsToIgnore();
+
+    boolean shouldAddSentinels();
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/ThoroughSweeper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/ThoroughSweeper.java
new file mode 100644
index 00000000000..20a0bf6c674
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/sweep/sweepers/ThoroughSweeper.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ * <p>
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://opensource.org/licenses/BSD-3-Clause
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.sweep.sweepers;
+
+import java.util.Set;
+
+import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableSet;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.common.base.ClosableIterator;
+
+public class ThoroughSweeper implements Sweeper {
+    private final KeyValueService keyValueService;
+    private final Supplier<Long> immutableTimestampSupplier;
+
+    public ThoroughSweeper(KeyValueService keyValueService, Supplier<Long> immutableTimestampSupplier) {
+        this.keyValueService = keyValueService;
+        this.immutableTimestampSupplier = immutableTimestampSupplier;
+    }
+
+    @Override
+    public long getSweepTimestamp() {
+        return immutableTimestampSupplier.get();
+    }
+
+    @Override
+    public ClosableIterator<RowResult<Value>> getValues(TableReference table, RangeRequest range, long maxTimestamp) {
+        return keyValueService.getRange(table, range, maxTimestamp);
+    }
+
+    @Override
+    public ClosableIterator<RowResult<Set<Long>>> getCellTimestamps(
+            TableReference table,
+            RangeRequest range,
+            long maxTimestamp) {
+        return keyValueService.getRangeOfTimestamps(table, range, maxTimestamp);
+    }
+
+    @Override
+    public Set<Long> getTimestampsToIgnore() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public boolean shouldAddSentinels() {
+        return false;
+    }
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java
index 866c9756133..b074584438e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/MutableRange.java
@@ -20,14 +20,14 @@
 import com.google.common.base.Preconditions;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 
-class MutableRange {
+public class MutableRange {
     private byte[] startRow;
     private final byte[] endRow;
     private final int batchSize;
 
     public MutableRange(byte[] startRow, byte[] endRow, int batchSize) {
-        this.startRow = Preconditions.checkNotNull(startRow);
-        this.endRow = Preconditions.checkNotNull(endRow);
+        this.startRow = Preconditions.checkNotNull(startRow, "startRow cannot be null");
+        this.endRow = Preconditions.checkNotNull(endRow, "endRow cannot be null");
         this.batchSize = batchSize;
     }
 
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java
index b8b6d8f7a6a..7a347ba78bc 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/RangeVisitor.java
@@ -40,7 +40,6 @@
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.BlockingWorkerPool;
 import com.palantir.lock.HeldLocksToken;
-import com.palantir.lock.LockRequest;
 
 public class RangeVisitor {
     private static final Logger log = LoggerFactory.getLogger(RangeVisitor.class);
@@ -60,13 +59,13 @@ public RangeVisitor(LockAwareTransactionManager txManager,
         this.tableRef = tableRef;
     }
 
-    public RangeVisitor setStartRowInclusive(byte[] startRow) {
-        this.startRow = startRow;
+    public RangeVisitor setStartRowInclusive(byte[] newStartRow) {
+        this.startRow = newStartRow;
         return this;
     }
 
-    public RangeVisitor setEndRowExclusive(byte[] endRow) {
-        this.endRow = endRow;
+    public RangeVisitor setEndRowExclusive(byte[] newEndRow) {
+        this.endRow = newEndRow;
         return this;
     }
 
@@ -76,58 +75,51 @@ public RangeVisitor setRangePrefix(byte[] prefix) {
         return this;
     }
 
-    public RangeVisitor setBatchSize(int batchSize) {
-        this.batchSize = batchSize;
+    public RangeVisitor setBatchSize(int newBatchSize) {
+        this.batchSize = newBatchSize;
         return this;
     }
 
-    public RangeVisitor setExecutor(ExecutorService exec) {
-        this.exec = exec;
+    public RangeVisitor setExecutor(ExecutorService newExec) {
+        this.exec = newExec;
         return this;
     }
 
-    public RangeVisitor setThreadCount(int threadCount) {
-        this.threadCount = threadCount;
+    public RangeVisitor setThreadCount(int newThreadCount) {
+        this.threadCount = newThreadCount;
         return this;
     }
 
-    public RangeVisitor setLockTokens(Iterable<HeldLocksToken> lockTokens) {
-        this.lockTokens = lockTokens;
+    public RangeVisitor setLockTokens(Iterable<HeldLocksToken> newLockTokens) {
+        this.lockTokens = newLockTokens;
         return this;
     }
 
-    public RangeVisitor setProgressCounter(AtomicLong counter) {
-        this.counter = counter;
+    public RangeVisitor setProgressCounter(AtomicLong newCounter) {
+        this.counter = newCounter;
         return this;
     }
 
     public long visit(final Visitor visitor) throws InterruptedException {
         BlockingWorkerPool pool = new BlockingWorkerPool(exec, threadCount);
         for (final MutableRange range : getRanges()) {
-            pool.submitTask(new Runnable() {
-                @Override
-                public void run() {
-                    visitRange(visitor, range);
-                }
-            });
+            pool.submitTask(() -> visitRange(visitor, range));
         }
         pool.waitForSubmittedTasks();
         return counter.get();
     }
 
-    private void visitRange(final Visitor visitor,
-                            final MutableRange range) {
+    private void visitRange(Visitor visitor, MutableRange range) {
         do {
             final RangeRequest request = range.getRangeRequest();
             try {
                 long startTime = System.currentTimeMillis();
                 long numVisited = txManager.runTaskWithLocksWithRetry(lockTokens,
-                        Suppliers.<LockRequest> ofInstance(null),
+                        Suppliers.ofInstance(null),
                         new LockAwareTransactionTask<Long, RuntimeException>() {
                             @Override
-                            public Long execute(Transaction t,
-                                                Iterable<HeldLocksToken> heldLocks) {
-                                return visitInternal(t, visitor, request, range);
+                            public Long execute(Transaction tx, Iterable<HeldLocksToken> heldLocks) {
+                                return visitInternal(tx, visitor, request, range);
                             }
 
                             @Override
@@ -146,16 +138,13 @@ public String toString() {
         } while (!range.isComplete());
     }
 
-    private long visitInternal(final Transaction t,
-                               final Visitor visitor,
-                               RangeRequest request,
-                               final MutableRange range) {
+    private long visitInternal(Transaction tx, Visitor visitor, RangeRequest request, MutableRange range) {
         final AtomicLong numVisited = new AtomicLong();
-        boolean isEmpty = t.getRange(tableRef, request).batchAccept(range.getBatchSize(),
+        boolean isEmpty = tx.getRange(tableRef, request).batchAccept(range.getBatchSize(),
                 new AbortingVisitor<List<RowResult<byte[]>>, RuntimeException>() {
                     @Override
                     public boolean visit(List<RowResult<byte[]>> batch) {
-                        visitor.visit(t, batch);
+                        visitor.visit(tx, batch);
                         if (batch.size() < range.getBatchSize()) {
                             range.setStartRow(null);
                         } else {
@@ -201,11 +190,16 @@ private Iterable<MutableRange> getRanges() {
     private static byte[] toBytes(BigInteger num, int length) {
         byte[] rawBytes = num.toByteArray();
         byte[] paddedBytes = new byte[length];
-        System.arraycopy(rawBytes, Math.max(0, rawBytes.length - length), paddedBytes, Math.max(0, length - rawBytes.length), length);
+        System.arraycopy(
+                rawBytes,
+                Math.max(0, rawBytes.length - length),
+                paddedBytes,
+                Math.max(0, length - rawBytes.length),
+                length);
         return paddedBytes;
     }
 
-    public static interface Visitor {
-        void visit(Transaction t, List<RowResult<byte[]>> batch);
+    public interface Visitor {
+        void visit(Transaction tx, List<RowResult<byte[]>> batch);
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java
index c801c0bfe4e..1809eb66b80 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/table/common/TableTasks.java
@@ -18,7 +18,6 @@
 import java.math.BigInteger;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ExecutorService;
@@ -43,80 +42,45 @@
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
-import com.palantir.atlasdb.transaction.api.RuntimeTransactionTask;
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.common.annotation.Inclusive;
 import com.palantir.common.annotation.Output;
-import com.palantir.common.base.AbortingVisitor;
 import com.palantir.common.base.BatchingVisitables;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.BlockingWorkerPool;
 import com.palantir.lock.LockRefreshToken;
 
-public class TableTasks {
+public final class TableTasks {
     private static final Logger log = LoggerFactory.getLogger(TableTasks.class);
 
-    public static class CopyStats {
-        private final AtomicLong rowsCopied;
-        private final AtomicLong cellsCopied;
-
-        public CopyStats(AtomicLong rowsCopied,
-                         AtomicLong cellsCopied) {
-            this.rowsCopied = rowsCopied;
-            this.cellsCopied = cellsCopied;
-        }
+    private TableTasks() {
+        // Utility class
     }
 
-    private static class PartialCopyStats {
-        private long rowsCopied = 0;
-        private long cellsCopied = 0;
+    public static void copy(
+            TransactionManager txManager,
+            ExecutorService exec,
+            TableReference srcTable,
+            TableReference dstTable,
+            int batchSize,
+            int threadCount,
+            @Output CopyStats stats) throws InterruptedException {
+        copyExternal(exec, srcTable, dstTable, batchSize, threadCount, stats, (request, range) ->
+                txManager.runTaskWithRetry(tx -> copyInternal(tx, srcTable, dstTable, request, range)));
     }
 
-    private static interface CopyTask {
-        PartialCopyStats call(RangeRequest request, MutableRange range) throws InterruptedException;
-    }
-
-    public static void copy(final TransactionManager txManager,
-                            ExecutorService exec,
-                            final TableReference srcTable,
-                            final TableReference dstTable,
-                            int batchSize,
-                            int threadCount,
-                            @Output CopyStats stats) throws InterruptedException {
-        copyExternal(exec, srcTable, dstTable, batchSize, threadCount, stats, new CopyTask() {
-            @Override
-            public PartialCopyStats call(final RangeRequest request, final MutableRange range) {
-                return txManager.runTaskWithRetry(new RuntimeTransactionTask<PartialCopyStats>() {
-                    @Override
-                    public PartialCopyStats execute(final Transaction t) {
-                        return copyInternal(t, srcTable, dstTable, request, range);
-                    }
-                });
-            }
-        });
-    }
-
-    public static void copy(final TransactionManager txManager,
-                            ExecutorService exec,
-                            final Iterable<LockRefreshToken> lockTokens,
-                            final TableReference srcTable,
-                            final TableReference dstTable,
-                            int batchSize,
-                            int threadCount,
-                            @Output CopyStats stats) throws InterruptedException {
-        copyExternal(exec, srcTable, dstTable, batchSize, threadCount, stats, new CopyTask() {
-            @Override
-            public PartialCopyStats call(final RangeRequest request, final MutableRange range) throws InterruptedException {
-                return txManager.runTaskWithRetry(
-                        new RuntimeTransactionTask<PartialCopyStats>() {
-                            @Override
-                            public PartialCopyStats execute(Transaction t) {
-                                return copyInternal(t, srcTable, dstTable, request, range);
-                            }
-                        });
-            }
-        });
+    public static void copy(
+            TransactionManager txManager,
+            ExecutorService exec,
+            Iterable<LockRefreshToken> lockTokens,
+            final TableReference srcTable,
+            final TableReference dstTable,
+            int batchSize,
+            int threadCount,
+            @Output CopyStats stats) throws InterruptedException {
+        copyExternal(exec, srcTable, dstTable, batchSize, threadCount, stats, (request, range) ->
+                txManager.runTaskWithRetry(tx -> copyInternal(tx, srcTable, dstTable, request, range)));
     }
 
     public static void copyExternal(ExecutorService exec,
@@ -154,33 +118,29 @@ public void run() {
         pool.waitForSubmittedTasks();
     }
 
-    private static PartialCopyStats copyInternal(final Transaction t,
+    private static PartialCopyStats copyInternal(final Transaction transaction,
                                                  final TableReference srcTable,
                                                  final TableReference dstTable,
                                                  RangeRequest request,
                                                  final MutableRange range) {
         final PartialCopyStats stats = new PartialCopyStats();
-        boolean isEmpty = t.getRange(srcTable, request).batchAccept(range.getBatchSize(),
-                new AbortingVisitor<List<RowResult<byte[]>>, RuntimeException>() {
-            @Override
-            public boolean visit(List<RowResult<byte[]>> batch) {
-                Map<Cell, byte[]> entries = Maps.newHashMapWithExpectedSize(batch.size());
-                for (RowResult<byte[]> result : batch) {
-                    for (Entry<Cell, byte[]> entry : result.getCells()) {
-                        entries.put(entry.getKey(), entry.getValue());
-                    }
-                }
-                if (batch.size() < range.getBatchSize()) {
-                    range.setStartRow(null);
-                } else {
-                    byte[] lastRow = batch.get(batch.size() - 1).getRowName();
-                    range.setStartRow(RangeRequests.nextLexicographicName(lastRow));
+        boolean isEmpty = transaction.getRange(srcTable, request).batchAccept(range.getBatchSize(), batch -> {
+            Map<Cell, byte[]> entries = Maps.newHashMapWithExpectedSize(batch.size());
+            for (RowResult<byte[]> result : batch) {
+                for (Entry<Cell, byte[]> entry : result.getCells()) {
+                    entries.put(entry.getKey(), entry.getValue());
                 }
-                t.put(dstTable, entries);
-                stats.rowsCopied = batch.size();
-                stats.cellsCopied = entries.size();
-                return false;
             }
+            if (batch.size() < range.getBatchSize()) {
+                range.setStartRow(null);
+            } else {
+                byte[] lastRow = batch.get(batch.size() - 1).getRowName();
+                range.setStartRow(RangeRequests.nextLexicographicName(lastRow));
+            }
+            transaction.put(dstTable, entries);
+            stats.rowsCopied = batch.size();
+            stats.cellsCopied = entries.size();
+            return false;
         });
         if (isEmpty) {
             range.setStartRow(null);
@@ -188,71 +148,27 @@ public boolean visit(List<RowResult<byte[]>> batch) {
         return stats;
     }
 
-    public static long estimateSize(Transaction t,
+    public static long estimateSize(Transaction transaction,
                                     TableReference table,
-                                    final int batchSize,
-                                    final Function<byte[], byte[]> uniformizer) {
+                                    int batchSize,
+                                    Function<byte[], byte[]> uniformizer) {
         final AtomicLong estimate = new AtomicLong();
-        t.getRange(table, RangeRequest.all()).batchAccept(batchSize,
-                new AbortingVisitor<List<RowResult<byte[]>>, RuntimeException>() {
-            @Override
-            public boolean visit(List<RowResult<byte[]>> batch) {
-                if (batch.size() < batchSize) {
-                    estimate.set(batch.size());
-                } else {
-                    byte[] row = uniformizer.apply(batch.get(batchSize - 1).getRowName());
-                    estimate.set(BigInteger.valueOf(2)
+        transaction.getRange(table, RangeRequest.all()).batchAccept(batchSize, batch -> {
+            if (batch.size() < batchSize) {
+                estimate.set(batch.size());
+            } else {
+                byte[] row = uniformizer.apply(batch.get(batchSize - 1).getRowName());
+                estimate.set(BigInteger.valueOf(2)
                         .pow(row.length * 8)
                         .multiply(BigInteger.valueOf(batchSize))
                         .divide(new BigInteger(1, row))
                         .longValue());
-                }
-                return false;
             }
+            return false;
         });
         return estimate.get();
     }
 
-    public static class DiffStats {
-        private final AtomicLong rowsOnlyInSource;
-        private final AtomicLong rowsPartiallyInCommon;
-        private final AtomicLong rowsCompletelyInCommon;
-        private final AtomicLong rowsVisited;
-        private final AtomicLong cellsOnlyInSource;
-        private final AtomicLong cellsInCommon;
-
-        public DiffStats(AtomicLong rowsOnlyInSource,
-                         AtomicLong rowsPartiallyInCommon,
-                         AtomicLong rowsCompletelyInCommon,
-                         AtomicLong rowsVisited,
-                         AtomicLong cellsOnlyInSource,
-                         AtomicLong cellsInCommon) {
-            this.rowsOnlyInSource = rowsOnlyInSource;
-            this.rowsPartiallyInCommon = rowsPartiallyInCommon;
-            this.rowsCompletelyInCommon = rowsCompletelyInCommon;
-            this.rowsVisited = rowsVisited;
-            this.cellsOnlyInSource = cellsOnlyInSource;
-            this.cellsInCommon = cellsInCommon;
-        }
-    }
-
-    public static class PartialDiffStats {
-        private long rowsOnlyInSource;
-        private long rowsPartiallyInCommon;
-        private long rowsCompletelyInCommon;
-        private long rowsVisited;
-        private long cellsOnlyInSource;
-        private long cellsInCommon;
-    }
-
-    private static interface DiffTask {
-        PartialDiffStats call(RangeRequest request, MutableRange range, DiffStrategy strategy) throws InterruptedException;
-    }
-
-    public static interface DiffVisitor {
-        void visit(Transaction t, Iterator<Cell> partialDiff);
-    }
-
     public static void diff(final TransactionManager txManager,
                             ExecutorService exec,
                             final TableReference plusTable,
@@ -261,20 +177,17 @@ public static void diff(final TransactionManager txManager,
                             int threadCount,
                             @Output DiffStats stats,
                             final DiffVisitor visitor) throws InterruptedException {
-        diffExternal(txManager, exec, plusTable, minusTable, batchSize, threadCount, stats, new DiffTask() {
-            @Override
-            public PartialDiffStats call(final RangeRequest request, final MutableRange range, final DiffStrategy strategy)
-                    throws InterruptedException {
-                return txManager.runTaskWithRetry(new RuntimeTransactionTask<PartialDiffStats>() {
-                    @Override
-                    public PartialDiffStats execute(final Transaction t) {
-                        return diffInternal(t, plusTable, minusTable, request, range, strategy, visitor);
-                    }
-                });
-            }
-        });
+        diffExternal(txManager, exec, plusTable, minusTable, batchSize, threadCount, stats,
+                (request, range, strategy) -> txManager.runTaskWithRetry(t ->
+                                diffInternal(t, plusTable, minusTable, request, range, strategy, visitor)));
     }
 
+    /**
+     * Deprecated.
+     * @deprecated Use {@link #diff(TransactionManager, ExecutorService, TableReference, TableReference,
+     *             int, int, DiffStats, DiffVisitor)} instead
+     */
+    @Deprecated
     public static void diff(final TransactionManager txManager,
                             ExecutorService exec,
                             final Iterable<LockRefreshToken> lockTokens,
@@ -284,24 +197,7 @@ public static void diff(final TransactionManager txManager,
                             int threadCount,
                             @Output DiffStats stats,
                             final DiffVisitor visitor) throws InterruptedException {
-        diffExternal(txManager, exec, plusTable, minusTable, batchSize, threadCount, stats, new DiffTask() {
-            @Override
-            public PartialDiffStats call(final RangeRequest request, final MutableRange range, final DiffStrategy strategy)
-                    throws InterruptedException {
-                return txManager.runTaskWithRetry(
-                        new RuntimeTransactionTask<PartialDiffStats>() {
-                            @Override
-                            public PartialDiffStats execute(Transaction t) {
-                                return diffInternal(t, plusTable, minusTable, request, range, strategy, visitor);
-                            }
-
-                            @Override
-                            public String toString() {
-                                return "diff(" + request + ',' + strategy + ')';
-                            }
-                        });
-            }
-        });
+        diff(txManager, exec, plusTable, minusTable, batchSize, threadCount, stats, visitor);
     }
 
     private static void diffExternal(final TransactionManager txManager,
@@ -330,14 +226,14 @@ public void run() {
                             stats.cellsOnlyInSource.addAndGet(partialStats.cellsOnlyInSource);
                             stats.cellsInCommon.addAndGet(partialStats.cellsInCommon);
                             if (log.isInfoEnabled()) {
-                                log.info("Processed diff of " +
-                                        "{} rows " +
-                                        "{} rows only in source " +
-                                        "{} rows partially in common " +
-                                        "{} rows completely in common " +
-                                        "{} cells only in source " +
-                                        "{} cells in common " +
-                                        "between {} and {} in {} ms.",
+                                log.info("Processed diff of "
+                                        + "{} rows "
+                                        + "{} rows only in source "
+                                        + "{} rows partially in common "
+                                        + "{} rows completely in common "
+                                        + "{} cells only in source "
+                                        + "{} cells in common "
+                                        + "between {} and {} in {} ms.",
                                         partialStats.rowsVisited,
                                         partialStats.rowsOnlyInSource,
                                         partialStats.rowsPartiallyInCommon,
@@ -362,19 +258,15 @@ private static DiffStrategy getDiffStrategy(TransactionManager txManager,
                                                 final TableReference plusTable,
                                                 final TableReference minusTable,
                                                 final int batchSize) {
-        final DiffStrategy strategy = txManager.runTaskWithRetry(
-                new RuntimeTransactionTask<DiffStrategy>() {
-            @Override
-            public DiffStrategy execute(final Transaction t) {
-                long minusSize = estimateSize(t, minusTable, batchSize, Functions.<byte[]>identity());
-                long plusSize = estimateSize(t, plusTable, batchSize, Functions.<byte[]>identity());
-                return minusSize > 4 * plusSize ? DiffStrategy.ROWS : DiffStrategy.RANGE;
-            }
+        final DiffStrategy strategy = txManager.runTaskWithRetry(tx -> {
+            long minusSize = estimateSize(tx, minusTable, batchSize, Functions.identity());
+            long plusSize = estimateSize(tx, plusTable, batchSize, Functions.identity());
+            return minusSize > 4 * plusSize ? DiffStrategy.ROWS : DiffStrategy.RANGE;
         });
         return strategy;
     }
 
-    private static PartialDiffStats diffInternal(final Transaction t,
+    private static PartialDiffStats diffInternal(final Transaction tx,
                                                  TableReference plusTable,
                                                  final TableReference minusTable,
                                                  final RangeRequest request,
@@ -382,35 +274,31 @@ private static PartialDiffStats diffInternal(final Transaction t,
                                                  final DiffStrategy strategy,
                                                  final DiffVisitor visitor) {
         final PartialDiffStats partialStats = new PartialDiffStats();
-        boolean isEmpty = t.getRange(plusTable, request).batchAccept(range.getBatchSize(),
-                new AbortingVisitor<List<RowResult<byte[]>>, RuntimeException>() {
-            @Override
-            public boolean visit(List<RowResult<byte[]>> batch) {
-                partialStats.rowsOnlyInSource = 0;
-                partialStats.rowsPartiallyInCommon = 0;
-                partialStats.rowsCompletelyInCommon = 0;
-                partialStats.rowsVisited = 0;
-                partialStats.cellsOnlyInSource = 0;
-                partialStats.cellsInCommon = 0;
-                byte[] lastRow = batch.get(batch.size() - 1).getRowName();
-                if (batch.size() < range.getBatchSize()) {
-                    range.setStartRow(null);
-                } else {
-                    range.setStartRow(RangeRequests.nextLexicographicName(lastRow));
-                }
-                Iterable<RowResult<byte[]>> toRemove;
-                if (strategy == DiffStrategy.RANGE) {
-                    toRemove = BatchingVisitables.visitWhile(
-                            t.getRange(minusTable, request), lessThan(lastRow)).immutableCopy();
-                } else {
-                    toRemove = t.getRows(minusTable,
-                            Iterables.transform(batch, RowResult.<byte[]>getRowNameFun()),
-                            ColumnSelection.all()).values();
-                }
-                visitor.visit(t, diffInternal(asCells(batch), asCells(toRemove), partialStats));
-                partialStats.rowsVisited += batch.size();
-                return false;
+        boolean isEmpty = tx.getRange(plusTable, request).batchAccept(range.getBatchSize(), batch -> {
+            partialStats.rowsOnlyInSource = 0;
+            partialStats.rowsPartiallyInCommon = 0;
+            partialStats.rowsCompletelyInCommon = 0;
+            partialStats.rowsVisited = 0;
+            partialStats.cellsOnlyInSource = 0;
+            partialStats.cellsInCommon = 0;
+            byte[] lastRow = batch.get(batch.size() - 1).getRowName();
+            if (batch.size() < range.getBatchSize()) {
+                range.setStartRow(null);
+            } else {
+                range.setStartRow(RangeRequests.nextLexicographicName(lastRow));
+            }
+            Iterable<RowResult<byte[]>> toRemove;
+            if (strategy == DiffStrategy.RANGE) {
+                toRemove = BatchingVisitables.visitWhile(
+                        tx.getRange(minusTable, request), lessThan(lastRow)).immutableCopy();
+            } else {
+                toRemove = tx.getRows(minusTable,
+                        Iterables.transform(batch, RowResult.getRowNameFun()),
+                        ColumnSelection.all()).values();
             }
+            visitor.visit(tx, diffInternal(asCells(batch), asCells(toRemove), partialStats));
+            partialStats.rowsVisited += batch.size();
+            return false;
         });
         if (isEmpty) {
             range.setStartRow(null);
@@ -418,34 +306,6 @@ public boolean visit(List<RowResult<byte[]>> batch) {
         return partialStats;
     }
 
-    private static Iterable<Cell> asCells(final Iterable<RowResult<byte[]>> results) {
-        return new Iterable<Cell>() {
-            @Override
-            public Iterator<Cell> iterator() {
-                return new AbstractIterator<Cell>() {
-                    private final Iterator<RowResult<byte[]>> outerIter = results.iterator();
-                    private byte[] row = null;
-                    private Iterator<byte[]> innerIter = null;
-                    @Override
-                    protected Cell computeNext() {
-                        while (true) {
-                            if (innerIter != null && innerIter.hasNext()) {
-                                byte[] col = innerIter.next();
-                                return Cell.create(row, col);
-                            }
-                            if (!outerIter.hasNext()) {
-                                return endOfData();
-                            }
-                            RowResult<byte[]> result = outerIter.next();
-                            row = result.getRowName();
-                            innerIter = result.getColumns().keySet().iterator();
-                        }
-                    }
-                };
-            }
-        };
-    }
-
     private static Iterator<Cell> diffInternal(final Iterable<Cell> plus,
                                                final Iterable<Cell> minus,
                                                final PartialDiffStats partialStats) {
@@ -516,26 +376,46 @@ private boolean matches(Cell cell, byte[] key) {
         };
     }
 
-    private static Predicate<RowResult<byte[]>> lessThan(@Inclusive final byte[] max) {
-        return new Predicate<RowResult<byte[]>>() {
+    private static Iterable<Cell> asCells(final Iterable<RowResult<byte[]>> results) {
+        return new Iterable<Cell>() {
             @Override
-            public boolean apply(RowResult<byte[]> bytes) {
-                return UnsignedBytes.lexicographicalComparator()
-                        .compare(bytes.getRowName(), max) <= 0;
+            public Iterator<Cell> iterator() {
+                return new AbstractIterator<Cell>() {
+                    private final Iterator<RowResult<byte[]>> outerIter = results.iterator();
+                    private byte[] row = null;
+                    private Iterator<byte[]> innerIter = null;
+                    @Override
+                    protected Cell computeNext() {
+                        while (true) {
+                            if (innerIter != null && innerIter.hasNext()) {
+                                byte[] col = innerIter.next();
+                                return Cell.create(row, col);
+                            }
+                            if (!outerIter.hasNext()) {
+                                return endOfData();
+                            }
+                            RowResult<byte[]> result = outerIter.next();
+                            row = result.getRowName();
+                            innerIter = result.getColumns().keySet().iterator();
+                        }
+                    }
+                };
             }
         };
     }
 
-    private enum DiffStrategy {
-        RANGE, ROWS;
+    private static Predicate<RowResult<byte[]>> lessThan(@Inclusive final byte[] max) {
+        return bytes -> UnsignedBytes.lexicographicalComparator().compare(bytes.getRowName(), max) <= 0;
     }
 
-    private static Iterable<MutableRange> getRanges(int threadCount, int batchSize) {
+    private static Iterable<MutableRange> getRanges(int givenThreadCount, int batchSize) {
+        int threadCount = Math.min(givenThreadCount, 256);
+
+        Preconditions.checkState(threadCount > 0, "threadCount must be positive");
         if (threadCount == 1) {
             return ImmutableList.of(new MutableRange(new byte[0], new byte[0], batchSize));
         }
-        Preconditions.checkState(threadCount > 0);
-        threadCount = Math.min(threadCount, 256);
+
         byte step = (byte) (256 / threadCount);
         byte curr = step;
         Collection<MutableRange> ranges = Lists.newArrayListWithCapacity(threadCount);
@@ -549,31 +429,68 @@ private static Iterable<MutableRange> getRanges(int threadCount, int batchSize)
         return ranges;
     }
 
-    private static class MutableRange {
-        private byte[] startRow;
-        private final byte[] endRow;
-        private final int batchSize;
+    public interface DiffVisitor {
+        void visit(Transaction transaction, Iterator<Cell> partialDiff);
+    }
 
-        public MutableRange(byte[] startRow, byte[] endRow, int batchSize) {
-            this.startRow = Preconditions.checkNotNull(startRow);
-            this.endRow = Preconditions.checkNotNull(endRow);
-            this.batchSize = batchSize;
-        }
+    public static class DiffStats {
+        private final AtomicLong rowsOnlyInSource;
+        private final AtomicLong rowsPartiallyInCommon;
+        private final AtomicLong rowsCompletelyInCommon;
+        private final AtomicLong rowsVisited;
+        private final AtomicLong cellsOnlyInSource;
+        private final AtomicLong cellsInCommon;
 
-        public void setStartRow(byte[] startRow) {
-            this.startRow = startRow;
+        public DiffStats(AtomicLong rowsOnlyInSource,
+                AtomicLong rowsPartiallyInCommon,
+                AtomicLong rowsCompletelyInCommon,
+                AtomicLong rowsVisited,
+                AtomicLong cellsOnlyInSource,
+                AtomicLong cellsInCommon) {
+            this.rowsOnlyInSource = rowsOnlyInSource;
+            this.rowsPartiallyInCommon = rowsPartiallyInCommon;
+            this.rowsCompletelyInCommon = rowsCompletelyInCommon;
+            this.rowsVisited = rowsVisited;
+            this.cellsOnlyInSource = cellsOnlyInSource;
+            this.cellsInCommon = cellsInCommon;
         }
+    }
 
-        public RangeRequest getRangeRequest() {
-            return RangeRequest.builder().startRowInclusive(startRow).endRowExclusive(endRow).build();
-        }
+    public static class PartialDiffStats {
+        private long rowsOnlyInSource;
+        private long rowsPartiallyInCommon;
+        private long rowsCompletelyInCommon;
+        private long rowsVisited;
+        private long cellsOnlyInSource;
+        private long cellsInCommon;
+    }
 
-        public int getBatchSize() {
-            return batchSize;
-        }
+    public static class CopyStats {
+        private final AtomicLong rowsCopied;
+        private final AtomicLong cellsCopied;
 
-        public boolean isComplete() {
-            return startRow == null;
+        public CopyStats(AtomicLong rowsCopied,
+                AtomicLong cellsCopied) {
+            this.rowsCopied = rowsCopied;
+            this.cellsCopied = cellsCopied;
         }
     }
+
+    private enum DiffStrategy {
+        RANGE, ROWS;
+    }
+
+    private interface DiffTask {
+        PartialDiffStats call(RangeRequest request, MutableRange range, DiffStrategy strategy)
+                throws InterruptedException;
+    }
+
+    private interface CopyTask {
+        PartialCopyStats call(RangeRequest request, MutableRange range) throws InterruptedException;
+    }
+
+    private static class PartialCopyStats {
+        private long rowsCopied = 0;
+        private long cellsCopied = 0;
+    }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/api/TransactionWrapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/api/TransactionWrapper.java
index 9b27fc5ff72..c4530200147 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/api/TransactionWrapper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/api/TransactionWrapper.java
@@ -17,5 +17,5 @@
 
 
 public interface TransactionWrapper {
-    Transaction wrap(Transaction t);
+    Transaction wrap(Transaction transaction);
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java
index 7b61852f2c4..e2238540412 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractLockAwareTransactionManager.java
@@ -15,7 +15,7 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
@@ -30,26 +30,30 @@
 import com.palantir.lock.LockClient;
 import com.palantir.lock.LockRequest;
 
-public abstract class AbstractLockAwareTransactionManager extends AbstractTransactionManager implements LockAwareTransactionManager {
-
+public abstract class AbstractLockAwareTransactionManager
+        extends AbstractTransactionManager
+        implements LockAwareTransactionManager {
     @Override
-    public <T, E extends Exception> T runTaskWithLocksWithRetry(Iterable<HeldLocksToken> lockTokens,
-                                                                Supplier<LockRequest> lockSupplier,
-                                                                LockAwareTransactionTask<T, E> task) throws E, InterruptedException {
+    public <T, E extends Exception> T runTaskWithLocksWithRetry(
+            Iterable<HeldLocksToken> lockTokens,
+            Supplier<LockRequest> lockSupplier,
+            LockAwareTransactionTask<T, E> task) throws E, InterruptedException {
         int failureCount = 0;
         while (true) {
             LockRequest lockRequest = lockSupplier.get();
             HeldLocksToken lockToken = null;
             if (lockRequest != null) {
                 Validate.isTrue(lockRequest.getVersionId() == null, "Using a version id is not allowed");
-                HeldLocksToken response = getLockService().lockAndGetHeldLocks(LockClient.ANONYMOUS.getClientId(), lockRequest);
+                HeldLocksToken response = getLockService()
+                        .lockAndGetHeldLocks(LockClient.ANONYMOUS.getClientId(), lockRequest);
                 if (response == null) {
-                    RuntimeException e = new LockAcquisitionException("Failed to lock using the provided lock request: " + lockRequest);
-                    log.warn("Could not lock successfullly", e);
+                    RuntimeException ex = new LockAcquisitionException(
+                            "Failed to lock using the provided lock request: " + lockRequest);
+                    log.warn("Could not lock successfully", ex);
                     failureCount++;
                     if (shouldStopRetrying(failureCount)) {
-                        log.warn("Failing after " + failureCount + " tries", e);
-                        throw e;
+                        log.warn("Failing after " + failureCount + " tries", ex);
+                        throw ex;
                     }
                     sleepForBackoff(failureCount);
                     continue;
@@ -88,15 +92,15 @@ public <T, E extends Exception> T runTaskWithLocksWithRetry(Iterable<HeldLocksTo
     }
 
     @Override
-    public <T, E extends Exception> T runTaskThrowOnConflict(TransactionTask<T, E> task) throws E {
-        return runTaskWithLocksThrowOnConflict(ImmutableList.<HeldLocksToken>of(), LockAwareTransactionTasks.asLockAware(task));
+    public <T, E extends Exception> T runTaskWithLocksWithRetry(
+            Supplier<LockRequest> lockSupplier,
+            LockAwareTransactionTask<T, E> task)
+            throws E, InterruptedException {
+        return runTaskWithLocksWithRetry(ImmutableList.of(), lockSupplier, task);
     }
 
     @Override
-    public <T, E extends Exception> T runTaskWithLocksWithRetry(Supplier<LockRequest> lockSupplier,
-                                                                LockAwareTransactionTask<T, E> task)
-            throws E, InterruptedException {
-        return runTaskWithLocksWithRetry(ImmutableList.<HeldLocksToken>of(), lockSupplier, task);
+    public <T, E extends Exception> T runTaskThrowOnConflict(TransactionTask<T, E> task) throws E {
+        return runTaskWithLocksThrowOnConflict(ImmutableList.of(), LockAwareTransactionTasks.asLockAware(task));
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java
new file mode 100644
index 00000000000..1da1d98b7a7
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchProvider.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.transaction.impl;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import com.palantir.common.base.ClosableIterator;
+
+public interface BatchProvider<T> {
+    ClosableIterator<T> getBatch(int batchSize, @Nullable byte[] lastToken);
+    boolean hasNext(byte[] lastToken);
+    byte[] getLastToken(List<T> batch);
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java
new file mode 100644
index 00000000000..1acbfe8139f
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/BatchSizeIncreasingIterator.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.transaction.impl;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterators;
+import com.palantir.atlasdb.AtlasDbPerformanceConstants;
+import com.palantir.common.base.ClosableIterator;
+import com.palantir.common.base.ClosableIterators;
+import com.palantir.util.AssertUtils;
+
+public class BatchSizeIncreasingIterator<T> {
+    final int originalBatchSize;
+
+    final BatchProvider<T> batchProvider;
+    ClosableIterator<T> currentResults = null;
+    byte[] lastToken;
+
+    long numReturned = 0;
+    long numNotDeleted = 0;
+    int lastBatchSize;
+
+    public BatchSizeIncreasingIterator(BatchProvider<T> batchProvider,
+                                       int originalBatchSize,
+                                       @Nullable ClosableIterator<T> currentResults) {
+        Preconditions.checkArgument(originalBatchSize > 0);
+        this.batchProvider = batchProvider;
+        this.originalBatchSize = originalBatchSize;
+        this.currentResults = currentResults;
+        if (currentResults != null) {
+            this.lastBatchSize = originalBatchSize;
+        }
+    }
+
+    public void markNumResultsNotDeleted(int resultsInBatch) {
+        numNotDeleted += resultsInBatch;
+        AssertUtils.assertAndLog(numNotDeleted <= numReturned,
+                "NotDeleted is bigger than the number of results we returned.");
+    }
+
+    int getBestBatchSize() {
+        if (numReturned == 0) {
+            return originalBatchSize;
+        }
+        final long batchSize;
+        long maxNewBatchSize = numReturned * 4;
+        if (numNotDeleted == 0) {
+            // If everything we've seen has been deleted, we should be aggressive about getting more rows.
+            batchSize = maxNewBatchSize;
+        } else {
+            batchSize = Math.min(
+                    (long) Math.ceil(originalBatchSize * (numReturned / (double) numNotDeleted)),
+                    maxNewBatchSize);
+        }
+        return (int) Math.min(batchSize, AtlasDbPerformanceConstants.MAX_BATCH_SIZE);
+    }
+
+    private void updateResultsIfNeeded() {
+        if (currentResults == null) {
+            currentResults = batchProvider.getBatch(originalBatchSize, null);
+            lastBatchSize = originalBatchSize;
+            return;
+        }
+
+        // We have current results and have not read them.
+        if (lastToken == null) {
+            return;
+        }
+
+        // If the last row we got was the maximal row, then we are done.
+        if (!batchProvider.hasNext(lastToken)) {
+            currentResults = ClosableIterators.wrap(ImmutableList.<T>of().iterator());
+            return;
+        }
+
+        int bestBatchSize = getBestBatchSize();
+        // Only close and throw away our old iterator if the batch size has changed by a factor of 2 or more.
+        if (bestBatchSize >= lastBatchSize * 2 || bestBatchSize <= lastBatchSize / 2) {
+            currentResults.close();
+            currentResults = batchProvider.getBatch(bestBatchSize, lastToken);
+            lastBatchSize = bestBatchSize;
+        }
+    }
+
+    public List<T> getBatch() {
+        updateResultsIfNeeded();
+        Preconditions.checkState(lastBatchSize > 0);
+        ImmutableList<T> list = ImmutableList.copyOf(Iterators.limit(currentResults, lastBatchSize));
+        numReturned += list.size();
+        if (!list.isEmpty()) {
+            lastToken = batchProvider.getLastToken(list);
+        }
+        return list;
+    }
+
+    public void close() {
+        if (currentResults != null) {
+            currentResults.close();
+            currentResults = null;
+            lastToken = null;
+        }
+    }
+
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransactionManager.java
index a830aa98919..a6b8ee602cf 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTransactionManager.java
@@ -24,7 +24,7 @@ public CachingTransactionManager(LockAwareTransactionManager delegate) {
     }
 
     @Override
-    protected Transaction wrap(Transaction t) {
-        return new CachingTransaction(t);
+    protected Transaction wrap(Transaction transaction) {
+        return new CachingTransaction(transaction);
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java
new file mode 100644
index 00000000000..e16cd32e6d2
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ColumnRangeBatchProvider.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.transaction.impl;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.common.base.ClosableIterator;
+import com.palantir.common.base.ClosableIterators;
+
+public class ColumnRangeBatchProvider implements BatchProvider<Map.Entry<Cell, Value>> {
+    private final KeyValueService keyValueService;
+    private final TableReference tableRef;
+    private final byte[] row;
+    private final ColumnRangeSelection columnRangeSelection;
+    private final long timestamp;
+
+    public ColumnRangeBatchProvider(
+            KeyValueService keyValueService,
+            TableReference tableRef,
+            byte[] row,
+            ColumnRangeSelection columnRangeSelection,
+            long timestamp) {
+        this.keyValueService = keyValueService;
+        this.tableRef = tableRef;
+        this.row = row;
+        this.columnRangeSelection = columnRangeSelection;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public ClosableIterator<Map.Entry<Cell, Value>> getBatch(int batchSize, @Nullable byte[] lastToken) {
+        byte[] startCol = columnRangeSelection.getStartCol();
+        if (lastToken != null) {
+            startCol = RangeRequests.nextLexicographicName(lastToken);
+        }
+        ColumnRangeSelection newRange = new ColumnRangeSelection(startCol, columnRangeSelection.getEndCol(), batchSize);
+        Map<byte[], RowColumnRangeIterator> range = keyValueService.getRowsColumnRange(
+                tableRef,
+                ImmutableList.of(row),
+                newRange,
+                timestamp);
+        if (range.isEmpty()) {
+            return ClosableIterators.wrap(ImmutableList.<Map.Entry<Cell, Value>>of().iterator());
+        }
+        return ClosableIterators.wrap(Iterables.getOnlyElement(range.values()));
+    }
+
+    @Override
+    public boolean hasNext(byte[] lastToken) {
+        if (RangeRequests.isLastRowName(lastToken)) {
+            return false;
+        } else {
+            return !Arrays.equals(RangeRequests.nextLexicographicName(lastToken), columnRangeSelection.getEndCol());
+        }
+    }
+
+    @Override
+    public byte[] getLastToken(List<Map.Entry<Cell, Value>> batch) {
+        Preconditions.checkArgument(!batch.isEmpty());
+        return batch.get(batch.size() - 1).getKey().getColumnName();
+    }
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RawTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RawTransaction.java
index 22a48f883a7..076796933f5 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RawTransaction.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RawTransaction.java
@@ -34,4 +34,4 @@ public SnapshotTransaction delegate() {
     LockRefreshToken getImmutableTsLock() {
         return lock;
     }
-}
\ No newline at end of file
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransaction.java
index f8b0db787af..218a7533f09 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransaction.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ReadOnlyTransaction.java
@@ -17,7 +17,7 @@
 
 import java.util.List;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.google.common.base.Functions;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -62,44 +62,42 @@ protected boolean shouldDeleteAndRollback() {
         return false;
     }
 
-    public BatchingVisitable<RowResult<Value>> getRangeWithTimestamps(final TableReference tableRef,
-                                                                      final RangeRequest range) {
+    public BatchingVisitable<RowResult<Value>> getRangeWithTimestamps(TableReference tableRef, RangeRequest range) {
         checkGetPreconditions(tableRef);
         if (range.isEmptyRange()) {
             return BatchingVisitables.emptyBatchingVisitable();
         }
         return new AbstractBatchingVisitable<RowResult<Value>>() {
             @Override
-            public <K extends Exception> void batchAcceptSizeHint(int userRequestedSize,
-                                                                  ConsistentVisitor<RowResult<Value>, K> v)
+            public <K extends Exception> void batchAcceptSizeHint(
+                    int userRequestedSize,
+                    ConsistentVisitor<RowResult<Value>, K> visitor)
                     throws K {
-                if (range.getBatchHint() != null) {
-                    userRequestedSize = range.getBatchHint();
-                }
-
-                int preFilterBatchSize = getRequestHintToKvStore(userRequestedSize);
+                int requestSize = range.getBatchHint() != null ? range.getBatchHint() : userRequestedSize;
+                int preFilterBatchSize = getRequestHintToKvStore(requestSize);
 
                 Validate.isTrue(!range.isReverse(), "we currently do not support reverse ranges");
                 getBatchingVisitableFromIterator(
                         tableRef,
                         range,
-                        userRequestedSize,
-                        v,
+                        requestSize,
+                        visitor,
                         preFilterBatchSize);
             }
 
         };
     }
 
-    private <K extends Exception> boolean getBatchingVisitableFromIterator(final TableReference tableRef,
-                                                                           RangeRequest range,
-                                                                           int userRequestedSize,
-                                                                           AbortingVisitor<List<RowResult<Value>>, K> v,
-                                                                           int preFilterBatchSize) throws K {
+    private <K extends Exception> boolean getBatchingVisitableFromIterator(
+            TableReference tableRef,
+            RangeRequest range,
+            int userRequestedSize,
+            AbortingVisitor<List<RowResult<Value>>, K> visitor,
+            int preFilterBatchSize) throws K {
         ClosableIterator<RowResult<Value>> postFilterIterator =
-                postFilterIterator(tableRef, range, preFilterBatchSize, Functions.<Value>identity());
+                postFilterIterator(tableRef, range, preFilterBatchSize, Functions.identity());
         try {
-            return BatchingVisitableFromIterable.create(postFilterIterator).batchAccept(userRequestedSize, v);
+            return BatchingVisitableFromIterable.create(postFilterIterator).batchAccept(userRequestedSize, visitor);
         } finally {
             postFilterIterator.close();
         }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java
new file mode 100644
index 00000000000..db6591a70ab
--- /dev/null
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/RowRangeBatchProvider.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright 2015 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.transaction.impl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import com.google.common.base.Preconditions;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.common.base.ClosableIterator;
+
+public class RowRangeBatchProvider implements BatchProvider<RowResult<Value>> {
+    private final KeyValueService keyValueService;
+    private final TableReference tableRef;
+    private final RangeRequest range;
+    private final long timestamp;
+
+    public RowRangeBatchProvider(
+            KeyValueService keyValueService,
+            TableReference tableRef,
+            RangeRequest range,
+            long timestamp) {
+        this.keyValueService = keyValueService;
+        this.tableRef = tableRef;
+        this.range = range;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public ClosableIterator<RowResult<Value>> getBatch(int batchSize, @Nullable byte[] lastToken) {
+        RangeRequest.Builder newRange = range.getBuilder();
+        if (lastToken != null) {
+            newRange.startRowInclusive(RangeRequests.getNextStartRow(range.isReverse(), lastToken));
+        }
+        newRange.batchHint(batchSize);
+        return keyValueService.getRange(tableRef, newRange.build(), timestamp);
+    }
+
+    @Override
+    public boolean hasNext(byte[] lastToken) {
+        if (RangeRequests.isTerminalRow(range.isReverse(), lastToken)) {
+            return false;
+        } else {
+            byte[] nextStartRow = RangeRequests.getNextStartRow(range.isReverse(), lastToken);
+            return !Arrays.equals(nextStartRow, range.getEndExclusive());
+        }
+    }
+
+    @Override
+    public byte[] getLastToken(List<RowResult<Value>> batch) {
+        Preconditions.checkArgument(!batch.isEmpty());
+        return batch.get(batch.size() - 1).getRowName();
+    }
+}
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java
index fff36fa60e6..f373192e341 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SerializableTransaction.java
@@ -16,7 +16,6 @@
 package com.palantir.atlasdb.transaction.impl;
 
 import java.nio.ByteBuffer;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -24,17 +23,14 @@
 import java.util.NavigableMap;
 import java.util.Set;
 import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentNavigableMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -54,6 +50,7 @@
 import com.palantir.atlasdb.cleaner.NoOpCleaner;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
@@ -89,10 +86,14 @@
  * write/write conflict checking as well as preventing read/write conflicts to attain serializability.
  */
 public class SerializableTransaction extends SnapshotTransaction {
-    private final static Logger log = LoggerFactory.getLogger(SerializableTransaction.class);
+    private static final Logger log = LoggerFactory.getLogger(SerializableTransaction.class);
+
+    private static final int BATCH_SIZE = 1000;
 
     final ConcurrentMap<TableReference, ConcurrentNavigableMap<Cell, byte[]>> readsByTable = Maps.newConcurrentMap();
     final ConcurrentMap<TableReference, ConcurrentMap<RangeRequest, byte[]>> rangeEndByTable = Maps.newConcurrentMap();
+    final ConcurrentMap<TableReference, ConcurrentMap<byte[], ConcurrentMap<ColumnRangeSelection, byte[]>>>
+            columnRangeEndsByTable = Maps.newConcurrentMap();
     final ConcurrentMap<TableReference, Set<Cell>> cellsRead = Maps.newConcurrentMap();
     final ConcurrentMap<TableReference, Set<RowRead>> rowsRead = Maps.newConcurrentMap();
 
@@ -136,6 +137,37 @@ public SortedMap<byte[], RowResult<byte[]>> getRows(TableReference tableRef,
         return ret;
     }
 
+    @Override
+    public Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> ret =
+                super.getRowsColumnRange(tableRef, rows, columnRangeSelection);
+        return Maps.transformEntries(ret, (row, visitable) -> new BatchingVisitable<Entry<Cell, byte[]>>() {
+            @Override
+            public <K extends Exception> boolean batchAccept(
+                    int batchSize,
+                    AbortingVisitor<? super List<Entry<Cell, byte[]>>, K> visitor)
+                    throws K {
+                boolean hitEnd = visitable.batchAccept(batchSize, new AbortingVisitor<List<Entry<Cell, byte[]>>, K>() {
+                    @Override
+                    public boolean visit(List<Entry<Cell, byte[]>> items) throws K {
+                        if (items.size() < batchSize) {
+                            reachedEndOfColumnRange(tableRef, row, columnRangeSelection);
+                        }
+                        markRowColumnRangeRead(tableRef, row, columnRangeSelection, items);
+                        return visitor.visit(items);
+                    }
+                });
+                if (hitEnd) {
+                    reachedEndOfColumnRange(tableRef, row, columnRangeSelection);
+                }
+                return hitEnd;
+            }
+        });
+    }
+
     @Override
     @Idempotent
     public Map<Cell, byte[]> get(TableReference tableRef, Set<Cell> cells) {
@@ -146,7 +178,7 @@ public Map<Cell, byte[]> get(TableReference tableRef, Set<Cell> cells) {
 
     @Override
     @Idempotent
-    public BatchingVisitable<RowResult<byte[]>> getRange(final TableReference tableRef, final RangeRequest rangeRequest) {
+    public BatchingVisitable<RowResult<byte[]>> getRange(TableReference tableRef, RangeRequest rangeRequest) {
         final BatchingVisitable<RowResult<byte[]>> ret = super.getRange(tableRef, rangeRequest);
         return wrapRange(tableRef, rangeRequest, ret);
     }
@@ -157,12 +189,7 @@ public Iterable<BatchingVisitable<RowResult<byte[]>>> getRanges(final TableRefer
                                                              Iterable<RangeRequest> rangeRequests) {
         Iterable<BatchingVisitable<RowResult<byte[]>>> ret = super.getRanges(tableRef, rangeRequests);
         Iterable<Pair<RangeRequest, BatchingVisitable<RowResult<byte[]>>>> zip = IterableUtils.zip(rangeRequests, ret);
-        return Iterables.transform(zip, new Function<Pair<RangeRequest, BatchingVisitable<RowResult<byte[]>>>, BatchingVisitable<RowResult<byte[]>>>() {
-            @Override
-            public BatchingVisitable<RowResult<byte[]>> apply(Pair<RangeRequest, BatchingVisitable<RowResult<byte[]>>> pair) {
-                return wrapRange(tableRef, pair.lhSide, pair.rhSide);
-            }
-        });
+        return Iterables.transform(zip, pair -> wrapRange(tableRef, pair.lhSide, pair.rhSide));
     }
 
     private BatchingVisitable<RowResult<byte[]>> wrapRange(final TableReference tableRef,
@@ -170,8 +197,9 @@ private BatchingVisitable<RowResult<byte[]>> wrapRange(final TableReference tabl
                                                            final BatchingVisitable<RowResult<byte[]>> ret) {
         return new BatchingVisitable<RowResult<byte[]>>() {
             @Override
-            public <K extends Exception> boolean batchAccept(final int batchSize,
-                                                             final AbortingVisitor<? super List<RowResult<byte[]>>, K> v)
+            public <K extends Exception> boolean batchAccept(
+                    int batchSize,
+                    AbortingVisitor<? super List<RowResult<byte[]>>, K> visitor)
                     throws K {
                 boolean hitEnd = ret.batchAccept(batchSize, new AbortingVisitor<List<RowResult<byte[]>>, K>() {
                     @Override
@@ -180,7 +208,7 @@ public boolean visit(List<RowResult<byte[]>> items) throws K {
                             reachedEndOfRange(tableRef, rangeRequest);
                         }
                         markRangeRead(tableRef, rangeRequest, items);
-                        return v.visit(items);
+                        return visitor.visit(items);
                     }
                 });
                 if (hitEnd) {
@@ -194,7 +222,7 @@ public boolean visit(List<RowResult<byte[]>> items) throws K {
     private ConcurrentNavigableMap<Cell, byte[]> getReadsForTable(TableReference table) {
         ConcurrentNavigableMap<Cell, byte[]> reads = readsByTable.get(table);
         if (reads == null) {
-            ConcurrentNavigableMap<Cell, byte[]> newMap = new ConcurrentSkipListMap<Cell, byte[]>();
+            ConcurrentNavigableMap<Cell, byte[]> newMap = new ConcurrentSkipListMap<>();
             readsByTable.putIfAbsent(table, newMap);
             reads = readsByTable.get(table);
         }
@@ -202,7 +230,7 @@ private ConcurrentNavigableMap<Cell, byte[]> getReadsForTable(TableReference tab
     }
 
     private void setRangeEnd(TableReference table, RangeRequest range, byte[] maxRow) {
-        Validate.notNull(maxRow);
+        Validate.notNull(maxRow, "maxRow cannot be null");
         ConcurrentMap<RangeRequest, byte[]> rangeEnds = rangeEndByTable.get(table);
         if (rangeEnds == null) {
             ConcurrentMap<RangeRequest, byte[]> newMap = Maps.newConcurrentMap();
@@ -236,6 +264,48 @@ private void setRangeEnd(TableReference table, RangeRequest range, byte[] maxRow
         }
     }
 
+    private void setColumnRangeEnd(
+            TableReference table,
+            byte[] row,
+            ColumnRangeSelection columnRangeSelection,
+            byte[] maxCol) {
+        Validate.notNull(maxCol, "maxCol cannot be null");
+        if (!columnRangeEndsByTable.containsKey(table)) {
+            ConcurrentMap<byte[], ConcurrentMap<ColumnRangeSelection, byte[]>> newMap = Maps.newConcurrentMap();
+            columnRangeEndsByTable.putIfAbsent(table, newMap);
+        }
+        if (!columnRangeEndsByTable.get(table).containsKey(row)) {
+            ConcurrentMap<ColumnRangeSelection, byte[]> newMap = Maps.newConcurrentMap();
+            columnRangeEndsByTable.get(table).putIfAbsent(row, newMap);
+        }
+        ConcurrentMap<ColumnRangeSelection, byte[]> rangeEnds = columnRangeEndsByTable.get(table).get(row);
+
+        if (maxCol.length == 0) {
+            rangeEnds.put(columnRangeSelection, maxCol);
+        }
+
+        while (true) {
+            byte[] curVal = rangeEnds.get(columnRangeSelection);
+            if (curVal == null) {
+                byte[] oldVal = rangeEnds.putIfAbsent(columnRangeSelection, maxCol);
+                if (oldVal == null) {
+                    return;
+                } else {
+                    continue;
+                }
+            }
+            if (curVal.length == 0) {
+                return;
+            }
+            if (UnsignedBytes.lexicographicalComparator().compare(curVal, maxCol) >= 0) {
+                return;
+            }
+            if (rangeEnds.replace(columnRangeSelection, curVal, maxCol)) {
+                return;
+            }
+        }
+    }
+
     boolean isSerializableTable(TableReference table) {
         return getConflictHandlerForTable(table) == ConflictHandler.SERIALIZABLE;
     }
@@ -253,11 +323,10 @@ private void markCellsRead(TableReference table, Set<Cell> searched, Map<Cell, b
         if (!isSerializableTable(table)) {
             return;
         }
-        result = transformGetsForTesting(result);
-        getReadsForTable(table).putAll(result);
+        getReadsForTable(table).putAll(transformGetsForTesting(result));
         Set<Cell> cellsForTable = cellsRead.get(table);
         if (cellsForTable == null) {
-            cellsRead.putIfAbsent(table, Sets.<Cell>newConcurrentHashSet());
+            cellsRead.putIfAbsent(table, Sets.newConcurrentHashSet());
             cellsForTable = cellsRead.get(table);
         }
         cellsForTable.addAll(searched);
@@ -273,7 +342,22 @@ private void markRangeRead(TableReference table, RangeRequest range, List<RowRes
             map = transformGetsForTesting(map);
             reads.putAll(map);
         }
-        setRangeEnd(table, range, result.get(result.size()-1).getRowName());
+        setRangeEnd(table, range, Iterables.getLast(result).getRowName());
+    }
+
+    private void markRowColumnRangeRead(
+            TableReference table,
+            byte[] row,
+            ColumnRangeSelection range,
+            List<Entry<Cell, byte[]>> result) {
+        if (!isSerializableTable(table)) {
+            return;
+        }
+        ConcurrentNavigableMap<Cell, byte[]> reads = getReadsForTable(table);
+        Map<Cell, byte[]> map = Maps2.fromEntries(result);
+        map = transformGetsForTesting(map);
+        reads.putAll(map);
+        setColumnRangeEnd(table, row, range, Iterables.getLast(result).getKey().getColumnName());
     }
 
     static class RowRead {
@@ -286,7 +370,11 @@ static class RowRead {
         }
     }
 
-    private void markRowsRead(TableReference table, Iterable<byte[]> rows, ColumnSelection cols, Iterable<RowResult<byte[]>> result) {
+    private void markRowsRead(
+            TableReference table,
+            Iterable<byte[]> rows,
+            ColumnSelection cols,
+            Iterable<RowResult<byte[]>> result) {
         if (!isSerializableTable(table)) {
             return;
         }
@@ -311,6 +399,13 @@ private void reachedEndOfRange(TableReference table, RangeRequest range) {
         setRangeEnd(table, range, PtBytes.EMPTY_BYTE_ARRAY);
     }
 
+    private void reachedEndOfColumnRange(TableReference table, byte[] row, ColumnRangeSelection columnRangeSelection) {
+        if (!isSerializableTable(table)) {
+            return;
+        }
+        setColumnRangeEnd(table, row, columnRangeSelection, PtBytes.EMPTY_BYTE_ARRAY);
+    }
+
     @Override
     @Idempotent
     public void put(TableReference tableRef, Map<Cell, byte[]> values) {
@@ -321,64 +416,85 @@ public void put(TableReference tableRef, Map<Cell, byte[]> values) {
     protected void throwIfReadWriteConflictForSerializable(long commitTimestamp) {
         Transaction ro = getReadOnlyTransaction(commitTimestamp);
         verifyRanges(ro);
+        verifyColumnRanges(ro);
         verifyCells(ro);
         verifyRows(ro);
     }
 
     private void verifyRows(Transaction ro) {
-        for (TableReference table : rowsRead.keySet()) {
-            final ConcurrentNavigableMap<Cell, byte[]> readsForTable = getReadsForTable(table);
-            Multimap<ColumnSelection, byte[]> map = Multimaps.newSortedSetMultimap(Maps.<ColumnSelection, Collection<byte[]>>newHashMap(), new Supplier<SortedSet<byte[]>>() {
-                @Override
-                public TreeSet<byte[]> get() {
-                    return Sets.newTreeSet(UnsignedBytes.lexicographicalComparator());
-                }
-            });
-            for (RowRead r : rowsRead.get(table)) {
-                map.putAll(r.cols, r.rows);
+        for (Map.Entry<TableReference, Set<RowRead>> tableAndRowsEntry : rowsRead.entrySet()) {
+            TableReference table = tableAndRowsEntry.getKey();
+            Set<RowRead> rows = tableAndRowsEntry.getValue();
+
+            ConcurrentNavigableMap<Cell, byte[]> readsForTable = getReadsForTable(table);
+            Multimap<ColumnSelection, byte[]> rowsReadByColumns = Multimaps.newSortedSetMultimap(
+                    Maps.newHashMap(),
+                    () -> Sets.newTreeSet(UnsignedBytes.lexicographicalComparator()));
+            for (RowRead r : rows) {
+                rowsReadByColumns.putAll(r.cols, r.rows);
+            }
+            for (ColumnSelection cols : rowsReadByColumns.keySet()) {
+                verifyColumns(ro, table, readsForTable, rowsReadByColumns, cols);
             }
-            for (final ColumnSelection cols : map.keySet()) {
-                for (List<byte[]> batch : Iterables.partition(map.get(cols), 1000)) {
-                    SortedMap<byte[], RowResult<byte[]>> currentRows = ro.getRows(table, batch, cols);
-                    for (byte[] row : batch) {
-                        RowResult<byte[]> currentRow = currentRows.get(row);
-                        Map<Cell, byte[]> orignalReads = readsForTable.tailMap(Cells.createSmallestCellForRow(row), true).headMap(Cells.createLargestCellForRow(row), true);
-
-                        // We want to filter out all our reads to just the set that matches our column selection.
-                        orignalReads = Maps.filterKeys(orignalReads, new Predicate<Cell>() {
-                            @Override
-                            public boolean apply(Cell input) {
-                                return cols.contains(input.getColumnName());
-                            }
-                        });
-
-                        if (writesByTable.get(table) != null) {
-                            // We don't want to verify any reads that we wrote to cause we will just read our own values.
-                            // NB: We filter our write set out here because our normal SI checking handles this case to ensure the value hasn't changed.
-                            orignalReads = Maps.filterKeys(orignalReads, Predicates.not(Predicates.in(writesByTable.get(table).keySet())));
-                        }
 
-                        if (currentRow == null && orignalReads.isEmpty()) {
-                            continue;
-                        }
+        }
+    }
 
-                        if (currentRow == null) {
-                            throw TransactionSerializableConflictException.create(table, getTimestamp(), System.currentTimeMillis() - timeCreated);
-                        }
+    private void verifyColumns(
+            Transaction ro,
+            TableReference table,
+            ConcurrentNavigableMap<Cell, byte[]> readsForTable,
+            Multimap<ColumnSelection, byte[]> rowsReadByColumns,
+            ColumnSelection columns) {
+        for (List<byte[]> batch : Iterables.partition(rowsReadByColumns.get(columns), BATCH_SIZE)) {
+            SortedMap<byte[], RowResult<byte[]>> currentRows = ro.getRows(table, batch, columns);
+            for (byte[] row : batch) {
+                RowResult<byte[]> currentRow = currentRows.get(row);
+                Map<Cell, byte[]> orignalReads = readsForTable
+                        .tailMap(Cells.createSmallestCellForRow(row), true)
+                        .headMap(Cells.createLargestCellForRow(row), true);
+
+                // We want to filter out all our reads to just the set that matches our column selection.
+                orignalReads = Maps.filterKeys(orignalReads, input -> columns.contains(input.getColumnName()));
 
-                        Map<Cell, byte[]> currentCells = Maps2.fromEntries(currentRow.getCells());
-                        if (writesByTable.get(table) != null) {
-                            // We don't want to verify any reads that we wrote to cause we will just read our own values.
-                            // NB: We filter our write set out here because our normal SI checking handles this case to ensure the value hasn't changed.
-                            currentCells = Maps.filterKeys(currentCells, Predicates.not(Predicates.in(writesByTable.get(table).keySet())));
-                        }
-                        if (!areMapsEqual(orignalReads, currentCells)) {
-                            throw TransactionSerializableConflictException.create(table, getTimestamp(), System.currentTimeMillis() - timeCreated);
-                        }
-                    }
+                if (writesByTable.get(table) != null) {
+                    // We don't want to verify any reads that we wrote to cause
+                    // we will just read our own values.
+                    // NB: We filter our write set out here because our normal SI
+                    // checking handles this case to ensure the value hasn't changed.
+                    orignalReads = Maps.filterKeys(
+                            orignalReads,
+                            Predicates.not(Predicates.in(writesByTable.get(table).keySet())));
+                }
+
+                if (currentRow == null && orignalReads.isEmpty()) {
+                    continue;
+                }
+
+                if (currentRow == null) {
+                    throw TransactionSerializableConflictException.create(
+                            table,
+                            getTimestamp(),
+                            System.currentTimeMillis() - timeCreated);
                 }
-            }
 
+                Map<Cell, byte[]> currentCells = Maps2.fromEntries(currentRow.getCells());
+                if (writesByTable.get(table) != null) {
+                    // We don't want to verify any reads that we wrote to cause
+                    // we will just read our own values.
+                    // NB: We filter our write set out here because our normal SI
+                    // checking handles this case to ensure the value hasn't changed.
+                    currentCells = Maps.filterKeys(
+                            currentCells,
+                            Predicates.not(Predicates.in(writesByTable.get(table).keySet())));
+                }
+                if (!areMapsEqual(orignalReads, currentCells)) {
+                    throw TransactionSerializableConflictException.create(
+                            table,
+                            getTimestamp(),
+                            System.currentTimeMillis() - timeCreated);
+                }
+            }
         }
     }
 
@@ -397,69 +513,169 @@ private boolean areMapsEqual(Map<Cell, byte[]> map1, Map<Cell, byte[]> map2) {
         return true;
     }
 
-    private void verifyCells(Transaction ro) {
-        for (TableReference table : cellsRead.keySet()) {
+    private void verifyCells(Transaction readOnlyTransaction) {
+        for (Entry<TableReference, Set<Cell>> tableAndCellsEntry : cellsRead.entrySet()) {
+            TableReference table = tableAndCellsEntry.getKey();
+            Set<Cell> cells = tableAndCellsEntry.getValue();
+
             final ConcurrentNavigableMap<Cell, byte[]> readsForTable = getReadsForTable(table);
-            for (Iterable<Cell> batch : Iterables.partition(cellsRead.get(table), 1000)) {
-                if (writesByTable.get(table) != null) {
-                    // We don't want to verify any reads that we wrote to cause we will just read our own values.
-                    // NB: If the value has changed between read and write, our normal SI checking handles this case
-                    batch = Iterables.filter(batch, Predicates.not(Predicates.in(writesByTable.get(table).keySet())));
-                }
-                ImmutableSet<Cell> batchSet = ImmutableSet.copyOf(batch);
-                Map<Cell, byte[]> currentBatch = ro.get(table, batchSet);
-                ImmutableMap<Cell, byte[]> originalReads = Maps.toMap(Sets.intersection(batchSet, readsForTable.keySet()), Functions.forMap(readsForTable));
+            for (Iterable<Cell> batch : Iterables.partition(cells, BATCH_SIZE)) {
+                // We don't want to verify any reads that we wrote to cause we will just read our own values.
+                // NB: If the value has changed between read and write, our normal SI checking handles this case
+                Iterable<Cell> batchWithoutWrites = writesByTable.get(table) != null
+                        ? Iterables.filter(batch, Predicates.not(Predicates.in(writesByTable.get(table).keySet())))
+                        : batch;
+                ImmutableSet<Cell> batchWithoutWritesSet = ImmutableSet.copyOf(batchWithoutWrites);
+                Map<Cell, byte[]> currentBatch = readOnlyTransaction.get(table, batchWithoutWritesSet);
+                ImmutableMap<Cell, byte[]> originalReads = Maps.toMap(
+                        Sets.intersection(batchWithoutWritesSet, readsForTable.keySet()),
+                        Functions.forMap(readsForTable));
                 if (!areMapsEqual(currentBatch, originalReads)) {
-                    throw TransactionSerializableConflictException.create(table, getTimestamp(), System.currentTimeMillis() - timeCreated);
+                    throw TransactionSerializableConflictException.create(
+                            table,
+                            getTimestamp(),
+                            System.currentTimeMillis() - timeCreated);
                 }
             }
         }
     }
 
-    private void verifyRanges(Transaction ro) {
+    private void verifyRanges(Transaction readOnlyTransaction) {
         // verify each set of reads to ensure they are the same.
-        for (TableReference table : rangeEndByTable.keySet()) {
-            for (Entry<RangeRequest, byte[]> e : rangeEndByTable.get(table).entrySet()) {
-                RangeRequest range = e.getKey();
-                byte[] rangeEnd = e.getValue();
+        for (Entry<TableReference, ConcurrentMap<RangeRequest, byte[]>> tableAndRange : rangeEndByTable.entrySet()) {
+            TableReference table = tableAndRange.getKey();
+            Map<RangeRequest, byte[]> rangeEnds = tableAndRange.getValue();
+
+            for (Entry<RangeRequest, byte[]> rangeAndRangeEndEntry : rangeEnds.entrySet()) {
+                RangeRequest range = rangeAndRangeEndEntry.getKey();
+                byte[] rangeEnd = rangeAndRangeEndEntry.getValue();
+
                 if (rangeEnd.length != 0 && !RangeRequests.isTerminalRow(range.isReverse(), rangeEnd)) {
-                    range = range.getBuilder().endRowExclusive(RangeRequests.getNextStartRow(range.isReverse(), rangeEnd)).build();
+                    range = range.getBuilder()
+                            .endRowExclusive(RangeRequests.getNextStartRow(range.isReverse(), rangeEnd))
+                            .build();
                 }
 
-                final ConcurrentNavigableMap<Cell, byte[]> writes = writesByTable.get(table);
-                BatchingVisitableView<RowResult<byte[]>> bv = BatchingVisitableView.of(ro.getRange(table, range));
-                NavigableMap<Cell, ByteBuffer> readsInRange = Maps.transformValues(getReadsInRange(table, e, range),
-                        new Function<byte[], ByteBuffer>() {
-                            @Override
-                            public ByteBuffer apply(byte[] input) {
-                                return ByteBuffer.wrap(input);
-                            }
-                        });
-                boolean isEqual = bv.transformBatch(new Function<List<RowResult<byte[]>>, List<Entry<Cell, ByteBuffer>>>() {
-                    @Override
-                    public List<Entry<Cell, ByteBuffer>> apply(List<RowResult<byte[]>> input) {
-                        List<Entry<Cell, ByteBuffer>> ret = Lists.newArrayList();
-                        for (RowResult<byte[]> row : input) {
-                            for (Entry<Cell, byte[]> cell : row.getCells()) {
-
-                                // NB: We filter our write set out here because our normal SI checking handles this case to ensure the value hasn't changed.
-                                if (writes == null || !writes.containsKey(cell.getKey())) {
-                                    ret.add(Maps.immutableEntry(cell.getKey(), ByteBuffer.wrap(cell.getValue())));
-                                }
-                            }
-                        }
-                        return ret;
+                ConcurrentNavigableMap<Cell, byte[]> writes = writesByTable.get(table);
+                BatchingVisitableView<RowResult<byte[]>> bv = BatchingVisitableView.of(
+                        readOnlyTransaction.getRange(table, range));
+                NavigableMap<Cell, ByteBuffer> readsInRange = Maps.transformValues(
+                        getReadsInRange(table, range),
+                        ByteBuffer::wrap);
+                if (!bv.transformBatch(input -> filterWritesFromRows(input, writes)).isEqual(readsInRange.entrySet())) {
+                    throw TransactionSerializableConflictException.create(
+                            table,
+                            getTimestamp(),
+                            System.currentTimeMillis() - timeCreated);
+                }
+            }
+        }
+    }
+
+    private NavigableMap<Cell, byte[]> getReadsInColumnRange(TableReference table,
+                                                             byte[] row,
+                                                             ColumnRangeSelection range) {
+        NavigableMap<Cell, byte[]> reads = getReadsForTable(table);
+        Cell startCell = Cells.createSmallestCellForRow(row);
+        if ((range.getStartCol() != null) && (range.getStartCol().length > 0)) {
+            startCell = Cell.create(row, range.getStartCol());
+        }
+        reads = reads.tailMap(startCell, true);
+        if ((range.getEndCol() != null) && (range.getEndCol().length > 0)) {
+            Cell endCell = Cell.create(row, range.getEndCol());
+            reads = reads.headMap(endCell, false);
+        } else {
+            if (!RangeRequests.isLastRowName(row)) {
+                Cell endCell = Cells.createSmallestCellForRow(RangeRequests.nextLexicographicName(row));
+                reads = reads.headMap(endCell, false);
+            }
+        }
+        ConcurrentNavigableMap<Cell, byte[]> writes = writesByTable.get(table);
+        if (writes != null) {
+            reads = Maps.filterKeys(reads, Predicates.not(Predicates.in(writes.keySet())));
+        }
+        return reads;
+    }
+
+    private void verifyColumnRanges(Transaction readOnlyTransaction) {
+        // verify each set of reads to ensure they are the same.
+        for (Entry<TableReference, ConcurrentMap<byte[], ConcurrentMap<ColumnRangeSelection, byte[]>>> tableAndRange :
+                columnRangeEndsByTable.entrySet()) {
+            TableReference table = tableAndRange.getKey();
+            Map<byte[], ConcurrentMap<ColumnRangeSelection, byte[]>> columnRangeEnds = tableAndRange.getValue();
+
+            Map<Cell, byte[]> writes = writesByTable.get(table);
+            Map<ColumnRangeSelection, List<byte[]>> rangesToRows = Maps.newHashMap();
+            for (Entry<byte[], ConcurrentMap<ColumnRangeSelection, byte[]>> rowAndRangeEnds :
+                    columnRangeEnds.entrySet()) {
+                byte[] row = rowAndRangeEnds.getKey();
+                Map<ColumnRangeSelection, byte[]> rangeEnds = columnRangeEnds.get(row);
+
+                for (Entry<ColumnRangeSelection, byte[]> e : rangeEnds.entrySet()) {
+                    ColumnRangeSelection range = e.getKey();
+                    byte[] rangeEnd = e.getValue();
+                    if (rangeEnd.length != 0 && !RangeRequests.isTerminalRow(false, rangeEnd)) {
+                        range = new ColumnRangeSelection(
+                                range.getStartCol(),
+                                RangeRequests.getNextStartRow(false, rangeEnd),
+                                range.getBatchHint());
+                    }
+                    if (rangesToRows.get(range) != null) {
+                        rangesToRows.get(range).add(row);
+                    } else {
+                        rangesToRows.put(range, ImmutableList.of(row));
                     }
-                }).isEqual(readsInRange.entrySet());
-                if (!isEqual) {
-                    throw TransactionSerializableConflictException.create(table, getTimestamp(), System.currentTimeMillis() - timeCreated);
                 }
             }
+            for (Entry<ColumnRangeSelection, List<byte[]>> e : rangesToRows.entrySet()) {
+                ColumnRangeSelection range = e.getKey();
+                List<byte[]> rows = e.getValue();
+                Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> result =
+                        readOnlyTransaction.getRowsColumnRange(table, rows, range);
+                for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> res : result.entrySet()) {
+                    byte[] row = res.getKey();
+                    BatchingVisitableView<Entry<Cell, byte[]>> bv = BatchingVisitableView.of(res.getValue());
+                    NavigableMap<Cell, ByteBuffer> readsInRange = Maps.transformValues(
+                            getReadsInColumnRange(table, row, range),
+                            input -> ByteBuffer.wrap(input));
+                    boolean isEqual = bv.transformBatch(input -> filterWritesFromCells(input, writes))
+                            .isEqual(readsInRange.entrySet());
+                    if (!isEqual) {
+                        throw TransactionSerializableConflictException.create(
+                                table,
+                                getTimestamp(),
+                                System.currentTimeMillis() - timeCreated);
+                    }
+                }
+            }
+        }
+    }
+
+    private List<Entry<Cell, ByteBuffer>> filterWritesFromCells(
+            Iterable<Entry<Cell, byte[]>> cells,
+            Map<Cell, byte[]> writes) {
+        List<Entry<Cell, ByteBuffer>> cellsWithoutWrites = Lists.newArrayList();
+        for (Entry<Cell, byte[]> cell : cells) {
+            // NB: We filter our write set out here because our normal SI
+            // checking handles this case to ensure the value hasn't changed.
+            if (writes == null || !writes.containsKey(cell.getKey())) {
+                cellsWithoutWrites.add(Maps.immutableEntry(cell.getKey(), ByteBuffer.wrap(cell.getValue())));
+            }
         }
+        return cellsWithoutWrites;
+    }
+
+    private List<Entry<Cell, ByteBuffer>> filterWritesFromRows(
+            Iterable<RowResult<byte[]>> rows,
+            Map<Cell, byte[]> writes) {
+        List<Entry<Cell, ByteBuffer>> rowsWithoutWrites = Lists.newArrayList();
+        for (RowResult<byte[]> row : rows) {
+            rowsWithoutWrites.addAll(filterWritesFromCells(row.getCells(), writes));
+        }
+        return rowsWithoutWrites;
     }
 
     private NavigableMap<Cell, byte[]> getReadsInRange(TableReference table,
-                                                       Entry<RangeRequest, byte[]> e,
                                                        RangeRequest range) {
         NavigableMap<Cell, byte[]> reads = getReadsForTable(table);
         if (range.getStartInclusive().length != 0) {
@@ -468,18 +684,19 @@ private NavigableMap<Cell, byte[]> getReadsInRange(TableReference table,
         if (range.getEndExclusive().length != 0) {
             reads = reads.headMap(Cells.createSmallestCellForRow(range.getEndExclusive()), false);
         }
-        ConcurrentNavigableMap<Cell, byte[]> writes = writesByTable.get(table);
+        Map<Cell, byte[]> writes = writesByTable.get(table);
         if (writes != null) {
             reads = Maps.filterKeys(reads, Predicates.not(Predicates.in(writes.keySet())));
         }
         if (!range.getColumnNames().isEmpty()) {
-            Predicate<Cell> columnInNames = Predicates.compose(Predicates.in(range.getColumnNames()), Cells.getColumnFunction());
+            Predicate<Cell> columnInNames = Predicates.compose(
+                    Predicates.in(range.getColumnNames()),
+                    Cells.getColumnFunction());
             reads = Maps.filterKeys(reads, columnInNames);
         }
         return reads;
     }
 
-
     private Transaction getReadOnlyTransaction(final long commitTs) {
         return new SnapshotTransaction(
                 keyValueService,
@@ -491,7 +708,7 @@ private Transaction getReadOnlyTransaction(final long commitTs) {
                 ConflictDetectionManagers.withoutConflictDetection(keyValueService),
                 sweepStrategyManager,
                 immutableTimestamp,
-                Collections.<LockRefreshToken>emptyList(),
+                Collections.emptyList(),
                 AtlasDbConstraintCheckingMode.NO_CONSTRAINT_CHECKING,
                 transactionReadTimeoutMillis,
                 getReadSentinelBehavior(),
@@ -523,9 +740,9 @@ protected Map<Long, Long> getCommitTimestamps(TableReference tableRef,
                         // If we do not get back all these results we may be in the deadlock case so we should just
                         // fail out early.  It may be the case that abort more transactions than needed to break the
                         // deadlock cycle, but this should be pretty rare.
-                        throw new TransactionSerializableConflictException("An uncommitted conflicting read was " +
-                                "written after our start timestamp for table " + tableRef + ".  " +
-                                "This case can cause deadlock and is very likely to be a read write conflict.");
+                        throw new TransactionSerializableConflictException("An uncommitted conflicting read was "
+                                + "written after our start timestamp for table " + tableRef + ".  "
+                                + "This case can cause deadlock and is very likely to be a read write conflict.");
                     } else {
                         ret.putAll(afterResults);
                     }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShellAwareReadOnlyTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShellAwareReadOnlyTransactionManager.java
index 84b3b23dbcc..6f9454a1c9b 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShellAwareReadOnlyTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ShellAwareReadOnlyTransactionManager.java
@@ -22,18 +22,17 @@
 import com.palantir.atlasdb.transaction.service.TransactionService;
 
 public class ShellAwareReadOnlyTransactionManager extends ReadOnlyTransactionManager {
-
-    public ShellAwareReadOnlyTransactionManager(KeyValueService keyValueService,
-                                                TransactionService transactionService,
-                                                AtlasDbConstraintCheckingMode constraintCheckingMode) {
+    public ShellAwareReadOnlyTransactionManager(
+            KeyValueService keyValueService,
+            TransactionService transactionService,
+            AtlasDbConstraintCheckingMode constraintCheckingMode) {
         super(keyValueService, transactionService, constraintCheckingMode);
     }
 
     @Override
-    public <T, E extends Exception> T runTaskThrowOnConflict(TransactionTask<T, E> task) throws E,
-            TransactionFailedRetriableException {
-        throw new UnsupportedOperationException("AtlasDB Shell only supports write operations if connected" +
-                " to lock and timestamp servers also.");
+    public <T, E extends Exception> T runTaskThrowOnConflict(TransactionTask<T, E> task)
+            throws E, TransactionFailedRetriableException {
+        throw new UnsupportedOperationException("AtlasDB Shell only supports write operations if connected"
+                + " to lock and timestamp servers also.");
     }
-
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java
index 59425251a40..930287ade12 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java
@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -33,12 +34,13 @@
 
 import javax.annotation.Nullable;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -62,17 +64,20 @@
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.Sets;
+import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.AtlasDbPerformanceConstants;
 import com.palantir.atlasdb.cleaner.Cleaner;
 import com.palantir.atlasdb.cleaner.NoOpCleaner;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -136,11 +141,12 @@
  *    should think about breaking these up into different rows and using range scans.
  */
 public class SnapshotTransaction extends AbstractTransaction implements ConstraintCheckingTransaction {
-    private static final int BATCH_SIZE_GET_FIRST_PAGE = 1000;
-    private final static Logger log = LoggerFactory.getLogger(SnapshotTransaction.class);
+    private static final Logger log = LoggerFactory.getLogger(SnapshotTransaction.class);
     private static final Logger perfLogger = LoggerFactory.getLogger("dualschema.perf");
     private static final Logger constraintLogger = LoggerFactory.getLogger("dualschema.constraints");
 
+    private static final int BATCH_SIZE_GET_FIRST_PAGE = 1000;
+
     private enum State {
         UNCOMMITTED,
         COMMITTED,
@@ -151,6 +157,7 @@ private enum State {
          */
         FAILED
     }
+
     protected final TimestampService timestampService;
     final KeyValueService keyValueService;
     protected final RemoteLockService lockService;
@@ -163,16 +170,17 @@ private enum State {
 
     protected final long timeCreated = System.currentTimeMillis();
 
-    protected final ConcurrentMap<TableReference, ConcurrentNavigableMap<Cell, byte[]>> writesByTable = Maps.newConcurrentMap();
+    protected final ConcurrentMap<TableReference, ConcurrentNavigableMap<Cell, byte[]>> writesByTable =
+            Maps.newConcurrentMap();
     private final ConflictDetectionManager conflictDetectionManager;
-    private final DistributedCacheMgrCache<Long, Long> cachedCommitTimes = new SoftCache<Long, Long>();
+    private final DistributedCacheMgrCache<Long, Long> cachedCommitTimes = new SoftCache<>();
     private final AtomicLong byteCount = new AtomicLong();
 
     private final AtlasDbConstraintCheckingMode constraintCheckingMode;
 
     private final ConcurrentMap<TableReference, ConstraintCheckable> constraintsByTableName = Maps.newConcurrentMap();
 
-    private final AtomicReference<State> state = new AtomicReference<State>(State.UNCOMMITTED);
+    private final AtomicReference<State> state = new AtomicReference<>(State.UNCOMMITTED);
     private final AtomicLong numWriters = new AtomicLong();
     protected final SweepStrategyManager sweepStrategyManager;
     protected final Long transactionReadTimeoutMillis;
@@ -182,15 +190,10 @@ private enum State {
     protected final Stopwatch transactionTimer = Stopwatch.createStarted();
 
     /**
-     * @param keyValueService
-     * @param lockService
-     * @param timestampService
-     * @param startTimeStamp
      * @param immutableTimestamp If we find a row written before the immutableTimestamp we don't need to
      *                           grab a read lock for it because we know that no writers exist.
      * @param tokensValidForCommit These tokens need to be valid with {@link #lockService} for this transaction
      *                             to commit.  If these locks have expired then the commit will fail.
-     * @param transactionTimeoutMillis
      */
     /* package */ SnapshotTransaction(KeyValueService keyValueService,
                                RemoteLockService lockService,
@@ -258,7 +261,8 @@ protected SnapshotTransaction(KeyValueService keyValueService,
                                   long startTimeStamp,
                                   AtlasDbConstraintCheckingMode constraintCheckingMode,
                                   TransactionReadSentinelBehavior readSentinelBehavior) {
-        this(keyValueService, transactionService, lockService, startTimeStamp, constraintCheckingMode, readSentinelBehavior, false);
+        this(keyValueService, transactionService, lockService, startTimeStamp,
+                constraintCheckingMode, readSentinelBehavior, false);
     }
 
     protected SnapshotTransaction(KeyValueService keyValueService,
@@ -303,7 +307,8 @@ public Stopwatch getTrasactionTimer() {
     }
 
     protected void checkGetPreconditions(TableReference tableRef) {
-        if (transactionReadTimeoutMillis != null && System.currentTimeMillis() - timeCreated > transactionReadTimeoutMillis) {
+        if (transactionReadTimeoutMillis != null
+                && System.currentTimeMillis() - timeCreated > transactionReadTimeoutMillis) {
             throw new TransactionFailedRetriableException("Transaction timed out.");
         }
         Preconditions.checkArgument(allowHiddenTableAccess || !AtlasDbConstants.hiddenTables.contains(tableRef));
@@ -342,7 +347,72 @@ public SortedMap<byte[], RowResult<byte[]>> getRows(TableReference tableRef, Ite
     }
 
     @Override
-    public SortedMap<byte[], RowResult<byte[]>> getRowsIgnoringLocalWrites(TableReference tableRef, Iterable<byte[]> rows) {
+    public Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> getRowsColumnRange(
+            TableReference tableRef,
+            Iterable<byte[]> rows,
+            ColumnRangeSelection columnRangeSelection) {
+        if (Iterables.isEmpty(rows)) {
+            return ImmutableMap.of();
+        }
+        Map<byte[], RowColumnRangeIterator> rawResults = keyValueService.getRowsColumnRange(tableRef, rows,
+                columnRangeSelection, getStartTimestamp());
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> postfilteredResults =
+                Maps.newHashMapWithExpectedSize(rawResults.size());
+        for (Entry<byte[], RowColumnRangeIterator> e : rawResults.entrySet()) {
+            byte[] row = e.getKey();
+            RowColumnRangeIterator rawIterator = e.getValue();
+            Iterator<Map.Entry<Cell, byte[]>> postfilterIterator =
+                    getRowColumnRangePostfiltered(tableRef, row, columnRangeSelection, rawIterator);
+            SortedMap<Cell, byte[]> localWrites = getLocalWritesForColumnRange(tableRef, columnRangeSelection, row);
+            Iterator<Map.Entry<Cell, byte[]>> localIterator = localWrites.entrySet().iterator();
+            Iterator<Map.Entry<Cell, byte[]>> mergedIterator = IteratorUtils.mergeIterators(localIterator,
+                    postfilterIterator,
+                    Ordering.from(UnsignedBytes.lexicographicalComparator())
+                            .onResultOf(entry -> entry.getKey().getColumnName()),
+                    Pair::getLhSide);
+            // Filter empty columns.
+            Iterator<Map.Entry<Cell, byte[]>> filteredIterator =
+                    Iterators.filter(mergedIterator, entry -> entry.getValue().length > 0);
+            postfilteredResults.put(row, BatchingVisitableFromIterable.create(filteredIterator));
+        }
+        return postfilteredResults;
+    }
+
+    private Iterator<Map.Entry<Cell, byte[]>> getRowColumnRangePostfiltered(
+            TableReference tableRef,
+            byte[] row,
+            ColumnRangeSelection columnRangeSelection,
+            RowColumnRangeIterator rawIterator) {
+        ColumnRangeBatchProvider batchProvider = new ColumnRangeBatchProvider(
+                keyValueService, tableRef, row, columnRangeSelection, getStartTimestamp());
+        BatchSizeIncreasingIterator<Map.Entry<Cell, Value>> batchIterator = new BatchSizeIncreasingIterator<>(
+                batchProvider, columnRangeSelection.getBatchHint(), ClosableIterators.wrap(rawIterator));
+        Iterator<Iterator<Map.Entry<Cell, byte[]>>> postfilteredBatches =
+                new AbstractIterator<Iterator<Map.Entry<Cell, byte[]>>>() {
+            @Override
+            protected Iterator<Map.Entry<Cell, byte[]>> computeNext() {
+                ImmutableMap.Builder<Cell, Value> rawBuilder = ImmutableMap.builder();
+                List<Map.Entry<Cell, Value>> batch = batchIterator.getBatch();
+                for (Map.Entry<Cell, Value> result : batch) {
+                    rawBuilder.put(result);
+                }
+                Map<Cell, Value> raw = rawBuilder.build();
+                if (raw.isEmpty()) {
+                    return endOfData();
+                }
+                Map<Cell, byte[]> post = new LinkedHashMap<>();
+                getWithPostfiltering(tableRef, raw, post, Value.GET_VALUE);
+                batchIterator.markNumResultsNotDeleted(post.keySet().size());
+                return post.entrySet().iterator();
+            }
+        };
+        return Iterators.concat(postfilteredBatches);
+    }
+
+    @Override
+    public SortedMap<byte[], RowResult<byte[]>> getRowsIgnoringLocalWrites(
+            TableReference tableRef,
+            Iterable<byte[]> rows) {
         checkGetPreconditions(tableRef);
         if (Iterables.isEmpty(rows)) {
             return AbstractTransaction.EMPTY_SORTED_ROWS;
@@ -353,7 +423,7 @@ public SortedMap<byte[], RowResult<byte[]>> getRowsIgnoringLocalWrites(TableRefe
                 ColumnSelection.all(),
                 getStartTimestamp()));
 
-        return filterRowResults(tableRef, rawResults, Maps.<Cell, byte[]>newHashMap());
+        return filterRowResults(tableRef, rawResults, Maps.newHashMap());
     }
 
     private SortedMap<byte[], RowResult<byte[]>> filterRowResults(TableReference tableRef,
@@ -374,12 +444,12 @@ private void extractLocalWritesForRow(@Output Map<Cell, byte[]> result,
         Cell lowCell = Cells.createSmallestCellForRow(row);
         Iterator<Entry<Cell, byte[]>> it = writes.tailMap(lowCell).entrySet().iterator();
         while (it.hasNext()) {
-            Entry<Cell, byte[]> e = it.next();
-            Cell cell = e.getKey();
+            Entry<Cell, byte[]> entry = it.next();
+            Cell cell = entry.getKey();
             if (!Arrays.equals(row, cell.getRowName())) {
                 break;
             }
-            result.put(cell, e.getValue());
+            result.put(cell, entry.getValue());
         }
     }
 
@@ -387,7 +457,9 @@ private void extractLocalWritesForRow(@Output Map<Cell, byte[]> result,
     public Map<Cell, byte[]> get(TableReference tableRef, Set<Cell> cells) {
         Stopwatch watch = Stopwatch.createStarted();
         checkGetPreconditions(tableRef);
-        if (Iterables.isEmpty(cells)) { return ImmutableMap.of(); }
+        if (Iterables.isEmpty(cells)) {
+            return ImmutableMap.of();
+        }
 
         Map<Cell, byte[]> result = Maps.newHashMap();
         SortedMap<Cell, byte[]> writes = writesByTable.get(tableRef);
@@ -413,7 +485,9 @@ public Map<Cell, byte[]> get(TableReference tableRef, Set<Cell> cells) {
     @Override
     public Map<Cell, byte[]> getIgnoringLocalWrites(TableReference tableRef, Set<Cell> cells) {
         checkGetPreconditions(tableRef);
-        if (Iterables.isEmpty(cells)) { return ImmutableMap.of(); }
+        if (Iterables.isEmpty(cells)) {
+            return ImmutableMap.of();
+        }
 
         Map<Cell, byte[]> result = getFromKeyValueService(tableRef, cells);
 
@@ -433,7 +507,9 @@ private Map<Cell, byte[]> getFromKeyValueService(TableReference tableRef, Set<Ce
         return result;
     }
 
-    private static byte[] getNextStartRowName(RangeRequest range, TokenBackedBasicResultsPage<RowResult<Value>, byte[]> prePostFilter) {
+    private static byte[] getNextStartRowName(
+            RangeRequest range,
+            TokenBackedBasicResultsPage<RowResult<Value>, byte[]> prePostFilter) {
         if (!prePostFilter.moreResultsAvailable()) {
             return range.getEndExclusive();
         }
@@ -456,23 +532,22 @@ public Iterable<BatchingVisitable<RowResult<byte[]>>> getRanges(final TableRefer
                     @Override
                     public List<BatchingVisitable<RowResult<byte[]>>> apply(List<RangeRequest> input) {
                         Stopwatch timer = Stopwatch.createStarted();
-                        Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> firstPages = keyValueService.getFirstBatchForRanges(
-                                tableRef,
-                                input,
-                                getStartTimestamp());
+                        Map<RangeRequest, TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> firstPages =
+                                keyValueService.getFirstBatchForRanges(tableRef, input, getStartTimestamp());
                         validateExternalAndCommitLocksIfNecessary(tableRef);
 
-                        final SortedMap<Cell, byte[]> postFiltered = postFilterPages(
+                        SortedMap<Cell, byte[]> postFiltered = postFilterPages(
                                 tableRef,
                                 firstPages.values());
 
                         List<BatchingVisitable<RowResult<byte[]>>> ret = Lists.newArrayListWithCapacity(input.size());
-                        for (final RangeRequest rangeRequest : input) {
-                            final TokenBackedBasicResultsPage<RowResult<Value>, byte[]> prePostFilter = firstPages.get(rangeRequest);
-                            final byte[] nextStartRowName = getNextStartRowName(
+                        for (RangeRequest rangeRequest : input) {
+                            TokenBackedBasicResultsPage<RowResult<Value>, byte[]> prePostFilter =
+                                    firstPages.get(rangeRequest);
+                            byte[] nextStartRowName = getNextStartRowName(
                                     rangeRequest,
                                     prePostFilter);
-                            final List<Entry<Cell, byte[]>> mergeIterators = getPostfilteredWithLocalWrites(
+                            List<Entry<Cell, byte[]>> mergeIterators = getPostfilteredWithLocalWrites(
                                     tableRef,
                                     postFiltered,
                                     rangeRequest,
@@ -480,13 +555,14 @@ public List<BatchingVisitable<RowResult<byte[]>>> apply(List<RangeRequest> input
                                     nextStartRowName);
                             ret.add(new AbstractBatchingVisitable<RowResult<byte[]>>() {
                                 @Override
-                                protected <K extends Exception> void batchAcceptSizeHint(int batchSizeHint,
-                                                                                         ConsistentVisitor<RowResult<byte[]>, K> v)
-                                                                                                 throws K {
+                                protected <K extends Exception> void batchAcceptSizeHint(
+                                        int batchSizeHint,
+                                        ConsistentVisitor<RowResult<byte[]>, K> visitor)
+                                        throws K {
                                     checkGetPreconditions(tableRef);
                                     final Iterator<RowResult<byte[]>> rowResults = Cells.createRowView(mergeIterators);
                                     while (rowResults.hasNext()) {
-                                        if (!v.visit(ImmutableList.of(rowResults.next()))) {
+                                        if (!visitor.visit(ImmutableList.of(rowResults.next()))) {
                                             return;
                                         }
                                     }
@@ -497,7 +573,7 @@ protected <K extends Exception> void batchAcceptSizeHint(int batchSizeHint,
                                             .startRowInclusive(nextStartRowName)
                                             .build();
                                     getRange(tableRef, newRange)
-                                            .batchAccept(batchSizeHint, v);
+                                            .batchAccept(batchSizeHint, visitor);
                                 }
                             });
                         }
@@ -530,7 +606,7 @@ private List<Entry<Cell, byte[]>> getPostfilteredWithLocalWrites(final TableRefe
                 postFiltered.entrySet(),
                 Predicates.compose(
                         Predicates.in(prePostFilterCells.keySet()),
-                        MapEntries.<Cell, byte[]> getKeyFunction()));
+                        MapEntries.getKeyFunction()));
         Collection<Entry<Cell, byte[]>> localWritesInRange = getLocalWritesForRange(
                 tableRef,
                 rangeRequest.getStartInclusive(),
@@ -551,42 +627,42 @@ public BatchingVisitable<RowResult<byte[]>> getRange(final TableReference tableR
 
         return new AbstractBatchingVisitable<RowResult<byte[]>>() {
             @Override
-            public <K extends Exception> void batchAcceptSizeHint(int userRequestedSize,
-                                                                  ConsistentVisitor<RowResult<byte[]>, K> v)
+            public <K extends Exception> void batchAcceptSizeHint(
+                    int userRequestedSize,
+                    ConsistentVisitor<RowResult<byte[]>, K> visitor)
                     throws K {
                 Preconditions.checkState(state.get() == State.UNCOMMITTED,
                         "Transaction must be uncommitted.");
-                if (range.getBatchHint() != null) {
-                    userRequestedSize = range.getBatchHint();
-                }
 
-                int preFilterBatchSize = getRequestHintToKvStore(userRequestedSize);
+                int requestSize = range.getBatchHint() != null ? range.getBatchHint() : userRequestedSize;
+                int preFilterBatchSize = getRequestHintToKvStore(requestSize);
 
                 Validate.isTrue(!range.isReverse(), "we currently do not support reverse ranges");
                 getBatchingVisitableFromIterator(
                         tableRef,
                         range,
-                        userRequestedSize,
-                        v,
+                        requestSize,
+                        visitor,
                         preFilterBatchSize);
             }
 
         };
     }
 
-    private <K extends Exception> boolean getBatchingVisitableFromIterator(final TableReference tableRef,
-                                                                           RangeRequest range,
-                                                                           int userRequestedSize,
-                                                                           AbortingVisitor<List<RowResult<byte[]>>, K> v,
-                                                                           int preFilterBatchSize) throws K {
+    private <K extends Exception> boolean getBatchingVisitableFromIterator(
+            TableReference tableRef,
+            RangeRequest range,
+            int userRequestedSize,
+            AbortingVisitor<List<RowResult<byte[]>>, K> visitor,
+            int preFilterBatchSize) throws K {
         ClosableIterator<RowResult<byte[]>> postFilterIterator =
                 postFilterIterator(tableRef, range, preFilterBatchSize, Value.GET_VALUE);
         try {
-            Iterator<RowResult<byte[]>> localWritesInRange =
-                    Cells.createRowView(getLocalWritesForRange(tableRef, range.getStartInclusive(), range.getEndExclusive()).entrySet());
+            Iterator<RowResult<byte[]>> localWritesInRange = Cells.createRowView(
+                    getLocalWritesForRange(tableRef, range.getStartInclusive(), range.getEndExclusive()).entrySet());
             Iterator<RowResult<byte[]>> mergeIterators =
                     mergeInLocalWritesRows(postFilterIterator, localWritesInRange, range.isReverse());
-            return BatchingVisitableFromIterable.create(mergeIterators).batchAccept(userRequestedSize, v);
+            return BatchingVisitableFromIterable.create(mergeIterators).batchAccept(userRequestedSize, visitor);
         } finally {
             postFilterIterator.close();
         }
@@ -599,7 +675,7 @@ protected static int getRequestHintToKvStore(int userRequestedSize) {
         }
         //TODO: carrino: tune the param here based on how likely we are to post filter
         // rows out and have deleted rows
-        int preFilterBatchSize = userRequestedSize + ((userRequestedSize+9)/10);
+        int preFilterBatchSize = userRequestedSize + ((userRequestedSize + 9) / 10);
         if (preFilterBatchSize > AtlasDbPerformanceConstants.MAX_BATCH_SIZE
                 || preFilterBatchSize < 0) {
             preFilterBatchSize = AtlasDbPerformanceConstants.MAX_BATCH_SIZE;
@@ -607,47 +683,41 @@ protected static int getRequestHintToKvStore(int userRequestedSize) {
         return preFilterBatchSize;
     }
 
-    private static Iterator<RowResult<byte[]>> mergeInLocalWritesRows(Iterator<RowResult<byte[]>> postFilterIterator,
-                                                                           Iterator<RowResult<byte[]>> localWritesInRange,
-                                                                           boolean isReverse) {
-        Ordering<RowResult<byte[]>> ordering = RowResult.<byte[]>getOrderingByRowName();
+    private static Iterator<RowResult<byte[]>> mergeInLocalWritesRows(
+            Iterator<RowResult<byte[]>> postFilterIterator,
+            Iterator<RowResult<byte[]>> localWritesInRange,
+            boolean isReverse) {
+        Ordering<RowResult<byte[]>> ordering = RowResult.getOrderingByRowName();
         Iterator<RowResult<byte[]>> mergeIterators = IteratorUtils.mergeIterators(
-            postFilterIterator, localWritesInRange,
-            isReverse ? ordering.reverse() : ordering,
-            new Function<Pair<RowResult<byte[]>, RowResult<byte[]>>, RowResult<byte[]>>() {
-                @Override
-                public RowResult<byte[]> apply(Pair<RowResult<byte[]>,RowResult<byte[]>> from) {
-                    // prefer local writes
-                    return RowResults.merge(from.lhSide, from.rhSide);
-                }
-            });
+                postFilterIterator, localWritesInRange,
+                isReverse ? ordering.reverse() : ordering,
+                from -> RowResults.merge(from.lhSide, from.rhSide)); // prefer local writes
         return RowResults.filterDeletedColumnsAndEmptyRows(mergeIterators);
     }
 
-    private static Iterator<Entry<Cell, byte[]>> mergeInLocalWrites(Iterator<Entry<Cell, byte[]>> postFilterIterator,
-                                                                         Iterator<Entry<Cell, byte[]>> localWritesInRange,
-                                                                         boolean isReverse) {
-        Ordering<Entry<Cell, byte[]>> ordering = Ordering.natural().onResultOf(MapEntries.<Cell, byte[]>getKeyFunction());
+    private static Iterator<Entry<Cell, byte[]>> mergeInLocalWrites(
+            Iterator<Entry<Cell, byte[]>> postFilterIterator,
+            Iterator<Entry<Cell, byte[]>> localWritesInRange,
+            boolean isReverse) {
+        Ordering<Entry<Cell, byte[]>> ordering = Ordering.natural().onResultOf(MapEntries.getKeyFunction());
         Iterator<Entry<Cell, byte[]>> mergeIterators = IteratorUtils.mergeIterators(
                 postFilterIterator, localWritesInRange,
                 isReverse ? ordering.reverse() : ordering,
-                new Function<Pair<Entry<Cell, byte[]>, Entry<Cell, byte[]>>, Entry<Cell, byte[]>>() {
-                    @Override
-                    public Map.Entry<Cell, byte[]> apply(Pair<Map.Entry<Cell, byte[]>, Map.Entry<Cell, byte[]>> from) {
-                        // always override their value with written values
-                        return from.rhSide;
-                    }
-                });
+                from -> from.rhSide); // always override their value with written values
         return Iterators.filter(mergeIterators,
-            Predicates.compose(Predicates.not(Value.IS_EMPTY), MapEntries.<Cell, byte[]>getValueFunction()));
-    }
-
-    protected <T> ClosableIterator<RowResult<T>> postFilterIterator(final TableReference tableRef,
-                                                                    RangeRequest range,
-                                                                    int preFilterBatchSize,
-                                                                    final Function<Value, T> transformer) {
-        final BatchSizeIncreasingRangeIterator results = new BatchSizeIncreasingRangeIterator(tableRef, range, preFilterBatchSize);
-        Iterator<Iterator<RowResult<T>>> batchedPostfiltered = new AbstractIterator<Iterator<RowResult<T>>>() {
+            Predicates.compose(Predicates.not(Value.IS_EMPTY), MapEntries.getValueFunction()));
+    }
+
+    protected <T> ClosableIterator<RowResult<T>> postFilterIterator(
+            TableReference tableRef,
+            RangeRequest range,
+            int preFilterBatchSize,
+            Function<Value, T> transformer) {
+        RowRangeBatchProvider batchProvider =
+                new RowRangeBatchProvider(keyValueService, tableRef, range, getStartTimestamp());
+        BatchSizeIncreasingIterator<RowResult<Value>> results =
+                new BatchSizeIncreasingIterator<>(batchProvider, preFilterBatchSize, null);
+        Iterator<Iterator<RowResult<T>>> batchedPostFiltered = new AbstractIterator<Iterator<RowResult<T>>>() {
             @Override
             protected Iterator<RowResult<T>> computeNext() {
                 List<RowResult<Value>> batch = results.getBatch();
@@ -655,12 +725,12 @@ protected Iterator<RowResult<T>> computeNext() {
                     return endOfData();
                 }
                 SortedMap<Cell, T> postFilter = postFilterRows(tableRef, batch, transformer);
-                results.markNumRowsNotDeleted(Cells.getRows(postFilter.keySet()).size());
+                results.markNumResultsNotDeleted(Cells.getRows(postFilter.keySet()).size());
                 return Cells.createRowView(postFilter.entrySet());
             }
         };
 
-        final Iterator<RowResult<T>> rows = Iterators.concat(batchedPostfiltered);
+        final Iterator<RowResult<T>> rows = Iterators.concat(batchedPostFiltered);
         return new ForwardingClosableIterator<RowResult<T>>() {
             @Override
             protected ClosableIterator<RowResult<T>> delegate() {
@@ -669,102 +739,9 @@ protected ClosableIterator<RowResult<T>> delegate() {
 
             @Override
             public void close() {
-                if (results != null) {
-                    results.close();
-                }
-            }
-        };
-    }
-
-    private class BatchSizeIncreasingRangeIterator {
-        final TableReference tableRef;
-        final RangeRequest range;
-        final int originalBatchSize;
-
-        long numReturned = 0;
-        long numNotDeleted = 0;
-
-        ClosableIterator<RowResult<Value>> results = null;
-        int lastBatchSize;
-        byte[] lastRow = null;
-
-        public BatchSizeIncreasingRangeIterator(TableReference tableRef,
-                                                RangeRequest range,
-                                                int originalBatchSize) {
-            Validate.isTrue(originalBatchSize > 0);
-            this.tableRef = tableRef;
-            this.range = range;
-            this.originalBatchSize = originalBatchSize;
-        }
-
-        public void markNumRowsNotDeleted(int rowsInBatch) {
-            numNotDeleted += rowsInBatch;
-            AssertUtils.assertAndLog(numNotDeleted <= numReturned, "NotDeleted is bigger than the number of rows we returned.");
-        }
-
-        int getBestBatchSize() {
-            if (numReturned == 0) {
-                return originalBatchSize;
-            }
-            final long batchSize;
-            if (numNotDeleted == 0) {
-                // If everything we've seen has been deleted, we should be aggressive about getting more rows.
-                batchSize = numReturned*4;
-            } else {
-                batchSize = (long)Math.ceil(originalBatchSize * (numReturned / (double)numNotDeleted));
-            }
-            return (int)Math.min(batchSize, AtlasDbPerformanceConstants.MAX_BATCH_SIZE);
-        }
-
-        private void updateResultsIfNeeded() {
-            if (results == null) {
-                results = keyValueService.getRange(tableRef, range.withBatchHint(originalBatchSize), getStartTimestamp());
-                lastBatchSize = originalBatchSize;
-                return;
-            }
-
-            Validate.isTrue(lastRow != null);
-
-            // If the last row we got was the maximal row, then we are done.
-            if (RangeRequests.isTerminalRow(range.isReverse(), lastRow)) {
-                results = ClosableIterators.wrap(ImmutableList.<RowResult<Value>>of().iterator());
-                return;
-            }
-
-            int bestBatchSize = getBestBatchSize();
-            // Only close and throw away our old iterator if the batch size has changed by a factor of 2 or more.
-            if (bestBatchSize >= lastBatchSize*2 || bestBatchSize <= lastBatchSize/2) {
-                byte[] nextStartRow = RangeRequests.getNextStartRow(range.isReverse(), lastRow);
-                if (Arrays.equals(nextStartRow, range.getEndExclusive())) {
-                    results = ClosableIterators.wrap(ImmutableList.<RowResult<Value>>of().iterator());
-                    return;
-                }
-                RangeRequest.Builder newRange = range.getBuilder();
-                newRange.startRowInclusive(nextStartRow);
-                newRange.batchHint(bestBatchSize);
                 results.close();
-                results = keyValueService.getRange(tableRef, newRange.build(), getStartTimestamp());
-                lastBatchSize = bestBatchSize;
             }
-        }
-
-        public List<RowResult<Value>> getBatch() {
-            updateResultsIfNeeded();
-            Validate.isTrue(lastBatchSize > 0);
-            ImmutableList<RowResult<Value>> list = ImmutableList.copyOf(Iterators.limit(results, lastBatchSize));
-            numReturned += list.size();
-            if (!list.isEmpty()) {
-                lastRow = list.get(list.size()-1).getRowName();
-            }
-            return list;
-        }
-
-        public void close() {
-            if (results != null) {
-                results.close();
-            }
-        }
-
+        };
     }
 
     private ConcurrentNavigableMap<Cell, byte[]> getLocalWrites(TableReference tableRef) {
@@ -793,6 +770,31 @@ private SortedMap<Cell, byte[]> getLocalWritesForRange(TableReference tableRef,
         return writes;
     }
 
+    private SortedMap<Cell, byte[]> getLocalWritesForColumnRange(
+            TableReference tableRef,
+            ColumnRangeSelection columnRangeSelection,
+            byte[] row) {
+        SortedMap<Cell, byte[]> writes = getLocalWrites(tableRef);
+        Cell startCell;
+        if (columnRangeSelection.getStartCol().length != 0) {
+            startCell = Cell.create(row, columnRangeSelection.getStartCol());
+        } else {
+            startCell = Cells.createSmallestCellForRow(row);
+        }
+        writes = writes.tailMap(startCell);
+        if (RangeRequests.isLastRowName(row)) {
+            return writes;
+        }
+        Cell endCell;
+        if (columnRangeSelection.getEndCol().length != 0) {
+            endCell = Cell.create(row, columnRangeSelection.getEndCol());
+        } else {
+            endCell = Cells.createSmallestCellForRow(RangeRequests.nextLexicographicName(row));
+        }
+        writes = writes.headMap(endCell);
+        return writes;
+    }
+
     private SortedMap<Cell, byte[]> postFilterPages(TableReference tableRef,
             Iterable<TokenBackedBasicResultsPage<RowResult<Value>, byte[]>> rangeRows) {
         List<RowResult<Value>> results = Lists.newArrayList();
@@ -839,7 +841,8 @@ private <T> void getWithPostfiltering(TableReference tableRef,
         for (Map.Entry<Cell, Value> e : rawResults.entrySet()) {
             bytes += e.getValue().getContents().length + Cells.getApproxSizeOfCell(e.getKey());
         }
-        if (bytes > TransactionConstants.ERROR_LEVEL_FOR_QUEUED_BYTES && !AtlasDbConstants.TABLES_KNOWN_TO_BE_POORLY_DESIGNED.contains(tableRef)) {
+        if (bytes > TransactionConstants.ERROR_LEVEL_FOR_QUEUED_BYTES
+                && !AtlasDbConstants.TABLES_KNOWN_TO_BE_POORLY_DESIGNED.contains(tableRef)) {
             log.error("A single get had a lot of bytes: " + bytes + " for table " + tableRef.getQualifiedName() + ". "
                     + "The number of results was " + rawResults.size() + ". "
                     + "The first 10 results were " + Iterables.limit(rawResults.entrySet(), 10) + ". "
@@ -852,7 +855,8 @@ private <T> void getWithPostfiltering(TableReference tableRef,
                     new RuntimeException("This exception and stack trace are provided for debugging purposes."));
         }
 
-        if (isTempTable(tableRef) || (AtlasDbConstants.SKIP_POSTFILTER_TABLES.contains(tableRef) && allowHiddenTableAccess)) {
+        if (isTempTable(tableRef)
+                || (AtlasDbConstants.SKIP_POSTFILTER_TABLES.contains(tableRef) && allowHiddenTableAccess)) {
             // If we are reading from a temp table, we can just bypass postfiltering
             // or skip postfiltering if reading the transaction or namespace table from atlasdb shell
             for (Map.Entry<Cell, Value> e : rawResults.entrySet()) {
@@ -860,8 +864,11 @@ private <T> void getWithPostfiltering(TableReference tableRef,
             }
             return;
         }
-        while (!rawResults.isEmpty()) {
-            rawResults = getWithPostfilteringInternal(tableRef, rawResults, results, transformer);
+
+        Map<Cell, Value> remainingResultsToPostfilter = rawResults;
+        while (!remainingResultsToPostfilter.isEmpty()) {
+            remainingResultsToPostfilter = getWithPostfilteringInternal(
+                    tableRef, remainingResultsToPostfilter, results, transformer);
         }
     }
 
@@ -888,11 +895,11 @@ private <T> Map<Cell, Value> getWithPostfilteringInternal(TableReference tableRe
                     case IGNORE:
                         break;
                     case THROW_EXCEPTION:
-                        throw new TransactionFailedRetriableException("Tried to read a value that has been deleted. " +
-                                " This can be caused by hard delete transactions using the type " +
-                                TransactionType.AGGRESSIVE_HARD_DELETE +
-                                ". It can also be caused by transactions taking too long, or" +
-                                " its locks expired. Retrying it should work.");
+                        throw new TransactionFailedRetriableException("Tried to read a value that has been deleted. "
+                                + " This can be caused by hard delete transactions using the type "
+                                + TransactionType.AGGRESSIVE_HARD_DELETE
+                                + ". It can also be caused by transactions taking too long, or"
+                                + " its locks expired. Retrying it should work.");
                     default:
                         throw new IllegalStateException("Invalid read sentinel behavior " + getReadSentinelBehavior());
                 }
@@ -942,29 +949,38 @@ protected boolean shouldDeleteAndRollback() {
         return true;
     }
 
+    @Override
+    public final void delete(TableReference tableRef, Set<Cell> cells) {
+        put(tableRef, Cells.constantValueMap(cells, PtBytes.EMPTY_BYTE_ARRAY), Cell.INVALID_TTL, Cell.INVALID_TTL_TYPE);
+    }
+
     @Override
     public void put(TableReference tableRef, Map<Cell, byte[]> values) {
+        ensureNoEmptyValues(values);
         put(tableRef, values, Cell.INVALID_TTL, Cell.INVALID_TTL_TYPE);
     }
 
-    public void put(TableReference tableRef, Map<Cell, byte[]> values, long ttlDuration, TimeUnit ttlUnit) {
+    private void put(TableReference tableRef, Map<Cell, byte[]> values, long ttlDuration, TimeUnit ttlUnit) {
         Preconditions.checkArgument(!AtlasDbConstants.hiddenTables.contains(tableRef));
-        // todo (clockfort) also check if valid table for TTL
-        if (ttlDuration != Cell.INVALID_TTL && ttlUnit != Cell.INVALID_TTL_TYPE) {
-            values = createExpiringValues(values, ttlDuration, ttlUnit);
-        }
 
         if (!validConflictDetection(tableRef)) {
             conflictDetectionManager.recompute();
-            Preconditions.checkArgument(validConflictDetection(tableRef),
+            Preconditions.checkArgument(
+                    validConflictDetection(tableRef),
                     "Not a valid table for this transaction.  Make sure this table name has a namespace: " + tableRef);
         }
-        Validate.isTrue(isTempTable(tableRef) || getAllTempTables().isEmpty(),
+        Validate.isTrue(
+                isTempTable(tableRef) || getAllTempTables().isEmpty(),
                 "Temp tables may only be used by read only transactions.");
         if (values.isEmpty()) {
             return;
         }
 
+        // todo (clockfort) also check if valid table for TTL
+        Map<Cell, byte[]> valuesToWrite = ttlDuration != Cell.INVALID_TTL && ttlUnit != Cell.INVALID_TTL_TYPE
+                ? createExpiringValues(values, ttlDuration, ttlUnit)
+                : values;
+
         numWriters.incrementAndGet();
         try {
             // We need to check the status after incrementing writers to ensure that we fail if we are committing.
@@ -973,15 +989,24 @@ public void put(TableReference tableRef, Map<Cell, byte[]> values, long ttlDurat
             ConcurrentNavigableMap<Cell, byte[]> writes = getLocalWrites(tableRef);
 
             if (isTempTable(tableRef)) {
-                putTempTableWrites(tableRef, values, writes);
+                putTempTableWrites(tableRef, valuesToWrite, writes);
             } else {
-                putWritesAndLogIfTooLarge(values, writes);
+                putWritesAndLogIfTooLarge(valuesToWrite, writes);
             }
         } finally {
             numWriters.decrementAndGet();
         }
     }
 
+    private void ensureNoEmptyValues(Map<Cell, byte[]> values) {
+        for (Entry<Cell, byte[]> cellEntry : values.entrySet()) {
+            if ((cellEntry.getValue() == null) || (cellEntry.getValue().length == 0)) {
+                throw new IllegalArgumentException(
+                        "AtlasDB does not currently support inserting null or empty (zero-byte) values.");
+            }
+        }
+    }
+
     private Map<Cell, byte[]> createExpiringValues(Map<Cell, byte[]> values,
                                                    long ttlDuration,
                                                    TimeUnit ttlUnit) {
@@ -1005,24 +1030,21 @@ private boolean validConflictDetection(TableReference tableRef) {
 
     private void putWritesAndLogIfTooLarge(Map<Cell, byte[]> values, SortedMap<Cell, byte[]> writes) {
         for (Map.Entry<Cell, byte[]> e : values.entrySet()) {
-            byte[] val = e.getValue();
-            if (val == null) {
-                val = PtBytes.EMPTY_BYTE_ARRAY;
-            }
+            byte[] val = MoreObjects.firstNonNull(e.getValue(), PtBytes.EMPTY_BYTE_ARRAY);
             Cell cell = e.getKey();
             if (writes.put(cell, val) == null) {
                 long toAdd = val.length + Cells.getApproxSizeOfCell(cell);
                 long newVal = byteCount.addAndGet(toAdd);
                 if (newVal >= TransactionConstants.WARN_LEVEL_FOR_QUEUED_BYTES
                         && newVal - toAdd < TransactionConstants.WARN_LEVEL_FOR_QUEUED_BYTES) {
-                    log.warn("A single transaction has put quite a few bytes: " + newVal,
-                            new RuntimeException("This exception and stack trace are provided for debugging purposes."));
+                    log.warn("A single transaction has put quite a few bytes: " + newVal, new RuntimeException(
+                            "This exception and stack trace are provided for debugging purposes."));
                 }
                 if (newVal >= TransactionConstants.ERROR_LEVEL_FOR_QUEUED_BYTES
                         && newVal - toAdd < TransactionConstants.ERROR_LEVEL_FOR_QUEUED_BYTES) {
-                    log.warn("A single transaction has put too many bytes: " + newVal + ". This can potentially cause" +
-                            "out-of-memory errors.",
-                            new RuntimeException("This exception and stack trace are provided for debugging purposes."));
+                    log.warn("A single transaction has put too many bytes: " + newVal + ". This can potentially cause"
+                            + " out-of-memory errors.", new RuntimeException(
+                            "This exception and stack trace are provided for debugging purposes."));
                 }
             }
         }
@@ -1082,8 +1104,8 @@ public void commit(TransactionService transactionService) {
         // This must be done BEFORE we commit (otherwise if the system goes down after
         // we commit but before we queue cells for scrubbing, then we will lose track of
         // which cells we need to scrub)
-        if (getTransactionType() == TransactionType.AGGRESSIVE_HARD_DELETE ||
-                getTransactionType() == TransactionType.HARD_DELETE) {
+        if (getTransactionType() == TransactionType.AGGRESSIVE_HARD_DELETE
+                || getTransactionType() == TransactionType.HARD_DELETE) {
             cleaner.queueCellsForScrubbing(getCellsToQueueForScrubbing(), getStartTimestamp());
         }
 
@@ -1121,7 +1143,7 @@ private void checkConstraints() {
             }
         }
         if (!violations.isEmpty()) {
-            if(constraintCheckingMode.shouldThrowException()) {
+            if (constraintCheckingMode.shouldThrowException()) {
                 throw new AtlasDbConstraintException(violations);
             } else {
                 constraintLogger.error("Constraint failure on commit.",
@@ -1173,16 +1195,17 @@ private void commitWrites(TransactionService transactionService) {
             Set<LockRefreshToken> expiredLocks = refreshExternalAndCommitLocks(commitLocksToken);
             if (!expiredLocks.isEmpty()) {
                 String errorMessage =
-                    "This isn't a bug but it should happen very infrequently.  Required locks are no longer" +
-                    " valid but we have already committed successfully.  " + getExpiredLocksErrorString(commitLocksToken, expiredLocks);
+                        "This isn't a bug but it should happen very infrequently. Required locks are no longer"
+                        + " valid but we have already committed successfully. "
+                        + getExpiredLocksErrorString(commitLocksToken, expiredLocks);
                 log.error(errorMessage, new TransactionFailedRetriableException(errorMessage));
             }
             long millisSinceCreation = System.currentTimeMillis() - timeCreated;
             if (perfLogger.isDebugEnabled()) {
-                perfLogger.debug("Committed {} bytes with locks, start ts {}, commit ts {}, " +
-                        "acquiring locks took {} ms, checking for conflicts took {} ms, " +
-                        "writing took {} ms, punch took {} ms, putCommitTs took {} ms, " +
-                        "total time since tx creation {} ms, tables: {}.",
+                perfLogger.debug("Committed {} bytes with locks, start ts {}, commit ts {}, "
+                        + "acquiring locks took {} ms, checking for conflicts took {} ms, "
+                        + "writing took {} ms, punch took {} ms, putCommitTs took {} ms, "
+                        + "total time since tx creation {} ms, tables: {}.",
                         byteCount.get(), getStartTimestamp(),
                         commitTimestamp, millisForLocks, millisCheckingForConflicts, millisForWrites,
                         millisForPunch, millisForCommitTs, millisSinceCreation, writesByTable.keySet());
@@ -1217,24 +1240,24 @@ protected ConflictHandler getConflictHandlerForTable(TableReference tableRef) {
 
     private String getExpiredLocksErrorString(@Nullable LockRefreshToken commitLocksToken,
                                               Set<LockRefreshToken> expiredLocks) {
-        return "The following external locks were required: " + externalLocksTokens +
-            "; the following commit locks were required: " + commitLocksToken +
-            "; the following locks are no longer valid: " + expiredLocks;
+        return "The following external locks were required: " + externalLocksTokens
+            + "; the following commit locks were required: " + commitLocksToken
+            + "; the following locks are no longer valid: " + expiredLocks;
     }
 
     private void throwIfExternalAndCommitLocksNotValid(@Nullable LockRefreshToken commitLocksToken) {
         Set<LockRefreshToken> expiredLocks = refreshExternalAndCommitLocks(commitLocksToken);
         if (!expiredLocks.isEmpty()) {
-            String errorMessage =
-                "Required locks are no longer valid.  " + getExpiredLocksErrorString(commitLocksToken, expiredLocks);
-            TransactionLockTimeoutException e = new TransactionLockTimeoutException(errorMessage);
-            log.error(errorMessage, e);
-            throw e;
-       }
+            String errorMessage = "Required locks are no longer valid. "
+                    + getExpiredLocksErrorString(commitLocksToken, expiredLocks);
+            TransactionLockTimeoutException ex = new TransactionLockTimeoutException(errorMessage);
+            log.error(errorMessage, ex);
+            throw ex;
+        }
     }
 
     /**
-     * @param commitLocksToken
+     * Refreshes external and commit locks.
      * @return set of locks that could not be refreshed
      */
     private Set<LockRefreshToken> refreshExternalAndCommitLocks(@Nullable LockRefreshToken commitLocksToken) {
@@ -1256,10 +1279,16 @@ private Set<LockRefreshToken> refreshExternalAndCommitLocks(@Nullable LockRefres
     /**
      * Make sure we have all the rows we are checking already locked before calling this.
      */
-    protected void throwIfConflictOnCommit(LockRefreshToken commitLocksToken, TransactionService transactionService) throws TransactionConflictException {
+    protected void throwIfConflictOnCommit(LockRefreshToken commitLocksToken, TransactionService transactionService)
+            throws TransactionConflictException {
         for (Entry<TableReference, ConcurrentNavigableMap<Cell, byte[]>> write : writesByTable.entrySet()) {
             ConflictHandler conflictHandler = getConflictHandlerForTable(write.getKey());
-            throwIfWriteAlreadyCommitted(write.getKey(), write.getValue(), conflictHandler, commitLocksToken, transactionService);
+            throwIfWriteAlreadyCommitted(
+                    write.getKey(),
+                    write.getValue(),
+                    conflictHandler,
+                    commitLocksToken,
+                    transactionService);
         }
     }
 
@@ -1276,7 +1305,12 @@ protected void throwIfWriteAlreadyCommitted(TableReference tableRef,
         Set<CellConflict> dominatingWrites = Sets.newHashSet();
         Map<Cell, Long> keysToLoad = Maps.asMap(writes.keySet(), Functions.constant(Long.MAX_VALUE));
         while (!keysToLoad.isEmpty()) {
-            keysToLoad = detectWriteAlreadyCommittedInternal(tableRef, keysToLoad, spanningWrites, dominatingWrites, transactionService);
+            keysToLoad = detectWriteAlreadyCommittedInternal(
+                    tableRef,
+                    keysToLoad,
+                    spanningWrites,
+                    dominatingWrites,
+                    transactionService);
         }
 
         if (conflictHandler == ConflictHandler.RETRY_ON_VALUE_CHANGED) {
@@ -1340,14 +1374,17 @@ private void throwIfValueChangedConflict(TableReference table,
                     || !Arrays.equals(writeVal, conflictingVal)) {
                 conflictingCells.add(cell);
             } else if (log.isInfoEnabled()) {
-                log.info("Another transaction committed to the same cell before us but " +
-                        "their value was the same. " + "Cell: "  + cell + " Table: " + table);
+                log.info("Another transaction committed to the same cell before us but their value was the same."
+                        + " Cell: "  + cell
+                        + " Table: " + table);
             }
         }
         if (conflictingCells.isEmpty()) {
             return;
         }
-        Predicate<CellConflict> conflicting = Predicates.compose(Predicates.in(conflictingCells), CellConflict.getCellFunction());
+        Predicate<CellConflict> conflicting = Predicates.compose(
+                Predicates.in(conflictingCells),
+                CellConflict.getCellFunction());
         throw TransactionConflictException.create(table,
                 getStartTimestamp(),
                 Sets.filter(spanningWrites, conflicting),
@@ -1416,10 +1453,13 @@ protected Map<Cell, Long> detectWriteAlreadyCommittedInternal(TableReference tab
     /**
      * This will attempt to rollback the passed transactions.  If all are rolled back correctly this
      * method will also delete the values for the transactions that have been rolled back.
-     * @return false if we cannot roll back the failed transactions because someone beat us to it.
+     * @return false if we cannot roll back the failed transactions because someone beat us to it
      */
-    private boolean rollbackFailedTransactions(TableReference tableRef,
-            Map<Cell, Long> keysToDelete,  Map<Long, Long> commitTimestamps, TransactionService transactionService) {
+    private boolean rollbackFailedTransactions(
+            TableReference tableRef,
+            Map<Cell, Long> keysToDelete,
+            Map<Long, Long> commitTimestamps,
+            TransactionService transactionService) {
         for (long startTs : Sets.newHashSet(keysToDelete.values())) {
             if (commitTimestamps.get(startTs) == null) {
                 log.warn("Rolling back transaction: " + startTs);
@@ -1432,7 +1472,8 @@ private boolean rollbackFailedTransactions(TableReference tableRef,
         }
 
         try {
-            log.warn("For table: " + tableRef + " we are deleting values of an uncommitted transaction: " + keysToDelete);
+            log.warn("For table: " + tableRef
+                    + " we are deleting values of an uncommitted transaction: " + keysToDelete);
             keyValueService.delete(tableRef, Multimaps.forMap(keysToDelete));
         } catch (RuntimeException e) {
             String msg = "This isn't a bug but it should be infrequent if all nodes of your KV service are running. "
@@ -1448,6 +1489,7 @@ private boolean rollbackFailedTransactions(TableReference tableRef,
     }
 
     /**
+     * Rollback a someone else's transaction.
      * @return true if the other transaction was rolled back
      */
     private boolean rollbackOtherTransaction(long startTs, TransactionService transactionService) {
@@ -1455,9 +1497,10 @@ private boolean rollbackOtherTransaction(long startTs, TransactionService transa
             transactionService.putUnlessExists(startTs, TransactionConstants.FAILED_COMMIT_TS);
             return true;
         } catch (KeyAlreadyExistsException e) {
-                String msg = "Two transactions tried to roll back someone else's request with start: " + startTs;
-                log.error("This isn't a bug but it should be very infrequent. " + msg, new TransactionFailedRetriableException(msg, e));
-                return false;
+            String msg = "Two transactions tried to roll back someone else's request with start: " + startTs;
+            log.error("This isn't a bug but it should be very infrequent. " + msg,
+                    new TransactionFailedRetriableException(msg, e));
+            return false;
         }
     }
 
@@ -1479,22 +1522,35 @@ protected LockRefreshToken acquireLocksForCommit() {
 
     protected ImmutableSortedMap<LockDescriptor, LockMode> getLocksForWrites() {
         Builder<LockDescriptor, LockMode> builder = ImmutableSortedMap.naturalOrder();
-        Iterable<TableReference> allTables = IterableUtils.append(writesByTable.keySet(), TransactionConstants.TRANSACTION_TABLE);
+        Iterable<TableReference> allTables = IterableUtils.append(
+                writesByTable.keySet(),
+                TransactionConstants.TRANSACTION_TABLE);
         for (TableReference tableRef : allTables) {
             if (tableRef.equals(TransactionConstants.TRANSACTION_TABLE)) {
-                builder.put(AtlasRowLockDescriptor.of(TransactionConstants.TRANSACTION_TABLE.getQualifiedName(), TransactionConstants.getValueForTimestamp(getStartTimestamp())), LockMode.WRITE);
+                builder.put(
+                        AtlasRowLockDescriptor.of(
+                                TransactionConstants.TRANSACTION_TABLE.getQualifiedName(),
+                                TransactionConstants.getValueForTimestamp(getStartTimestamp())),
+                        LockMode.WRITE);
                 continue;
             }
             ConflictHandler conflictHandler = getConflictHandlerForTable(tableRef);
             if (conflictHandler == ConflictHandler.RETRY_ON_WRITE_WRITE_CELL) {
                 for (Cell cell : getLocalWrites(tableRef).keySet()) {
-                    builder.put(AtlasCellLockDescriptor.of(tableRef.getQualifiedName(), cell.getRowName(), cell.getColumnName()), LockMode.WRITE);
+                    builder.put(
+                            AtlasCellLockDescriptor.of(
+                                    tableRef.getQualifiedName(),
+                                    cell.getRowName(),
+                                    cell.getColumnName()),
+                            LockMode.WRITE);
                 }
             } else if (conflictHandler != ConflictHandler.IGNORE_ALL) {
                 Cell lastCell = null;
                 for (Cell cell : getLocalWrites(tableRef).keySet()) {
                     if (lastCell == null || !Arrays.equals(lastCell.getRowName(), cell.getRowName())) {
-                        builder.put(AtlasRowLockDescriptor.of(tableRef.getQualifiedName(), cell.getRowName()), LockMode.WRITE);
+                        builder.put(
+                                AtlasRowLockDescriptor.of(tableRef.getQualifiedName(), cell.getRowName()),
+                                LockMode.WRITE);
                     }
                     lastCell = cell;
                 }
@@ -1517,7 +1573,11 @@ private void waitForCommitToComplete(Iterable<Long> startTimestamps) {
                 continue;
             }
             isEmpty = false;
-            builder.put(AtlasRowLockDescriptor.of(TransactionConstants.TRANSACTION_TABLE.getQualifiedName(), TransactionConstants.getValueForTimestamp(start)), LockMode.READ);
+            builder.put(
+                    AtlasRowLockDescriptor.of(
+                            TransactionConstants.TRANSACTION_TABLE.getQualifiedName(),
+                            TransactionConstants.getValueForTimestamp(start)),
+                    LockMode.READ);
         }
 
         if (isEmpty) {
@@ -1527,7 +1587,9 @@ private void waitForCommitToComplete(Iterable<Long> startTimestamps) {
         // TODO: This can have better performance if we have a blockAndReturn method in lock server
         // However lock server blocking is an issue if we fill up all our requests
         try {
-            lockService.lock(LockClient.ANONYMOUS.getClientId(), LockRequest.builder(builder.build()).lockAndRelease().build());
+            lockService.lock(
+                    LockClient.ANONYMOUS.getClientId(),
+                    LockRequest.builder(builder.build()).lockAndRelease().build());
         } catch (InterruptedException e) {
             throw Throwables.throwUncheckedException(e);
         }
@@ -1558,12 +1620,12 @@ protected Map<Long, Long> getCommitTimestamps(@Nullable TableReference tableRef,
         }
         Map<Long, Long> result = Maps.newHashMap();
         Set<Long> gets = Sets.newHashSet();
-        for (long startTS : startTimestamps) {
-            Long cached = cachedCommitTimes.get(startTS);
+        for (long startTs : startTimestamps) {
+            Long cached = cachedCommitTimes.get(startTs);
             if (cached != null) {
-                result.put(startTS, cached);
+                result.put(startTs, cached);
             } else {
-                gets.add(startTS);
+                gets.add(startTs);
             }
         }
 
@@ -1579,13 +1641,15 @@ protected Map<Long, Long> getCommitTimestamps(@Nullable TableReference tableRef,
                     watch.elapsed(TimeUnit.MILLISECONDS), tableRef);
         }
 
+        log.trace("Getting commit timestamps for {} start timestamps in response to read from table {}",
+                gets.size(), tableRef);
         Map<Long, Long> rawResults = defaultTransactionService.get(gets);
         for (Map.Entry<Long, Long> e : rawResults.entrySet()) {
             if (e.getValue() != null) {
-                long startTS = e.getKey();
-                long commitTS = e.getValue();
-                result.put(startTS, commitTS);
-                cachedCommitTimes.put(startTS, commitTS);
+                long startTs = e.getKey();
+                long commitTs = e.getValue();
+                result.put(startTs, commitTs);
+                cachedCommitTimes.put(startTs, commitTs);
             }
         }
         return result;
@@ -1597,7 +1661,11 @@ protected Map<Long, Long> getCommitTimestamps(@Nullable TableReference tableRef,
      * @throws TransactionLockTimeoutException If our locks timed out while trying to commit.
      * @throws TransactionCommitFailedException failed when committing in a way that isn't retriable
      */
-    private void putCommitTimestamp(long commitTimestamp, LockRefreshToken locksToken, TransactionService transactionService) throws TransactionFailedException {
+    private void putCommitTimestamp(
+            long commitTimestamp,
+            LockRefreshToken locksToken,
+            TransactionService transactionService)
+            throws TransactionFailedException {
         Validate.isTrue(commitTimestamp > getStartTimestamp(), "commitTs must be greater than startTs");
         try {
             transactionService.putUnlessExists(getStartTimestamp(), commitTimestamp);
@@ -1605,14 +1673,17 @@ private void putCommitTimestamp(long commitTimestamp, LockRefreshToken locksToke
             handleKeyAlreadyExistsException(commitTimestamp, e, locksToken);
         } catch (Exception e) {
             TransactionCommitFailedException commitFailedEx = new TransactionCommitFailedException(
-                    "This transaction failed writing the commit timestamp. " +
-                    "It might have been committed, but it may not have.", e);
+                    "This transaction failed writing the commit timestamp. "
+                    + "It might have been committed, but it may not have.", e);
             log.error("failed to commit an atlasdb transaction", commitFailedEx);
             throw commitFailedEx;
         }
     }
 
-    private void handleKeyAlreadyExistsException(long commitTs, KeyAlreadyExistsException e, LockRefreshToken commitLocksToken) {
+    private void handleKeyAlreadyExistsException(
+            long commitTs,
+            KeyAlreadyExistsException ex,
+            LockRefreshToken commitLocksToken) {
         try {
             if (wasCommitSuccessful(commitTs)) {
                 // We did actually commit successfully.  This case could happen if the impl
@@ -1621,23 +1692,24 @@ private void handleKeyAlreadyExistsException(long commitTs, KeyAlreadyExistsExce
             }
             Set<LockRefreshToken> expiredLocks = refreshExternalAndCommitLocks(commitLocksToken);
             if (!expiredLocks.isEmpty()) {
-                throw new TransactionLockTimeoutException("Our commit was already rolled back at commit time " +
-                        "because our locks timed out.  startTs: " + getStartTimestamp() + ".  " +
-                        getExpiredLocksErrorString(commitLocksToken, expiredLocks), e);
+                throw new TransactionLockTimeoutException("Our commit was already rolled back at commit time"
+                        + " because our locks timed out. startTs: " + getStartTimestamp() + ".  "
+                        + getExpiredLocksErrorString(commitLocksToken, expiredLocks), ex);
             } else {
-                AssertUtils.assertAndLog(false,
-                        "BUG: Someone tried to roll back our transaction but our locks were still valid; this is not allowed." +
-                        " Held external locks: " + externalLocksTokens + "; held commit locks: " + commitLocksToken);
+                AssertUtils.assertAndLog(false, "BUG: Someone tried to roll back our transaction but"
+                        + " our locks were still valid; this is not allowed."
+                        + " Held external locks: " + externalLocksTokens
+                        + "; held commit locks: " + commitLocksToken);
             }
         } catch (TransactionFailedException e1) {
             throw e1;
         } catch (Exception e1) {
             log.error("Failed to determine if we can retry this transaction. startTs: " + getStartTimestamp(), e1);
         }
-        String msg = "Our commit was already rolled back at commit time.  " +
-                "Locking should prevent this from happening, but our locks may have timed out.  " +
-                "startTs: " + getStartTimestamp();
-        throw new TransactionCommitFailedException(msg, e);
+        String msg = "Our commit was already rolled back at commit time."
+                + " Locking should prevent this from happening, but our locks may have timed out."
+                + " startTs: " + getStartTimestamp();
+        throw new TransactionCommitFailedException(msg, ex);
     }
 
     private boolean wasCommitSuccessful(long commitTs) throws Exception {
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java
index c282a9e1a8e..df4cc87ae0c 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionManager.java
@@ -50,7 +50,7 @@
 import com.palantir.timestamp.TimestampService;
 
 /* package */ class SnapshotTransactionManager extends AbstractLockAwareTransactionManager {
-    private final static int NUM_RETRIES = 10;
+    private static final int NUM_RETRIES = 10;
 
     final KeyValueService keyValueService;
     final TransactionService transactionService;
@@ -109,7 +109,7 @@ protected boolean shouldStopRetrying(int numTimesFailed) {
     public <T, E extends Exception> T runTaskWithLocksThrowOnConflict(Iterable<HeldLocksToken> lockTokens,
                                                                       LockAwareTransactionTask<T, E> task)
             throws E, TransactionFailedRetriableException {
-        Iterable<LockRefreshToken> lockRefreshTokens= Iterables.transform(lockTokens,
+        Iterable<LockRefreshToken> lockRefreshTokens = Iterables.transform(lockTokens,
                 new Function<HeldLocksToken, LockRefreshToken>() {
                     @Nullable
                     @Override
@@ -128,22 +128,24 @@ public RawTransaction setupRunTaskWithLocksThrowOnConflict(Iterable<LockRefreshT
         LockRequest lockRequest =
                 LockRequest.builder(ImmutableSortedMap.of(lockDesc, LockMode.READ)).withLockedInVersionId(
                         immutableLockTs).build();
-        final LockRefreshToken lock;
+        LockRefreshToken lock;
         try {
             lock = lockService.lock(lockClient.getClientId(), lockRequest);
         } catch (InterruptedException e) {
             throw Throwables.throwUncheckedException(e);
         }
         try {
-            ImmutableList<LockRefreshToken> allTokens =
-                    ImmutableList.<LockRefreshToken> builder().add(lock).addAll(lockTokens).build();
-            SnapshotTransaction t = createTransaction(immutableLockTs, startTimestampSupplier, allTokens);
-            return new RawTransaction(t, lock);
-        } catch (Throwable t) {
-            lockService.unlock(lock);
-            Throwables.throwIfInstance(t, Error.class);
-            Throwables.throwIfInstance(t, RuntimeException.class);
-            throw Throwables.rewrapAndThrowUncheckedException(t);
+            ImmutableList<LockRefreshToken> allTokens = ImmutableList.<LockRefreshToken>builder()
+                    .add(lock)
+                    .addAll(lockTokens)
+                    .build();
+            SnapshotTransaction transaction = createTransaction(immutableLockTs, startTimestampSupplier, allTokens);
+            return new RawTransaction(transaction, lock);
+        } catch (Throwable e) {
+            if (lock != null) {
+                lockService.unlock(lock);
+            }
+            throw Throwables.rewrapAndThrowUncheckedException(e);
         }
     }
 
@@ -189,7 +191,7 @@ protected SnapshotTransaction createTransaction(long immutableLockTs,
     @Override
     public <T, E extends Exception> T runTaskReadOnly(TransactionTask<T, E> task) throws E {
         long immutableTs = getApproximateImmutableTimestamp();
-        SnapshotTransaction t = new SnapshotTransaction(
+        SnapshotTransaction transaction = new SnapshotTransaction(
                 keyValueService,
                 lockService,
                 timestampService,
@@ -204,7 +206,7 @@ public <T, E extends Exception> T runTaskReadOnly(TransactionTask<T, E> task) th
                 cleaner.getTransactionReadTimeoutMillis(),
                 TransactionReadSentinelBehavior.THROW_EXCEPTION,
                 allowHiddenTableAccess);
-        return runTaskThrowOnConflict(task, new OnlyWriteTempTablesTransaction(t, sweepStrategyManager));
+        return runTaskThrowOnConflict(task, new OnlyWriteTempTablesTransaction(transaction, sweepStrategyManager));
     }
 
     private Supplier<Long> getStartTimestampSupplier() {
@@ -269,7 +271,7 @@ public Cleaner getCleaner() {
     public KeyValueService getKeyValueService() {
         return keyValueService;
     }
-    
+
     public TimestampService getTimestampService() {
         return timestampService;
     }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ThreadLocalWrappingTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ThreadLocalWrappingTransactionManager.java
index 25f27662636..17a1f7bc9f1 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ThreadLocalWrappingTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/ThreadLocalWrappingTransactionManager.java
@@ -23,18 +23,19 @@
 public class ThreadLocalWrappingTransactionManager extends WrappingTransactionManager {
     private final ExecutorInheritableThreadLocal<TransactionWrapper> wrapper;
 
-    public ThreadLocalWrappingTransactionManager(LockAwareTransactionManager delegate,
-                                                 ExecutorInheritableThreadLocal<TransactionWrapper> wrapper) {
+    public ThreadLocalWrappingTransactionManager(
+            LockAwareTransactionManager delegate,
+            ExecutorInheritableThreadLocal<TransactionWrapper> wrapper) {
         super(delegate);
         this.wrapper = wrapper;
     }
 
     @Override
-    protected Transaction wrap(Transaction t) {
-        TransactionWrapper w = wrapper.get();
-        if (w == null) {
-            return t;
+    protected Transaction wrap(Transaction transaction) {
+        TransactionWrapper transactionWrapper = this.wrapper.get();
+        if (transactionWrapper == null) {
+            return transaction;
         }
-        return w.wrap(t);
+        return transactionWrapper.wrap(transaction);
     }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTables.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTables.java
index ae110cf0f6d..05ad6c6e4c7 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTables.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TransactionTables.java
@@ -17,12 +17,22 @@
 
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 
-public class TransactionTables {
+public final class TransactionTables {
+    private TransactionTables() {
+        // Utility class
+    }
+
     public static void createTables(KeyValueService keyValueService) {
-        keyValueService.createTable(TransactionConstants.TRANSACTION_TABLE, TransactionConstants.TRANSACTION_TABLE_METADATA.persistToBytes());
+        keyValueService.createTable(
+                TransactionConstants.TRANSACTION_TABLE,
+                TransactionConstants.TRANSACTION_TABLE_METADATA.persistToBytes());
     }
 
     public static void deleteTables(KeyValueService keyValueService) {
         keyValueService.dropTable(TransactionConstants.TRANSACTION_TABLE);
     }
+
+    public static void truncateTables(KeyValueService keyValueService) {
+        keyValueService.truncateTable(TransactionConstants.TRANSACTION_TABLE);
+    }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java
index 611a8611b95..8e561af16bf 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/WrappingTransactionManager.java
@@ -26,7 +26,6 @@
 import com.palantir.lock.RemoteLockService;
 
 public abstract class WrappingTransactionManager extends ForwardingLockAwareTransactionManager {
-
     private final LockAwareTransactionManager delegate;
 
     public WrappingTransactionManager(LockAwareTransactionManager delegate) {
@@ -38,15 +37,15 @@ protected LockAwareTransactionManager delegate() {
         return delegate;
     }
 
-    protected abstract Transaction wrap(Transaction t);
+    protected abstract Transaction wrap(Transaction transaction);
 
     @Override
-    public <T, E extends Exception> T runTaskWithRetry(final TransactionTask<T, E> task) throws E {
+    public <T, E extends Exception> T runTaskWithRetry(TransactionTask<T, E> task) throws E {
         return delegate().runTaskWithRetry(wrapTask(task));
     }
 
     @Override
-    public <T, E extends Exception> T runTaskThrowOnConflict(final TransactionTask<T, E> task) throws E,
+    public <T, E extends Exception> T runTaskThrowOnConflict(TransactionTask<T, E> task) throws E,
             TransactionConflictException {
         return delegate().runTaskThrowOnConflict(wrapTask(task));
     }
@@ -66,49 +65,41 @@ public RemoteLockService getLockService() {
         return delegate.getLockService();
     }
 
-    private <T, E extends Exception> TransactionTask<T, E> wrapTask(final TransactionTask<T, E> task) {
-        return new TransactionTask<T, E>() {
-            @Override
-            public T execute(Transaction t) throws E {
-                return task.execute(wrap(t));
-            }
-        };
+    private <T, E extends Exception> TransactionTask<T, E> wrapTask(TransactionTask<T, E> task) {
+        return transaction -> task.execute(wrap(transaction));
     }
 
-    private <T, E extends Exception> LockAwareTransactionTask<T, E> wrapTask(final LockAwareTransactionTask<T, E> task) {
-        return new LockAwareTransactionTask<T, E>() {
-            @Override
-            public T execute(Transaction t, Iterable<HeldLocksToken> locks) throws E {
-                return task.execute(wrap(t), locks);
-            }
-        };
+    private <T, E extends Exception> LockAwareTransactionTask<T, E> wrapTask(LockAwareTransactionTask<T, E> task) {
+        return (transaction, locks) -> task.execute(wrap(transaction), locks);
     }
 
     @Override
-    public <T, E extends Exception> T runTaskWithLocksThrowOnConflict(Iterable<HeldLocksToken> lockTokens,
-                                                                      LockAwareTransactionTask<T, E> task) throws E,
-            TransactionConflictException {
+    public <T, E extends Exception> T runTaskWithLocksThrowOnConflict(
+            Iterable<HeldLocksToken> lockTokens,
+            LockAwareTransactionTask<T, E> task)
+            throws E, TransactionConflictException {
         return delegate().runTaskWithLocksThrowOnConflict(lockTokens, wrapTask(task));
     }
 
     @Override
-    public <T, E extends Exception> T runTaskWithLocksWithRetry(Supplier<LockRequest> lockSupplier,
-                                                                LockAwareTransactionTask<T, E> task) throws E,
-            InterruptedException {
+    public <T, E extends Exception> T runTaskWithLocksWithRetry(
+            Supplier<LockRequest> lockSupplier,
+            LockAwareTransactionTask<T, E> task)
+            throws E, InterruptedException {
         return delegate().runTaskWithLocksWithRetry(lockSupplier, wrapTask(task));
     }
 
     @Override
-    public <T, E extends Exception> T runTaskReadOnly(TransactionTask<T, E> task) throws E {
-        return delegate().runTaskReadOnly(wrapTask(task));
-    }
-
-    @Override
-    public <T, E extends Exception> T runTaskWithLocksWithRetry(Iterable<HeldLocksToken> lockTokens,
-                                                                Supplier<LockRequest> lockSupplier,
-                                                                LockAwareTransactionTask<T, E> task)
+    public <T, E extends Exception> T runTaskWithLocksWithRetry(
+            Iterable<HeldLocksToken> lockTokens,
+            Supplier<LockRequest> lockSupplier,
+            LockAwareTransactionTask<T, E> task)
             throws E, InterruptedException {
         return delegate().runTaskWithLocksWithRetry(lockTokens, lockSupplier, wrapTask(task));
     }
 
+    @Override
+    public <T, E extends Exception> T runTaskReadOnly(TransactionTask<T, E> task) throws E {
+        return delegate().runTaskReadOnly(wrapTask(task));
+    }
 }
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java
index 524f3c6fe05..d2b390f5e1e 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/SimpleTransactionService.java
@@ -24,7 +24,7 @@
 import com.palantir.atlasdb.keyvalue.api.Value;
 import com.palantir.atlasdb.transaction.impl.TransactionConstants;
 
-final class SimpleTransactionService implements TransactionService {
+public final class SimpleTransactionService implements TransactionService {
     private final KeyValueService keyValueService;
 
     public SimpleTransactionService(KeyValueService keyValueService) {
@@ -54,8 +54,8 @@ public Long get(long startTimestamp) {
     public Map<Long, Long> get(Iterable<Long> startTimestamps) {
         Map<Cell, Long> startTsMap = Maps.newHashMap();
         for (Long startTimestamp : startTimestamps) {
-            Cell k = getTransactionCell(startTimestamp);
-            startTsMap.put(k, MAX_TIMESTAMP);
+            Cell cell = getTransactionCell(startTimestamp);
+            startTsMap.put(cell, MAX_TIMESTAMP);
         }
 
         Map<Cell, Value> rawResults = keyValueService.get(
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKVSWrapper.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKVSWrapper.java
index 07f365d03fe..a8ad44f6c03 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKVSWrapper.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionKVSWrapper.java
@@ -46,18 +46,19 @@ public Long get(Long startTimestamp) {
         Cell cell = getTransactionCell(startTimestamp);
         Map<Cell, Value> returnMap = keyValueService.get(TransactionConstants.TRANSACTION_TABLE,
                                                          ImmutableMap.of(cell, MAX_TIMESTAMP));
-        if (returnMap.containsKey(cell))
+        if (returnMap.containsKey(cell)) {
             return TransactionConstants.getTimestampForValue(returnMap.get(cell).getContents());
-        else
+        } else {
             return null;
+        }
     }
 
     public Map<Long, Long> get(Iterable<Long> startTimestamps) {
         Map<Long, Long> result = Maps.newHashMap();
         Map<Cell, Long> startTsMap = Maps.newHashMap();
-        for (Long startTimestamp: startTimestamps) {
-            Cell k = getTransactionCell(startTimestamp);
-            startTsMap.put(k, MAX_TIMESTAMP);
+        for (Long startTimestamp : startTimestamps) {
+            Cell cell = getTransactionCell(startTimestamp);
+            startTsMap.put(cell, MAX_TIMESTAMP);
         }
 
         Map<Cell, Value> rawResults = keyValueService.get(TransactionConstants.TRANSACTION_TABLE, startTsMap);
@@ -78,8 +79,8 @@ public void putUnlessExists(long startTimestamp, long commitTimestamp) throws Ke
     }
 
     public void putAll(Map<Long, Long> timestampMap) throws KeyAlreadyExistsException {
-        Map<Cell, byte[]> kvMap = new HashMap<Cell, byte[]> ();
-        for (Map.Entry<Long, Long> entry: timestampMap.entrySet()) {
+        Map<Cell, byte[]> kvMap = new HashMap<>();
+        for (Map.Entry<Long, Long> entry : timestampMap.entrySet()) {
             kvMap.put(
                     getTransactionCell(entry.getKey()),
                     TransactionConstants.getValueForTimestamp(entry.getValue()));
diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionServices.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionServices.java
index afe719dde71..55bdf330113 100644
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionServices.java
+++ b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/service/TransactionServices.java
@@ -17,7 +17,11 @@
 
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 
-public class TransactionServices {
+public final class TransactionServices {
+    private TransactionServices() {
+        // Uility class
+    }
+
     public static TransactionService createTransactionService(
             KeyValueService keyValueService) {
         return new SimpleTransactionService(keyValueService);
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/StartTsToCommitTsCacheLoaderTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/StartTsToCommitTsCacheLoaderTest.java
new file mode 100644
index 00000000000..ff0f79bf10e
--- /dev/null
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/StartTsToCommitTsCacheLoaderTest.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.atlasdb.sweep;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.junit.Test;
+
+import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
+import com.palantir.atlasdb.transaction.service.TransactionService;
+
+public class StartTsToCommitTsCacheLoaderTest {
+    private static final Long VALID_START_TIMESTAMP = 100L;
+    private static final Long VALID_COMMIT_TIMESTAMP = 200L;
+    private static final Long ROLLBACK_TIMESTAMP = -1L;
+    private static final Long NO_TIMESTAMP = null;
+
+    private final TransactionService mockTransactionService = mock(TransactionService.class);
+    private final StartTsToCommitTsCacheLoader loader = new StartTsToCommitTsCacheLoader(mockTransactionService);
+
+    @Test
+    public void loadShouldReturnTheValidTimestamp() throws Exception {
+        when(mockTransactionService.get(VALID_START_TIMESTAMP))
+                .thenReturn(VALID_COMMIT_TIMESTAMP);
+
+        assertThat(loader.load(VALID_START_TIMESTAMP)).isEqualTo(VALID_COMMIT_TIMESTAMP);
+    }
+
+    @Test
+    public void loadShouldPutRollbackIfCommitTsIsNull() throws Exception {
+        AtomicLong answerCount = new AtomicLong();
+
+        doAnswer((invocation) -> answerCount.get() > 0 ? ROLLBACK_TIMESTAMP : NO_TIMESTAMP)
+                .when(mockTransactionService).get(VALID_START_TIMESTAMP);
+
+        doAnswer((invocation) -> {
+            answerCount.set(1);
+            return null;
+        }).when(mockTransactionService).putUnlessExists(VALID_START_TIMESTAMP, ROLLBACK_TIMESTAMP);
+
+        assertThat(loader.load(VALID_START_TIMESTAMP)).isEqualTo(ROLLBACK_TIMESTAMP);
+
+        verify(mockTransactionService).putUnlessExists(VALID_START_TIMESTAMP, ROLLBACK_TIMESTAMP);
+    }
+
+    @Test
+    public void loadShouldContinueIfKeyAlreadyExistsIsThrown() throws Exception {
+        AtomicLong answerCount = new AtomicLong();
+
+        doAnswer((invocation) -> answerCount.get() > 0 ? VALID_COMMIT_TIMESTAMP : NO_TIMESTAMP)
+                .when(mockTransactionService).get(VALID_START_TIMESTAMP);
+
+        doAnswer((invocation) -> {
+            answerCount.set(1);
+            throw new KeyAlreadyExistsException("Already exists");
+        }).when(mockTransactionService).putUnlessExists(VALID_START_TIMESTAMP, ROLLBACK_TIMESTAMP);
+
+        assertThat(loader.load(VALID_START_TIMESTAMP)).isEqualTo(VALID_COMMIT_TIMESTAMP);
+
+        verify(mockTransactionService).putUnlessExists(VALID_START_TIMESTAMP, ROLLBACK_TIMESTAMP);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void loadShouldThrowIfANullIsToBeReturned() throws Exception {
+        doAnswer((invocation) -> NO_TIMESTAMP)
+                .when(mockTransactionService).get(VALID_START_TIMESTAMP);
+
+        loader.load(VALID_START_TIMESTAMP);
+    }
+}
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTaskRunnerImplTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTaskRunnerImplTest.java
new file mode 100644
index 00000000000..7eb5b080bda
--- /dev/null
+++ b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/sweep/SweepTaskRunnerImplTest.java
@@ -0,0 +1,330 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.atlasdb.sweep;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Test;
+
+import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Multimap;
+import com.palantir.atlasdb.cleaner.Follower;
+import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
+import com.palantir.atlasdb.keyvalue.api.RowResult;
+import com.palantir.atlasdb.keyvalue.api.TableReference;
+import com.palantir.atlasdb.keyvalue.api.Value;
+import com.palantir.atlasdb.protos.generated.TableMetadataPersistence.SweepStrategy;
+import com.palantir.atlasdb.sweep.sweepers.ConservativeSweeper;
+import com.palantir.atlasdb.sweep.sweepers.Sweeper;
+import com.palantir.atlasdb.sweep.sweepers.ThoroughSweeper;
+import com.palantir.atlasdb.transaction.api.Transaction;
+import com.palantir.atlasdb.transaction.impl.TransactionConstants;
+import com.palantir.atlasdb.transaction.service.TransactionService;
+import com.palantir.common.base.ClosableIterators;
+
+public class SweepTaskRunnerImplTest {
+    private static final long LOW_START_TS = 6L;
+    private static final long LOW_COMMIT_TS = 7L;
+    private static final long HIGH_START_TS = 100L;
+    private static final long HIGH_COMMIT_TS = 102L;
+    private static final long VALID_TIMESTAMP = 123L;
+
+    private static final TableReference TABLE_REFERENCE = TableReference.create(Namespace.create("ns"), "testTable");
+    private static final Cell SINGLE_CELL = Cell.create(
+            "cellRow".getBytes(StandardCharsets.UTF_8),
+            "cellCol".getBytes(StandardCharsets.UTF_8));
+    private static final Set<Cell> SINGLE_CELL_SET = ImmutableSet.of(SINGLE_CELL);
+    private static final Multimap<Cell, Long> SINGLE_CELL_TS_PAIR = ImmutableMultimap.<Cell, Long>builder()
+            .putAll(
+                    Cell.create(
+                            "cellPairRow".getBytes(StandardCharsets.UTF_8),
+                            "cellPairCol".getBytes(StandardCharsets.UTF_8)),
+                    ImmutableSet.of(5L, 10L, 15L, 20L))
+            .build();
+
+    private final KeyValueService mockKvs = mock(KeyValueService.class);
+    private final Follower mockFollower = mock(Follower.class);
+    private final Supplier<Long> mockImmutableTimestampSupplier = mock(Supplier.class);
+    private final Supplier<Long> mockUnreadableTimestampSupplier = mock(Supplier.class);
+    private final TransactionService mockTransactionService = mock(TransactionService.class);
+    private final SweepTaskRunnerImpl sweepTaskRunner = new SweepTaskRunnerImpl(
+            null,
+            mockKvs,
+            mockUnreadableTimestampSupplier,
+            mockImmutableTimestampSupplier,
+            mockTransactionService,
+            null,
+            ImmutableList.of(mockFollower));
+    private final Sweeper thoroughSweeper = new ThoroughSweeper(mockKvs, mockImmutableTimestampSupplier);
+    private final Sweeper conservativeSweeper = new ConservativeSweeper(
+            mockKvs,
+            mockImmutableTimestampSupplier,
+            mockUnreadableTimestampSupplier);
+
+    @Test
+    public void ensureCellSweepDeletesCells() {
+        sweepTaskRunner.sweepCells(TABLE_REFERENCE, SINGLE_CELL_TS_PAIR, ImmutableSet.of());
+
+        verify(mockKvs).delete(TABLE_REFERENCE, SINGLE_CELL_TS_PAIR);
+    }
+
+    @Test
+    public void ensureSentinelsAreAddedToKvs() {
+        sweepTaskRunner.sweepCells(TABLE_REFERENCE, SINGLE_CELL_TS_PAIR, SINGLE_CELL_SET);
+
+        verify(mockKvs).addGarbageCollectionSentinelValues(TABLE_REFERENCE, SINGLE_CELL_SET);
+    }
+
+    @Test
+    public void ensureFollowersRunAgainstCellsToSweep() {
+        sweepTaskRunner.sweepCells(TABLE_REFERENCE, SINGLE_CELL_TS_PAIR, ImmutableSet.of());
+
+        verify(mockFollower)
+                .run(any(), any(), eq(SINGLE_CELL_TS_PAIR.keySet()), eq(Transaction.TransactionType.HARD_DELETE));
+    }
+
+    @Test
+    public void sentinelsArentAddedIfNoCellsToSweep() {
+        sweepTaskRunner.sweepCells(TABLE_REFERENCE, ImmutableMultimap.of(), SINGLE_CELL_SET);
+
+        verify(mockKvs, never()).addGarbageCollectionSentinelValues(TABLE_REFERENCE, SINGLE_CELL_SET);
+    }
+
+    @Test
+    public void ensureNoActionTakenIfNoCellsToSweep() {
+        sweepTaskRunner.sweepCells(TABLE_REFERENCE, ImmutableMultimap.of(), ImmutableSet.of());
+
+        verify(mockKvs, never()).delete(any(), any());
+        verify(mockKvs, never()).addGarbageCollectionSentinelValues(any(), any());
+    }
+
+    @Test
+    public void getTimestampsFromEmptyRowResultsReturnsEmptyInThoroughSweep() {
+        Multimap<Cell, Long> actualTimestamps =
+                SweepTaskRunnerImpl.getTimestampsFromRowResults(ImmutableList.of(), thoroughSweeper);
+
+        assertThat(actualTimestamps).isEqualTo(ImmutableMultimap.of());
+    }
+
+    @Test
+    public void getTimestampsFromEmptyRowResultsReturnsEmptyInConservativeSweep() {
+        Multimap<Cell, Long> actualTimestamps =
+                SweepTaskRunnerImpl.getTimestampsFromRowResults(ImmutableList.of(), conservativeSweeper);
+
+        assertThat(actualTimestamps).isEqualTo(ImmutableMultimap.of());
+    }
+
+    @Test
+    public void invalidTimestampsAreFilteredOutWhenGettingTimestampsFromRowResultsInConservativeSweep() {
+        List<RowResult<Set<Long>>> cellsToSweep = ImmutableList.of(
+                RowResult.of(SINGLE_CELL, ImmutableSet.of(Value.INVALID_VALUE_TIMESTAMP)));
+
+        Multimap<Cell, Long> actualTimestamps =
+                SweepTaskRunnerImpl.getTimestampsFromRowResults(cellsToSweep, conservativeSweeper);
+
+        assertThat(actualTimestamps).isEqualTo(ImmutableMultimap.of());
+    }
+
+    @Test
+    public void invalidTimetampsAreKeptWhenGettingTimestampsFromRowResultsInThoroughSweep() {
+        List<RowResult<Set<Long>>> cellsToSweep = ImmutableList.of(
+                RowResult.of(SINGLE_CELL, ImmutableSet.of(Value.INVALID_VALUE_TIMESTAMP)));
+        Multimap<Cell, Long> expectedTimestamps = ImmutableMultimap.of(
+                SINGLE_CELL, Value.INVALID_VALUE_TIMESTAMP);
+
+        Multimap<Cell, Long> actualTimestamps =
+                SweepTaskRunnerImpl.getTimestampsFromRowResults(cellsToSweep, thoroughSweeper);
+
+        assertThat(actualTimestamps).isEqualTo(expectedTimestamps);
+    }
+
+    @Test
+    public void validTimestampsAreKeptWhenGettingTimestampsFromRowResultsInThoroughSweep() {
+        List<RowResult<Set<Long>>> cellsToSweep = ImmutableList.of(
+                RowResult.of(SINGLE_CELL, ImmutableSet.of(VALID_TIMESTAMP)));
+        Multimap<Cell, Long> expectedTimestamps = ImmutableMultimap.of(SINGLE_CELL, VALID_TIMESTAMP);
+
+        Multimap<Cell, Long> actualTimestamps =
+                SweepTaskRunnerImpl.getTimestampsFromRowResults(cellsToSweep, thoroughSweeper);
+
+        assertThat(actualTimestamps).isEqualTo(expectedTimestamps);
+    }
+
+    @Test
+    public void validTimestampsAreKeptWhenGettingTimestampsFromRowResultsInConservativeSweep() {
+        List<RowResult<Set<Long>>> cellsToSweep = ImmutableList.of(
+                RowResult.of(SINGLE_CELL, ImmutableSet.of(VALID_TIMESTAMP)));
+        Multimap<Cell, Long> expectedTimestamps = ImmutableMultimap.of(SINGLE_CELL, VALID_TIMESTAMP);
+
+        Multimap<Cell, Long> actualTimestamps =
+                SweepTaskRunnerImpl.getTimestampsFromRowResults(cellsToSweep, conservativeSweeper);
+
+        assertThat(actualTimestamps).isEqualTo(expectedTimestamps);
+    }
+
+    @Test
+    public void thoroughWillReturnTheImmutableTimestamp() {
+        when(mockImmutableTimestampSupplier.get()).thenReturn(VALID_TIMESTAMP);
+
+        assertThat(sweepTaskRunner.getSweepTimestamp(SweepStrategy.THOROUGH)).isEqualTo(VALID_TIMESTAMP);
+    }
+
+    @Test
+    public void conservativeWillReturnTheImmutableTimestampIfItIsLowerThanUnreadableTimestamp() {
+        when(mockImmutableTimestampSupplier.get()).thenReturn(100L);
+        when(mockUnreadableTimestampSupplier.get()).thenReturn(200L);
+
+        assertThat(sweepTaskRunner.getSweepTimestamp(SweepStrategy.CONSERVATIVE)).isEqualTo(100L);
+    }
+
+    @Test
+    public void conservativeWillReturnTheUnreadableTimestampIfItIsLowerThanImmutableTimestamp() {
+        when(mockImmutableTimestampSupplier.get()).thenReturn(200L);
+        when(mockUnreadableTimestampSupplier.get()).thenReturn(100L);
+
+        assertThat(sweepTaskRunner.getSweepTimestamp(SweepStrategy.CONSERVATIVE)).isEqualTo(100L);
+    }
+
+    @Test
+    public void getTimestampsToSweep_noRowsMeansNoTransactionGets() {
+        sweepTaskRunner.getStartTimestampsPerRowToSweep(
+                ImmutableMultimap.of(),
+                Iterators.peekingIterator(Collections.emptyIterator()),
+                VALID_TIMESTAMP,
+                conservativeSweeper);
+
+        verify(mockTransactionService, never()).get(any());
+        verify(mockTransactionService, never()).get(anyLong());
+    }
+
+    @Test
+    public void conservative_getTimestampsToSweep_twoEntriesBelowSweepTimestamp_returnsLowerOne() {
+        long sweepTimestampHigherThanCommitTimestamp = HIGH_COMMIT_TS + 1;
+        Multimap<Cell, Long> timestampsPerRow = twoCommittedTimestampsForSingleCell();
+
+        Multimap<Cell, Long> startTimestampsPerRowToSweep = sweepTaskRunner.getStartTimestampsPerRowToSweep(
+                timestampsPerRow,
+                Iterators.peekingIterator(Collections.emptyIterator()),
+                sweepTimestampHigherThanCommitTimestamp,
+                conservativeSweeper).startTimestampsToSweepPerCell();
+
+        assertThat(startTimestampsPerRowToSweep.get(SINGLE_CELL)).contains(LOW_START_TS);
+    }
+
+    @Test
+    public void conservative_getTimestampsToSweep_oneEntryBelowTimestamp_oneAbove_returnsNone() {
+        long sweepTimestampLowerThanCommitTimestamp = HIGH_COMMIT_TS - 1;
+        Multimap<Cell, Long> timestampsPerRow = twoCommittedTimestampsForSingleCell();
+
+        Multimap<Cell, Long> startTimestampsPerRowToSweep = sweepTaskRunner.getStartTimestampsPerRowToSweep(
+                timestampsPerRow,
+                Iterators.peekingIterator(Collections.emptyIterator()),
+                sweepTimestampLowerThanCommitTimestamp,
+                conservativeSweeper).startTimestampsToSweepPerCell();
+
+        assertThat(startTimestampsPerRowToSweep.get(SINGLE_CELL)).isEmpty();
+    }
+
+    @Test
+    public void conservativeGetTimestampToSweepAddsSentinels() {
+        long sweepTimestampHigherThanCommitTimestamp = HIGH_COMMIT_TS + 1;
+        Multimap<Cell, Long> timestampsPerRow = twoCommittedTimestampsForSingleCell();
+
+        CellsAndSentinels cellsAndSentinels = sweepTaskRunner.getStartTimestampsPerRowToSweep(timestampsPerRow,
+                Iterators.peekingIterator(ClosableIterators.emptyImmutableClosableIterator()),
+                sweepTimestampHigherThanCommitTimestamp,
+                conservativeSweeper);
+
+        assertThat(cellsAndSentinels.sentinelsToAdd()).contains(SINGLE_CELL);
+    }
+
+    @Test
+    public void thoroughGetTimestampToSweepDoesNotAddSentinels() {
+        long sweepTimestampHigherThanCommitTimestamp = HIGH_COMMIT_TS + 1;
+        Multimap<Cell, Long> timestampsPerRow = twoCommittedTimestampsForSingleCell();
+
+        CellsAndSentinels cellsAndSentinels = sweepTaskRunner.getStartTimestampsPerRowToSweep(timestampsPerRow,
+                Iterators.peekingIterator(ClosableIterators.emptyImmutableClosableIterator()),
+                sweepTimestampHigherThanCommitTimestamp,
+                thoroughSweeper);
+
+        assertThat(cellsAndSentinels.sentinelsToAdd()).isEmpty();
+    }
+
+    @Test
+    public void getTimestampsToSweep_onlyTransactionUncommitted_returnsIt() {
+        Multimap<Cell, Long> timestampsPerRow = ImmutableMultimap.of(SINGLE_CELL, LOW_START_TS);
+        when(mockTransactionService.get(timestampsPerRow.values()))
+                .thenReturn(ImmutableMap.of(LOW_START_TS, TransactionConstants.FAILED_COMMIT_TS));
+
+        CellsAndSentinels cellsAndSentinels = sweepTaskRunner.getStartTimestampsPerRowToSweep(timestampsPerRow,
+                Iterators.peekingIterator(ClosableIterators.emptyImmutableClosableIterator()),
+                HIGH_START_TS,
+                conservativeSweeper);
+        Multimap<Cell, Long> timestampsToSweep = cellsAndSentinels.startTimestampsToSweepPerCell();
+
+        assertThat(timestampsToSweep.get(SINGLE_CELL)).contains(LOW_START_TS);
+    }
+
+    @Test
+    public void thorough_getTimestampsToSweep_oneTransaction_emptyValue_returnsIt() {
+        Multimap<Cell, Long> timestampsPerRow = ImmutableMultimap.of(SINGLE_CELL, LOW_START_TS);
+        when(mockTransactionService.get(timestampsPerRow.values()))
+                .thenReturn(ImmutableMap.of(LOW_START_TS, LOW_COMMIT_TS));
+        RowResult<Value> rowResult = RowResult.of(SINGLE_CELL, Value.create(null, LOW_START_TS));
+
+        CellsAndSentinels cellsAndSentinels = sweepTaskRunner.getStartTimestampsPerRowToSweep(timestampsPerRow,
+                Iterators.peekingIterator(ClosableIterators.wrap(ImmutableList.of(rowResult).iterator())),
+                HIGH_START_TS,
+                thoroughSweeper);
+        Multimap<Cell, Long> timestampsToSweep = cellsAndSentinels.startTimestampsToSweepPerCell();
+
+        assertThat(timestampsToSweep.get(SINGLE_CELL)).contains(LOW_START_TS);
+    }
+
+    private Multimap<Cell, Long> twoCommittedTimestampsForSingleCell() {
+        Multimap<Cell, Long> timestampsPerRow = ImmutableMultimap.of(
+                SINGLE_CELL, LOW_START_TS,
+                SINGLE_CELL, HIGH_START_TS);
+
+        when(mockTransactionService.get(timestampsPerRow.values()))
+                .thenReturn(ImmutableMap.of(
+                        LOW_START_TS, LOW_COMMIT_TS,
+                        HIGH_START_TS, HIGH_COMMIT_TS));
+
+        return timestampsPerRow;
+    }
+}
diff --git a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweeperTest.java b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweeperTest.java
index 1a7e35d1b74..1c7902c59bf 100644
--- a/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweeperTest.java
+++ b/atlasdb-jdbc-tests/src/test/java/com/palantir/atlasdb/jdbc/JdbcSweeperTest.java
@@ -15,8 +15,8 @@
  */
 package com.palantir.atlasdb.jdbc;
 
-import com.palantir.atlasdb.cleaner.AbstractSweeperTest;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
+import com.palantir.atlasdb.sweep.AbstractSweeperTest;
 
 public class JdbcSweeperTest extends AbstractSweeperTest {
     @Override
diff --git a/atlasdb-jdbc/build.gradle b/atlasdb-jdbc/build.gradle
index 06670c1e5c7..3c4a71efe54 100644
--- a/atlasdb-jdbc/build.gradle
+++ b/atlasdb-jdbc/build.gradle
@@ -3,14 +3,14 @@ apply plugin: "org.inferred.processors"
 apply from: "../gradle/shared.gradle"
 
 dependencies {
+  compile project(":atlasdb-api")
   compile project(":atlasdb-client")
-  compile project(":atlasdb-spi")
   compile project(":timestamp-impl")
 
   compile "io.dropwizard:dropwizard-jackson:" + libVersions.dropwizard
   compile "org.jooq:jooq:3.6.4"
 
-  processor "org.immutables:value:2.0.21"
+  processor "org.immutables:value:" + libVersions.immutables
   processor "com.google.auto.service:auto-service:1.0-rc2"
 }
 
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java
index 1e65d35c0b0..965785518d9 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcAtlasDbFactory.java
@@ -16,6 +16,8 @@
 package com.palantir.atlasdb.keyvalue.jdbc;
 
 import com.google.auto.service.AutoService;
+import com.google.common.base.Optional;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.spi.AtlasDbFactory;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
@@ -32,7 +34,7 @@ public String getType() {
     }
 
     @Override
-    public KeyValueService createRawKeyValueService(KeyValueServiceConfig config) {
+    public KeyValueService createRawKeyValueService(KeyValueServiceConfig config, Optional<LeaderConfig> leaderConfig) {
         AtlasDbVersion.ensureVersionReported();
         return JdbcKeyValueService.create((JdbcKeyValueConfiguration) config);
     }
diff --git a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java
index ef91bb700a0..9c72235cf1d 100644
--- a/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java
+++ b/atlasdb-jdbc/src/main/java/com/palantir/atlasdb/keyvalue/jdbc/JdbcKeyValueService.java
@@ -108,12 +108,14 @@
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.jdbc.config.JdbcDataSourceConfiguration;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -1087,4 +1089,9 @@ String hashTableName(String rawName) {
         byte[] bytes = Hashing.murmur3_128().hashString(rawName, StandardCharsets.UTF_8).asBytes();
         return BaseEncoding.base32().omitPadding().encode(bytes);
     }
+
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef, Iterable<byte[]> rows, ColumnRangeSelection columnRangeSelection, long timestamp) {
+        return KeyValueServices.filterGetRowsToColumnRange(this, tableRef, rows, columnRangeSelection, timestamp);
+    }
 }
diff --git a/atlasdb-perf/build.gradle b/atlasdb-perf/build.gradle
index 08144bb9ebf..cad89c86957 100644
--- a/atlasdb-perf/build.gradle
+++ b/atlasdb-perf/build.gradle
@@ -7,7 +7,7 @@ mainClassName = 'com.palantir.atlasdb.performance.cli.AtlasDbPerfCli'
 applicationName = 'atlasdb-perf'
 
 dependencies {
-  compile project(':atlasdb-spi')
+  compile project(':atlasdb-api')
   compile project(':atlasdb-dbkvs')
   compile project(':atlasdb-cassandra')
 
@@ -28,6 +28,7 @@ dependencies {
 
 configurations.matching({ it.name in ['compile', 'runtime'] }).all {
       resolutionStrategy {
+          force 'javax.validation:validation-api:1.1.0.Final'
           force 'com.google.code.findbugs:annotations:2.0.3'
           force 'org.slf4j:slf4j-api:' + libVersions.slf4j
           force 'org.apache.commons:commons-lang3:' + libVersions.commons_lang3
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/BenchmarkParam.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/BenchmarkParam.java
index f65ef0c5e8a..35cdd07fd32 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/BenchmarkParam.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/BenchmarkParam.java
@@ -1,3 +1,20 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package com.palantir.atlasdb.performance;
 
 /**
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java
index a998b32c5b3..73059fdd79b 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/PerformanceResults.java
@@ -1,10 +1,30 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package com.palantir.atlasdb.performance;
 
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -30,31 +50,35 @@ public PerformanceResults(Collection<RunResult> results) {
     }
 
     public void writeToFile(File file) throws IOException {
-        try (BufferedWriter fout = new BufferedWriter(new FileWriter(file))) {
+        try (BufferedWriter fout = openFileWriter(file)) {
             long date = System.currentTimeMillis();
-            List<ImmutablePerformanceResult> newResults = results.stream().map(r -> {
-                String[] benchmarkParts = r.getParams().getBenchmark().split("\\.");
+            List<ImmutablePerformanceResult> newResults = results.stream().map(rs -> {
+                String[] benchmarkParts = rs.getParams().getBenchmark().split("\\.");
                 String benchmarkSuite = benchmarkParts[benchmarkParts.length - 2];
                 String benchmarkName = benchmarkParts[benchmarkParts.length - 1];
                 return ImmutablePerformanceResult.builder()
                         .date(date)
                         .suite(benchmarkSuite)
                         .benchmark(benchmarkName)
-                        .backend(r.getParams().getParam((BenchmarkParam.BACKEND.getKey())))
-                        .samples(r.getPrimaryResult().getStatistics().getN())
-                        .std(r.getPrimaryResult().getStatistics().getStandardDeviation())
-                        .mean(r.getPrimaryResult().getStatistics().getMean())
-                        .data(getData(r))
-                        .units(r.getParams().getTimeUnit())
-                        .p50(r.getPrimaryResult().getStatistics().getPercentile(50.0))
-                        .p90(r.getPrimaryResult().getStatistics().getPercentile(90.0))
-                        .p99(r.getPrimaryResult().getStatistics().getPercentile(99.0))
+                        .backend(rs.getParams().getParam(BenchmarkParam.BACKEND.getKey()))
+                        .samples(rs.getPrimaryResult().getStatistics().getN())
+                        .std(rs.getPrimaryResult().getStatistics().getStandardDeviation())
+                        .mean(rs.getPrimaryResult().getStatistics().getMean())
+                        .data(getData(rs))
+                        .units(rs.getParams().getTimeUnit())
+                        .p50(rs.getPrimaryResult().getStatistics().getPercentile(50.0))
+                        .p90(rs.getPrimaryResult().getStatistics().getPercentile(90.0))
+                        .p99(rs.getPrimaryResult().getStatistics().getPercentile(99.0))
                         .build();
             }).collect(Collectors.toList());
             new ObjectMapper().writeValue(fout, newResults);
         }
     }
 
+    private BufferedWriter openFileWriter(File file) throws FileNotFoundException {
+        return new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8));
+    }
+
     private List<Double> getData(RunResult result) {
         return result.getBenchmarkResults().stream()
                 .flatMap(b -> getRawResults(b.getPrimaryResult().getStatistics()).stream())
@@ -63,9 +87,9 @@ private List<Double> getData(RunResult result) {
 
     private List<Double> getRawResults(Statistics statistics) {
         try {
-            Field f = statistics.getClass().getDeclaredField("values");
-            f.setAccessible(true);
-            Multiset<Double> rawResults = (Multiset<Double>) f.get(statistics);
+            Field field = statistics.getClass().getDeclaredField("values");
+            field.setAccessible(true);
+            Multiset<Double> rawResults = (Multiset<Double>) field.get(statistics);
             return rawResults.entrySet().stream()
                     .flatMap(e -> DoubleStream.iterate(e.getKey(), d -> d).limit(e.getValue()).boxed())
                     .collect(Collectors.toList());
@@ -77,7 +101,7 @@ private List<Double> getRawResults(Statistics statistics) {
     @JsonDeserialize(as = ImmutablePerformanceResult.class)
     @JsonSerialize(as = ImmutablePerformanceResult.class)
     @Value.Immutable
-    static abstract class PerformanceResult {
+    abstract static class PerformanceResult {
         public abstract long date();
         public abstract String suite();
         public abstract String benchmark();
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraPhysicalStore.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraPhysicalStore.java
index f96ed39d080..45d5bf8ba39 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraPhysicalStore.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/CassandraPhysicalStore.java
@@ -23,6 +23,7 @@
 
 import org.joda.time.Duration;
 
+import com.google.common.base.Optional;
 import com.jayway.awaitility.Awaitility;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfig;
 import com.palantir.atlasdb.cassandra.CassandraKeyValueServiceConfigManager;
@@ -40,7 +41,7 @@
  *
  * @author mwakerman
  */
-public class CassandraPhysicalStore extends PhysicalStore {
+public final class CassandraPhysicalStore extends PhysicalStore {
 
     private static final String KEYSPACE                     = "atlasdb";
     private static final int    THRIFT_PORT_NUMBER           = 9160;
@@ -50,19 +51,21 @@ public class CassandraPhysicalStore extends PhysicalStore {
     private static final String DOCKER_LOGS_DIR              = "container-logs";
 
     public static CassandraPhysicalStore create() {
-            DockerComposeRule docker = DockerComposeRule.builder()
-                    .file(getDockerComposeFileAbsolutePath())
-                    .waitingForHostNetworkedPort(THRIFT_PORT_NUMBER, toBeOpen(), Duration.standardMinutes(1))
-                    .saveLogsTo(DOCKER_LOGS_DIR)
-                    .build();
+        DockerComposeRule docker = DockerComposeRule.builder()
+                .file(getDockerComposeFileAbsolutePath())
+                .waitingForHostNetworkedPort(THRIFT_PORT_NUMBER, toBeOpen(), Duration.standardMinutes(1))
+                .saveLogsTo(DOCKER_LOGS_DIR)
+                .build();
 
 
-            return new CassandraPhysicalStore(docker);
+        return new CassandraPhysicalStore(docker);
     }
 
     private static String getDockerComposeFileAbsolutePath() {
         try {
-            return PhysicalStores.writeResourceToTempFile(CassandraPhysicalStore.class, CASSANDRA_DOCKER_COMPOSE_PATH).getAbsolutePath();
+            return PhysicalStores
+                    .writeResourceToTempFile(CassandraPhysicalStore.class, CASSANDRA_DOCKER_COMPOSE_PATH)
+                    .getAbsolutePath();
         } catch (IOException e) {
             throw new RuntimeException("Unable to write docker compose file to a temporary file.", e);
         }
@@ -87,9 +90,7 @@ public KeyValueService connect() {
                 docker.before();
             }
         } catch (IOException | InterruptedException | IllegalStateException e) {
-            System.err.println("Could not run docker compose rule for cassandra.");
-            e.printStackTrace();
-            return null;
+            throw new RuntimeException("Could not run docker compose rule for cassandra.", e);
         }
 
         ImmutableCassandraKeyValueServiceConfig connectionConfig = ImmutableCassandraKeyValueServiceConfig.builder()
@@ -114,13 +115,17 @@ public KeyValueService connect() {
                 .pollInterval(com.jayway.awaitility.Duration.FIVE_SECONDS)
                 .until(canCreateKeyValueService(connectionConfig));
 
-        return CassandraKeyValueService.create(CassandraKeyValueServiceConfigManager.createSimpleManager(connectionConfig));
+        return CassandraKeyValueService.create(
+                CassandraKeyValueServiceConfigManager.createSimpleManager(connectionConfig),
+                Optional.absent());
     }
 
     private static Callable<Boolean> canCreateKeyValueService(CassandraKeyValueServiceConfig config) {
         return () -> {
             try {
-                CassandraKeyValueService.create(CassandraKeyValueServiceConfigManager.createSimpleManager(config));
+                CassandraKeyValueService.create(
+                        CassandraKeyValueServiceConfigManager.createSimpleManager(config),
+                        Optional.absent());
                 return true;
             } catch (Exception e) {
                 return false;
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceConnector.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceConnector.java
index 3d950528396..c2ecc007579 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceConnector.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/KeyValueServiceConnector.java
@@ -1,3 +1,20 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package com.palantir.atlasdb.performance.backend;
 
 import org.openjdk.jmh.annotations.Param;
@@ -10,7 +27,7 @@
 public class KeyValueServiceConnector extends PhysicalStore {
 
     /**
-     * Edit this instance variable name ("backend") with care -- it must match {@code BenchmarkParam.BACKEND}.getKey()
+     * Edit this instance variable name ("backend") with care -- it must match {@code BenchmarkParam.BACKEND}.getKey().
      */
     @Param
     private KeyValueServiceType backend;
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PhysicalStore.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PhysicalStore.java
index 40b798f48be..7d8b77a93ec 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PhysicalStore.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PhysicalStore.java
@@ -20,8 +20,8 @@
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 
 /**
- * The physical store backing the AtlasDB key-value service. Any new physical store should extend this class (currently only Postgres is
- * implemented).
+ * The physical store backing the AtlasDB key-value service. Any new physical store should extend this class
+ * (currently only Postgres is implemented).
  */
 public abstract class PhysicalStore implements AutoCloseable {
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresPhysicalStore.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresPhysicalStore.java
index 12afe6d3d27..fb50f507260 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresPhysicalStore.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/backend/PostgresPhysicalStore.java
@@ -27,6 +27,7 @@
 import com.palantir.docker.compose.connection.DockerPort;
 import com.palantir.docker.compose.connection.waiting.HealthCheck;
 import com.palantir.docker.compose.connection.waiting.SuccessOrFailure;
+import com.palantir.nexus.db.pool.config.ImmutableMaskedValue;
 import com.palantir.nexus.db.pool.config.ImmutablePostgresConnectionConfig;
 
 /**
@@ -34,7 +35,7 @@
  *
  * @author mwakerman
  */
-public class PostgresPhysicalStore extends PhysicalStore {
+public final class PostgresPhysicalStore extends PhysicalStore {
 
     private static final String POSTGRES_DB_NAME             = "atlas";
     private static final int    POSTGRES_PORT_NUMBER         = 5432;
@@ -44,17 +45,19 @@ public class PostgresPhysicalStore extends PhysicalStore {
     private static final String POSTGRES_DOCKER_LOGS_DIR     = "container-logs";
 
     public static PostgresPhysicalStore create() {
-            DockerComposeRule docker = DockerComposeRule.builder()
-                    .file(getDockerComposeFileAbsolutePath())
-                    .waitingForHostNetworkedPort(POSTGRES_PORT_NUMBER, toBeOpen())
-                    .saveLogsTo(POSTGRES_DOCKER_LOGS_DIR)
-                    .build();
-            return new PostgresPhysicalStore(docker);
+        DockerComposeRule docker = DockerComposeRule.builder()
+                .file(getDockerComposeFileAbsolutePath())
+                .waitingForHostNetworkedPort(POSTGRES_PORT_NUMBER, toBeOpen())
+                .saveLogsTo(POSTGRES_DOCKER_LOGS_DIR)
+                .build();
+        return new PostgresPhysicalStore(docker);
     }
 
     private static String getDockerComposeFileAbsolutePath() {
         try {
-            return PhysicalStores.writeResourceToTempFile(PostgresPhysicalStore.class, POSTGRES_DOCKER_COMPOSE_PATH).getAbsolutePath();
+            return PhysicalStores
+                    .writeResourceToTempFile(PostgresPhysicalStore.class, POSTGRES_DOCKER_COMPOSE_PATH)
+                    .getAbsolutePath();
         } catch (IOException e) {
             throw new RuntimeException("Unable to write docker compose file to a temporary file.", e);
         }
@@ -79,15 +82,13 @@ public KeyValueService connect() {
                 docker.before();
             }
         } catch (IOException | InterruptedException | IllegalStateException e) {
-            System.err.println("Could not run docker compose rule for postgres.");
-            e.printStackTrace();
-            return null;
+            throw new RuntimeException("Could not run docker compose rule for postgres.", e);
         }
 
         ImmutablePostgresConnectionConfig connectionConfig = ImmutablePostgresConnectionConfig.builder()
                 .dbName(POSTGRES_DB_NAME)
                 .dbLogin(POSTGRES_USER_LOGIN)
-                .dbPassword(POSTGRES_USER_PASSWORD)
+                .dbPassword(ImmutableMaskedValue.of(POSTGRES_USER_PASSWORD))
                 .host(docker.containers().ip())
                 .port(POSTGRES_PORT_NUMBER)
                 .build();
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsBenchmarks.java
index 7ee9d916e01..baaf0b96687 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsBenchmarks.java
@@ -17,7 +17,7 @@
 
 package com.palantir.atlasdb.performance.benchmarks;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -50,34 +50,45 @@ public static void validate(boolean assertion, String formatString, Object... ar
      * @param tableName the name of the table being created.
      * @param rowComponent the name of the row being created.
      * @param columnName the name of the column being created.
-     * @return a reference to the newly created table.
+     * @return a reference to the newly created table
      */
-    public static TableReference createTable(KeyValueService kvs, String tableName, String rowComponent, String columnName) {
+    public static TableReference createTable(KeyValueService kvs,
+            String tableName,
+            String rowComponent,
+            String columnName) {
         TableReference tableRef = TableReference.createFromFullyQualifiedName(tableName);
-        TableDefinition tableDef = new TableDefinition() {{
-            rowName();
-            rowComponent(rowComponent, ValueType.STRING);
-            columns();
-            column(columnName, columnName, ValueType.BLOB);
-            conflictHandler(ConflictHandler.IGNORE_ALL);
-            sweepStrategy(TableMetadataPersistence.SweepStrategy.NOTHING);
-        }};
+        TableDefinition tableDef = new TableDefinition() {
+            {
+                rowName();
+                rowComponent(rowComponent, ValueType.STRING);
+                columns();
+                column(columnName, columnName, ValueType.BLOB);
+                conflictHandler(ConflictHandler.IGNORE_ALL);
+                sweepStrategy(TableMetadataPersistence.SweepStrategy.NOTHING);
+            }
+        };
         kvs.createTable(tableRef, tableDef.toTableMetadata().persistToBytes());
         return tableRef;
     }
 
-    public static TableReference createTableWithDynamicColumns(KeyValueService kvs, String tableName, String rowComponent, String columnComponent) {
+    public static TableReference createTableWithDynamicColumns(KeyValueService kvs,
+            String tableName,
+            String rowComponent,
+            String columnComponent) {
         TableReference tableRef = TableReference.createFromFullyQualifiedName(tableName);
-        TableDefinition tableDef = new TableDefinition() {{
-            rowName();
-            rowComponent(rowComponent, ValueType.STRING);
-            dynamicColumns();
-              columnComponent(columnComponent, ValueType.FIXED_LONG);
-              value(ValueType.FIXED_LONG);
-            conflictHandler(ConflictHandler.IGNORE_ALL);
-            sweepStrategy(TableMetadataPersistence.SweepStrategy.NOTHING);
-        }};
+        TableDefinition tableDef = new TableDefinition() {
+            {
+                rowName();
+                rowComponent(rowComponent, ValueType.STRING);
+                dynamicColumns();
+                columnComponent(columnComponent, ValueType.FIXED_LONG);
+                value(ValueType.FIXED_LONG);
+                conflictHandler(ConflictHandler.IGNORE_ALL);
+                sweepStrategy(TableMetadataPersistence.SweepStrategy.NOTHING);
+            }
+        };
         kvs.createTable(tableRef, tableDef.toTableMetadata().persistToBytes());
         return tableRef;
     }
+
 }
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java
index b8993b945fe..ae8fe8da851 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetDynamicBenchmarks.java
@@ -1,7 +1,24 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package com.palantir.atlasdb.performance.benchmarks;
 
 import java.io.UnsupportedEncodingException;
-import java.util.Collection;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -49,7 +66,7 @@ public class KvsGetDynamicBenchmarks {
     private static final long DUMMY_TIMESTAMP = 1L;
     private static final long READ_TIMESTAMP = 2L;
 
-    private final int NUM_COLS = 50000;
+    private static final int NUM_COLS = 50000;
 
     private KeyValueServiceConnector connector;
     private KeyValueService kvs;
@@ -60,18 +77,19 @@ public class KvsGetDynamicBenchmarks {
     private Map<Cell, Long> firstCell2ReadTimestamp;
 
     @Setup
-    public void setup(KeyValueServiceConnector connector) throws UnsupportedEncodingException {
-        this.connector = connector;
-        kvs = connector.connect();
+    public void setup(KeyValueServiceConnector conn) throws UnsupportedEncodingException {
+        this.connector = conn;
+        kvs = conn.connect();
         tableRef1 = KvsBenchmarks.createTableWithDynamicColumns(kvs, TABLE_NAME_1, ROW_COMPONENT, COLUMN_COMPONENT);
-        byte[] rowBytes = ROW_COMPONENT.getBytes("UTF-8");
-        Map<Cell,byte[]> values = Maps.newHashMap();
+        byte[] rowBytes = ROW_COMPONENT.getBytes(StandardCharsets.UTF_8);
+        Map<Cell, byte[]> values = Maps.newHashMap();
         allCells2ReadTimestamp = Maps.newHashMap();
-        firstCell2ReadTimestamp = ImmutableMap.of(Cell.create(rowBytes, ("col_0").getBytes("UTF-8")), READ_TIMESTAMP);
+        firstCell2ReadTimestamp = ImmutableMap.of(
+                Cell.create(rowBytes, "col_0".getBytes(StandardCharsets.UTF_8)), READ_TIMESTAMP);
         for (int i = 0; i < NUM_COLS; i++) {
-            Cell c = Cell.create(rowBytes, ("col_"+i).getBytes("UTF-8"));
-            values.put(c, Ints.toByteArray(i));
-            allCells2ReadTimestamp.put(c, READ_TIMESTAMP);
+            Cell cell = Cell.create(rowBytes, ("col_" + i).getBytes(StandardCharsets.UTF_8));
+            values.put(cell, Ints.toByteArray(i));
+            allCells2ReadTimestamp.put(cell, READ_TIMESTAMP);
         }
         kvs.put(tableRef1, values, DUMMY_TIMESTAMP);
     }
@@ -86,14 +104,20 @@ public void cleanup() throws Exception {
     @Benchmark
     public Map<Cell, Value> getAllColumnsExplicitly() {
         Map<Cell, Value> result = kvs.get(tableRef1, allCells2ReadTimestamp);
-        KvsBenchmarks.validate(result.size() == NUM_COLS, "Should be %s columns, but were: %s", NUM_COLS, result.size());
+        KvsBenchmarks.validate(result.size() == NUM_COLS,
+                "Should be %s columns, but were: %s", NUM_COLS, result.size());
         return result;
     }
 
     @Benchmark
     public Map<Cell, Value> getAllColumnsImplicitly() throws UnsupportedEncodingException {
-        Map<Cell, Value> result = kvs.getRows(tableRef1, Collections.singleton(ROW_COMPONENT.getBytes("UTF-8")), ColumnSelection.all(), READ_TIMESTAMP);
-        KvsBenchmarks.validate(result.size() == NUM_COLS, "Should be %s columns, but were: %s", NUM_COLS, result.size());
+        Map<Cell, Value> result = kvs.getRows(
+                tableRef1,
+                Collections.singleton(ROW_COMPONENT.getBytes("UTF-8")),
+                ColumnSelection.all(),
+                READ_TIMESTAMP);
+        KvsBenchmarks.validate(result.size() == NUM_COLS,
+                "Should be %s columns, but were: %s", NUM_COLS, result.size());
         return result;
     }
 
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java
index 652c830af00..7776c14663b 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsGetRangeBenchmarks.java
@@ -1,5 +1,23 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package com.palantir.atlasdb.performance.benchmarks;
 
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -8,7 +26,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Level;
@@ -46,7 +64,7 @@ public class KvsGetRangeBenchmarks {
     private static final String TABLE_NAME_1 = "performance.table1";
     private static final String ROW_COMPONENT = "key";
     private static final String COLUMN_NAME = "value";
-    private static final byte [] COLUMN_NAME_IN_BYTES = COLUMN_NAME.getBytes();
+    private static final byte [] COLUMN_NAME_IN_BYTES = COLUMN_NAME.getBytes(StandardCharsets.UTF_8);
     private static final long DUMMY_TIMESTAMP = 1L;
     private static final long QUERY_TIMESTAMP = 2L;
 
@@ -64,9 +82,9 @@ public class KvsGetRangeBenchmarks {
     private static final int NUM_REQUESTS = 1000;
 
     @Setup(Level.Trial)
-    public void setup(KeyValueServiceConnector connector) {
-        this.connector = connector;
-        this.kvs = connector.connect();
+    public void setup(KeyValueServiceConnector conn) {
+        this.connector = conn;
+        this.kvs = conn.connect();
         this.tableRef1 = KvsBenchmarks.createTable(kvs, TABLE_NAME_1, ROW_COMPONENT, COLUMN_NAME);
         storeData();
     }
@@ -74,8 +92,6 @@ public void setup(KeyValueServiceConnector connector) {
 
     private void storeData() {
         Validate.isTrue(NUM_ROWS % PUT_BATCH_SIZE  == 0);
-
-
         for (int i = 0; i < NUM_ROWS; i += PUT_BATCH_SIZE) {
             Map<TableReference, Map<Cell, byte[]>> multiPutMap = Maps.newHashMap();
             multiPutMap.put(tableRef1, generateBatch(i, PUT_BATCH_SIZE));
@@ -153,7 +169,8 @@ public void getMultiRange() {
         int numRequests = Iterables.size(requests);
 
         KvsBenchmarks.validate(numRequests == results.size(),
-                "Got %s requests and %s results, requests %s, results %s", numRequests, results.size(), requests, results);
+                "Got %s requests and %s results, requests %s, results %s",
+                numRequests, results.size(), requests, results);
 
         results.forEach((request, result) -> {
             KvsBenchmarks.validate(1 == result.getResults().size(), "Key %s, List size is %s",
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java
index e563ce7b216..1d9c4efa5b5 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/benchmarks/KvsPutBenchmarks.java
@@ -17,6 +17,7 @@
 
 package com.palantir.atlasdb.performance.benchmarks;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -56,7 +57,7 @@ public class KvsPutBenchmarks {
     private static final String TABLE_NAME_2 = "performance.table2";
     private static final String ROW_COMPONENT = "key";
     private static final String COLUMN_NAME = "value";
-    private static final byte [] COLUMN_NAME_IN_BYTES = COLUMN_NAME.getBytes();
+    private static final byte [] COLUMN_NAME_IN_BYTES = COLUMN_NAME.getBytes(StandardCharsets.UTF_8);
     private static final long DUMMY_TIMESTAMP = 1L;
 
     private static final int VALUE_BYTE_ARRAY_SIZE = 100;
@@ -72,9 +73,9 @@ public class KvsPutBenchmarks {
     private TableReference tableRef2;
 
     @Setup
-    public void setup(KeyValueServiceConnector connector) {
-        this.connector = connector;
-        this.kvs = connector.connect();
+    public void setup(KeyValueServiceConnector conn) {
+        this.connector = conn;
+        this.kvs = conn.connect();
         this.tableRef1 = KvsBenchmarks.createTable(kvs, TABLE_NAME_1, ROW_COMPONENT, COLUMN_NAME);
         this.tableRef2 = KvsBenchmarks.createTable(kvs, TABLE_NAME_2, ROW_COMPONENT, COLUMN_NAME);
     }
diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java
index eabbac579b6..c03d71ec852 100644
--- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java
+++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/cli/AtlasDbPerfCli.java
@@ -45,11 +45,7 @@
 /**
  * The Atlas Perf(ormance) CLI is a tool for making and running AtlasDB performance tests.
  *
- *
- * Note, you must have a docker machine running, and put the environment variables in your run configuration (if you are in an IDE).
- * Something like this:
- * DOCKER_TLS_VERIFY=1;DOCKER_HOST=tcp://192.168.99.100:2376;DOCKER_CERT_PATH=/Users/dcohen/.docker/machine/machines/atlas;DOCKER_MACHINE_NAME=atlas
- * Check these against your actual env, e.g. "docker-machine env atlas"
+ * This requires you to have a docker-machine running and configured correctly.
  *
  * @author mwakerman, bullman
  */
@@ -68,8 +64,9 @@ public class AtlasDbPerfCli {
     @Option(name = {"-l", "--list-tests"}, description = "Lists all available benchmarks.")
     private boolean listTests;
 
-    @Option(name = {"-o", "--output"}, description = "The file in which to store the test results. Leave blank to only write results to " +
-                                                     "the console.")
+    @Option(name = {"-o", "--output"},
+            description = "The file in which to store the test results. "
+                    + "Leave blank to only write results to the console.")
     private String outputFile;
 
     public static void main(String[] args) throws Exception {
@@ -125,7 +122,9 @@ private static void listAllBenchmarks() {
     }
 
     private static Set<String> getAllBenchmarks() {
-        Reflections reflections = new Reflections("com.palantir.atlasdb.performance.benchmarks", new MethodAnnotationsScanner());
+        Reflections reflections = new Reflections(
+                "com.palantir.atlasdb.performance.benchmarks",
+                new MethodAnnotationsScanner());
         return reflections.getMethodsAnnotatedWith(Benchmark.class).stream()
                 .map(method -> method.getDeclaringClass().getSimpleName() + "." + method.getName())
                 .collect(Collectors.toSet());
diff --git a/atlasdb-rocksdb-tests/src/test/java/com/palantir/atlasdb/cleaner/RocksDbSweeperTest.java b/atlasdb-rocksdb-tests/src/test/java/com/palantir/atlasdb/cleaner/RocksDbSweeperTest.java
index 6fcc7bb8fd7..5943f8856fa 100644
--- a/atlasdb-rocksdb-tests/src/test/java/com/palantir/atlasdb/cleaner/RocksDbSweeperTest.java
+++ b/atlasdb-rocksdb-tests/src/test/java/com/palantir/atlasdb/cleaner/RocksDbSweeperTest.java
@@ -22,6 +22,7 @@
 import com.google.common.io.Files;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.rocksdb.impl.RocksDbKeyValueService;
+import com.palantir.atlasdb.sweep.AbstractSweeperTest;
 
 public class RocksDbSweeperTest extends AbstractSweeperTest {
     private File tempDir;
diff --git a/atlasdb-rocksdb/build.gradle b/atlasdb-rocksdb/build.gradle
index 8a06ae8e424..c39c02dfbd2 100644
--- a/atlasdb-rocksdb/build.gradle
+++ b/atlasdb-rocksdb/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'org.inferred.processors'
 apply from: "../gradle/shared.gradle"
 
 dependencies {
+  compile project(":atlasdb-api")
   compile project(":atlasdb-client")
-  compile project(":atlasdb-spi")
   compile project(":timestamp-impl")
 
   compile "org.rocksdb:rocksdbjni:4.1.0"
 
-  processor 'org.immutables:value:2.0.21'
+  processor 'org.immutables:value:' + libVersions.immutables
   processor "com.google.auto.service:auto-service:1.0-rc2"
 }
diff --git a/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/keyvalue/rocksdb/impl/RocksDbKeyValueService.java b/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/keyvalue/rocksdb/impl/RocksDbKeyValueService.java
index 2383031ecbd..ff0ab898c8d 100644
--- a/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/keyvalue/rocksdb/impl/RocksDbKeyValueService.java
+++ b/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/keyvalue/rocksdb/impl/RocksDbKeyValueService.java
@@ -62,11 +62,13 @@
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.InsufficientConsistencyException;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -655,4 +657,9 @@ private RocksDB getDb() {
         }
         return db;
     }
+
+    @Override
+    public Map<byte[], RowColumnRangeIterator> getRowsColumnRange(TableReference tableRef, Iterable<byte[]> rows, ColumnRangeSelection columnRangeSelection, long timestamp) {
+        return KeyValueServices.filterGetRowsToColumnRange(this, tableRef, rows, columnRangeSelection, timestamp);
+    }
 }
diff --git a/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/keyvalue/rocksdb/impl/RocksDbUpgrader.java b/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/keyvalue/rocksdb/impl/RocksDbUpgrader.java
index fb589dd6dcf..eecde90f49b 100644
--- a/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/keyvalue/rocksdb/impl/RocksDbUpgrader.java
+++ b/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/keyvalue/rocksdb/impl/RocksDbUpgrader.java
@@ -22,7 +22,9 @@
 import org.rocksdb.WriteOptions;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Optional;
 import com.palantir.atlasdb.AtlasDbConstants;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.rocksdb.impl.ColumnFamilyMap.ColumnFamily;
 import com.palantir.atlasdb.rocksdb.RocksDbAtlasDbFactory;
@@ -50,8 +52,8 @@ public static void main(String[] args) throws Exception {
         }
 
         RocksDbAtlasDbFactory factory = new RocksDbAtlasDbFactory();
-        RocksDbKeyValueService oldKvs = factory.createRawKeyValueService(oldConfig);
-        RocksDbKeyValueService newKvs = factory.createRawKeyValueService(newConfig);
+        RocksDbKeyValueService oldKvs = factory.createRawKeyValueService(oldConfig, Optional.<LeaderConfig>absent());
+        RocksDbKeyValueService newKvs = factory.createRawKeyValueService(newConfig, Optional.<LeaderConfig>absent());
 
         for (TableReference table : oldKvs.getAllTableNames()) {
             newKvs.createTable(table, AtlasDbConstants.EMPTY_TABLE_METADATA);
diff --git a/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/rocksdb/RocksDbAtlasDbFactory.java b/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/rocksdb/RocksDbAtlasDbFactory.java
index 9d159fef71b..aa128128a40 100644
--- a/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/rocksdb/RocksDbAtlasDbFactory.java
+++ b/atlasdb-rocksdb/src/main/java/com/palantir/atlasdb/rocksdb/RocksDbAtlasDbFactory.java
@@ -17,8 +17,10 @@
 
 import com.google.auto.service.AutoService;
 import com.google.common.base.MoreObjects;
+import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.SimpleKvsTimestampBoundStore;
 import com.palantir.atlasdb.keyvalue.rocksdb.impl.ImmutableWriteOpts;
@@ -38,7 +40,7 @@ public String getType() {
     }
 
     @Override
-    public RocksDbKeyValueService createRawKeyValueService(KeyValueServiceConfig config) {
+    public RocksDbKeyValueService createRawKeyValueService(KeyValueServiceConfig config, Optional<LeaderConfig> leaderConfig) {
         AtlasDbVersion.ensureVersionReported();
         Preconditions.checkArgument(config instanceof RocksDbKeyValueServiceConfig,
                 "RocksDbAtlasDbFactory expects a configuration of type RocksDbKeyValueServiceConfig, found %s", config.getClass());
diff --git a/atlasdb-server-dropwizard/.gitignore b/atlasdb-service-server/.gitignore
similarity index 100%
rename from atlasdb-server-dropwizard/.gitignore
rename to atlasdb-service-server/.gitignore
diff --git a/atlasdb-server-dropwizard/build.gradle b/atlasdb-service-server/build.gradle
similarity index 89%
rename from atlasdb-server-dropwizard/build.gradle
rename to atlasdb-service-server/build.gradle
index 9e4db62d603..3f8120430ff 100644
--- a/atlasdb-server-dropwizard/build.gradle
+++ b/atlasdb-service-server/build.gradle
@@ -1,11 +1,11 @@
 apply from: "../gradle/shared.gradle"
 
 apply plugin: 'application'
-mainClassName = 'com.palantir.atlasdb.server.AtlasDbServer'
-applicationName = 'atlas-server'
+mainClassName = 'com.palantir.atlasdb.server.AtlasDbServiceServer'
+applicationName = 'atlas-service-server'
 
 dependencies {
-    compile project(':atlasdb-server')
+    compile project(':atlasdb-service')
     compile project(':lock-impl')
     compile project(':leader-election-impl')
     compile project(':atlasdb-config')
@@ -23,9 +23,10 @@ dependencies {
         exclude(module:'libthrift')
     }
     compile "io.dropwizard:dropwizard-core:" + libVersions.dropwizard
-    
+
     testCompile "io.dropwizard:dropwizard-testing:" + libVersions.dropwizard
 }
+
 configurations.matching({ it.name in ['compile', 'runtime'] }).all {
     resolutionStrategy {
         force 'com.google.code.findbugs:jsr305:' + libVersions.jsr305
diff --git a/atlasdb-server-dropwizard/src/dist/var/.gitignore b/atlasdb-service-server/src/dist/var/.gitignore
similarity index 100%
rename from atlasdb-server-dropwizard/src/dist/var/.gitignore
rename to atlasdb-service-server/src/dist/var/.gitignore
diff --git a/atlasdb-server-dropwizard/src/dist/var/conf/atlasdb1.yml b/atlasdb-service-server/src/dist/var/conf/atlasdb1.yml
similarity index 100%
rename from atlasdb-server-dropwizard/src/dist/var/conf/atlasdb1.yml
rename to atlasdb-service-server/src/dist/var/conf/atlasdb1.yml
diff --git a/atlasdb-server-dropwizard/src/dist/var/conf/atlasdb2.yml b/atlasdb-service-server/src/dist/var/conf/atlasdb2.yml
similarity index 100%
rename from atlasdb-server-dropwizard/src/dist/var/conf/atlasdb2.yml
rename to atlasdb-service-server/src/dist/var/conf/atlasdb2.yml
diff --git a/atlasdb-server-dropwizard/src/dist/var/conf/atlasdb3.yml b/atlasdb-service-server/src/dist/var/conf/atlasdb3.yml
similarity index 100%
rename from atlasdb-server-dropwizard/src/dist/var/conf/atlasdb3.yml
rename to atlasdb-service-server/src/dist/var/conf/atlasdb3.yml
diff --git a/atlasdb-server-dropwizard/src/dist/var/conf/atlasdb_standalone.yml b/atlasdb-service-server/src/dist/var/conf/atlasdb_standalone.yml
similarity index 100%
rename from atlasdb-server-dropwizard/src/dist/var/conf/atlasdb_standalone.yml
rename to atlasdb-service-server/src/dist/var/conf/atlasdb_standalone.yml
diff --git a/atlasdb-server-dropwizard/src/dist/var/conf/atlasdb_standalone_postgres.yml b/atlasdb-service-server/src/dist/var/conf/atlasdb_standalone_postgres.yml
similarity index 100%
rename from atlasdb-server-dropwizard/src/dist/var/conf/atlasdb_standalone_postgres.yml
rename to atlasdb-service-server/src/dist/var/conf/atlasdb_standalone_postgres.yml
diff --git a/atlasdb-server-dropwizard/src/main/java/com/palantir/atlasdb/server/AtlasDbServer.java b/atlasdb-service-server/src/main/java/com/palantir/atlasdb/server/AtlasDbServiceServer.java
similarity index 68%
rename from atlasdb-server-dropwizard/src/main/java/com/palantir/atlasdb/server/AtlasDbServer.java
rename to atlasdb-service-server/src/main/java/com/palantir/atlasdb/server/AtlasDbServiceServer.java
index dadfa87205b..d5d40166adc 100644
--- a/atlasdb-server-dropwizard/src/main/java/com/palantir/atlasdb/server/AtlasDbServer.java
+++ b/atlasdb-service-server/src/main/java/com/palantir/atlasdb/server/AtlasDbServiceServer.java
@@ -15,35 +15,31 @@
  */
 package com.palantir.atlasdb.server;
 
-import javax.net.ssl.SSLSocketFactory;
-
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
 import com.palantir.atlasdb.factory.TransactionManagers;
 import com.palantir.atlasdb.impl.AtlasDbServiceImpl;
 import com.palantir.atlasdb.impl.TableMetadataCache;
 import com.palantir.atlasdb.jackson.AtlasJacksonModule;
-import com.palantir.atlasdb.table.description.Schema;
 import com.palantir.atlasdb.transaction.impl.SerializableTransactionManager;
 
 import io.dropwizard.Application;
 import io.dropwizard.setup.Environment;
 
-public class AtlasDbServer extends Application<AtlasDbServerConfiguration> {
+public class AtlasDbServiceServer extends Application<AtlasDbServiceServerConfiguration> {
 
     public static void main(String[] args) throws Exception {
-        new AtlasDbServer().run(args);
+        new AtlasDbServiceServer().run(args);
     }
 
     @Override
-    public void run(AtlasDbServerConfiguration config, final Environment environment) throws Exception {
-        SerializableTransactionManager tm = TransactionManagers.create(config.getConfig(), Optional.<SSLSocketFactory>absent(), ImmutableSet.<Schema>of(),
-                new com.palantir.atlasdb.factory.TransactionManagers.Environment() {
-                    @Override
-                    public void register(Object resource) {
-                        environment.jersey().register(resource);
-                    }
-                }, false);
+    public void run(AtlasDbServiceServerConfiguration config, final Environment environment) throws Exception {
+        SerializableTransactionManager tm = TransactionManagers.create(
+                config.getConfig(),
+                Optional.absent(),
+                ImmutableSet.of(),
+                environment.jersey()::register,
+                false);
 
         TableMetadataCache cache = new TableMetadataCache(tm.getKeyValueService());
 
diff --git a/atlasdb-server-dropwizard/src/main/java/com/palantir/atlasdb/server/AtlasDbServerConfiguration.java b/atlasdb-service-server/src/main/java/com/palantir/atlasdb/server/AtlasDbServiceServerConfiguration.java
similarity index 83%
rename from atlasdb-server-dropwizard/src/main/java/com/palantir/atlasdb/server/AtlasDbServerConfiguration.java
rename to atlasdb-service-server/src/main/java/com/palantir/atlasdb/server/AtlasDbServiceServerConfiguration.java
index cbeb9a2ed2b..d7c40fac7a3 100644
--- a/atlasdb-server-dropwizard/src/main/java/com/palantir/atlasdb/server/AtlasDbServerConfiguration.java
+++ b/atlasdb-service-server/src/main/java/com/palantir/atlasdb/server/AtlasDbServiceServerConfiguration.java
@@ -21,16 +21,16 @@
 
 import io.dropwizard.Configuration;
 
-public class AtlasDbServerConfiguration extends Configuration {
-    
+public class AtlasDbServiceServerConfiguration extends Configuration {
+
     private final AtlasDbConfig atlasdb;
 
-    public AtlasDbServerConfiguration(@JsonProperty(AtlasDbConfigs.ATLASDB_CONFIG_ROOT) AtlasDbConfig atlasdb) {
+    public AtlasDbServiceServerConfiguration(@JsonProperty(AtlasDbConfigs.ATLASDB_CONFIG_ROOT) AtlasDbConfig atlasdb) {
         this.atlasdb = atlasdb;
     }
-    
+
     public AtlasDbConfig getConfig() {
         return atlasdb;
     }
-    
+
 }
diff --git a/atlasdb-server-dropwizard/src/test/java/com/palantir/server/LeaderRemotingTest.java b/atlasdb-service-server/src/test/java/com/palantir/server/LeaderRemotingTest.java
similarity index 100%
rename from atlasdb-server-dropwizard/src/test/java/com/palantir/server/LeaderRemotingTest.java
rename to atlasdb-service-server/src/test/java/com/palantir/server/LeaderRemotingTest.java
diff --git a/atlasdb-server-dropwizard/src/test/java/com/palantir/server/LockRemotingTest.java b/atlasdb-service-server/src/test/java/com/palantir/server/LockRemotingTest.java
similarity index 100%
rename from atlasdb-server-dropwizard/src/test/java/com/palantir/server/LockRemotingTest.java
rename to atlasdb-service-server/src/test/java/com/palantir/server/LockRemotingTest.java
diff --git a/atlasdb-server-dropwizard/src/test/java/com/palantir/server/TimestampRemotingTest.java b/atlasdb-service-server/src/test/java/com/palantir/server/TimestampRemotingTest.java
similarity index 100%
rename from atlasdb-server-dropwizard/src/test/java/com/palantir/server/TimestampRemotingTest.java
rename to atlasdb-service-server/src/test/java/com/palantir/server/TimestampRemotingTest.java
diff --git a/atlasdb-server-dropwizard/src/test/java/com/palantir/server/TransactionRemotingTest.java b/atlasdb-service-server/src/test/java/com/palantir/server/TransactionRemotingTest.java
similarity index 100%
rename from atlasdb-server-dropwizard/src/test/java/com/palantir/server/TransactionRemotingTest.java
rename to atlasdb-service-server/src/test/java/com/palantir/server/TransactionRemotingTest.java
diff --git a/atlasdb-server-dropwizard/src/test/resources/logback.xml b/atlasdb-service-server/src/test/resources/logback.xml
similarity index 100%
rename from atlasdb-server-dropwizard/src/test/resources/logback.xml
rename to atlasdb-service-server/src/test/resources/logback.xml
diff --git a/atlasdb-server/build.gradle b/atlasdb-service/build.gradle
similarity index 100%
rename from atlasdb-server/build.gradle
rename to atlasdb-service/build.gradle
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/api/AtlasDbService.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/api/RangeToken.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/api/RangeToken.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/api/RangeToken.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableCell.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCell.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableCell.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCell.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableCellVal.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableCellVal.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableCellVal.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableRange.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableRange.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRange.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableRowResult.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableRowResult.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowResult.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableRowSelection.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowSelection.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/api/TableRowSelection.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/api/TableRowSelection.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/api/TransactionToken.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/api/TransactionToken.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/api/TransactionToken.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/api/TransactionToken.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/impl/AtlasDbServiceImpl.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/impl/TableMetadataCache.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasDeserializers.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasJacksonModule.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/AtlasSerializers.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenDeserializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/RangeTokenSerializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellDeserializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellSerializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValDeserializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableCellValSerializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataDeserializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableMetadataSerializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeDeserializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRangeSerializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultDeserializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowResultSerializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionDeserializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/jackson/TableRowSelectionSerializer.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/ForkedJsonFormat.java
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/proto/fork/LICENSE.txt b/atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/LICENSE.txt
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/proto/fork/LICENSE.txt
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/proto/fork/LICENSE.txt
diff --git a/atlasdb-server/src/main/java/com/palantir/atlasdb/transaction/service/PaxosTransactionService.java b/atlasdb-service/src/main/java/com/palantir/atlasdb/transaction/service/PaxosTransactionService.java
similarity index 100%
rename from atlasdb-server/src/main/java/com/palantir/atlasdb/transaction/service/PaxosTransactionService.java
rename to atlasdb-service/src/main/java/com/palantir/atlasdb/transaction/service/PaxosTransactionService.java
diff --git a/atlasdb-spi/build.gradle b/atlasdb-spi/build.gradle
deleted file mode 100644
index ef8a1d7bb14..00000000000
--- a/atlasdb-spi/build.gradle
+++ /dev/null
@@ -1,8 +0,0 @@
-apply from: "../gradle/shared.gradle"
-
-dependencies {
-    compile project(':atlasdb-api')
-    compile project(':timestamp-api')
-    compile 'com.fasterxml.jackson.core:jackson-databind:' + libVersions.jackson
-}
-
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractAtlasDbKeyValueServiceTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractAtlasDbKeyValueServiceTest.java
index 81f22ab628f..420bfc88db2 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractAtlasDbKeyValueServiceTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/keyvalue/impl/AbstractAtlasDbKeyValueServiceTest.java
@@ -26,6 +26,7 @@
 import static org.junit.Assume.assumeTrue;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -45,16 +46,20 @@
 import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
+import com.palantir.atlasdb.keyvalue.api.RangeRequests;
+import com.palantir.atlasdb.keyvalue.api.RowColumnRangeIterator;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
 import com.palantir.atlasdb.keyvalue.api.Value;
@@ -159,6 +164,109 @@ public void testGetRowsAllColumns() {
         assertArrayEquals(value22, values.get(Cell.create(row2, column2)).getContents());
     }
 
+    private Map<Cell, Value> getValuesForRow(Map<byte[], RowColumnRangeIterator> values, byte[] row, int number) {
+        Map<Cell, Value> results = Maps.newHashMap();
+
+        Iterator<Entry<Cell, Value>> it = Collections.emptyIterator();
+        for (byte[] r : values.keySet()) {
+            if (Arrays.equals(r, row)) {
+                it = Iterators.limit(values.get(r), number);
+            }
+        }
+        while (it.hasNext()) {
+            Entry<Cell, Value> result = it.next();
+            results.put(result.getKey(), result.getValue());
+        }
+        return results;
+    }
+
+    @Test
+    public void testGetRowColumnRange() {
+        putTestDataForSingleTimestamp();
+        Map<byte[], RowColumnRangeIterator> values = keyValueService.getRowsColumnRange(TEST_TABLE,
+                ImmutableList.of(row1),
+                new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1),
+                TEST_TIMESTAMP + 1);
+        assertEquals(1, values.size());
+        Map<Cell, Value> batchValues = getValuesForRow(values, row1, 1);
+        assertEquals(1, batchValues.size());
+        assertArrayEquals(batchValues.get(Cell.create(row1, column0)).getContents(), value10);
+        values = keyValueService.getRowsColumnRange(TEST_TABLE,
+                ImmutableList.of(row1),
+                new ColumnRangeSelection(RangeRequests.nextLexicographicName(column0), PtBytes.EMPTY_BYTE_ARRAY, 1),
+                TEST_TIMESTAMP + 1);
+        assertEquals(1, values.size());
+        batchValues = getValuesForRow(values, row1, 1);
+        assertEquals(1, batchValues.size());
+        assertArrayEquals(batchValues.get(Cell.create(row1, column2)).getContents(), value12);
+        values = keyValueService.getRowsColumnRange(TEST_TABLE,
+                ImmutableList.of(row1),
+                new ColumnRangeSelection(RangeRequests.nextLexicographicName(column0), column2, 1),
+                TEST_TIMESTAMP + 1);
+        assertEquals(1, values.size());
+        assertEquals(0, getValuesForRow(values, row1, 1).size());
+        values = keyValueService.getRowsColumnRange(TEST_TABLE,
+                ImmutableList.of(row1),
+                new ColumnRangeSelection(RangeRequests.nextLexicographicName(column2), PtBytes.EMPTY_BYTE_ARRAY, 1),
+                TEST_TIMESTAMP + 1);
+        assertEquals(1, values.size());
+        assertEquals(0, getValuesForRow(values, row1, 1).size());
+        values = keyValueService.getRowsColumnRange(TEST_TABLE,
+                ImmutableList.of(row1),
+                new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, Integer.MAX_VALUE),
+                TEST_TIMESTAMP + 1);
+        assertEquals(1, values.size());
+        batchValues = getValuesForRow(values, row1, 2);
+        assertEquals(2, batchValues.size());
+        assertArrayEquals(batchValues.get(Cell.create(row1, column0)).getContents(), value10);
+        assertArrayEquals(batchValues.get(Cell.create(row1, column2)).getContents(), value12);
+    }
+
+    @Test
+    public void testGetRowColumnRangeHistorical() {
+        putTestDataForMultipleTimestamps();
+        Map<byte[], RowColumnRangeIterator> values = keyValueService.getRowsColumnRange(TEST_TABLE,
+                ImmutableList.of(row0),
+                new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1),
+                TEST_TIMESTAMP + 2);
+        assertEquals(1, values.size());
+        Map<Cell, Value> batchValues = getValuesForRow(values, row0, 1);
+        assertEquals(1, batchValues.size());
+        assertArrayEquals(value0_t1, batchValues.get(Cell.create(row0, column0)).getContents());
+        values = keyValueService.getRowsColumnRange(TEST_TABLE,
+                ImmutableList.of(row0),
+                new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1),
+                TEST_TIMESTAMP + 1);
+        assertEquals(1, values.size());
+        batchValues = getValuesForRow(values, row0, 1);
+        assertEquals(1, batchValues.size());
+        assertArrayEquals(value0_t0, batchValues.get(Cell.create(row0, column0)).getContents());
+    }
+
+    @Test
+    public void testGetRowColumnRangeMultipleHistorical() {
+        keyValueService.put(TEST_TABLE,
+                ImmutableMap.of(Cell.create(row1, column0), value0_t0), TEST_TIMESTAMP);
+        keyValueService.put(TEST_TABLE,
+                ImmutableMap.of(Cell.create(row1, column0), value0_t1), TEST_TIMESTAMP + 1);
+        keyValueService.put(TEST_TABLE,
+                ImmutableMap.of(Cell.create(row1, column1), value0_t0), TEST_TIMESTAMP);
+        keyValueService.put(TEST_TABLE,
+                ImmutableMap.of(Cell.create(row1, column1), value0_t1), TEST_TIMESTAMP + 1);
+
+        // The initial multiget will get results for column0 only, then the next page for column1 will not include
+        // the TEST_TIMESTAMP result so we have to get another page for column1.
+        Map<byte[], RowColumnRangeIterator> values = keyValueService.getRowsColumnRange(TEST_TABLE,
+                ImmutableList.of(row1),
+                new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, RangeRequests.nextLexicographicName(column1), 2),
+                TEST_TIMESTAMP + 1);
+        assertEquals(1, values.size());
+        Map<Cell, Value> batchValues = getValuesForRow(values, row1, 2);
+        assertEquals(2, batchValues.size());
+        assertArrayEquals(value0_t0, batchValues.get(Cell.create(row1, column0)).getContents());
+        assertArrayEquals(value0_t0, batchValues.get(Cell.create(row1, column1)).getContents());
+    }
+
     @Test
     public void testGetRowsWhenMultipleVersions() {
         putTestDataForMultipleTimestamps();
@@ -286,8 +394,8 @@ public void testTableMetadata() {
         assertEquals(AtlasDbConstants.GENERIC_TABLE_METADATA.length, keyValueService.getMetadataForTable(TEST_TABLE).length);
         keyValueService.putMetadataForTable(TEST_TABLE, ArrayUtils.EMPTY_BYTE_ARRAY);
         assertEquals(0, keyValueService.getMetadataForTable(TEST_TABLE).length);
-        keyValueService.putMetadataForTable(TEST_TABLE, metadata0);
-        assertTrue(Arrays.equals(metadata0, keyValueService.getMetadataForTable(TEST_TABLE)));
+        keyValueService.putMetadataForTable(TEST_TABLE, AtlasDbConstants.GENERIC_TABLE_METADATA);
+        assertTrue(Arrays.equals(AtlasDbConstants.GENERIC_TABLE_METADATA, keyValueService.getMetadataForTable(TEST_TABLE)));
     }
 
     private static <V, T extends Iterator<RowResult<V>>> void assertRangeSizeAndOrdering(T it, int expectedSize, RangeRequest rangeRequest) {
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/cleaner/AbstractSweeperTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweeperTest.java
similarity index 99%
rename from atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/cleaner/AbstractSweeperTest.java
rename to atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweeperTest.java
index 059fbedf66d..e5753932dd6 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/cleaner/AbstractSweeperTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/sweep/AbstractSweeperTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2015 Palantir Technologies
+ * Copyright 2016 Palantir Technologies
  *
  * Licensed under the BSD-3 License (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.palantir.atlasdb.cleaner;
+package com.palantir.atlasdb.sweep;
 
 import static com.palantir.atlasdb.schema.generated.SweepProgressTable.SweepProgressRowResult;
 
@@ -33,6 +33,9 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.palantir.atlasdb.cleaner.Cleaner;
+import com.palantir.atlasdb.cleaner.Follower;
+import com.palantir.atlasdb.cleaner.NoOpCleaner;
 import com.palantir.atlasdb.keyvalue.api.Cell;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.api.SweepResults;
@@ -45,9 +48,6 @@
 import com.palantir.atlasdb.schema.generated.SweepPriorityTable.SweepPriorityRowResult;
 import com.palantir.atlasdb.schema.generated.SweepProgressTable;
 import com.palantir.atlasdb.schema.generated.SweepTableFactory;
-import com.palantir.atlasdb.sweep.BackgroundSweeperImpl;
-import com.palantir.atlasdb.sweep.SweepTaskRunner;
-import com.palantir.atlasdb.sweep.SweepTaskRunnerImpl;
 import com.palantir.atlasdb.table.description.Schemas;
 import com.palantir.atlasdb.table.description.TableDefinition;
 import com.palantir.atlasdb.table.description.ValueType;
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java
index 3e7ee144f62..9a2a2f91087 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractSerializableTransactionTest.java
@@ -16,6 +16,7 @@
 package com.palantir.atlasdb.transaction.impl;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
 import java.util.Map;
@@ -33,10 +34,15 @@
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSortedMap;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Ordering;
+import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.cleaner.NoOpCleaner;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.RangeRequest;
 import com.palantir.atlasdb.keyvalue.api.RowResult;
 import com.palantir.atlasdb.keyvalue.api.TableReference;
@@ -47,6 +53,7 @@
 import com.palantir.atlasdb.transaction.api.TransactionManager;
 import com.palantir.atlasdb.transaction.api.TransactionReadSentinelBehavior;
 import com.palantir.atlasdb.transaction.api.TransactionSerializableConflictException;
+import com.palantir.common.base.BatchingVisitable;
 import com.palantir.common.base.BatchingVisitables;
 import com.palantir.common.base.Throwables;
 import com.palantir.common.concurrent.PTExecutors;
@@ -492,4 +499,132 @@ public void testColumnSelection2() {
         t1.commit();
     }
 
+    @Test
+    public void testColumnRangeReadWriteConflict() {
+        byte[] row = PtBytes.toBytes("row1");
+        writeColumns();
+
+        Transaction t1 = startTransaction();
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange =
+                t1.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1));
+        // Serializable transaction records only the first column as read.
+        Map.Entry<Cell, byte[]> read = BatchingVisitables.getFirst(Iterables.getOnlyElement(columnRange.values()));
+        assertEquals(Cell.create(row, PtBytes.toBytes("col0")), read.getKey());
+        // Write to avoid the read only path.
+        put(t1, "row1_1", "col0", "v0");
+
+        Transaction t2 = startTransaction();
+        put(t2, "row1", "col0", "v0_0");
+        t2.commit();
+
+        try {
+            t1.commit();
+            fail();
+        } catch (TransactionSerializableConflictException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testColumnRangeReadWriteConflictOnNewCell() {
+        byte[] row = PtBytes.toBytes("row1");
+        writeColumns();
+
+        Transaction t1 = startTransaction();
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange =
+                t1.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1));
+        // Serializable transaction records only the first column as read.
+        Map.Entry<Cell, byte[]> read = BatchingVisitables.getFirst(Iterables.getOnlyElement(columnRange.values()));
+        assertEquals(Cell.create(row, PtBytes.toBytes("col0")), read.getKey());
+        // Write to avoid the read only path.
+        put(t1, "row1_1", "col0", "v0");
+
+        Transaction t2 = startTransaction();
+        // Write on the start of the range.
+        put(t2, "row1", "col", "v");
+        t2.commit();
+
+        try {
+            t1.commit();
+            fail();
+        } catch (TransactionSerializableConflictException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testColumnRangeReadWriteNoConflict() {
+        byte[] row = PtBytes.toBytes("row1");
+        writeColumns();
+
+        Transaction t1 = startTransaction();
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange =
+                t1.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1));
+        // Serializable transaction records only the first column as read.
+        Map.Entry<Cell, byte[]> read = BatchingVisitables.getFirst(Iterables.getOnlyElement(columnRange.values()));
+        assertEquals(Cell.create(row, PtBytes.toBytes("col0")), read.getKey());
+        // Write to avoid the read only path.
+        put(t1, "row1_1", "col0", "v0");
+
+        Transaction t2 = startTransaction();
+        put(t2, "row1", "col1", "v0_0");
+        t2.commit();
+
+        t1.commit();
+    }
+
+    @Test
+    public void testColumnRangeReadWriteEmptyRange() {
+        byte[] row = PtBytes.toBytes("row1");
+
+        Transaction t1 = startTransaction();
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange =
+                t1.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.toBytes("col"), PtBytes.toBytes("col0"), 1));
+        assertNull(BatchingVisitables.getFirst(Iterables.getOnlyElement(columnRange.values())));
+        // Write to avoid the read only path.
+        put(t1, "row1_1", "col0", "v0");
+
+        Transaction t2 = startTransaction();
+        put(t2, "row1", "col", "v0");
+        t2.commit();
+
+        try {
+            t1.commit();
+            fail();
+        } catch (TransactionSerializableConflictException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testColumnRangeReadWriteEmptyRangeUnread() {
+        byte[] row = PtBytes.toBytes("row1");
+
+        Transaction t1 = startTransaction();
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange =
+                t1.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.toBytes("col"), PtBytes.toBytes("col0"), 1));
+        // Intentionally not reading anything from the result, so we shouldn't get a conflict.
+        // Write to avoid the read only path.
+        put(t1, "row1_1", "col0", "v0");
+
+        Transaction t2 = startTransaction();
+        put(t2, "row1", "col", "v0");
+        t2.commit();
+
+        t1.commit();
+    }
+
+    private void writeColumns() {
+        Transaction t1 = startTransaction();
+        int totalPuts = 101;
+        byte[] row = PtBytes.toBytes("row1");
+        // Record expected results using byte ordering
+        ImmutableSortedMap.Builder<Cell, byte[]> writes = ImmutableSortedMap
+                .orderedBy(Ordering.from(UnsignedBytes.lexicographicalComparator()).onResultOf(key -> key.getColumnName()));
+        for (int i = 0 ; i < totalPuts ; i++) {
+            put(t1, "row1", "col" + i, "v" + i);
+            writes.put(Cell.create(row, PtBytes.toBytes("col" + i)), PtBytes.toBytes("v" + i));
+        }
+        t1.commit();
+    }
 }
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java
index d7aa24572a1..40eb7be7eae 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/AbstractTransactionTest.java
@@ -15,6 +15,7 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -44,16 +45,20 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
+import com.google.common.collect.Ordering;
 import com.google.common.io.BaseEncoding;
+import com.google.common.primitives.UnsignedBytes;
 import com.palantir.atlasdb.AtlasDbConstants;
 import com.palantir.atlasdb.cleaner.NoOpCleaner;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.KeyAlreadyExistsException;
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
@@ -204,6 +209,10 @@ private void put(Transaction t,
         t.put(tableRef, map);
     }
 
+    protected void delete(Transaction t, String rowName, String columnName) {
+        t.delete(TEST_TABLE, ImmutableSet.of(Cell.create(PtBytes.toBytes(rowName), PtBytes.toBytes(columnName))));
+    }
+
     protected String get(Transaction t,
                          String rowName,
                          String columnName) {
@@ -695,6 +704,143 @@ public void testRangePaging() {
         }
     }
 
+    @Test
+    public void testEmptyColumnRangePagingTransaction() {
+        byte[] row = PtBytes.toBytes("row1");
+        Transaction t = startTransaction();
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1));
+        List<Map.Entry<Cell, byte[]>> expected = ImmutableList.of();
+        verifyMatchingResult(expected, row, columnRange);
+
+        put(t, "row1", "col1", "v1");
+        t.commit();
+
+        t = startTransaction();
+        delete(t, "row1", "col1");
+        columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1));
+        verifyMatchingResult(expected, row, columnRange);
+        t.commit();
+
+        t = startTransaction();
+        columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1));
+        verifyMatchingResult(expected, row, columnRange);
+    }
+
+    @Test
+    public void testColumnRangePagingTransaction() {
+        Transaction t = startTransaction();
+        int totalPuts = 101;
+        byte[] row = PtBytes.toBytes("row1");
+        // Record expected results using byte ordering
+        ImmutableSortedMap.Builder<Cell, byte[]> writes = ImmutableSortedMap
+                .orderedBy(Ordering.from(UnsignedBytes.lexicographicalComparator()).onResultOf(key -> key.getColumnName()));
+        for (int i = 0 ; i < totalPuts ; i++) {
+            put(t, "row1", "col" + i, "v" + i);
+            writes.put(Cell.create(row, PtBytes.toBytes("col" + i)), PtBytes.toBytes("v" + i));
+        }
+        t.commit();
+
+        t = startTransaction();
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1));
+        List<Map.Entry<Cell, byte[]>> expected = ImmutableList.copyOf(writes.build().entrySet());
+        verifyMatchingResult(expected, row, columnRange);
+
+        columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.toBytes("col"), PtBytes.EMPTY_BYTE_ARRAY, 1));
+        verifyMatchingResult(expected, row, columnRange);
+
+        columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.toBytes("col"), PtBytes.EMPTY_BYTE_ARRAY, 101));
+        verifyMatchingResult(expected, row, columnRange);
+
+        columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY,
+                        RangeRequests.nextLexicographicName(expected.get(expected.size() - 1).getKey().getColumnName()), 1));
+        verifyMatchingResult(expected, row, columnRange);
+
+        columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY,
+                        expected.get(expected.size() - 1).getKey().getColumnName(), 1));
+        verifyMatchingResult(ImmutableList.copyOf(Iterables.limit(expected, 100)), row, columnRange);
+    }
+
+    protected void verifyMatchingResult(List<Map.Entry<Cell, byte[]>> expected, byte[] row, Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange) {
+        assertEquals(1, columnRange.size());
+        assertArrayEquals(row, Iterables.getOnlyElement(columnRange.keySet()));
+        BatchingVisitable<Map.Entry<Cell, byte[]>> batchingVisitable = Iterables.getOnlyElement(columnRange.values());
+        List<Map.Entry<Cell, byte[]>> results = BatchingVisitables.copyToList(batchingVisitable);
+        assertEquals(expected.size(), results.size());
+        for (int i = 0 ; i < expected.size() ; i++) {
+            assertEquals(expected.get(i).getKey(), results.get(i).getKey());
+            assertArrayEquals(expected.get(i).getValue(), results.get(i).getValue());
+        }
+    }
+
+    @Test
+    public void testReadMyWritesColumnRangePagingTransaction() {
+        Transaction t = startTransaction();
+        int totalPuts = 101;
+        byte[] row = PtBytes.toBytes("row1");
+        // Record expected results using byte ordering
+        ImmutableSortedMap.Builder<Cell, byte[]> writes = ImmutableSortedMap
+                .orderedBy(Ordering.from(UnsignedBytes.lexicographicalComparator()).onResultOf(key -> key.getColumnName()));
+        for (int i = 0 ; i < totalPuts ; i++) {
+            put(t, "row1", "col" + i, "v" + i);
+            if (i % 2 == 0) {
+                writes.put(Cell.create(row, PtBytes.toBytes("col" + i)), PtBytes.toBytes("v" + i));
+            }
+        }
+        t.commit();
+
+        t = startTransaction();
+
+        for (int i = 0 ; i < totalPuts ; i++) {
+            if (i % 2 == 1) {
+                put(t, "row1", "col" + i, "t_v" + i);
+                writes.put(Cell.create(row, PtBytes.toBytes("col" + i)), PtBytes.toBytes("t_v" + i));
+            }
+        }
+
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1));
+        List<Map.Entry<Cell, byte[]>> expected = ImmutableList.copyOf(writes.build().entrySet());
+        verifyMatchingResult(expected, row, columnRange);
+    }
+
+    @Test
+    public void testReadMyDeletesColumnRangePagingTransaction() {
+        Transaction t = startTransaction();
+        int totalPuts = 101;
+        byte[] row = PtBytes.toBytes("row1");
+        // Record expected results using byte ordering
+        ImmutableSortedMap.Builder<Cell, byte[]> writes = ImmutableSortedMap
+                .orderedBy(Ordering.from(UnsignedBytes.lexicographicalComparator()).onResultOf(key -> key.getColumnName()));
+        for (int i = 0 ; i < totalPuts ; i++) {
+            put(t, "row1", "col" + i, "v" + i);
+            if (i % 2 == 0) {
+                writes.put(Cell.create(row, PtBytes.toBytes("col" + i)), PtBytes.toBytes("v" + i));
+            }
+        }
+        t.commit();
+
+        t = startTransaction();
+
+        for (int i = 0 ; i < totalPuts ; i++) {
+            if (i % 2 == 1) {
+                delete(t, "row1", "col" + i);
+            }
+        }
+
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> columnRange =
+                t.getRowsColumnRange(TEST_TABLE, ImmutableList.of(row), new ColumnRangeSelection(PtBytes.EMPTY_BYTE_ARRAY, PtBytes.EMPTY_BYTE_ARRAY, 1));
+        List<Map.Entry<Cell, byte[]>> expected = ImmutableList.copyOf(writes.build().entrySet());
+        verifyMatchingResult(expected, row, columnRange);
+    }
+
     @Test
     public void testKeyValueMultiput() {
         TableReference table = TableReference.createWithEmptyNamespace("table2");
@@ -887,7 +1033,7 @@ public void testReadMyWritesRange() {
         put(t, "row1", "col1", "v5");
         put(t, "row1", "col3", "v6");
         put(t, "row3", "col1", "v7");
-        put(t, "row2", "col1", "");
+        delete(t, "row2", "col1");
         put(t, "row2", "col2", "v8");
 
         final Map<Cell, byte[]> vals = Maps.newHashMap();
@@ -976,7 +1122,7 @@ public boolean visit(RowResult<byte[]> item) throws RuntimeException {
         put(t, "row1", "col1", "v5"); // this put is checked to exist
         put(t, "row1", "col3", "v6"); // it is checked there are 3 cells for this
         put(t, "row3", "col1", "v7");
-        put(t, "row2", "col1", ""); // this delete is checked
+        delete(t, "row2", "col1"); // this delete is checked
         put(t, "row2", "col2", "v8");
         latch2.countDown();
         futureTask.get();
@@ -1025,24 +1171,13 @@ public Void execute(Transaction t) throws RuntimeException {
     }
 
     @Test
-    public void testNullDelete() {
-        getManager().runTaskWithRetry(new TransactionTask<Void, RuntimeException>() {
-            @Override
-            public Void execute(Transaction t) throws RuntimeException {
-                put(t, "row1", "col1", "v1");
-                assertEquals("v1", get(t, "row1", "col1"));
-                put(t, "row1", "col1", null);
-                assertEquals(null, get(t, "row1", "col1"));
-                return null;
-            }
-        });
-
+    public void testDelete() {
         getManager().runTaskWithRetry(new TransactionTask<Void, RuntimeException>() {
             @Override
             public Void execute(Transaction t) throws RuntimeException {
                 put(t, "row1", "col1", "v1");
                 assertEquals("v1", get(t, "row1", "col1"));
-                put(t, "row1", "col1", "");
+                delete(t, "row1", "col1");
                 assertEquals(null, get(t, "row1", "col1"));
                 return null;
             }
@@ -1059,7 +1194,7 @@ public Void execute(Transaction t) throws RuntimeException {
         getManager().runTaskWithRetry(new TxTask() {
             @Override
             public Void execute(Transaction t) throws RuntimeException {
-                put(t, "row1", "col1", "");
+                delete(t, "row1", "col1");
                 return null;
             }
         });
@@ -1083,7 +1218,7 @@ public Void execute(Transaction t) throws RuntimeException {
         getManager().runTaskWithRetry(new TxTask() {
             @Override
             public Void execute(Transaction t) throws RuntimeException {
-                put(t, "row1", "col1", null);
+                delete(t, "row1", "col1");
                 return null;
             }
         });
diff --git a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTestTransactionManager.java b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTestTransactionManager.java
index fcd7b085370..8061872da5a 100644
--- a/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTestTransactionManager.java
+++ b/atlasdb-tests-shared/src/main/java/com/palantir/atlasdb/transaction/impl/CachingTestTransactionManager.java
@@ -24,7 +24,7 @@ public CachingTestTransactionManager(TestTransactionManager delegate) {
     }
 
     @Override
-    protected Transaction wrap(Transaction t) {
-        return new CachingTransaction(t);
+    protected Transaction wrap(Transaction transaction) {
+        return new CachingTransaction(transaction);
     }
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java
index 7f0bdbd10d0..94877ce270d 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/AsyncPuncherTest.java
@@ -40,7 +40,7 @@ public class AsyncPuncherTest {
     @Before
     public void setup() {
         PuncherStore puncherStore = InMemoryPuncherStore.create();
-        Clock clock = SystemClock.create();
+        Clock clock = new SystemClock();
         Puncher puncher = SimplePuncher.create(puncherStore, clock, Suppliers.ofInstance(TRANSACTION_TIMEOUT));
         timestampService = new InMemoryTimestampService();
         asyncPuncher = AsyncPuncher.create(puncher, ASYNC_PUNCHER_INTERVAL);
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweeperTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweeperTest.java
index ad91cc921fe..23bd250c17d 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweeperTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/cleaner/InMemorySweeperTest.java
@@ -21,6 +21,7 @@
 
 import com.palantir.atlasdb.keyvalue.api.KeyValueService;
 import com.palantir.atlasdb.keyvalue.impl.InMemoryKeyValueService;
+import com.palantir.atlasdb.sweep.AbstractSweeperTest;
 import com.palantir.common.concurrent.PTExecutors;
 
 public class InMemorySweeperTest extends AbstractSweeperTest {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java
index 1ceb06c884e..a82651dab1c 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/keyvalue/impl/TableTasksTest.java
@@ -122,7 +122,7 @@ public void testDiffTask() throws InterruptedException {
         DiffStats stats = new TableTasks.DiffStats(rowsOnlyInSource, rowsPartiallyInCommon, rowsCompletelyInCommon, rowsVisited, cellsOnlyInSource, cellsInCommon);
         TableTasks.diff(txManager, MoreExecutors.newDirectExecutorService(), table1, table2, 10, 1, stats, new TableTasks.DiffVisitor() {
             @Override
-            public void visit(Transaction t, Iterator<Cell> partialDiff) {
+            public void visit(Transaction transaction, Iterator<Cell> partialDiff) {
                 Iterators.size(partialDiff);
             }
         });
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/DataTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/DataTable.java
index b8a54924a98..d909e40698b 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/DataTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/DataTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class DataTable implements
     private final List<DataTrigger> triggers;
     private final static String rawTableName = "data";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(DataNamedColumn.values());
 
     static DataTable of(Transaction t, Namespace namespace) {
         return new DataTable(t, namespace, ImmutableList.<DataTrigger>of());
@@ -609,7 +612,7 @@ public void delete(Iterable<DataRow> rows) {
 
     @Override
     public Optional<DataRowResult> getRow(DataRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -625,7 +628,7 @@ public Optional<DataRowResult> getRow(DataRow row, ColumnSelection columns) {
 
     @Override
     public List<DataRowResult> getRows(Iterable<DataRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -640,7 +643,7 @@ public List<DataRowResult> getRows(Iterable<DataRow> rows, ColumnSelection colum
 
     @Override
     public List<DataRowResult> getAsyncRows(Iterable<DataRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -657,7 +660,7 @@ public List<DataRowResult> call() {
 
     @Override
     public List<DataNamedColumnValue<?>> getRowColumns(DataRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -677,7 +680,7 @@ public List<DataNamedColumnValue<?>> getRowColumns(DataRow row, ColumnSelection
 
     @Override
     public Multimap<DataRow, DataNamedColumnValue<?>> getRowsMultimap(Iterable<DataRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -687,7 +690,7 @@ public Multimap<DataRow, DataNamedColumnValue<?>> getRowsMultimap(Iterable<DataR
 
     @Override
     public Multimap<DataRow, DataNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<DataRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -718,6 +721,20 @@ private static Multimap<DataRow, DataNamedColumnValue<?>> getRowMapFromRowResult
         return rowMap;
     }
 
+    @Override
+    public Map<DataRow, BatchingVisitable<DataNamedColumnValue<?>>> getRowsColumnRange(Iterable<DataRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<DataRow, BatchingVisitable<DataNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            DataRow row = DataRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<DataNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     private Multimap<DataRow, DataNamedColumnValue<?>> getAffectedCells(Multimap<DataRow, ? extends DataNamedColumnValue<?>> rows) {
         Multimap<DataRow, DataNamedColumnValue<?>> oldData = getRowsMultimap(rows.keySet());
         Multimap<DataRow, DataNamedColumnValue<?>> cellsAffected = ArrayListMultimap.create();
@@ -809,7 +826,7 @@ private void deleteIndex4Idx(Multimap<DataRow, DataNamedColumnValue<?>> result)
     }
 
     public BatchingVisitableView<DataRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<DataRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -845,6 +862,7 @@ public static final class Index1IdxTable implements
         private final List<Index1IdxTrigger> triggers;
         private final static String rawTableName = "index1_idx";
         private final TableReference tableRef;
+        private final static ColumnSelection allColumns = ColumnSelection.all();
 
         public static Index1IdxTable of(DataTable table) {
             return new Index1IdxTable(table.t, table.tableRef.getNamespace(), ImmutableList.<Index1IdxTrigger>of());
@@ -1056,6 +1074,28 @@ public Index1IdxColumn hydrateFromBytes(byte[] __input) {
                 }
             };
 
+            public static ColumnRangeSelection createPrefixRangeUnsorted(byte[] rowName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes), batchSize);
+            }
+
+            public static Prefix prefixUnsorted(byte[] rowName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return new Prefix(EncodingUtils.add(rowNameBytes));
+            }
+
+            public static ColumnRangeSelection createPrefixRange(byte[] rowName, byte[] columnName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes, columnNameBytes), batchSize);
+            }
+
+            public static Prefix prefix(byte[] rowName, byte[] columnName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return new Prefix(EncodingUtils.add(rowNameBytes, columnNameBytes));
+            }
+
             @Override
             public String toString() {
                 return MoreObjects.toStringHelper(getClass().getSimpleName())
@@ -1082,7 +1122,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(rowName, columnName, id);
+                return Arrays.deepHashCode(new Object[]{ rowName, columnName, id });
             }
 
             @Override
@@ -1343,7 +1383,7 @@ public Multimap<Index1IdxRow, Index1IdxColumnValue> call() {
 
         @Override
         public List<Index1IdxColumnValue> getRowColumns(Index1IdxRow row) {
-            return getRowColumns(row, ColumnSelection.all());
+            return getRowColumns(row, allColumns);
         }
 
         @Override
@@ -1365,7 +1405,7 @@ public List<Index1IdxColumnValue> getRowColumns(Index1IdxRow row, ColumnSelectio
 
         @Override
         public Multimap<Index1IdxRow, Index1IdxColumnValue> getRowsMultimap(Iterable<Index1IdxRow> rows) {
-            return getRowsMultimapInternal(rows, ColumnSelection.all());
+            return getRowsMultimapInternal(rows, allColumns);
         }
 
         @Override
@@ -1375,7 +1415,7 @@ public Multimap<Index1IdxRow, Index1IdxColumnValue> getRowsMultimap(Iterable<Ind
 
         @Override
         public Multimap<Index1IdxRow, Index1IdxColumnValue> getAsyncRowsMultimap(Iterable<Index1IdxRow> rows, ExecutorService exec) {
-            return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+            return getAsyncRowsMultimap(rows, allColumns, exec);
         }
 
         @Override
@@ -1408,9 +1448,25 @@ private static Multimap<Index1IdxRow, Index1IdxColumnValue> getRowMapFromRowResu
             return rowMap;
         }
 
+        @Override
+        public Map<Index1IdxRow, BatchingVisitable<Index1IdxColumnValue>> getRowsColumnRange(Iterable<Index1IdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+            Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+            Map<Index1IdxRow, BatchingVisitable<Index1IdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+            for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+                Index1IdxRow row = Index1IdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+                BatchingVisitable<Index1IdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                    Index1IdxColumn col = Index1IdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                    Long val = Index1IdxColumnValue.hydrateValue(result.getValue());
+                    return Index1IdxColumnValue.of(col, val);
+                });
+                transformed.put(row, bv);
+            }
+            return transformed;
+        }
+
         public BatchingVisitableView<Index1IdxRowResult> getRange(RangeRequest range) {
             if (range.getColumnNames().isEmpty()) {
-                range = range.getBuilder().retainColumns(ColumnSelection.all()).build();
+                range = range.getBuilder().retainColumns(allColumns).build();
             }
             return BatchingVisitables.transform(t.getRange(tableRef, range), new Function<RowResult<byte[]>, Index1IdxRowResult>() {
                 @Override
@@ -1481,6 +1537,7 @@ public static final class Index2IdxTable implements
         private final List<Index2IdxTrigger> triggers;
         private final static String rawTableName = "index2_idx";
         private final TableReference tableRef;
+        private final static ColumnSelection allColumns = ColumnSelection.all();
 
         public static Index2IdxTable of(DataTable table) {
             return new Index2IdxTable(table.t, table.tableRef.getNamespace(), ImmutableList.<Index2IdxTrigger>of());
@@ -1617,7 +1674,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(value, id);
+                return Arrays.deepHashCode(new Object[]{ value, id });
             }
 
             @Override
@@ -1695,6 +1752,16 @@ public Index2IdxColumn hydrateFromBytes(byte[] __input) {
                 }
             };
 
+            public static ColumnRangeSelection createPrefixRangeUnsorted(byte[] rowName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes), batchSize);
+            }
+
+            public static Prefix prefixUnsorted(byte[] rowName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return new Prefix(EncodingUtils.add(rowNameBytes));
+            }
+
             @Override
             public String toString() {
                 return MoreObjects.toStringHelper(getClass().getSimpleName())
@@ -1720,7 +1787,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(rowName, columnName);
+                return Arrays.deepHashCode(new Object[]{ rowName, columnName });
             }
 
             @Override
@@ -1979,7 +2046,7 @@ public Multimap<Index2IdxRow, Index2IdxColumnValue> call() {
 
         @Override
         public List<Index2IdxColumnValue> getRowColumns(Index2IdxRow row) {
-            return getRowColumns(row, ColumnSelection.all());
+            return getRowColumns(row, allColumns);
         }
 
         @Override
@@ -2001,7 +2068,7 @@ public List<Index2IdxColumnValue> getRowColumns(Index2IdxRow row, ColumnSelectio
 
         @Override
         public Multimap<Index2IdxRow, Index2IdxColumnValue> getRowsMultimap(Iterable<Index2IdxRow> rows) {
-            return getRowsMultimapInternal(rows, ColumnSelection.all());
+            return getRowsMultimapInternal(rows, allColumns);
         }
 
         @Override
@@ -2011,7 +2078,7 @@ public Multimap<Index2IdxRow, Index2IdxColumnValue> getRowsMultimap(Iterable<Ind
 
         @Override
         public Multimap<Index2IdxRow, Index2IdxColumnValue> getAsyncRowsMultimap(Iterable<Index2IdxRow> rows, ExecutorService exec) {
-            return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+            return getAsyncRowsMultimap(rows, allColumns, exec);
         }
 
         @Override
@@ -2044,9 +2111,25 @@ private static Multimap<Index2IdxRow, Index2IdxColumnValue> getRowMapFromRowResu
             return rowMap;
         }
 
+        @Override
+        public Map<Index2IdxRow, BatchingVisitable<Index2IdxColumnValue>> getRowsColumnRange(Iterable<Index2IdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+            Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+            Map<Index2IdxRow, BatchingVisitable<Index2IdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+            for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+                Index2IdxRow row = Index2IdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+                BatchingVisitable<Index2IdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                    Index2IdxColumn col = Index2IdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                    Long val = Index2IdxColumnValue.hydrateValue(result.getValue());
+                    return Index2IdxColumnValue.of(col, val);
+                });
+                transformed.put(row, bv);
+            }
+            return transformed;
+        }
+
         public BatchingVisitableView<Index2IdxRowResult> getRange(RangeRequest range) {
             if (range.getColumnNames().isEmpty()) {
-                range = range.getBuilder().retainColumns(ColumnSelection.all()).build();
+                range = range.getBuilder().retainColumns(allColumns).build();
             }
             return BatchingVisitables.transform(t.getRange(tableRef, range), new Function<RowResult<byte[]>, Index2IdxRowResult>() {
                 @Override
@@ -2117,6 +2200,7 @@ public static final class Index3IdxTable implements
         private final List<Index3IdxTrigger> triggers;
         private final static String rawTableName = "index3_idx";
         private final TableReference tableRef;
+        private final static ColumnSelection allColumns = ColumnSelection.all();
 
         public static Index3IdxTable of(DataTable table) {
             return new Index3IdxTable(table.t, table.tableRef.getNamespace(), ImmutableList.<Index3IdxTrigger>of());
@@ -2309,6 +2393,16 @@ public Index3IdxColumn hydrateFromBytes(byte[] __input) {
                 }
             };
 
+            public static ColumnRangeSelection createPrefixRangeUnsorted(byte[] rowName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes), batchSize);
+            }
+
+            public static Prefix prefixUnsorted(byte[] rowName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return new Prefix(EncodingUtils.add(rowNameBytes));
+            }
+
             @Override
             public String toString() {
                 return MoreObjects.toStringHelper(getClass().getSimpleName())
@@ -2334,7 +2428,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(rowName, columnName);
+                return Arrays.deepHashCode(new Object[]{ rowName, columnName });
             }
 
             @Override
@@ -2593,7 +2687,7 @@ public Multimap<Index3IdxRow, Index3IdxColumnValue> call() {
 
         @Override
         public List<Index3IdxColumnValue> getRowColumns(Index3IdxRow row) {
-            return getRowColumns(row, ColumnSelection.all());
+            return getRowColumns(row, allColumns);
         }
 
         @Override
@@ -2615,7 +2709,7 @@ public List<Index3IdxColumnValue> getRowColumns(Index3IdxRow row, ColumnSelectio
 
         @Override
         public Multimap<Index3IdxRow, Index3IdxColumnValue> getRowsMultimap(Iterable<Index3IdxRow> rows) {
-            return getRowsMultimapInternal(rows, ColumnSelection.all());
+            return getRowsMultimapInternal(rows, allColumns);
         }
 
         @Override
@@ -2625,7 +2719,7 @@ public Multimap<Index3IdxRow, Index3IdxColumnValue> getRowsMultimap(Iterable<Ind
 
         @Override
         public Multimap<Index3IdxRow, Index3IdxColumnValue> getAsyncRowsMultimap(Iterable<Index3IdxRow> rows, ExecutorService exec) {
-            return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+            return getAsyncRowsMultimap(rows, allColumns, exec);
         }
 
         @Override
@@ -2658,9 +2752,25 @@ private static Multimap<Index3IdxRow, Index3IdxColumnValue> getRowMapFromRowResu
             return rowMap;
         }
 
+        @Override
+        public Map<Index3IdxRow, BatchingVisitable<Index3IdxColumnValue>> getRowsColumnRange(Iterable<Index3IdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+            Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+            Map<Index3IdxRow, BatchingVisitable<Index3IdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+            for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+                Index3IdxRow row = Index3IdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+                BatchingVisitable<Index3IdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                    Index3IdxColumn col = Index3IdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                    Long val = Index3IdxColumnValue.hydrateValue(result.getValue());
+                    return Index3IdxColumnValue.of(col, val);
+                });
+                transformed.put(row, bv);
+            }
+            return transformed;
+        }
+
         public BatchingVisitableView<Index3IdxRowResult> getRange(RangeRequest range) {
             if (range.getColumnNames().isEmpty()) {
-                range = range.getBuilder().retainColumns(ColumnSelection.all()).build();
+                range = range.getBuilder().retainColumns(allColumns).build();
             }
             return BatchingVisitables.transform(t.getRange(tableRef, range), new Function<RowResult<byte[]>, Index3IdxRowResult>() {
                 @Override
@@ -2731,6 +2841,7 @@ public static final class Index4IdxTable implements
         private final List<Index4IdxTrigger> triggers;
         private final static String rawTableName = "index4_idx";
         private final TableReference tableRef;
+        private final static ColumnSelection allColumns = ColumnSelection.all();
 
         public static Index4IdxTable of(DataTable table) {
             return new Index4IdxTable(table.t, table.tableRef.getNamespace(), ImmutableList.<Index4IdxTrigger>of());
@@ -2867,7 +2978,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(value1, value2);
+                return Arrays.deepHashCode(new Object[]{ value1, value2 });
             }
 
             @Override
@@ -2945,6 +3056,16 @@ public Index4IdxColumn hydrateFromBytes(byte[] __input) {
                 }
             };
 
+            public static ColumnRangeSelection createPrefixRangeUnsorted(byte[] rowName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes), batchSize);
+            }
+
+            public static Prefix prefixUnsorted(byte[] rowName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return new Prefix(EncodingUtils.add(rowNameBytes));
+            }
+
             @Override
             public String toString() {
                 return MoreObjects.toStringHelper(getClass().getSimpleName())
@@ -2970,7 +3091,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(rowName, columnName);
+                return Arrays.deepHashCode(new Object[]{ rowName, columnName });
             }
 
             @Override
@@ -3229,7 +3350,7 @@ public Multimap<Index4IdxRow, Index4IdxColumnValue> call() {
 
         @Override
         public List<Index4IdxColumnValue> getRowColumns(Index4IdxRow row) {
-            return getRowColumns(row, ColumnSelection.all());
+            return getRowColumns(row, allColumns);
         }
 
         @Override
@@ -3251,7 +3372,7 @@ public List<Index4IdxColumnValue> getRowColumns(Index4IdxRow row, ColumnSelectio
 
         @Override
         public Multimap<Index4IdxRow, Index4IdxColumnValue> getRowsMultimap(Iterable<Index4IdxRow> rows) {
-            return getRowsMultimapInternal(rows, ColumnSelection.all());
+            return getRowsMultimapInternal(rows, allColumns);
         }
 
         @Override
@@ -3261,7 +3382,7 @@ public Multimap<Index4IdxRow, Index4IdxColumnValue> getRowsMultimap(Iterable<Ind
 
         @Override
         public Multimap<Index4IdxRow, Index4IdxColumnValue> getAsyncRowsMultimap(Iterable<Index4IdxRow> rows, ExecutorService exec) {
-            return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+            return getAsyncRowsMultimap(rows, allColumns, exec);
         }
 
         @Override
@@ -3294,9 +3415,25 @@ private static Multimap<Index4IdxRow, Index4IdxColumnValue> getRowMapFromRowResu
             return rowMap;
         }
 
+        @Override
+        public Map<Index4IdxRow, BatchingVisitable<Index4IdxColumnValue>> getRowsColumnRange(Iterable<Index4IdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+            Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+            Map<Index4IdxRow, BatchingVisitable<Index4IdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+            for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+                Index4IdxRow row = Index4IdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+                BatchingVisitable<Index4IdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                    Index4IdxColumn col = Index4IdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                    Long val = Index4IdxColumnValue.hydrateValue(result.getValue());
+                    return Index4IdxColumnValue.of(col, val);
+                });
+                transformed.put(row, bv);
+            }
+            return transformed;
+        }
+
         public BatchingVisitableView<Index4IdxRowResult> getRange(RangeRequest range) {
             if (range.getColumnNames().isEmpty()) {
-                range = range.getBuilder().retainColumns(ColumnSelection.all()).build();
+                range = range.getBuilder().retainColumns(allColumns).build();
             }
             return BatchingVisitables.transform(t.getRange(tableRef, range), new Function<RowResult<byte[]>, Index4IdxRowResult>() {
                 @Override
@@ -3382,6 +3519,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -3439,5 +3578,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "TAfXhQqzRAKrhLBxlvImOw==";
+    static String __CLASS_HASH = "Gw4KVbhTByDbyPGBajf5JQ==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/TwoColumnsTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/TwoColumnsTable.java
index 3b116ecc9fe..e4b2f6f9ddb 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/TwoColumnsTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/indexing/generated/TwoColumnsTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class TwoColumnsTable implements
     private final List<TwoColumnsTrigger> triggers;
     private final static String rawTableName = "two_columns";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(TwoColumnsNamedColumn.values());
 
     static TwoColumnsTable of(Transaction t, Namespace namespace) {
         return new TwoColumnsTable(t, namespace, ImmutableList.<TwoColumnsTrigger>of());
@@ -677,7 +680,7 @@ public void delete(Iterable<TwoColumnsRow> rows) {
 
     @Override
     public Optional<TwoColumnsRowResult> getRow(TwoColumnsRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -693,7 +696,7 @@ public Optional<TwoColumnsRowResult> getRow(TwoColumnsRow row, ColumnSelection c
 
     @Override
     public List<TwoColumnsRowResult> getRows(Iterable<TwoColumnsRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -708,7 +711,7 @@ public List<TwoColumnsRowResult> getRows(Iterable<TwoColumnsRow> rows, ColumnSel
 
     @Override
     public List<TwoColumnsRowResult> getAsyncRows(Iterable<TwoColumnsRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -725,7 +728,7 @@ public List<TwoColumnsRowResult> call() {
 
     @Override
     public List<TwoColumnsNamedColumnValue<?>> getRowColumns(TwoColumnsRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -745,7 +748,7 @@ public List<TwoColumnsNamedColumnValue<?>> getRowColumns(TwoColumnsRow row, Colu
 
     @Override
     public Multimap<TwoColumnsRow, TwoColumnsNamedColumnValue<?>> getRowsMultimap(Iterable<TwoColumnsRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -755,7 +758,7 @@ public Multimap<TwoColumnsRow, TwoColumnsNamedColumnValue<?>> getRowsMultimap(It
 
     @Override
     public Multimap<TwoColumnsRow, TwoColumnsNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<TwoColumnsRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -786,6 +789,20 @@ private static Multimap<TwoColumnsRow, TwoColumnsNamedColumnValue<?>> getRowMapF
         return rowMap;
     }
 
+    @Override
+    public Map<TwoColumnsRow, BatchingVisitable<TwoColumnsNamedColumnValue<?>>> getRowsColumnRange(Iterable<TwoColumnsRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<TwoColumnsRow, BatchingVisitable<TwoColumnsNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            TwoColumnsRow row = TwoColumnsRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<TwoColumnsNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     private Multimap<TwoColumnsRow, TwoColumnsNamedColumnValue<?>> getAffectedCells(Multimap<TwoColumnsRow, ? extends TwoColumnsNamedColumnValue<?>> rows) {
         Multimap<TwoColumnsRow, TwoColumnsNamedColumnValue<?>> oldData = getRowsMultimap(rows.keySet());
         Multimap<TwoColumnsRow, TwoColumnsNamedColumnValue<?>> cellsAffected = ArrayListMultimap.create();
@@ -839,7 +856,7 @@ private void deleteFooToIdIdx(Multimap<TwoColumnsRow, TwoColumnsNamedColumnValue
     }
 
     public BatchingVisitableView<TwoColumnsRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<TwoColumnsRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -875,6 +892,7 @@ public static final class FooToIdCondIdxTable implements
         private final List<FooToIdCondIdxTrigger> triggers;
         private final static String rawTableName = "foo_to_id_cond_idx";
         private final TableReference tableRef;
+        private final static ColumnSelection allColumns = ColumnSelection.all();
 
         public static FooToIdCondIdxTable of(TwoColumnsTable table) {
             return new FooToIdCondIdxTable(table.t, table.tableRef.getNamespace(), ImmutableList.<FooToIdCondIdxTrigger>of());
@@ -1086,6 +1104,28 @@ public FooToIdCondIdxColumn hydrateFromBytes(byte[] __input) {
                 }
             };
 
+            public static ColumnRangeSelection createPrefixRangeUnsorted(byte[] rowName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes), batchSize);
+            }
+
+            public static Prefix prefixUnsorted(byte[] rowName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return new Prefix(EncodingUtils.add(rowNameBytes));
+            }
+
+            public static ColumnRangeSelection createPrefixRange(byte[] rowName, byte[] columnName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes, columnNameBytes), batchSize);
+            }
+
+            public static Prefix prefix(byte[] rowName, byte[] columnName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return new Prefix(EncodingUtils.add(rowNameBytes, columnNameBytes));
+            }
+
             @Override
             public String toString() {
                 return MoreObjects.toStringHelper(getClass().getSimpleName())
@@ -1112,7 +1152,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(rowName, columnName, id);
+                return Arrays.deepHashCode(new Object[]{ rowName, columnName, id });
             }
 
             @Override
@@ -1373,7 +1413,7 @@ public Multimap<FooToIdCondIdxRow, FooToIdCondIdxColumnValue> call() {
 
         @Override
         public List<FooToIdCondIdxColumnValue> getRowColumns(FooToIdCondIdxRow row) {
-            return getRowColumns(row, ColumnSelection.all());
+            return getRowColumns(row, allColumns);
         }
 
         @Override
@@ -1395,7 +1435,7 @@ public List<FooToIdCondIdxColumnValue> getRowColumns(FooToIdCondIdxRow row, Colu
 
         @Override
         public Multimap<FooToIdCondIdxRow, FooToIdCondIdxColumnValue> getRowsMultimap(Iterable<FooToIdCondIdxRow> rows) {
-            return getRowsMultimapInternal(rows, ColumnSelection.all());
+            return getRowsMultimapInternal(rows, allColumns);
         }
 
         @Override
@@ -1405,7 +1445,7 @@ public Multimap<FooToIdCondIdxRow, FooToIdCondIdxColumnValue> getRowsMultimap(It
 
         @Override
         public Multimap<FooToIdCondIdxRow, FooToIdCondIdxColumnValue> getAsyncRowsMultimap(Iterable<FooToIdCondIdxRow> rows, ExecutorService exec) {
-            return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+            return getAsyncRowsMultimap(rows, allColumns, exec);
         }
 
         @Override
@@ -1438,8 +1478,24 @@ private static Multimap<FooToIdCondIdxRow, FooToIdCondIdxColumnValue> getRowMapF
             return rowMap;
         }
 
+        @Override
+        public Map<FooToIdCondIdxRow, BatchingVisitable<FooToIdCondIdxColumnValue>> getRowsColumnRange(Iterable<FooToIdCondIdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+            Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+            Map<FooToIdCondIdxRow, BatchingVisitable<FooToIdCondIdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+            for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+                FooToIdCondIdxRow row = FooToIdCondIdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+                BatchingVisitable<FooToIdCondIdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                    FooToIdCondIdxColumn col = FooToIdCondIdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                    Long val = FooToIdCondIdxColumnValue.hydrateValue(result.getValue());
+                    return FooToIdCondIdxColumnValue.of(col, val);
+                });
+                transformed.put(row, bv);
+            }
+            return transformed;
+        }
+
         public BatchingVisitableView<FooToIdCondIdxRowResult> getAllRowsUnordered() {
-            return getAllRowsUnordered(ColumnSelection.all());
+            return getAllRowsUnordered(allColumns);
         }
 
         public BatchingVisitableView<FooToIdCondIdxRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -1477,6 +1533,7 @@ public static final class FooToIdIdxTable implements
         private final List<FooToIdIdxTrigger> triggers;
         private final static String rawTableName = "foo_to_id_idx";
         private final TableReference tableRef;
+        private final static ColumnSelection allColumns = ColumnSelection.all();
 
         public static FooToIdIdxTable of(TwoColumnsTable table) {
             return new FooToIdIdxTable(table.t, table.tableRef.getNamespace(), ImmutableList.<FooToIdIdxTrigger>of());
@@ -1688,6 +1745,28 @@ public FooToIdIdxColumn hydrateFromBytes(byte[] __input) {
                 }
             };
 
+            public static ColumnRangeSelection createPrefixRangeUnsorted(byte[] rowName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes), batchSize);
+            }
+
+            public static Prefix prefixUnsorted(byte[] rowName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return new Prefix(EncodingUtils.add(rowNameBytes));
+            }
+
+            public static ColumnRangeSelection createPrefixRange(byte[] rowName, byte[] columnName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes, columnNameBytes), batchSize);
+            }
+
+            public static Prefix prefix(byte[] rowName, byte[] columnName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return new Prefix(EncodingUtils.add(rowNameBytes, columnNameBytes));
+            }
+
             @Override
             public String toString() {
                 return MoreObjects.toStringHelper(getClass().getSimpleName())
@@ -1714,7 +1793,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(rowName, columnName, id);
+                return Arrays.deepHashCode(new Object[]{ rowName, columnName, id });
             }
 
             @Override
@@ -1975,7 +2054,7 @@ public Multimap<FooToIdIdxRow, FooToIdIdxColumnValue> call() {
 
         @Override
         public List<FooToIdIdxColumnValue> getRowColumns(FooToIdIdxRow row) {
-            return getRowColumns(row, ColumnSelection.all());
+            return getRowColumns(row, allColumns);
         }
 
         @Override
@@ -1997,7 +2076,7 @@ public List<FooToIdIdxColumnValue> getRowColumns(FooToIdIdxRow row, ColumnSelect
 
         @Override
         public Multimap<FooToIdIdxRow, FooToIdIdxColumnValue> getRowsMultimap(Iterable<FooToIdIdxRow> rows) {
-            return getRowsMultimapInternal(rows, ColumnSelection.all());
+            return getRowsMultimapInternal(rows, allColumns);
         }
 
         @Override
@@ -2007,7 +2086,7 @@ public Multimap<FooToIdIdxRow, FooToIdIdxColumnValue> getRowsMultimap(Iterable<F
 
         @Override
         public Multimap<FooToIdIdxRow, FooToIdIdxColumnValue> getAsyncRowsMultimap(Iterable<FooToIdIdxRow> rows, ExecutorService exec) {
-            return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+            return getAsyncRowsMultimap(rows, allColumns, exec);
         }
 
         @Override
@@ -2040,8 +2119,24 @@ private static Multimap<FooToIdIdxRow, FooToIdIdxColumnValue> getRowMapFromRowRe
             return rowMap;
         }
 
+        @Override
+        public Map<FooToIdIdxRow, BatchingVisitable<FooToIdIdxColumnValue>> getRowsColumnRange(Iterable<FooToIdIdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+            Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+            Map<FooToIdIdxRow, BatchingVisitable<FooToIdIdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+            for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+                FooToIdIdxRow row = FooToIdIdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+                BatchingVisitable<FooToIdIdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                    FooToIdIdxColumn col = FooToIdIdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                    Long val = FooToIdIdxColumnValue.hydrateValue(result.getValue());
+                    return FooToIdIdxColumnValue.of(col, val);
+                });
+                transformed.put(row, bv);
+            }
+            return transformed;
+        }
+
         public BatchingVisitableView<FooToIdIdxRowResult> getAllRowsUnordered() {
-            return getAllRowsUnordered(ColumnSelection.all());
+            return getAllRowsUnordered(allColumns);
         }
 
         public BatchingVisitableView<FooToIdIdxRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -2094,6 +2189,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -2151,5 +2248,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "qm8uxD9QtsMkbXBnBo9Pvg==";
+    static String __CLASS_HASH = "7GRVAi0WA3eAZGEPT28KwQ==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestIndexCleanupTask.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestIndexCleanupTask.java
index 791053b6af6..c7821d8b910 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestIndexCleanupTask.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestIndexCleanupTask.java
@@ -6,12 +6,17 @@
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.Transaction;
 
 public class StreamTestIndexCleanupTask implements OnCleanupTask {
 
-    private final StreamTestTableFactory tables = StreamTestTableFactory.of();
+    private final StreamTestTableFactory tables;
+
+    public StreamTestIndexCleanupTask(Namespace namespace) {
+        tables = StreamTestTableFactory.of(namespace);
+    }
 
     @Override
     public boolean cellsCleanedUp(Transaction t, Set<Cell> cells) {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMetadataCleanupTask.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMetadataCleanupTask.java
index be640f025cd..2b12e4a6b76 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMetadataCleanupTask.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestMetadataCleanupTask.java
@@ -8,6 +8,7 @@
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.protos.generated.StreamPersistence.Status;
 import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata;
 import com.palantir.atlasdb.table.description.ValueType;
@@ -15,7 +16,11 @@
 
 public class StreamTestMetadataCleanupTask implements OnCleanupTask {
 
-    private final StreamTestTableFactory tables = StreamTestTableFactory.of();
+    private final StreamTestTableFactory tables;
+
+    public StreamTestMetadataCleanupTask(Namespace namespace) {
+        tables = StreamTestTableFactory.of(namespace);
+    }
 
     @Override
     public boolean cellsCleanedUp(Transaction t, Set<Cell> cells) {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamHashAidxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamHashAidxTable.java
index 23a8be2b424..8e7e6b510b1 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamHashAidxTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamHashAidxTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -94,6 +96,7 @@ public final class StreamTestStreamHashAidxTable implements
     private final List<StreamTestStreamHashAidxTrigger> triggers;
     private final static String rawTableName = "stream_test_stream_hash_aidx";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = ColumnSelection.all();
 
     static StreamTestStreamHashAidxTable of(Transaction t, Namespace namespace) {
         return new StreamTestStreamHashAidxTable(t, namespace, ImmutableList.<StreamTestStreamHashAidxTrigger>of());
@@ -557,7 +560,7 @@ public Multimap<StreamTestStreamHashAidxRow, StreamTestStreamHashAidxColumnValue
 
     @Override
     public List<StreamTestStreamHashAidxColumnValue> getRowColumns(StreamTestStreamHashAidxRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -579,7 +582,7 @@ public List<StreamTestStreamHashAidxColumnValue> getRowColumns(StreamTestStreamH
 
     @Override
     public Multimap<StreamTestStreamHashAidxRow, StreamTestStreamHashAidxColumnValue> getRowsMultimap(Iterable<StreamTestStreamHashAidxRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -589,7 +592,7 @@ public Multimap<StreamTestStreamHashAidxRow, StreamTestStreamHashAidxColumnValue
 
     @Override
     public Multimap<StreamTestStreamHashAidxRow, StreamTestStreamHashAidxColumnValue> getAsyncRowsMultimap(Iterable<StreamTestStreamHashAidxRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -622,8 +625,24 @@ private static Multimap<StreamTestStreamHashAidxRow, StreamTestStreamHashAidxCol
         return rowMap;
     }
 
+    @Override
+    public Map<StreamTestStreamHashAidxRow, BatchingVisitable<StreamTestStreamHashAidxColumnValue>> getRowsColumnRange(Iterable<StreamTestStreamHashAidxRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<StreamTestStreamHashAidxRow, BatchingVisitable<StreamTestStreamHashAidxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            StreamTestStreamHashAidxRow row = StreamTestStreamHashAidxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<StreamTestStreamHashAidxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                StreamTestStreamHashAidxColumn col = StreamTestStreamHashAidxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                Long val = StreamTestStreamHashAidxColumnValue.hydrateValue(result.getValue());
+                return StreamTestStreamHashAidxColumnValue.of(col, val);
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<StreamTestStreamHashAidxRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<StreamTestStreamHashAidxRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -674,6 +693,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -731,5 +752,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "6Q3CdWP3VG1WC0bRFfDnqg==";
+    static String __CLASS_HASH = "x7RpdftIM4aAZfD7iK/IMQ==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamIdxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamIdxTable.java
index 9078262ce6c..3ca61d2a014 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamIdxTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamIdxTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -94,6 +96,7 @@ public final class StreamTestStreamIdxTable implements
     private final List<StreamTestStreamIdxTrigger> triggers;
     private final static String rawTableName = "stream_test_stream_idx";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = ColumnSelection.all();
 
     static StreamTestStreamIdxTable of(Transaction t, Namespace namespace) {
         return new StreamTestStreamIdxTable(t, namespace, ImmutableList.<StreamTestStreamIdxTrigger>of());
@@ -557,7 +560,7 @@ public Multimap<StreamTestStreamIdxRow, StreamTestStreamIdxColumnValue> call() {
 
     @Override
     public List<StreamTestStreamIdxColumnValue> getRowColumns(StreamTestStreamIdxRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -579,7 +582,7 @@ public List<StreamTestStreamIdxColumnValue> getRowColumns(StreamTestStreamIdxRow
 
     @Override
     public Multimap<StreamTestStreamIdxRow, StreamTestStreamIdxColumnValue> getRowsMultimap(Iterable<StreamTestStreamIdxRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -589,7 +592,7 @@ public Multimap<StreamTestStreamIdxRow, StreamTestStreamIdxColumnValue> getRowsM
 
     @Override
     public Multimap<StreamTestStreamIdxRow, StreamTestStreamIdxColumnValue> getAsyncRowsMultimap(Iterable<StreamTestStreamIdxRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -622,8 +625,24 @@ private static Multimap<StreamTestStreamIdxRow, StreamTestStreamIdxColumnValue>
         return rowMap;
     }
 
+    @Override
+    public Map<StreamTestStreamIdxRow, BatchingVisitable<StreamTestStreamIdxColumnValue>> getRowsColumnRange(Iterable<StreamTestStreamIdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<StreamTestStreamIdxRow, BatchingVisitable<StreamTestStreamIdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            StreamTestStreamIdxRow row = StreamTestStreamIdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<StreamTestStreamIdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                StreamTestStreamIdxColumn col = StreamTestStreamIdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                Long val = StreamTestStreamIdxColumnValue.hydrateValue(result.getValue());
+                return StreamTestStreamIdxColumnValue.of(col, val);
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<StreamTestStreamIdxRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<StreamTestStreamIdxRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -674,6 +693,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -731,5 +752,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "LcPxHk1KeY0A0J1DTaOHxg==";
+    static String __CLASS_HASH = "9w4fKjWIzGTwxE3/K8JzYQ==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamMetadataTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamMetadataTable.java
index fe76e1ba556..ebd6cef630e 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamMetadataTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamMetadataTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class StreamTestStreamMetadataTable implements
     private final List<StreamTestStreamMetadataTrigger> triggers;
     private final static String rawTableName = "stream_test_stream_metadata";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(StreamTestStreamMetadataNamedColumn.values());
 
     static StreamTestStreamMetadataTable of(Transaction t, Namespace namespace) {
         return new StreamTestStreamMetadataTable(t, namespace, ImmutableList.<StreamTestStreamMetadataTrigger>of());
@@ -494,7 +497,7 @@ public void delete(Iterable<StreamTestStreamMetadataRow> rows) {
 
     @Override
     public Optional<StreamTestStreamMetadataRowResult> getRow(StreamTestStreamMetadataRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -510,7 +513,7 @@ public Optional<StreamTestStreamMetadataRowResult> getRow(StreamTestStreamMetada
 
     @Override
     public List<StreamTestStreamMetadataRowResult> getRows(Iterable<StreamTestStreamMetadataRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -525,7 +528,7 @@ public List<StreamTestStreamMetadataRowResult> getRows(Iterable<StreamTestStream
 
     @Override
     public List<StreamTestStreamMetadataRowResult> getAsyncRows(Iterable<StreamTestStreamMetadataRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -542,7 +545,7 @@ public List<StreamTestStreamMetadataRowResult> call() {
 
     @Override
     public List<StreamTestStreamMetadataNamedColumnValue<?>> getRowColumns(StreamTestStreamMetadataRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -562,7 +565,7 @@ public List<StreamTestStreamMetadataNamedColumnValue<?>> getRowColumns(StreamTes
 
     @Override
     public Multimap<StreamTestStreamMetadataRow, StreamTestStreamMetadataNamedColumnValue<?>> getRowsMultimap(Iterable<StreamTestStreamMetadataRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -572,7 +575,7 @@ public Multimap<StreamTestStreamMetadataRow, StreamTestStreamMetadataNamedColumn
 
     @Override
     public Multimap<StreamTestStreamMetadataRow, StreamTestStreamMetadataNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<StreamTestStreamMetadataRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -603,8 +606,22 @@ private static Multimap<StreamTestStreamMetadataRow, StreamTestStreamMetadataNam
         return rowMap;
     }
 
+    @Override
+    public Map<StreamTestStreamMetadataRow, BatchingVisitable<StreamTestStreamMetadataNamedColumnValue<?>>> getRowsColumnRange(Iterable<StreamTestStreamMetadataRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<StreamTestStreamMetadataRow, BatchingVisitable<StreamTestStreamMetadataNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            StreamTestStreamMetadataRow row = StreamTestStreamMetadataRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<StreamTestStreamMetadataNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<StreamTestStreamMetadataRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<StreamTestStreamMetadataRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -655,6 +672,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -712,5 +731,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "SYDaJSplmDPvNzfcvbjJSg==";
+    static String __CLASS_HASH = "KTlzZnx0VVIY6B4RAbr2OA==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamValueTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamValueTable.java
index 981483a2d26..89aeb9ec448 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamValueTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestStreamValueTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class StreamTestStreamValueTable implements
     private final List<StreamTestStreamValueTrigger> triggers;
     private final static String rawTableName = "stream_test_stream_value";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(StreamTestStreamValueNamedColumn.values());
 
     static StreamTestStreamValueTable of(Transaction t, Namespace namespace) {
         return new StreamTestStreamValueTable(t, namespace, ImmutableList.<StreamTestStreamValueTrigger>of());
@@ -222,7 +225,7 @@ public boolean equals(Object obj) {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(id, blockId);
+            return Arrays.deepHashCode(new Object[]{ id, blockId });
         }
 
         @Override
@@ -482,7 +485,7 @@ public void delete(Iterable<StreamTestStreamValueRow> rows) {
 
     @Override
     public Optional<StreamTestStreamValueRowResult> getRow(StreamTestStreamValueRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -498,7 +501,7 @@ public Optional<StreamTestStreamValueRowResult> getRow(StreamTestStreamValueRow
 
     @Override
     public List<StreamTestStreamValueRowResult> getRows(Iterable<StreamTestStreamValueRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -513,7 +516,7 @@ public List<StreamTestStreamValueRowResult> getRows(Iterable<StreamTestStreamVal
 
     @Override
     public List<StreamTestStreamValueRowResult> getAsyncRows(Iterable<StreamTestStreamValueRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -530,7 +533,7 @@ public List<StreamTestStreamValueRowResult> call() {
 
     @Override
     public List<StreamTestStreamValueNamedColumnValue<?>> getRowColumns(StreamTestStreamValueRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -550,7 +553,7 @@ public List<StreamTestStreamValueNamedColumnValue<?>> getRowColumns(StreamTestSt
 
     @Override
     public Multimap<StreamTestStreamValueRow, StreamTestStreamValueNamedColumnValue<?>> getRowsMultimap(Iterable<StreamTestStreamValueRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -560,7 +563,7 @@ public Multimap<StreamTestStreamValueRow, StreamTestStreamValueNamedColumnValue<
 
     @Override
     public Multimap<StreamTestStreamValueRow, StreamTestStreamValueNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<StreamTestStreamValueRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -591,8 +594,22 @@ private static Multimap<StreamTestStreamValueRow, StreamTestStreamValueNamedColu
         return rowMap;
     }
 
+    @Override
+    public Map<StreamTestStreamValueRow, BatchingVisitable<StreamTestStreamValueNamedColumnValue<?>>> getRowsColumnRange(Iterable<StreamTestStreamValueRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<StreamTestStreamValueRow, BatchingVisitable<StreamTestStreamValueNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            StreamTestStreamValueRow row = StreamTestStreamValueRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<StreamTestStreamValueNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<StreamTestStreamValueRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<StreamTestStreamValueRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -643,6 +660,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -700,5 +719,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "AW5bkfuNm5HKpXkur7a4cg==";
+    static String __CLASS_HASH = "9/3DQmfyJb8b6iKJn7qLWQ==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashIndexCleanupTask.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashIndexCleanupTask.java
index 86e3389ca52..9c601d7ac74 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashIndexCleanupTask.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashIndexCleanupTask.java
@@ -6,12 +6,17 @@
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.table.description.ValueType;
 import com.palantir.atlasdb.transaction.api.Transaction;
 
 public class StreamTestWithHashIndexCleanupTask implements OnCleanupTask {
 
-    private final StreamTestTableFactory tables = StreamTestTableFactory.of();
+    private final StreamTestTableFactory tables;
+
+    public StreamTestWithHashIndexCleanupTask(Namespace namespace) {
+        tables = StreamTestTableFactory.of(namespace);
+    }
 
     @Override
     public boolean cellsCleanedUp(Transaction t, Set<Cell> cells) {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashMetadataCleanupTask.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashMetadataCleanupTask.java
index 5c0f090c8d2..dedd397949a 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashMetadataCleanupTask.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashMetadataCleanupTask.java
@@ -8,6 +8,7 @@
 import com.google.common.collect.Sets;
 import com.palantir.atlasdb.cleaner.api.OnCleanupTask;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.protos.generated.StreamPersistence.Status;
 import com.palantir.atlasdb.protos.generated.StreamPersistence.StreamMetadata;
 import com.palantir.atlasdb.table.description.ValueType;
@@ -15,7 +16,11 @@
 
 public class StreamTestWithHashMetadataCleanupTask implements OnCleanupTask {
 
-    private final StreamTestTableFactory tables = StreamTestTableFactory.of();
+    private final StreamTestTableFactory tables;
+
+    public StreamTestWithHashMetadataCleanupTask(Namespace namespace) {
+        tables = StreamTestTableFactory.of(namespace);
+    }
 
     @Override
     public boolean cellsCleanedUp(Transaction t, Set<Cell> cells) {
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamHashAidxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamHashAidxTable.java
index 4ee8892138b..c638e52e728 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamHashAidxTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamHashAidxTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -94,6 +96,7 @@ public final class StreamTestWithHashStreamHashAidxTable implements
     private final List<StreamTestWithHashStreamHashAidxTrigger> triggers;
     private final static String rawTableName = "stream_test_with_hash_stream_hash_aidx";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = ColumnSelection.all();
 
     static StreamTestWithHashStreamHashAidxTable of(Transaction t, Namespace namespace) {
         return new StreamTestWithHashStreamHashAidxTable(t, namespace, ImmutableList.<StreamTestWithHashStreamHashAidxTrigger>of());
@@ -546,7 +549,7 @@ public Multimap<StreamTestWithHashStreamHashAidxRow, StreamTestWithHashStreamHas
 
     @Override
     public List<StreamTestWithHashStreamHashAidxColumnValue> getRowColumns(StreamTestWithHashStreamHashAidxRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -568,7 +571,7 @@ public List<StreamTestWithHashStreamHashAidxColumnValue> getRowColumns(StreamTes
 
     @Override
     public Multimap<StreamTestWithHashStreamHashAidxRow, StreamTestWithHashStreamHashAidxColumnValue> getRowsMultimap(Iterable<StreamTestWithHashStreamHashAidxRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -578,7 +581,7 @@ public Multimap<StreamTestWithHashStreamHashAidxRow, StreamTestWithHashStreamHas
 
     @Override
     public Multimap<StreamTestWithHashStreamHashAidxRow, StreamTestWithHashStreamHashAidxColumnValue> getAsyncRowsMultimap(Iterable<StreamTestWithHashStreamHashAidxRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -611,8 +614,24 @@ private static Multimap<StreamTestWithHashStreamHashAidxRow, StreamTestWithHashS
         return rowMap;
     }
 
+    @Override
+    public Map<StreamTestWithHashStreamHashAidxRow, BatchingVisitable<StreamTestWithHashStreamHashAidxColumnValue>> getRowsColumnRange(Iterable<StreamTestWithHashStreamHashAidxRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<StreamTestWithHashStreamHashAidxRow, BatchingVisitable<StreamTestWithHashStreamHashAidxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            StreamTestWithHashStreamHashAidxRow row = StreamTestWithHashStreamHashAidxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<StreamTestWithHashStreamHashAidxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                StreamTestWithHashStreamHashAidxColumn col = StreamTestWithHashStreamHashAidxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                Long val = StreamTestWithHashStreamHashAidxColumnValue.hydrateValue(result.getValue());
+                return StreamTestWithHashStreamHashAidxColumnValue.of(col, val);
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<StreamTestWithHashStreamHashAidxRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<StreamTestWithHashStreamHashAidxRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -663,6 +682,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -720,5 +741,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "6e3OpDo5DaHq4R1fMv/Mkg==";
+    static String __CLASS_HASH = "wpUjgbnce10Lxgmf3AdZ6A==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamIdxTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamIdxTable.java
index 33308df7d00..8c6ddae137f 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamIdxTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamIdxTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -94,6 +96,7 @@ public final class StreamTestWithHashStreamIdxTable implements
     private final List<StreamTestWithHashStreamIdxTrigger> triggers;
     private final static String rawTableName = "stream_test_with_hash_stream_idx";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = ColumnSelection.all();
 
     static StreamTestWithHashStreamIdxTable of(Transaction t, Namespace namespace) {
         return new StreamTestWithHashStreamIdxTable(t, namespace, ImmutableList.<StreamTestWithHashStreamIdxTrigger>of());
@@ -217,7 +220,7 @@ public boolean equals(Object obj) {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(firstComponentHash, id);
+            return Arrays.deepHashCode(new Object[]{ firstComponentHash, id });
         }
 
         @Override
@@ -555,7 +558,7 @@ public Multimap<StreamTestWithHashStreamIdxRow, StreamTestWithHashStreamIdxColum
 
     @Override
     public List<StreamTestWithHashStreamIdxColumnValue> getRowColumns(StreamTestWithHashStreamIdxRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -577,7 +580,7 @@ public List<StreamTestWithHashStreamIdxColumnValue> getRowColumns(StreamTestWith
 
     @Override
     public Multimap<StreamTestWithHashStreamIdxRow, StreamTestWithHashStreamIdxColumnValue> getRowsMultimap(Iterable<StreamTestWithHashStreamIdxRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -587,7 +590,7 @@ public Multimap<StreamTestWithHashStreamIdxRow, StreamTestWithHashStreamIdxColum
 
     @Override
     public Multimap<StreamTestWithHashStreamIdxRow, StreamTestWithHashStreamIdxColumnValue> getAsyncRowsMultimap(Iterable<StreamTestWithHashStreamIdxRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -620,8 +623,24 @@ private static Multimap<StreamTestWithHashStreamIdxRow, StreamTestWithHashStream
         return rowMap;
     }
 
+    @Override
+    public Map<StreamTestWithHashStreamIdxRow, BatchingVisitable<StreamTestWithHashStreamIdxColumnValue>> getRowsColumnRange(Iterable<StreamTestWithHashStreamIdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<StreamTestWithHashStreamIdxRow, BatchingVisitable<StreamTestWithHashStreamIdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            StreamTestWithHashStreamIdxRow row = StreamTestWithHashStreamIdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<StreamTestWithHashStreamIdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                StreamTestWithHashStreamIdxColumn col = StreamTestWithHashStreamIdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                Long val = StreamTestWithHashStreamIdxColumnValue.hydrateValue(result.getValue());
+                return StreamTestWithHashStreamIdxColumnValue.of(col, val);
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<StreamTestWithHashStreamIdxRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<StreamTestWithHashStreamIdxRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -672,6 +691,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -729,5 +750,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "KHQqZmUXCY2CT2lsPTkZiQ==";
+    static String __CLASS_HASH = "HAqOnZyByviFzuPFwZ99iA==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamMetadataTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamMetadataTable.java
index 9d67be918ef..5d27a8a6eb6 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamMetadataTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamMetadataTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class StreamTestWithHashStreamMetadataTable implements
     private final List<StreamTestWithHashStreamMetadataTrigger> triggers;
     private final static String rawTableName = "stream_test_with_hash_stream_metadata";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(StreamTestWithHashStreamMetadataNamedColumn.values());
 
     static StreamTestWithHashStreamMetadataTable of(Transaction t, Namespace namespace) {
         return new StreamTestWithHashStreamMetadataTable(t, namespace, ImmutableList.<StreamTestWithHashStreamMetadataTrigger>of());
@@ -219,7 +222,7 @@ public boolean equals(Object obj) {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(firstComponentHash, id);
+            return Arrays.deepHashCode(new Object[]{ firstComponentHash, id });
         }
 
         @Override
@@ -503,7 +506,7 @@ public void delete(Iterable<StreamTestWithHashStreamMetadataRow> rows) {
 
     @Override
     public Optional<StreamTestWithHashStreamMetadataRowResult> getRow(StreamTestWithHashStreamMetadataRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -519,7 +522,7 @@ public Optional<StreamTestWithHashStreamMetadataRowResult> getRow(StreamTestWith
 
     @Override
     public List<StreamTestWithHashStreamMetadataRowResult> getRows(Iterable<StreamTestWithHashStreamMetadataRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -534,7 +537,7 @@ public List<StreamTestWithHashStreamMetadataRowResult> getRows(Iterable<StreamTe
 
     @Override
     public List<StreamTestWithHashStreamMetadataRowResult> getAsyncRows(Iterable<StreamTestWithHashStreamMetadataRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -551,7 +554,7 @@ public List<StreamTestWithHashStreamMetadataRowResult> call() {
 
     @Override
     public List<StreamTestWithHashStreamMetadataNamedColumnValue<?>> getRowColumns(StreamTestWithHashStreamMetadataRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -571,7 +574,7 @@ public List<StreamTestWithHashStreamMetadataNamedColumnValue<?>> getRowColumns(S
 
     @Override
     public Multimap<StreamTestWithHashStreamMetadataRow, StreamTestWithHashStreamMetadataNamedColumnValue<?>> getRowsMultimap(Iterable<StreamTestWithHashStreamMetadataRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -581,7 +584,7 @@ public Multimap<StreamTestWithHashStreamMetadataRow, StreamTestWithHashStreamMet
 
     @Override
     public Multimap<StreamTestWithHashStreamMetadataRow, StreamTestWithHashStreamMetadataNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<StreamTestWithHashStreamMetadataRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -612,8 +615,22 @@ private static Multimap<StreamTestWithHashStreamMetadataRow, StreamTestWithHashS
         return rowMap;
     }
 
+    @Override
+    public Map<StreamTestWithHashStreamMetadataRow, BatchingVisitable<StreamTestWithHashStreamMetadataNamedColumnValue<?>>> getRowsColumnRange(Iterable<StreamTestWithHashStreamMetadataRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<StreamTestWithHashStreamMetadataRow, BatchingVisitable<StreamTestWithHashStreamMetadataNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            StreamTestWithHashStreamMetadataRow row = StreamTestWithHashStreamMetadataRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<StreamTestWithHashStreamMetadataNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<StreamTestWithHashStreamMetadataRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<StreamTestWithHashStreamMetadataRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -664,6 +681,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -721,5 +740,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "nGuTzn1WeUahrGFlnGzejA==";
+    static String __CLASS_HASH = "BJYXboOS1NEsY89A+lH5rA==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamValueTable.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamValueTable.java
index 25218050028..5a6fb3fc6ac 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamValueTable.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/schema/stream/generated/StreamTestWithHashStreamValueTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class StreamTestWithHashStreamValueTable implements
     private final List<StreamTestWithHashStreamValueTrigger> triggers;
     private final static String rawTableName = "stream_test_with_hash_stream_value";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(StreamTestWithHashStreamValueNamedColumn.values());
 
     static StreamTestWithHashStreamValueTable of(Transaction t, Namespace namespace) {
         return new StreamTestWithHashStreamValueTable(t, namespace, ImmutableList.<StreamTestWithHashStreamValueTrigger>of());
@@ -230,7 +233,7 @@ public boolean equals(Object obj) {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(firstComponentHash, id, blockId);
+            return Arrays.deepHashCode(new Object[]{ firstComponentHash, id, blockId });
         }
 
         @Override
@@ -491,7 +494,7 @@ public void delete(Iterable<StreamTestWithHashStreamValueRow> rows) {
 
     @Override
     public Optional<StreamTestWithHashStreamValueRowResult> getRow(StreamTestWithHashStreamValueRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -507,7 +510,7 @@ public Optional<StreamTestWithHashStreamValueRowResult> getRow(StreamTestWithHas
 
     @Override
     public List<StreamTestWithHashStreamValueRowResult> getRows(Iterable<StreamTestWithHashStreamValueRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -522,7 +525,7 @@ public List<StreamTestWithHashStreamValueRowResult> getRows(Iterable<StreamTestW
 
     @Override
     public List<StreamTestWithHashStreamValueRowResult> getAsyncRows(Iterable<StreamTestWithHashStreamValueRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -539,7 +542,7 @@ public List<StreamTestWithHashStreamValueRowResult> call() {
 
     @Override
     public List<StreamTestWithHashStreamValueNamedColumnValue<?>> getRowColumns(StreamTestWithHashStreamValueRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -559,7 +562,7 @@ public List<StreamTestWithHashStreamValueNamedColumnValue<?>> getRowColumns(Stre
 
     @Override
     public Multimap<StreamTestWithHashStreamValueRow, StreamTestWithHashStreamValueNamedColumnValue<?>> getRowsMultimap(Iterable<StreamTestWithHashStreamValueRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -569,7 +572,7 @@ public Multimap<StreamTestWithHashStreamValueRow, StreamTestWithHashStreamValueN
 
     @Override
     public Multimap<StreamTestWithHashStreamValueRow, StreamTestWithHashStreamValueNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<StreamTestWithHashStreamValueRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -600,8 +603,22 @@ private static Multimap<StreamTestWithHashStreamValueRow, StreamTestWithHashStre
         return rowMap;
     }
 
+    @Override
+    public Map<StreamTestWithHashStreamValueRow, BatchingVisitable<StreamTestWithHashStreamValueNamedColumnValue<?>>> getRowsColumnRange(Iterable<StreamTestWithHashStreamValueRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<StreamTestWithHashStreamValueRow, BatchingVisitable<StreamTestWithHashStreamValueNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            StreamTestWithHashStreamValueRow row = StreamTestWithHashStreamValueRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<StreamTestWithHashStreamValueNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<StreamTestWithHashStreamValueRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<StreamTestWithHashStreamValueRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -652,6 +669,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -709,5 +728,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "5yyhOKf8MpAopIcJMcvNGw==";
+    static String __CLASS_HASH = "vqKEwTLtv87YzkkG1tKtSg==";
 }
diff --git a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java
index 4b8f55e54f3..8ebd21d5f31 100644
--- a/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java
+++ b/atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java
@@ -15,6 +15,11 @@
  */
 package com.palantir.atlasdb.transaction.impl;
 
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -24,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.SortedMap;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletionService;
 import java.util.concurrent.ExecutionException;
@@ -579,8 +585,8 @@ public void testWriteChangedConflictsNoThrow() {
         final Cell cell = Cell.create("row1".getBytes(), "column1".getBytes());
         Transaction t1 = txManager.createNewTransaction();
         Transaction t2 = txManager.createNewTransaction();
-        t1.put(TABLE, ImmutableMap.of(cell, PtBytes.EMPTY_BYTE_ARRAY));
-        t2.put(TABLE, ImmutableMap.of(cell, PtBytes.EMPTY_BYTE_ARRAY));
+        t1.delete(TABLE, ImmutableSet.of(cell));
+        t2.delete(TABLE, ImmutableSet.of(cell));
         t1.commit();
         t2.commit();
     }
@@ -591,7 +597,7 @@ public void testWriteChangedConflictsThrow() {
         final Cell cell = Cell.create("row1".getBytes(), "column1".getBytes());
         Transaction t1 = txManager.createNewTransaction();
         Transaction t2 = txManager.createNewTransaction();
-        t1.put(TABLE, ImmutableMap.of(cell, PtBytes.EMPTY_BYTE_ARRAY));
+        t1.delete(TABLE, ImmutableSet.of(cell));
         t2.put(TABLE, ImmutableMap.of(cell, new byte[1]));
         t1.commit();
         try {
@@ -603,7 +609,7 @@ public void testWriteChangedConflictsThrow() {
 
         t1 = txManager.createNewTransaction();
         t2 = txManager.createNewTransaction();
-        t1.put(TABLE, ImmutableMap.of(cell, PtBytes.EMPTY_BYTE_ARRAY));
+        t1.delete(TABLE, ImmutableSet.of(cell));
         t2.put(TABLE, ImmutableMap.of(cell, new byte[1]));
         t2.commit();
         try {
@@ -615,7 +621,7 @@ public void testWriteChangedConflictsThrow() {
 
         t1 = txManager.createNewTransaction();
         t2 = txManager.createNewTransaction();
-        t2.put(TABLE, ImmutableMap.of(cell, PtBytes.EMPTY_BYTE_ARRAY));
+        t2.delete(TABLE, ImmutableSet.of(cell));
         t1.put(TABLE, ImmutableMap.of(cell, new byte[1]));
         t2.commit();
         try {
@@ -627,7 +633,7 @@ public void testWriteChangedConflictsThrow() {
 
         t1 = txManager.createNewTransaction();
         t2 = txManager.createNewTransaction();
-        t2.put(TABLE, ImmutableMap.of(cell, PtBytes.EMPTY_BYTE_ARRAY));
+        t2.delete(TABLE, ImmutableSet.of(cell));
         t1.put(TABLE, ImmutableMap.of(cell, new byte[1]));
         t1.commit();
         try {
@@ -644,8 +650,8 @@ public void testWriteWriteConflictsDeletedThrow() {
         final Cell cell = Cell.create("row1".getBytes(), "column1".getBytes());
         Transaction t1 = txManager.createNewTransaction();
         Transaction t2 = txManager.createNewTransaction();
-        t1.put(TABLE, ImmutableMap.of(cell, PtBytes.EMPTY_BYTE_ARRAY));
-        t2.put(TABLE, ImmutableMap.of(cell, PtBytes.EMPTY_BYTE_ARRAY));
+        t1.delete(TABLE, ImmutableSet.of(cell));
+        t2.delete(TABLE, ImmutableSet.of(cell));
         t1.commit();
         try {
             t2.commit();
@@ -655,6 +661,39 @@ public void testWriteWriteConflictsDeletedThrow() {
         }
     }
 
+    @Test (expected = IllegalArgumentException.class)
+    public void disallowPutOnEmptyObject() {
+        final Cell cell = Cell.create("row1".getBytes(), "column1".getBytes());
+        Transaction t1 = txManager.createNewTransaction();
+        t1.put(TABLE, ImmutableMap.of(cell, PtBytes.EMPTY_BYTE_ARRAY));
+    }
+
+    @Test
+    public void partiallyFilledRowsShouldBeVisible() {
+        byte[] defaultRow = "row1".getBytes();
+        final Cell emptyCell = Cell.create(defaultRow, "column1".getBytes());
+        final Cell writtenCell = Cell.create(defaultRow, "column2".getBytes());
+        writeCells(TABLE, ImmutableMap.of(writtenCell, PtBytes.toBytes("writtenCell")));
+
+        RowResult<byte[]> rowResult = readRow(defaultRow);
+
+        assertThat(rowResult, is(notNullValue()));
+        assertThat(rowResult.getCellSet(), hasItem(writtenCell));
+        assertThat(rowResult.getCellSet(), not(hasItem(emptyCell)));
+    }
+
+    private void writeCells(TableReference table, ImmutableMap<Cell, byte[]> cellsToWrite) {
+        Transaction writeTransaction = txManager.createNewTransaction();
+        writeTransaction.put(table, cellsToWrite);
+        writeTransaction.commit();
+    }
+
+    private RowResult<byte[]> readRow(byte[] defaultRow) {
+        Transaction readTransaction = txManager.createNewTransaction();
+        SortedMap<byte[], RowResult<byte[]>> allRows = readTransaction.getRows(TABLE, ImmutableSet.of(defaultRow), ColumnSelection.all());
+        return allRows.get(defaultRow);
+    }
+
     private HeldLocksToken getFakeHeldLocksToken() {
         ImmutableSortedMap.Builder<LockDescriptor, LockMode> builder =
                 ImmutableSortedMap.naturalOrder();
diff --git a/atlasdb-timelock-ete/src/test/java/com/palantir/atlasdb/timelock/TimelockServerEteTest.java b/atlasdb-timelock-ete/src/test/java/com/palantir/atlasdb/timelock/TimelockServerEteTest.java
index 6325606b5f8..c8f687602d9 100644
--- a/atlasdb-timelock-ete/src/test/java/com/palantir/atlasdb/timelock/TimelockServerEteTest.java
+++ b/atlasdb-timelock-ete/src/test/java/com/palantir/atlasdb/timelock/TimelockServerEteTest.java
@@ -21,9 +21,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThan;
 
-import static com.google.common.base.Throwables.propagate;
-
-import java.io.IOException;
 import java.util.List;
 
 import org.junit.ClassRule;
@@ -34,7 +31,7 @@
 import com.google.common.collect.ImmutableList;
 import com.palantir.atlasdb.ete.Gradle;
 import com.palantir.atlasdb.http.AtlasDbHttpClients;
-import com.palantir.docker.compose.DockerComposition;
+import com.palantir.docker.compose.DockerComposeRule;
 import com.palantir.docker.compose.connection.Container;
 import com.palantir.docker.compose.connection.DockerPort;
 import com.palantir.docker.compose.connection.waiting.HealthCheck;
@@ -45,7 +42,8 @@ public class TimelockServerEteTest {
     private static final int TIMELOCK_SERVER_PORT = 3828;
     private static final ImmutableList<String> TIMELOCK_NODES = ImmutableList.of("timelock1", "timelock2", "timelock3");
 
-    public static DockerComposition dockerComposition = DockerComposition.of("docker-compose.yml")
+    public static DockerComposeRule docker = DockerComposeRule.builder()
+            .file("docker-compose.yml")
             .waitingForServices(TIMELOCK_NODES, toHaveElectedALeader())
             .saveLogsTo("container-logs")
             .build();
@@ -55,7 +53,7 @@ public class TimelockServerEteTest {
     @ClassRule
     public static RuleChain rules = RuleChain
             .outerRule(gradle)
-            .around(dockerComposition);
+            .around(docker);
 
     @Test
     public void shouldBeAbleToGetTimestampsOffAClusterOfServices() throws Exception {
@@ -82,11 +80,7 @@ private static TimestampService createTimestampCluster(List<DockerPort> timelock
     }
 
     private DockerPort timelockPort(String container) {
-        try {
-            return dockerComposition.portOnContainerWithInternalMapping(container, TIMELOCK_SERVER_PORT);
-        } catch (IOException | InterruptedException e) {
-            throw propagate(e);
-        }
+        return docker.containers().container(container).port(TIMELOCK_SERVER_PORT);
     }
 
     private static HealthCheck<List<Container>> toHaveElectedALeader() {
diff --git a/atlasdb-timelock-server/build.gradle b/atlasdb-timelock-server/build.gradle
index d107c8a21b5..096ec769924 100644
--- a/atlasdb-timelock-server/build.gradle
+++ b/atlasdb-timelock-server/build.gradle
@@ -22,11 +22,11 @@ dependencies {
     compile 'com.google.dagger:dagger:2.0.2'
 
     compile "org.rocksdb:rocksdbjni:4.1.0"
-    compile 'org.postgresql:postgresql:9.4.1208'
+    compile 'org.postgresql:postgresql:' + libVersions.postgresql
 
     compile 'org.apache.thrift:libthrift:' + libVersions.libthrift
 
-    processor 'org.immutables:value:2.0.21'
+    processor 'org.immutables:value:' + libVersions.immutables
     processor('com.google.dagger:dagger-compiler:2.0.2') {
         // We need to explicitly exclude these so that intellij does not label them as provided
         if(gradle.startParameter.taskNames.contains('idea')) {
diff --git a/atlasdb-timelock-server/src/main/java/com/palantir/atlasdb/timelock/server/modules/TimeAndLockModule.java b/atlasdb-timelock-server/src/main/java/com/palantir/atlasdb/timelock/server/modules/TimeAndLockModule.java
index a2548b836fc..b24e42769da 100644
--- a/atlasdb-timelock-server/src/main/java/com/palantir/atlasdb/timelock/server/modules/TimeAndLockModule.java
+++ b/atlasdb-timelock-server/src/main/java/com/palantir/atlasdb/timelock/server/modules/TimeAndLockModule.java
@@ -18,7 +18,9 @@
 
 import javax.inject.Singleton;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
+import com.palantir.atlasdb.config.LeaderConfig;
 import com.palantir.atlasdb.factory.ServiceDiscoveringAtlasSupplier;
 import com.palantir.atlasdb.spi.KeyValueServiceConfig;
 import com.palantir.leader.LeaderElectionService;
@@ -34,8 +36,8 @@
 public class TimeAndLockModule {
     @Provides
     @Singleton
-    public ServiceDiscoveringAtlasSupplier provideAtlasSupplier(KeyValueServiceConfig kvsConfig) {
-        return new ServiceDiscoveringAtlasSupplier(kvsConfig);
+    public ServiceDiscoveringAtlasSupplier provideAtlasSupplier(KeyValueServiceConfig kvsConfig, LeaderConfig leaderConfig) {
+        return new ServiceDiscoveringAtlasSupplier(kvsConfig, Optional.fromNullable(leaderConfig));
     }
 
     @Provides
diff --git a/build.gradle b/build.gradle
index c21e4d29d33..1c23a81918c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,10 @@
+import org.gradle.plugins.ide.idea.model.IdeaModel
+
 buildscript {
     repositories {
         mavenCentral()
         maven {
-            url 'http://dl.bintray.com/palantir/releases/'
+            url 'https://dl.bintray.com/palantir/releases/'
         }
         maven {
             url 'https://plugins.gradle.org/m2/'
@@ -11,7 +13,8 @@ buildscript {
 
     dependencies {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.3.1'
-        classpath 'com.palantir:jacoco-coverage:0.1.4'
+        classpath 'com.palantir:gradle-baseline-java:0.7.1'
+        classpath 'com.palantir:jacoco-coverage:0.4.0'
         classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
     }
 }
@@ -21,6 +24,12 @@ plugins {
     id 'org.inferred.processors' version '1.1'
 }
 
+repositories {
+    maven {
+        url 'https://dl.bintray.com/palantir/releases/'
+    }
+}
+
 apply from: 'gradle/versions.gradle'
 
 group = 'com.palantir.atlasdb'
@@ -31,8 +40,30 @@ task clean(type: Delete) {
     delete buildDir
 }
 
+subprojects {
+  task allDeps(type: DependencyReportTask) {}
+}
+
 apply from: 'idea.gradle'
 
+// Setup copyright notice as JavaDoc and no newline after it
+project.afterEvaluate {
+    def ideaRootModel = project.rootProject.extensions.findByType(IdeaModel)
+    if (ideaRootModel) {
+        ideaRootModel.project.ipr.withXml { provider ->
+            def node = provider.asNode()
+            def copyrightManager = node.component.find { it.'@name' == 'CopyrightManager' }
+            copyrightManager.append(new XmlParser().parseText("""
+                <LanguageOptions name="__TEMPLATE__">
+                    <option name="addBlankAfter" value="false" />
+                    <option name="separateBefore" value="true" />
+                    <option name="lenBefore" value="2" />
+                </LanguageOptions>
+                """.stripIndent()))
+        }
+    }
+}
+
 def ideaSetModuleLevel(idea, targetCompatibility) {
     if (idea == null) return
     idea.module.jdkName = targetCompatibility
diff --git a/circle.yml b/circle.yml
index b44783776af..b427e2d279a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,6 +14,9 @@ machine:
 general:
   artifacts:
     - "build/reports/profile"
+    - "atlasdb-ete-tests/container-logs"
+    - "atlasdb-cassandra-tests/container-logs"
+    - "atlasdb-cassandra-multinode-tests/container-logs"
 
 dependencies:
   pre:
@@ -34,6 +37,12 @@ test:
         parallel: true
     - find . -type f -regex ".*/build/test-results/TEST-.*\.xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;:
         parallel: true
+    - mkdir -p $CIRCLE_ARTIFACTS/checkstyle $CIRCLE_ARTIFACTS/findbugs:
+        parallel: true
+    - find . -type d -regex ".*/build/reports/checkstyle" | sed 's#\./\(\(.*\)/build/reports/checkstyle\)#rsync -uav \1/ $CIRCLE_ARTIFACTS/checkstyle/\2#' | bash:
+        parallel: true
+    - find . -type d -regex ".*/build/reports/findbugs" | sed 's#\./\(\(.*\)/build/reports/findbugs\)#rsync -uav \1/ $CIRCLE_ARTIFACTS/findbugs/\2#' | bash:
+        parallel: true
 
 deployment:
   github-pages:
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java
index a9e01b2c2cc..04c468a4c77 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/pool/RetriableTransactions.java
@@ -293,7 +293,8 @@ private static void createTxTable(ConnectionManager cm) throws SQLException {
             }
             // Great, that worked, fallthrough to below but don't commit.
         } catch (SQLException e) {
-            log.info("Failed to add/remove testId, attempting to create table...", e);
+            log.info("The table {} has not been created yet, so we will try to create it.", TABLE_NAME);
+            log.debug("To check whether the table exists we tried to use it. This caused an exception indicating that it did not exist. The exception was: ", e);
             Connection c = cm.getConnection();
             try {
                 c.createStatement().execute("CREATE TABLE " + TABLE_NAME + " (id " + varcharType + "(36) PRIMARY KEY, created TIMESTAMP DEFAULT CURRENT_TIMESTAMP)");
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java
index ae73c0b9fbd..84ee65f2ba3 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/BasicSQL.java
@@ -505,7 +505,9 @@ private static SQLException getSQLException(Throwable cause) {
     }
 
     public static PalantirSqlException handleInterruptions(long startTime,
-            SQLException cause) throws PalantirSqlException {
+                                                           SQLException cause) throws PalantirSqlException {
+        SqlLoggers.SQL_EXCEPTION_LOG.debug("Caught SQLException", cause);
+
         String message = cause.getMessage().trim();
         //check for oracle and postgres
         if (!message.contains(ORACLE_CANCEL_ERROR) && !message.contains(POSTGRES_CANCEL_ERROR)) {
@@ -770,7 +772,7 @@ public Void call() throws PalantirSqlException {
                     }
                     ps.executeBatch();
                 } catch (SQLException sqle) {
-                    SqlLoggers.SQL_EXCEPTION_LOG.info("Caught SQLException", sqle);
+                    SqlLoggers.SQL_EXCEPTION_LOG.debug("Caught SQLException", sqle);
                     throw wrapSQLExceptionWithVerboseLogging(sqle, sql.getQuery(), vs);
                 } finally {
                     closeSilently(ps);
@@ -834,7 +836,7 @@ public Boolean call() throws PalantirSqlException {
 
                     inserted = ps.executeBatch();
                 } catch (SQLException sqle) {
-                    SqlLoggers.SQL_EXCEPTION_LOG.info("Caught SQLException", sqle);
+                    SqlLoggers.SQL_EXCEPTION_LOG.debug("Caught SQLException", sqle);
                     throw wrapSQLExceptionWithVerboseLogging(sqle, sql.getQuery(), vs);
                 } finally {
                     closeSilently(ps);
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java
index 0f20105531f..226c3379614 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/ConnectionBackedSqlConnectionImpl.java
@@ -17,9 +17,6 @@
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
 
 import com.google.common.base.Supplier;
 import com.palantir.exception.PalantirInterruptedException;
@@ -47,19 +44,8 @@ public ConnectionBackedSqlConnectionImpl(Connection c,
     }
 
     @Override
-    public void clearTempTable(String tempTable) throws PalantirSqlException {
-        sqlConnectionHelper.clearTempTable(c, tempTable, ClearStyle.DELETE);
-    }
-
-    @Override
-    public void deleteIdsFromTempIds(Collection<Long> ids) throws PalantirSqlException {
-        sqlConnectionHelper.deleteIdsFromTempIds(c, ids);
-    }
-
-    @Override
-    public void deleteIdsFromTempIdsForTable(Collection<Long> ids, String tempTable)
-        throws PalantirSqlException {
-        sqlConnectionHelper.deleteIdsFromTempIdsForTable(c, ids, tempTable);
+    public void initializeTempTable(TempTable tempTable) throws PalantirSqlException {
+        tempTable.initialize(c);
     }
 
     @Override
@@ -144,47 +130,6 @@ public boolean insertOneUnregisteredQuery(String sql, Object... vs)
         return sqlConnectionHelper.insertOneUnregisteredQuery(c, sql, vs);
     }
 
-    @Override
-    public void loadTempIdPairsIntoEight(Map<Long, Long> idToField1) throws PalantirSqlException {
-        sqlConnectionHelper.loadTempIdPairsIntoEight(c, idToField1, ClearStyle.DELETE);
-    }
-
-    @Override
-    public void loadEightFieldTempIds(Iterable<Object[]> args) throws PalantirSqlException {
-        sqlConnectionHelper.loadEightFieldTempIds(c, args, ClearStyle.DELETE);
-    }
-
-    @Override
-    public void loadTempIds(Iterable<Long> tempIds, String tableName)
-        throws PalantirSqlException {
-        sqlConnectionHelper.loadTempIds(c, tempIds, tableName, ClearStyle.DELETE);
-    }
-
-    @Override
-    public void loadTempIds(Iterable<Long> tempIds) throws PalantirSqlException {
-        sqlConnectionHelper.loadTempIds(c, tempIds, ClearStyle.DELETE);
-    }
-
-    @Override
-    public void loadIdKeyPairTempIds(Iterable<Object[]> args) throws PalantirSqlException {
-        sqlConnectionHelper.loadIdKeyPairTempIds(c, args, ClearStyle.DELETE);
-    }
-
-    @Override
-    public void loadTempExternalIds(Iterable<Object[]> externalIds) throws PalantirSqlException {
-        sqlConnectionHelper.loadTempExternalIds(c, externalIds, ClearStyle.DELETE);
-    }
-
-    @Override
-    public void loadThreeFieldTempIds(Iterable<Object[]> tempIds) throws PalantirSqlException {
-        sqlConnectionHelper.loadThreeFieldTempIds(c, tempIds, ClearStyle.DELETE);
-    }
-
-    @Override
-    public void loadKeysTempIds(Iterable<String> args) throws PalantirSqlException {
-        sqlConnectionHelper.loadKeysTempIds(c, args, ClearStyle.DELETE);
-    }
-
     @Override
     public long selectCount(String tableName, String whereClause, Object... vs)
         throws PalantirSqlException, PalantirInterruptedException {
@@ -383,16 +328,4 @@ public void close() throws PalantirSqlException {
     public Connection getUnderlyingConnection() {
         return c;
     }
-
-    @Override
-    public void loadIdKeyTuplesTempIds(List<Object[]> tempRows)
-            throws PalantirSqlException {
-        sqlConnectionHelper.loadIdKeyTuplesTempIds(c, tempRows);
-    }
-
-    @Override
-    public void loadTempIdPairsIntoIdKeyTuples(Map<Long, Long> idToField1)
-            throws PalantirSqlException {
-        sqlConnectionHelper.loadTempIdPairsIntoIdKeyTuples(c, idToField1);
-    }
 }
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/PalantirSqlConnection.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/PalantirSqlConnection.java
index ac833b5c0db..4887c76b742 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/PalantirSqlConnection.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/PalantirSqlConnection.java
@@ -15,10 +15,6 @@
  */
 package com.palantir.nexus.db.sql;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 import com.palantir.exception.PalantirInterruptedException;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.SQLString.RegisteredSQLString;
@@ -88,44 +84,7 @@ public interface PalantirSqlConnection extends SqlConnection {
      */
     Long selectLongWithDefault(RegisteredSQLString sql, Long defaultVal, Object... vs) throws PalantirSqlException, PalantirInterruptedException;
 
-    /**
-     * Clears out any existing rows in PT_TEMP_IDS and inserts the caller's list of temp ids.
-     * All users of this temp table should use this function, so that multiple uses within the
-     * same transaction do not interfere with each other.
-     *
-     * The main use case is that the caller has a large list of ids that would otherwise become part
-     * of a "AND table.column in (?,?,?,...)", potentially running into Oracle's limit on elements in
-     * a list unless the query is broken up.  Instead, you can add all of the ids in a single shot to this
-     * temp table, and then convert your query into a join.  Apparently, this is offers a performance improvement.
-     *
-     * Note: This does NOT need to run within a transaction. Each {@link java.sql.Connection} gets its own
-     *       temp table.
-     *
-     * @param tempIds collection of Longs to be inserted into PT_TEMP_IDS
-     * @throws PalantirSqlException
-     */
-    void loadTempIds(Iterable<Long> tempIds) throws PalantirSqlException;
-
-    /**
-     * Create clears out the contents of the temp table with the name provided and replaces
-     * it with the numbers passed in via 'tempIds'
-     *
-     * @param tempIds collection of Longs to be inserted into specified temp table
-     * @param tableName name of temporary table which will be cleared out and inserted with data
-     * @throws PalantirSqlException
-     */
-    void loadTempIds(Iterable<Long> tempIds, String tableName) throws PalantirSqlException;
-    void deleteIdsFromTempIds(Collection<Long> ids) throws PalantirSqlException;
-    void deleteIdsFromTempIdsForTable(Collection<Long> ids, String tempTable) throws PalantirSqlException;
-    void loadTempIdPairsIntoEight(Map<Long, Long> idToField1) throws PalantirSqlException;
-    void loadEightFieldTempIds(Iterable<Object[]> args) throws PalantirSqlException;
-    void loadIdKeyPairTempIds(Iterable<Object[]> args) throws PalantirSqlException;
-    void loadTempExternalIds(Iterable<Object[]> externalIds) throws PalantirSqlException;
-    void loadThreeFieldTempIds(Iterable<Object[]> args) throws PalantirSqlException;
-    void loadTempIdPairsIntoIdKeyTuples(Map<Long, Long> idToField1) throws PalantirSqlException;
-    void loadIdKeyTuplesTempIds(List<Object[]> tempRows) throws PalantirSqlException;
-    void loadKeysTempIds(Iterable<String> args) throws PalantirSqlException;
-    void clearTempTable(String tempTable) throws PalantirSqlException;
+    void initializeTempTable(TempTable tempTable) throws PalantirSqlException;
 
     /**
      * This will return the current time.  This is better than {@link System#currentTimeMillis()} because it will take
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/PalantirSqlConnectionRunner.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/PalantirSqlConnectionRunner.java
index 61de77df7dc..54481d42aca 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/PalantirSqlConnectionRunner.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/PalantirSqlConnectionRunner.java
@@ -16,7 +16,6 @@
 package com.palantir.nexus.db.sql;
 
 import java.sql.SQLException;
-import java.util.Map;
 
 import javax.annotation.Nonnull;
 
@@ -153,17 +152,6 @@ public final T call(PalantirSequenceEnabledSqlConnection conn) {
     public void executeQueryWithTempsIds(Iterable<Long> tempIds, RegisteredSQLString sql, Object ... sqlArgs);
     public void executeAndProcessQueryConvertSqlException(RegisteredSQLString sql, Object[] sqlArgs, Visitor<AgnosticLightResultRow> rowVisitor);
     public <T> void executeAndProcessQueryInChunks(RegisteredSQLString sql, Object[] sqlArgs, int chunkSize, ChunkedRowVisitor<T> visitor);
-
-    /**
-     * Encapsulates much of the boilerplate code required to execute a SQL query
-     * which requires ids to first be loaded into multiple temporary tables.
-     *
-     * @param tempIds the temp ids to load.  Maps from tempTableName to tempIds iterable.
-     * @param key The registred SQL to execute by name
-     * @param sqlArgs the SQL bind variables
-     * @param rowVisitor the AgnosticLightResultRow.Visitor which processes the results of the query
-     */
-    public void executeAndProcessQueryWithTempsIds(Map<String, Iterable<Long>> tempIds, String key, Object[] sqlArgs, Visitor<AgnosticLightResultRow> rowVisitor);
     public void executeAndProcessQueryWithTempsIds(Iterable<Long> tempIds, RegisteredSQLString sql, Object[] sqlArgs, Visitor<AgnosticLightResultRow> rowVisitor);
 
     public <T> void executeAndProcessQueryInChunks(final String sqlKey,
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java
index 4972d1e0d10..9d2b285018b 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQL.java
@@ -128,7 +128,7 @@ private BlobHandler handlePtInputStream(Connection c, PreparedStatement ps, int
             try {
                 blobHandler = getJdbcHandler().createBlob(c);
             } catch (SQLException e){
-                sqlExceptionlog.info("Caught SQLException", e); //$NON-NLS-1$
+                sqlExceptionlog.debug("Caught SQLException", e); //$NON-NLS-1$
                 throw PalantirSqlException.create(e);
             }
             OutputStream os = null;
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java
index d1af11398c8..830187152e8 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SQLString.java
@@ -27,6 +27,8 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.regex.Pattern;
 
+import javax.annotation.concurrent.GuardedBy;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 
@@ -42,15 +44,24 @@
 public class SQLString extends BasicSQLString {
     private static final Pattern ALL_WORD_CHARS_REGEX = Pattern.compile("^[a-zA-Z_0-9\\.\\-]*$"); //$NON-NLS-1$
 
+    /**
+     * Callers changing the value of cachedUnregistered and
+     * cachedKeyed should be synchronized on this lock. Readers
+     * do not need to - the values of those maps are not guaranteed
+     * to be in sync with each other.
+     */
+    private static final Object cacheLock = new Object();
     //TODO (DCohen): Combine cachedKeyed and cachedUnregistered maps into one.
     /**
      * Rewritten unregistered queries.
      * Key: String with all whitespace removed
      * Value: the new SQLString to run instead.
      */
-    protected static volatile ImmutableMap<String, FinalSQLString> cachedUnregistered = ImmutableMap.of();
+    @GuardedBy("cacheLock")
+    private static volatile ImmutableMap<String, FinalSQLString> cachedUnregistered = ImmutableMap.of();
     /** Rewritten registered queries */
-    protected static volatile ImmutableMap<String, FinalSQLString> cachedKeyed = ImmutableMap.of();
+    @GuardedBy("cacheLock")
+    private static volatile ImmutableMap<String, FinalSQLString> cachedKeyed = ImmutableMap.of();
     /** All registered queries */
     protected static final ConcurrentMap<String, FinalSQLString> registeredValues = new ConcurrentHashMap<String, FinalSQLString>();
     /** DB-specific registered queries */
@@ -66,6 +77,20 @@ public void noteUse(SQLString used) {
            //do nothing
         }};
 
+    protected static interface CallableCheckedException<T, E extends Exception> {
+        T call() throws E;
+    }
+
+    /**
+     * Runs the provided callable while holding the lock for the override caches.
+     * Callers replacing the caches should hold this lock.
+     */
+    protected static <T, E extends Exception> T runWithCacheLock(CallableCheckedException<T, E> callable) throws E {
+        synchronized (cacheLock) {
+            return callable.call();
+        }
+    }
+
     /**
      * Call this function to store a query to be used later with the given key.
      * @param key Unique identifier for this query
@@ -207,7 +232,6 @@ protected SQLString(String key, String sql, DBType dbType) {
      * Creates an appropriate comment string for the beginning of a SQL statement
      * @param keyString Identifier for the SQL; will be null if the SQL is unregistered
      * @param dbType
-     * @param fromDB
      */
     private static String makeCommentString(String keyString, DBType dbType) {
         String registrationState;
@@ -271,9 +295,7 @@ public String getQuery() {
      * @param sqlFormat format string which takes one argument which is the
      * conjunction of clauses (from <code>clauses</code>) which modify the
      * query variant
-     * @param baseClause the filter required for all instances of the search type
      * @param type database type the search is for, null for all DBs
-     * @param keys keys for clauses that can be added to the search
      * @param clauses clauses (in the same order as their keys) which can narrow
      * the search
      */
@@ -321,7 +343,7 @@ public static class RegisteredSQLString {
         /**
          * Should only be called inside SQLString because this class essentially verifies that we've
          * checked for updates.
-         * @param delegate
+         * @param sqlstring
          */
         private RegisteredSQLString(BasicSQLString sqlstring) {
             this.delegate = sqlstring;
@@ -342,4 +364,24 @@ public String getKey() {
     public static RegisteredSQLString getRegisteredQueryByKey(FinalSQLString key) {
          return new RegisteredSQLString(key.delegate);
     }
+
+    protected static ImmutableMap<String, FinalSQLString> getCachedUnregistered() {
+            return cachedUnregistered;
+    }
+
+    protected static void setCachedUnregistered(ImmutableMap<String, FinalSQLString> cachedUnregistered) {
+        synchronized (cacheLock) {
+            SQLString.cachedUnregistered = cachedUnregistered;
+        }
+    }
+
+    protected static ImmutableMap<String, FinalSQLString> getCachedKeyed() {
+            return cachedKeyed;
+    }
+
+    protected static void setCachedKeyed(ImmutableMap<String, FinalSQLString> cachedKeyed) {
+        synchronized (cacheLock) {
+            SQLString.cachedKeyed = cachedKeyed;
+        }
+    }
 }
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java
index 497ff4ccbf5..13bdc302580 100644
--- a/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/SqlConnectionHelper.java
@@ -17,23 +17,12 @@
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
-import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.palantir.common.collect.IterableView;
 import com.palantir.exception.PalantirInterruptedException;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.DBType;
@@ -41,8 +30,6 @@
 import com.palantir.nexus.db.sql.BasicSQLString.FinalSQLString;
 import com.palantir.nexus.db.sql.SQLString.RegisteredSQLString;
 import com.palantir.sql.PreparedStatements;
-import com.palantir.util.TextUtils;
-import com.palantir.util.sql.SqlStats;
 
 /**
  * Helper methods for {@link PalantirSqlConnection} implementations. These were originally
@@ -53,7 +40,6 @@
 public final class SqlConnectionHelper {
 
     private static final Logger log = LogManager.getLogger(SqlConnectionHelper.class);
-    private static final int TEMP_IDS_LOGGING_THRESHOLD = 100000;
 
     private final BasicSQL basicSql;
 
@@ -393,371 +379,4 @@ boolean insertMany(Connection c, RegisteredSQLString sql, Iterable<Object[]> lis
             throws PalantirSqlException {
         return insertMany(c, sql.getKey(), list);
     }
-
-    private final String SQL_TRUNCATE_PT_TEMP_IDS = " TRUNCATE TABLE /* SQL_TRUNCATE_PT_TEMP_IDS */ {0} "; //$NON-NLS-1$
-
-    private final String SQL_DELETE_PT_TEMP_IDS = " DELETE /* SQL_DELETE_PT_TEMP_IDS */ FROM {0} "; //$NON-NLS-1$
-
-    private final String SQL_DELETE_IDS_FROM_PT_TEMPS_IDS = " DELETE /* SQL_DELETE_IDS_FROM_PT_TEMPS_IDS */ FROM {0} WHERE id = ? "; //$NON-NLS-1$
-
-    // for large tables this may be faster, and if we know that pt_temp_ids is large, then we
-    // may want to use it. However, we've found that DELETE is faster on Oracle.
-    // NOTE: this query cannot be used with HSQLDB
-    // private final String SQL_TRUNCATE_PT_TEMP_IDS =
-    // " TRUNCATE /* SQL_TRUNCATE_PT_TEMP_IDS */ TABLE {0} ";
-
-    private final String SQL_INSERT_INTO_PT_TEMP_IDS = " INSERT /*+ APPEND */ INTO /* SQL_INSERT_INTO_PT_TEMP_IDS */ {0} (id) values (?) "; //$NON-NLS-1$
-
-    static {
-        SQLString.registerQuery("SQL_INSERT_INTO_PT_TEMP_IDS_EIGHT_FIELDS", //$NON-NLS-1$
-                " INSERT /*+ APPEND */ " + //$NON-NLS-1$
-                        " INTO "
-                        + //$NON-NLS-1$
-                        " PT_TEMP_IDS_EIGHT_FIELDS "
-                        + //$NON-NLS-1$
-                        "    (id, field1, field2, field3, field4, field5, field6, field7, field8) "
-                        + //$NON-NLS-1$
-                        " VALUES (?,?,?,?,?,?,?,?,?) "); //$NON-NLS-1$
-        SQLString.registerQuery("SQL_INSERT_INTO_PT_TEMP_IDS_ID_KEY_PAIRS", //$NON-NLS-1$
-                " INSERT /*+ APPEND */ " + //$NON-NLS-1$
-                        " INTO " + //$NON-NLS-1$
-                        " PT_TEMP_IDS_ID_KEY_PAIRS " + //$NON-NLS-1$
-                        "    (id, key) " + //$NON-NLS-1$
-                        " VALUES (?,?) "); //$NON-NLS-1$
-        SQLString.registerQuery("SQL_INSERT_INTO_PT_TEMP_IDS_KEYS", //$NON-NLS-1$
-                " INSERT /*+ APPEND */ " + //$NON-NLS-1$
-                        " INTO " + //$NON-NLS-1$
-                        " PT_TEMP_IDS_KEYS " + //$NON-NLS-1$
-                        "    (key) " + //$NON-NLS-1$
-                        " VALUES (?) "); //$NON-NLS-1$
-        SQLString.registerQuery("SQL_INSERT_INTO_PT_TEMP_THREE_IDS", //$NON-NLS-1$
-                " INSERT /*+ APPEND */ " + //$NON-NLS-1$
-                " INTO " + //$NON-NLS-1$
-                " PT_TEMP_THREE_IDS " + //$NON-NLS-1$
-                "    (id1, id2, id3) " + //$NON-NLS-1$
-                " VALUES (?,?,?) "); //$NON-NLS-1$
-        SQLString.registerQuery("SQL_INSERT_INTO_PT_TEMP_EXTERNAL_IDS", //$NON-NLS-1$
-                " INSERT /*+ APPEND */ " + //$NON-NLS-1$
-                        " INTO " + //$NON-NLS-1$
-                        " PT_TEMP_EXTERNAL_IDS" + //$NON-NLS-1$
-                        "    (original_system_id, original_system_nonce, original_object_id, " + //$NON-NLS-1$
-                        "           original_object_id_extension, external_id_type," + //$NON-NLS-1$
-                        "           field1, field2, field3, field4) " + //$NON-NLS-1$
-                        " VALUES (" + BasicSQLUtils.nArguments(9) + ")"); //$NON-NLS-1$
-    }
-
-    private final RegisteredSQLString SQL_INSERT_INTO_PT_TEMP_IDS_ID_KEY_TUPLES = SQLString.registerQuery(
-            "SQL_INSERT_INTO_PT_TEMP_IDS_ID_KEY_TUPLES", //$NON-NLS-1$
-            " INSERT /*+ APPEND */ INTO " + //$NON-NLS-1$
-                    " PT_TEMP_IDS_ID_KEY_TUPLES " + //$NON-NLS-1$
-                    " (id, field1, field2, field3, field4, field5, field6, field7, field8, key) " + //$NON-NLS-1$
-                    " VALUES (?,?,?,?,?,?,?,?,?,?) "); //$NON-NLS-1$
-
-    private final Function<Long, Object[]> TEMP_ID_TO_ARGUMENT = new Function<Long, Object[]>() {
-        @Override
-        public Object[] apply(Long tempId) {
-            return new Object[] { tempId };
-        }
-    };
-
-    /**
-     *
-     * Create clears out the contents of the temp table with the name provided and replaces it with
-     * the numbers passed in via 'tempIds'
-     *
-     * @param c the Connection
-     * @param tempIds collection of Longs to be inserted into specified temp table
-     * @param tableName name of temporary table which will be cleared out and inserted with data
-     * @throws PalantirSqlException
-     */
-
-    void loadTempIds(Connection c, Iterable<Long> tempIds, ClearStyle clearStyle)
-            throws PalantirSqlException {
-        loadTempIds(c, tempIds, "PT_TEMP_IDS", clearStyle); //$NON-NLS-1$
-    }
-
-    void loadTempIds(Connection c, Iterable<Long> tempIds, String tableName, ClearStyle clearStyle)
-            throws PalantirSqlException {
-        // First, delete any existing rows from temp table
-        clearTempTable(c, tableName, clearStyle);
-
-        // Second, add the ids that the user passed in, if any where passed in
-        if (tempIds != null && !Iterables.isEmpty(tempIds)) {
-            int size = Iterables.size(tempIds);
-            if (size > TEMP_IDS_LOGGING_THRESHOLD) {
-                log.error("Putting " + size + " objects in temp ids; stack trace provided for debugging", new Exception());
-            }
-            Iterable<Object[]> args = idsToArguments(tempIds);
-            String sqlInsert = TextUtils.format(SQL_INSERT_INTO_PT_TEMP_IDS, tableName);
-            try {
-                insertManyUnregisteredQuery(c, sqlInsert, args); // dynamic query
-            } catch (PalantirSqlException e) {
-                assert checkRepeatedInsert(e, c, tableName, tempIds, clearStyle);
-                throw e;
-            }
-        }
-    }
-
-    /**
-     * Check if the temp table has this exact set of tempIds already, for debugging purposes.
-     * This should be behind an assert so it does not run in production.
-     */
-    private boolean checkRepeatedInsert(PalantirSqlException e, Connection c, String tableName, Iterable<Long> tempIds, ClearStyle clearStyle) {
-        AgnosticResultSet results = selectResultSetUnregisteredQuery(c, "SELECT id FROM " + tableName);
-        Set<Long> attempt = Sets.newHashSet(tempIds);
-        Set<Long> current = Sets.newHashSet();
-        String isInTransaction = transactionAsString(c);
-        for (AgnosticResultRow row: results.rows()) {
-            current.add(row.getLong("id"));
-        }
-        if (attempt.equals(current)) {
-            String message = String.format("Tried to insert %s temp IDs into table %s, but that exact set of temp IDs was already there. (%s) (ClearStyle: %s)",
-                    attempt.size(), tableName, isInTransaction, clearStyle);
-            throw new RuntimeException(message, e);
-        } else {
-            Set<Long> onlyInAttempt = Sets.difference(attempt, current);
-            Set<Long> onlyInCurrent = Sets.difference(current, attempt);
-            String message = String.format(
-                    "Tried to insert %s temp IDs into table %s, but %s temp IDs were already there.  %s were only in our attempt, while " +
-                            "%s were only in the set already present. (%s) (ClearStyle: %s)",
-                    attempt.size(), tableName, current.size(), onlyInAttempt.size(), onlyInCurrent.size(), isInTransaction, clearStyle);
-            throw new RuntimeException(message, e);
-        }
-    }
-
-    private String transactionAsString(Connection c) {
-        String isInTransaction;
-        try {
-            if (c.getAutoCommit()) {
-                isInTransaction = "Not in transaction";
-            } else {
-                isInTransaction = "In transaction";
-            }
-        } catch (SQLException sqle) {
-            isInTransaction = "Unknown transaction status";
-        }
-        return isInTransaction;
-    }
-
-    private Iterable<Object[]> idsToArguments(Iterable<Long> tempIds) {
-        // unless the input tempIds is a Set, we need to check that
-        // the input collection of IDs contains no duplicate IDs
-        Set<Long> uniqueTempIds;
-        if (tempIds instanceof Set) {
-            uniqueTempIds = (Set<Long>) tempIds;
-        } else {
-            uniqueTempIds = Sets.newHashSet(tempIds);
-        }
-        return Collections2.transform(uniqueTempIds, TEMP_ID_TO_ARGUMENT);
-    }
-
-    void deleteIdsFromTempIds(Connection c, Collection<Long> ids) throws PalantirSqlException {
-        deleteIdsFromTempIdsForTable(c, ids, "pt_temp_ids"); //$NON-NLS-1$
-    }
-
-    void deleteIdsFromTempIdsForTable(Connection c, Collection<Long> ids, String tempTable)
-            throws PalantirSqlException {
-        Iterable<Object[]> args = IterableView.of(ids).transform(TEMP_ID_TO_ARGUMENT);
-        String sql = TextUtils.format(SQL_DELETE_IDS_FROM_PT_TEMPS_IDS, tempTable);
-        updateManyUnregisteredQuery(c, sql, args);
-    }
-
-    void loadEightFieldTempIds(Connection c, Iterable<Object[]> args, ClearStyle clearStyle)
-            throws PalantirSqlException {
-        clearTempTable(c, "PT_TEMP_IDS_EIGHT_FIELDS", clearStyle); //$NON-NLS-1$
-        insertMany(c, "SQL_INSERT_INTO_PT_TEMP_IDS_EIGHT_FIELDS", args); //$NON-NLS-1$
-    }
-
-    void loadIdKeyPairTempIds(Connection c, Iterable<Object[]> args, ClearStyle clearStyle)
-            throws PalantirSqlException {
-        clearTempTable(c, "PT_TEMP_IDS_ID_KEY_PAIRS", clearStyle); //$NON-NLS-1$
-        insertMany(c, "SQL_INSERT_INTO_PT_TEMP_IDS_ID_KEY_PAIRS", args); //$NON-NLS-1$
-    }
-
-    void loadTempExternalIds(Connection c, Iterable<Object[]> args, ClearStyle clearStyle)
-            throws PalantirSqlException {
-        clearTempTable(c, "PT_TEMP_EXTERNAL_IDS", clearStyle); //$NON-NLS-1$
-        insertMany(c, "SQL_INSERT_INTO_PT_TEMP_EXTERNAL_IDS", args); //$NON-NLS-1$
-    }
-
-    void loadThreeFieldTempIds(Connection c,
-                                      Iterable<Object[]> args,
-                                      ClearStyle clearStyle) throws PalantirSqlException {
-        clearTempTable(c, "PT_TEMP_THREE_IDS", clearStyle);
-        insertMany(c, "SQL_INSERT_INTO_PT_TEMP_THREE_IDS", args);
-    }
-
-    void loadKeysTempIds(Connection c, Iterable<String> args, ClearStyle clearStyle)
-            throws PalantirSqlException {
-        clearTempTable(c, "PT_TEMP_IDS_KEYS", clearStyle); //$NON-NLS-1$
-        List<Object[]> objArgs = Lists.newArrayList();
-        for (String arg : args) {
-            objArgs.add(new Object[] { arg });
-        }
-        insertMany(c, "SQL_INSERT_INTO_PT_TEMP_IDS_KEYS", objArgs); //$NON-NLS-1$
-    }
-
-    void clearTempTable(Connection c, String tempTable, ClearStyle clearStyle)
-            throws PalantirSqlException {
-        attemptToClearTempTable(c, tempTable, clearStyle);
-        if (ClearStyle.TRUNCATE.equals(clearStyle)) {
-            // We have noticed that TRUNCATE can fail silently on Oracle SE 11.2.0.4.0
-            // So we must always confirm
-            if (!isTableEmpty(c, tempTable)) {
-                log.error(
-                        String.format("On first attempt, did not clear temp table %s using style TRUNCATE.  Retrying.",
-                        tempTable));
-                attemptToClearTempTable(c, tempTable, clearStyle);
-                if (!isTableEmpty(c, tempTable)) {
-                    throw new RuntimeException(
-                            String.format("On multiple attempts with clear style TRUNCATE, did not clear temp table %s",
-                                    tempTable));
-                }
-            }
-        } else {
-            // We have never seen DELETE fail silently, so we will only confirm if assertions are enabled.
-            assert verifyTableCleared(c, tempTable, clearStyle);
-        }
-    }
-
-    private void attemptToClearTempTable(Connection c, String tempTable, ClearStyle clearStyle) {
-        if (clearStyle == ClearStyle.DELETE) {
-            clearTempTableUsingDelete(c, tempTable);
-        } else if (clearStyle == ClearStyle.TRUNCATE) {
-            clearTempTableUsingTruncate(c, tempTable);
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    private boolean isTableEmpty(Connection c, String table) {
-        return !selectExistsUnregisteredQuery(c, "SELECT 1 from " + table);
-    }
-
-    /**
-     * If the table was not cleared, try to diagnose the reason and throw an informative error message.
-     * In the future, we may want to allow the thread to continue executing if we eventually clear the temp table,
-     * but for now we will always throw if the initial attempt failed.
-     */
-    private boolean verifyTableCleared(Connection c, String tempTable, ClearStyle clearStyle) {
-        if (selectCount(c, tempTable) != 0) {
-
-            // Try again
-            attemptToClearTempTable(c, tempTable, clearStyle);
-            if (selectCount(c, tempTable) == 0) {
-
-                String message = "On first attempt, did not clear temp table " + tempTable
-                        + " using style " + clearStyle.toString()
-                        + " and transaction status: " + transactionAsString(c)
-                        + ".  Second attempt was successful.";
-                throw new RuntimeException(message);
-
-            } else {
-
-                if (clearStyle.equals(ClearStyle.TRUNCATE)) {
-                    attemptToClearTempTable(c, tempTable, ClearStyle.DELETE);
-                    if (selectCount(c, tempTable) == 0) {
-                        String message = "On multiple attempts with clear style TRUNCATE, did not clear temp table " + tempTable
-                                + ", however an attempt with clear style DELETE was successful."
-                                + "Transaction status: " + transactionAsString(c) + ".";
-                        throw new RuntimeException(message);
-
-                    } else {
-                        String message = "On multiple attempts, did not clear temp table " + tempTable
-                                + " using both clear styles "
-                                + " and transaction status: " + transactionAsString(c) + ".";
-                        throw new RuntimeException(message);
-                    }
-                } else {
-                    String message = "On multiple attempts, did not clear temp table " + tempTable
-                            + " using style " + clearStyle.toString()
-                            + " and transaction status: " + transactionAsString(c) + ".";
-                    throw new RuntimeException(message);
-
-                }
-            }
-        }
-
-        return true;
-    }
-
-
-    void clearTempTableUsingDelete(Connection c, String tempTable) throws PalantirSqlException {
-        String sqlDelete = TextUtils.format(SQL_DELETE_PT_TEMP_IDS, tempTable);
-        try {
-            executeUnregisteredQuery(c, sqlDelete, new Object[]{}); // dynamic query
-        } catch (PalantirSqlException e) {
-            if (e.getMessage().contains("ORA-08102")) { // "index key not found"
-                // Try again
-                try {
-                    executeUnregisteredQuery(c, sqlDelete, new Object[]{}); // dynamic query
-                    // Worked the second time
-                    // In production we can continue, but if asserts are on let's fail with an informative message to help diagnosis
-                    assert false: String.format("Tried to delete temp table %s, got ORA-08102, then tried again and it worked: %s",
-                            tempTable, sqlDelete);
-                } catch (PalantirSqlException e2) {
-                    // Repeated failure
-                    throw new RuntimeException(String.format(
-                            "Repeatedly failed to delete temp table %s: %s.  First exception was ORA-08102.  Second was: %s",
-                            tempTable, sqlDelete, e2.getMessage()), e2);
-                }
-            } else {
-                throw e;
-            }
-        }
-        SqlStats.INSTANCE.incrementClearTempTableByDelete();
-    }
-
-    void clearTempTableUsingTruncate(Connection c, String tempTable) throws PalantirSqlException {
-        String sqlTruncate = TextUtils.format(SQL_TRUNCATE_PT_TEMP_IDS, tempTable);
-        executeUnregisteredQuery(c, sqlTruncate);
-        SqlStats.INSTANCE.incrementClearTempTableByTruncate();
-    }
-
-    void loadTempIdPairsIntoEight(Connection c, Map<Long, Long> idToField1, ClearStyle clearStyle)
-            throws PalantirSqlException {
-        List<Object[]> args = pairToEightFields(idToField1);
-        loadEightFieldTempIds(c, args, clearStyle);
-    }
-
-    void loadIdKeyTuplesTempIds(Connection c, List<Object[]> args) throws PalantirSqlException {
-        clearTempTable(c, "PT_TEMP_IDS_ID_KEY_TUPLES", ClearStyle.DELETE); //$NON-NLS-1$
-        insertMany(c, SQL_INSERT_INTO_PT_TEMP_IDS_ID_KEY_TUPLES, args);
-    }
-
-    void loadTempIdPairsIntoIdKeyTuples(Connection c, Map<Long, Long> idToField1) {
-        List<Object[]> args = pairToIdKeyFields(idToField1);
-        loadIdKeyTuplesTempIds(c, args);
-    }
-
-    private List<Object[]> pairToEightFields(Map<Long, Long> idToField1) {
-        List<Object[]> args = Lists.newArrayListWithCapacity(idToField1.size());
-        for (Map.Entry<Long, Long> entry : idToField1.entrySet()) {
-            Object[] arg = newEmptyIds(9);
-            arg[0] = entry.getKey();
-            arg[1] = entry.getValue();
-            args.add(arg);
-        }
-
-        return args;
-    }
-
-    private List<Object[]> pairToIdKeyFields(Map<Long, Long> idToField1) {
-        List<Object[]> args = Lists.newArrayListWithCapacity(idToField1.size());
-        for (Map.Entry<Long, Long> entry : idToField1.entrySet()) {
-            Object[] arg = newEmptyIds(10);
-            arg[0] = entry.getKey();
-            arg[1] = entry.getValue();
-            arg[9] = null;
-            args.add(arg);
-        }
-
-        return args;
-    }
-
-    private Object[] newEmptyIds(int size) {
-        Object[] arg = new Object[size];
-        Arrays.fill(arg, 0L);
-        return arg;
-    }
 }
diff --git a/commons-db/src/main/java/com/palantir/nexus/db/sql/TempTable.java b/commons-db/src/main/java/com/palantir/nexus/db/sql/TempTable.java
new file mode 100644
index 00000000000..d779352f3be
--- /dev/null
+++ b/commons-db/src/main/java/com/palantir/nexus/db/sql/TempTable.java
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.nexus.db.sql;
+
+import java.sql.Connection;
+
+public interface TempTable {
+    public void initialize(Connection connection);
+    public String getTableName();
+}
diff --git a/commons-db/src/main/java/com/palantir/sql/Blobs.java b/commons-db/src/main/java/com/palantir/sql/Blobs.java
index 3cde1b5dd78..851c92cb2f6 100644
--- a/commons-db/src/main/java/com/palantir/sql/Blobs.java
+++ b/commons-db/src/main/java/com/palantir/sql/Blobs.java
@@ -18,19 +18,14 @@
 import java.sql.Blob;
 import java.sql.SQLException;
 
-import org.apache.log4j.Logger;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.BasicSQL;
 
 public class Blobs {
-    private final static Logger sqlExceptionlog = Logger.getLogger("sqlException." + Blobs.class.getName());
-
     public static long length(Blob b) throws PalantirSqlException {
         try {
             return b.length();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -39,7 +34,6 @@ public static byte[] getBytes(Blob b, long pos, int length) throws PalantirSqlEx
         try {
             return b.getBytes(pos, length);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
diff --git a/commons-db/src/main/java/com/palantir/sql/Clobs.java b/commons-db/src/main/java/com/palantir/sql/Clobs.java
index c8aadd2120b..08658f0b109 100644
--- a/commons-db/src/main/java/com/palantir/sql/Clobs.java
+++ b/commons-db/src/main/java/com/palantir/sql/Clobs.java
@@ -18,13 +18,10 @@
 import java.sql.Clob;
 import java.sql.SQLException;
 
-import org.apache.log4j.Logger;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.BasicSQL;
 
 public class Clobs {
-    private static final Logger sqlExceptionlog = Logger.getLogger("sqlException." + Clobs.class.getName());
 
     public static String getString(Clob clob, long clobLen) throws PalantirSqlException {
         try {
@@ -52,7 +49,6 @@ public static String getString(Clob clob, long clobLen) throws PalantirSqlExcept
 
         return rv.toString();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
diff --git a/commons-db/src/main/java/com/palantir/sql/Connections.java b/commons-db/src/main/java/com/palantir/sql/Connections.java
index df3add7248c..8c6d021a08f 100644
--- a/commons-db/src/main/java/com/palantir/sql/Connections.java
+++ b/commons-db/src/main/java/com/palantir/sql/Connections.java
@@ -21,20 +21,16 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import org.apache.log4j.Logger;
-
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.sql.BasicSQL;
 
 
 public class Connections  {
-    private static final Logger sqlExceptionlog = Logger.getLogger("sqlException." + Connections.class.getName());
 
     public static String getUrl(Connection c) throws PalantirSqlException {
         try {
             return c.getMetaData().getURL();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -44,7 +40,6 @@ public static PreparedStatement prepareStatement(Connection c, String sql)
         try {
             return c.prepareStatement(sql);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -54,7 +49,6 @@ public static Statement createStatement(Connection c)
         try {
             return c.createStatement();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -64,7 +58,6 @@ public static DatabaseMetaData getMetaData(Connection c)
         try {
             return c.getMetaData();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -74,7 +67,6 @@ public static String getUserName(Connection c)
         try {
             return c.getMetaData().getUserName();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -83,7 +75,6 @@ public static void close(Connection c) throws PalantirSqlException {
         try {
             c.close();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -92,7 +83,6 @@ public static void rollback(Connection c) throws PalantirSqlException {
         try {
             c.rollback();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -101,7 +91,6 @@ public static void setAutoCommit(Connection c, boolean condition) throws Palanti
         try {
             c.setAutoCommit(condition);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -110,7 +99,6 @@ public static boolean getAutoCommit(Connection c) throws PalantirSqlException {
         try {
             return c.getAutoCommit();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -119,7 +107,6 @@ public static void setTransactionIsolation(Connection c, int level) throws Palan
         try {
             c.setTransactionIsolation(level);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -128,7 +115,6 @@ public static int getTransactionIsolation(Connection c) throws PalantirSqlExcept
         try {
             return c.getTransactionIsolation();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -137,7 +123,6 @@ public static void commit(Connection c) throws PalantirSqlException {
         try {
             c.commit();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
diff --git a/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java b/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java
index 6231b4b54e6..f3ae4698516 100644
--- a/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java
+++ b/commons-db/src/main/java/com/palantir/sql/PreparedStatements.java
@@ -32,7 +32,6 @@ public static int getUpdateCount(PreparedStatement ps) throws PalantirSqlExcepti
         try {
             return ps.getUpdateCount();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -41,7 +40,6 @@ public static boolean execute(PreparedStatement ps) throws PalantirSqlException
         try {
             return ps.execute();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -50,7 +48,6 @@ public static ResultSet executeQuery(PreparedStatement ps) throws PalantirSqlExc
         try {
             return ps.executeQuery();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -60,7 +57,6 @@ public static void setObject(PreparedStatement ps, int index, Object obj) throws
         try {
             ps.setObject(index, obj);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -69,7 +65,6 @@ public static void setBytes(PreparedStatement ps, int index, byte[] bytes) throw
         try {
             ps.setBytes(index, bytes);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -78,7 +73,6 @@ public static void setBinaryStream(PreparedStatement ps, int index, InputStream
         try {
             ps.setBinaryStream(index, stream, length);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -87,7 +81,6 @@ public static void setInt(PreparedStatement ps, int index, Integer obj) throws P
         try {
             ps.setInt(index, obj);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -96,7 +89,6 @@ public static void setLong(PreparedStatement ps, int index, Long obj) throws Pal
         try {
             ps.setLong(index, obj);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -105,7 +97,6 @@ public static void setDouble(PreparedStatement ps, int index, Double obj) throws
         try {
             ps.setDouble(index, obj);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -114,7 +105,6 @@ public static void setFloat(PreparedStatement ps, int index, Float obj) throws P
         try {
             ps.setFloat(index, obj);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -123,7 +113,6 @@ public static void setShort(PreparedStatement ps, int index, Short obj) throws P
         try {
             ps.setShort(index, obj);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -132,7 +121,6 @@ public static void setByte(PreparedStatement ps, int index, Byte obj) throws Pal
         try {
             ps.setByte(index, obj);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -141,7 +129,6 @@ public static void setTimestamp(PreparedStatement ps, int index, Timestamp obj)
         try {
             ps.setTimestamp(index, obj);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -150,7 +137,6 @@ public static void cancel(PreparedStatement ps) throws PalantirSqlException {
         try {
             ps.cancel();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -159,7 +145,6 @@ public static void setMaxRows(PreparedStatement ps, int max) throws PalantirSqlE
         try {
             ps.setMaxRows(max);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -168,7 +153,6 @@ public static void setFetchSize(PreparedStatement ps, int fetchSize) throws Pala
         try {
             ps.setFetchSize(fetchSize);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -178,7 +162,6 @@ public static void setNull(PreparedStatement ps, int index, int sqlType,
         try {
             ps.setNull(index, sqlType, typeName);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
diff --git a/commons-db/src/main/java/com/palantir/sql/ResultSets.java b/commons-db/src/main/java/com/palantir/sql/ResultSets.java
index 6aa7cbd3799..8e32da499c3 100644
--- a/commons-db/src/main/java/com/palantir/sql/ResultSets.java
+++ b/commons-db/src/main/java/com/palantir/sql/ResultSets.java
@@ -26,21 +26,17 @@
 import java.sql.Timestamp;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
-
 import com.google.common.collect.Maps;
 import com.palantir.exception.PalantirSqlException;
 import com.palantir.nexus.db.DBType;
 import com.palantir.nexus.db.sql.BasicSQL;
 
 public class ResultSets {
-    private static final Logger sqlExceptionlog = Logger.getLogger("sqlException." + ResultSets.class.getName());
 
     public static Object getObject(ResultSet rs, int col) throws PalantirSqlException {
         try {
             return rs.getObject(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -75,7 +71,6 @@ public static String getString(ResultSet rs, int col) throws PalantirSqlExceptio
         try {
             return rs.getString(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -84,7 +79,6 @@ public static long getLong(ResultSet rs, int col) throws PalantirSqlException {
         try {
             return rs.getLong(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -93,7 +87,6 @@ public static long getLong(ResultSet rs, String idColName) {
         try {
             return rs.getLong(idColName);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -102,7 +95,6 @@ public static double getDouble(ResultSet rs, int col) throws PalantirSqlExceptio
         try {
             return rs.getDouble(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -111,7 +103,6 @@ public static int getInt(ResultSet rs, int col) throws PalantirSqlException {
         try {
             return rs.getInt(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -120,7 +111,6 @@ public static Timestamp getTimestamp(ResultSet rs, int col) throws PalantirSqlEx
         try {
             return rs.getTimestamp(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -129,7 +119,6 @@ public static ResultSetMetaData getMetaData(ResultSet rs) throws PalantirSqlExce
         try {
             return rs.getMetaData();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -138,7 +127,6 @@ public static int getColumnCount(ResultSet rs) throws PalantirSqlException {
         try {
             return rs.getMetaData().getColumnCount();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -147,7 +135,6 @@ public static String getColumnLabel(ResultSet rs, int col) throws PalantirSqlExc
         try {
             return rs.getMetaData().getColumnLabel(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -156,7 +143,6 @@ public static int getColumnCount(ResultSetMetaData metaData) throws PalantirSqlE
         try {
             return metaData.getColumnCount();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -165,7 +151,6 @@ public static String getColumnLabel(ResultSetMetaData metaData, int col) throws
         try {
             return metaData.getColumnLabel(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -174,7 +159,6 @@ public static Blob getBlob(ResultSet rs, int col) throws PalantirSqlException {
         try {
             return rs.getBlob(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -183,7 +167,6 @@ public static byte[] getBytes(ResultSet rs, int col) throws PalantirSqlException
         try {
             return rs.getBytes(col);
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -211,7 +194,6 @@ public void close() throws IOException {
                 }
             };
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -220,7 +202,6 @@ public static boolean next(ResultSet rs) throws PalantirSqlException {
         try {
             return rs.next();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
@@ -229,7 +210,6 @@ public static void close(ResultSet rs) throws PalantirSqlException {
         try {
             rs.close();
         } catch (SQLException e) {
-            sqlExceptionlog.info("Caught SQLException", e);
             throw BasicSQL.handleInterruptions(0, e);
         }
     }
diff --git a/commons-executors/build.gradle b/commons-executors/build.gradle
index 31f637f4b56..9f3b83379b5 100644
--- a/commons-executors/build.gradle
+++ b/commons-executors/build.gradle
@@ -13,5 +13,5 @@ repositories {
 
 libsDirName = file('build/artifacts')
 dependencies {
-    compile group: 'com.google.guava', name: 'guava', version: libVersions.guava
+    testCompile group: 'com.google.guava', name: 'guava', version: libVersions.guava
 }
diff --git a/commons-executors/src/main/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocal.java b/commons-executors/src/main/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocal.java
index 14e4f6c04e4..c2b38254511 100644
--- a/commons-executors/src/main/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocal.java
+++ b/commons-executors/src/main/java/com/palantir/common/concurrent/ExecutorInheritableThreadLocal.java
@@ -15,12 +15,13 @@
  */
 package com.palantir.common.concurrent;
 
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.MapMaker;
-
 /**
  * This class is like {@link InheritableThreadLocal} but it works with tasks spawned from the static
  * methods in {@link PTExecutors}. We don't usually use plain old threads for task management, so
@@ -28,34 +29,41 @@
  */
 public class ExecutorInheritableThreadLocal<T> {
 
-    private final static ThreadLocal<ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object>> mapForThisThread
-            = new ThreadLocal<ConcurrentMap<ExecutorInheritableThreadLocal<?>,Object>>() {
+    private final static ThreadLocal<ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object>> mapForThisThread
+            = new ThreadLocal<ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object>>() {
         @Override
-        protected ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> initialValue() {
+        protected ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> initialValue() {
             return makeNewMap();
         }
     };
 
+    private final WeakReference<ExecutorInheritableThreadLocal<T>> myReference;
+
+    public ExecutorInheritableThreadLocal() {
+        myReference = new WeakReference<ExecutorInheritableThreadLocal<T>>(this);
+    }
+
     private enum NullWrapper {
         INSTANCE
     }
 
     public void set(T value) {
-        mapForThisThread.get().put(this, wrapNull(value));
+        mapForThisThread.get().put(myReference, wrapNull(value));
     }
 
     public void remove() {
-        Map<ExecutorInheritableThreadLocal<?>, Object> map = mapForThisThread.get();
-        map.remove(this);
+        Map<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> map = mapForThisThread.get();
+        map.remove(myReference);
         if (map.isEmpty()) {
             mapForThisThread.remove();
         }
     }
 
     public T get() {
-        if (mapForThisThread.get().containsKey(this)) {
-            Object ret = mapForThisThread.get().get(this);
-            return unwrapNull(ret);
+        ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> myThreadLocals = mapForThisThread.get();
+        Object value = myThreadLocals.get(myReference);
+        if (value != null) {
+            return unwrapNull(value);
         } else {
             T ret = initialValue();
             set(ret);
@@ -127,48 +135,55 @@ protected T initialValue() {
         return null;
     }
 
-    static ImmutableMap<ExecutorInheritableThreadLocal<?>, Object> getMapForNewThread() {
-        ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> currentMap = mapForThisThread.get();
+    static Map<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> getMapForNewThread() {
+        ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> currentMap = mapForThisThread.get();
         if (currentMap.isEmpty()) {
             mapForThisThread.remove();
-            return ImmutableMap.of();
+            return Collections.emptyMap();
         }
-        ImmutableMap.Builder<ExecutorInheritableThreadLocal<?>, Object> ret = ImmutableMap.builder();
-        for (ExecutorInheritableThreadLocal<?> e : currentMap.keySet()) {
+        Map<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> ret =
+                new HashMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object>(currentMap.size());
+        for (WeakReference<? extends ExecutorInheritableThreadLocal<?>> ref : currentMap.keySet()) {
             @SuppressWarnings("unchecked")
-            ExecutorInheritableThreadLocal<Object> eitl = (ExecutorInheritableThreadLocal<Object>) e;
-            ret.put(eitl, wrapNull(eitl.callChildValue(eitl.get())));
+            ExecutorInheritableThreadLocal<Object> threadLocal = (ExecutorInheritableThreadLocal<Object>) ref.get();
+            if (threadLocal == null) {
+                currentMap.remove(ref);
+            } else {
+                ret.put(ref, wrapNull(threadLocal.callChildValue(threadLocal.get())));
+            }
         }
-
-        return ret.build();
+        return ret;
     }
 
     /**
      * @return the old map installed on that thread
      */
-    static ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> installMapOnThread(ImmutableMap<ExecutorInheritableThreadLocal<?>, Object> map) {
-        ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> oldMap = mapForThisThread.get();
+    static ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> installMapOnThread(
+                Map<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> map) {
+        ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> oldMap = mapForThisThread.get();
         if (map.isEmpty()) {
             mapForThisThread.remove();
         } else {
-            ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> newMap = makeNewMap();
+            ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> newMap = makeNewMap();
             newMap.putAll(map);
 
             // Install the map in case callInstallOnChildThread makes use
             // of existing thread locals (UserSessionClientInfo does this).
             mapForThisThread.set(newMap);
 
-            for (ExecutorInheritableThreadLocal<?> e : map.keySet()) {
+            for (WeakReference<? extends ExecutorInheritableThreadLocal<?>> ref : map.keySet()) {
                 @SuppressWarnings("unchecked")
-                ExecutorInheritableThreadLocal<Object> eitl = (ExecutorInheritableThreadLocal<Object>) e;
-                eitl.set(eitl.callInstallOnChildThread(eitl.get()));
+                ExecutorInheritableThreadLocal<Object> threadLocal = (ExecutorInheritableThreadLocal<Object>) ref.get();
+                if (threadLocal != null) {
+                    threadLocal.set(threadLocal.callInstallOnChildThread(threadLocal.get()));
+                }
             }
         }
         return oldMap;
     }
 
-    private static ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> makeNewMap() {
-        return new MapMaker().weakKeys().concurrencyLevel(1).makeMap();
+    private static ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> makeNewMap() {
+        return new ConcurrentHashMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object>();
     }
 
     private static Object wrapNull(Object value) {
@@ -184,10 +199,14 @@ private T unwrapNull(Object ret) {
         }
     }
 
-    static void uninstallMapOnThread(ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> oldMap) {
+    static void uninstallMapOnThread(ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> oldMap) {
         try {
-            for (ExecutorInheritableThreadLocal<?> eitl : mapForThisThread.get().keySet()) {
-                eitl.uninstallOnChildThread();
+            for (WeakReference<? extends ExecutorInheritableThreadLocal<?>> ref : mapForThisThread.get().keySet()) {
+                @SuppressWarnings("unchecked")
+                ExecutorInheritableThreadLocal<Object> threadLocal = (ExecutorInheritableThreadLocal<Object>) ref.get();
+                if (threadLocal != null) {
+                    threadLocal.uninstallOnChildThread();
+                }
             }
         } finally {
             if (oldMap.isEmpty()) {
diff --git a/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java b/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java
index 4e31f8b08b5..dff1a63cdf3 100644
--- a/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java
+++ b/commons-executors/src/main/java/com/palantir/common/concurrent/PTExecutors.java
@@ -15,8 +15,10 @@
  */
 package com.palantir.common.concurrent;
 
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentMap;
@@ -37,8 +39,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.google.common.collect.ImmutableMap;
-
 /**
  * Please always use the static methods in this class instead of the ones in {@link
  * java.util.concurrent.Executors}, because the executors returned by these methods will propagate
@@ -472,7 +472,7 @@ public static ScheduledExecutorService wrap(
      * interface, then the returned {@code Runnable} will also implement {@code Future}.
      */
     public static Runnable wrap(final Runnable runnable) {
-        final ImmutableMap<ExecutorInheritableThreadLocal<?>, Object> mapForNewThread =
+        final Map<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> mapForNewThread =
                 ExecutorInheritableThreadLocal.getMapForNewThread();
         if (runnable instanceof Future<?>) {
             @SuppressWarnings("unchecked")
@@ -480,7 +480,7 @@ public static Runnable wrap(final Runnable runnable) {
             return new ForwardingRunnableFuture<Object>(unsafeFuture) {
                 @Override
                 public void run() {
-                    ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> oldMap =
+                    ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> oldMap =
                         ExecutorInheritableThreadLocal.installMapOnThread(mapForNewThread);
                     try {
                         super.run();
@@ -493,7 +493,7 @@ public void run() {
         return new Runnable() {
             @Override
             public void run() {
-                ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> oldMap =
+                ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> oldMap =
                         ExecutorInheritableThreadLocal.installMapOnThread(mapForNewThread);
                 try {
                     runnable.run();
@@ -505,12 +505,12 @@ public void run() {
     }
 
     public static <T> RunnableFuture<T> wrap(RunnableFuture<T> rf) {
-        final ImmutableMap<ExecutorInheritableThreadLocal<?>, Object> mapForNewThread =
+        final Map<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> mapForNewThread =
                 ExecutorInheritableThreadLocal.getMapForNewThread();
         return new ForwardingRunnableFuture<T>(rf) {
             @Override
             public void run() {
-                ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> oldMap =
+                ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> oldMap =
                     ExecutorInheritableThreadLocal.installMapOnThread(mapForNewThread);
                 try {
                     super.run();
@@ -526,12 +526,12 @@ public void run() {
      * propagated through.
      */
     public static <T> Callable<T> wrap(final Callable<? extends T> callable) {
-        final ImmutableMap<ExecutorInheritableThreadLocal<?>, Object> mapForNewThread =
+        final Map<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> mapForNewThread =
                 ExecutorInheritableThreadLocal.getMapForNewThread();
         return new Callable<T>() {
             @Override
             public T call() throws Exception {
-                ConcurrentMap<ExecutorInheritableThreadLocal<?>, Object> oldMap =
+                ConcurrentMap<WeakReference<? extends ExecutorInheritableThreadLocal<?>>, Object> oldMap =
                         ExecutorInheritableThreadLocal.installMapOnThread(mapForNewThread);
                 try {
                     return callable.call();
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index c5d8c3a9155..dd2656b30e0 100755
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -39,6 +39,11 @@
           <property name="option" value="top"/>
           <property name="ordered" value="true"/>
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="format" value="(?i)log(ger)?\.(trace|debug|info|warn|error)\(.*%[sd]"/>
+            <property name="message" value="SLF4J loggers support '{}' style formatting."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
     </module>
 
 </module>
diff --git a/doc/adr/0001-prevent-tables-from-being-creating-simultaneously-in-cassandra-via-a-locks-table.md b/doc/adr/0002-prevent-tables-from-being-creating-simultaneously-in-cassandra-via-a-locks-table.md
similarity index 94%
rename from doc/adr/0001-prevent-tables-from-being-creating-simultaneously-in-cassandra-via-a-locks-table.md
rename to doc/adr/0002-prevent-tables-from-being-creating-simultaneously-in-cassandra-via-a-locks-table.md
index b10b7eaa8ec..19fdf1069bc 100644
--- a/doc/adr/0001-prevent-tables-from-being-creating-simultaneously-in-cassandra-via-a-locks-table.md
+++ b/doc/adr/0002-prevent-tables-from-being-creating-simultaneously-in-cassandra-via-a-locks-table.md
@@ -1,4 +1,4 @@
-# 1. Prevent tables from being created simultaneously in cassandra via a locks table
+# 2. Prevent tables from being created simultaneously in cassandra via a locks table
 
 Date: 18/05/2016
 
diff --git a/doc/adr/0002-create-schema-lock-table-via-a-one-off-cli-command.md b/doc/adr/0004-create-schema-lock-table-via-a-one-off-cli-command.md
similarity index 83%
rename from doc/adr/0002-create-schema-lock-table-via-a-one-off-cli-command.md
rename to doc/adr/0004-create-schema-lock-table-via-a-one-off-cli-command.md
index 427fff9bccc..766e865464b 100644
--- a/doc/adr/0002-create-schema-lock-table-via-a-one-off-cli-command.md
+++ b/doc/adr/0004-create-schema-lock-table-via-a-one-off-cli-command.md
@@ -1,27 +1,27 @@
-# 2. Create schema lock table via a one off CLI command
+# 4. Create schema lock table via a one off CLI command
 
 Date: 18/05/2016
 
 ## Status
 
-Accepted
+Superceded by [6. Create schema lock table using configuration](0006-create-schema-lock-table-using-configuration.md)
 
 ## Context
 
-Due to [table creation issue](0001-prevent-tables-from-being-creating-simultaneously-in-cassandra-via-a-locks-table.md) we need to be able to safely create _lock table as a one off operation for each keyspace that atlas uses. The discussed options include:
+Due to [table creation issue](0002-prevent-tables-from-being-creating-simultaneously-in-cassandra-via-a-locks-table.md) we need to be able to safely create _lock table as a one off operation for each keyspace that atlas uses. The discussed options include:
 
 - Have Atlas clients refuse to start if the _locks table is missing and provide a CLI to create it.
   - This does require manual interview for whoever is handling operations
   - Is very, very hard to get wrong
   - Should be easily automatable in most setups, removing the manual step
-  
+
 - Use the lock service for locking rather than the _locks table, then we don't have to create it.
   - Completely automatic and removes code
   - Leaves open the possibility of locks failing and operations never realising that the issue has been triggered
-  
+
 - Have each node create a unique table, then run paxos to decide which one is the winner
   - This requires a bunch of extra, error prone code
- 
+
 
 ## Decision
 
@@ -30,7 +30,7 @@ We will implement the CLI based solution as:
 - It is safe
 - Requires a very simple set of code changes
 - Should have minimal drawbacks if people can automate it
- 
+
 ## Consequences
 
 Deployers of atlas will have to run a CLI once on initial service installation.
diff --git a/doc/adr/0002-stop-allowing-embedded-lock-and-timestamp-services-in-production.md b/doc/adr/0005-stop-allowing-embedded-lock-and-timestamp-services-in-production.md
similarity index 90%
rename from doc/adr/0002-stop-allowing-embedded-lock-and-timestamp-services-in-production.md
rename to doc/adr/0005-stop-allowing-embedded-lock-and-timestamp-services-in-production.md
index 771aefe45d6..8ef2386a167 100644
--- a/doc/adr/0002-stop-allowing-embedded-lock-and-timestamp-services-in-production.md
+++ b/doc/adr/0005-stop-allowing-embedded-lock-and-timestamp-services-in-production.md
@@ -1,4 +1,4 @@
-# 2. stop allowing embedded lock and timestamp services in production
+# 5. stop allowing embedded lock and timestamp services in production
 
 Date: 13/04/2016
 
@@ -8,7 +8,7 @@ Accepted
 
 ## Context
 
-Currently a completely normal way to set up AtlasDB is to run an embedded lock and timestamp service that only your atlas client talks to in Java. If this happens with 2 different clients, then they can easily clash with each other and cause undefined issues in the KVS. It also stops CLIs that require knowledge of lock and timestamp being able to run against these atlas clients. 
+Currently a completely normal way to set up AtlasDB is to run an embedded lock and timestamp service that only your atlas client talks to in Java. If this happens with 2 different clients, then they can easily clash with each other and cause undefined issues in the KVS. It also stops CLIs that require knowledge of lock and timestamp being able to run against these atlas clients.
 
 There is no reason for this situation to arise in production. Lock and Timestamp services can still be deployed in a sensible fashion without spinning up a separate service by registering the lock and timestamp server endpoints in your application, and having your own nodes act as the servers. Alternatively, you can spin up an completely external lock and timestamp service whose whole reason for existence is to perform these roles.
 
diff --git a/doc/adr/0006-create-schema-lock-table-using-configuration.md b/doc/adr/0006-create-schema-lock-table-using-configuration.md
new file mode 100644
index 00000000000..a9e9f1ebd5b
--- /dev/null
+++ b/doc/adr/0006-create-schema-lock-table-using-configuration.md
@@ -0,0 +1,42 @@
+# 6. Create schema lock table using configuration
+
+Date: 18/07/2016
+
+## Status
+
+Accepted
+
+Supercedes [4. Create schema lock table via a one off CLI command](0004-create-schema-lock-table-via-a-one-off-cli-command.md)
+
+## Context
+
+Due to [table creation issue](0002-prevent-tables-from-being-creating-simultaneously-in-cassandra-via-a-locks-table.md) we need to be able to safely create _lock table as a one off operation for each keyspace that atlas uses. The discussed options include:
+
+- Have Atlas clients refuse to start if the _locks table is missing and provide a CLI to create it.
+  - This does require manual interview for whoever is handling operations
+  - Is very, very hard to get wrong
+  - Should be easily automatable in most setups, removing the manual step
+
+- Use the lock service for locking rather than the _locks table, then we don't have to create it.
+  - Completely automatic and removes code
+  - Leaves open the possibility of locks failing and operations never realising that the issue has been triggered
+
+- Have each node create a unique table, then run paxos to decide which one is the winner
+  - This requires a bunch of extra, error prone code
+
+- Create an additional entry in the configuration, lockLeader, to denote which host is responsible for creating the locks table.
+  - The host whose name is the same as lockLeader will create the lock table, others will wait until the lockLeader is up.
+  - Requires all hosts to have the same configuration for lock leader
+
+## Decision
+
+We decided to use an extra item of configuration, because:
+1. Internal tools enable us to be confident that different Atlas servers on the same cluster are configured consistently.
+2. Running paxos to decide which table is the winner was more complex than anticipated.
+
+## Consequences
+
+On first-time startup, servers can now be started concurrently, but they must have consistent configuration.
+There are two failure modes that can be caused by inconsistent configuration or failure of the lock leader:
+1. No node believes that it is the lock leader - then all nodes will wait forever.
+2. More than one node believes itself to be the lock table - then we will have duplicate lock tables and still be vulnerable to the initial issue.
diff --git a/docker-containers/cassandra/Dockerfile b/docker-containers/cassandra/Dockerfile
index 333f029cac8..62c68644a97 100644
--- a/docker-containers/cassandra/Dockerfile
+++ b/docker-containers/cassandra/Dockerfile
@@ -1,4 +1,4 @@
-FROM cassandra:2.2.6
+FROM cassandra:2.2.7
 
 ENV CASSANDRA_CONFIG /etc/cassandra
 ENV CASSANDRA_YAML $CASSANDRA_CONFIG/cassandra.yaml
diff --git a/docs/source/_static/release-notes.css b/docs/source/_static/release-notes.css
index 5e2ba2d601c..ec225f574ab 100644
--- a/docs/source/_static/release-notes.css
+++ b/docs/source/_static/release-notes.css
@@ -26,6 +26,10 @@
   background: #DB3737;
 }
 
+.changetype.changetype-breaking {
+  background: #C70000;
+}
+
 .changetype.changetype-new {
   background: #0F9960;
 }
diff --git a/docs/source/cluster_management/backup-restore.rst b/docs/source/cluster_management/backup-restore.rst
new file mode 100644
index 00000000000..b246285edc2
--- /dev/null
+++ b/docs/source/cluster_management/backup-restore.rst
@@ -0,0 +1,70 @@
+.. _backup-restore:
+
+==================
+Backup and Restore
+==================
+
+Overview
+========
+
+Backup and restore for AtlasDB are non-trivial operations that are not satisfied by simply backing up and restoring the underyling key value store you are using to store your data in.  This page describes how to take advantage of built in AtlasDB utilities, namely the Atlas CLI, in order to perform a live consistent point in time backup and subsequent restore of that backup from total data loss.
+
+Using the Atlas CLI
+===================
+
+The set of tasks described in this page rely heavily on having a functioning Atlas CLI.  Please see :ref:`clis` for information in how to deploy and use a functioning Atlas CLI utility.
+
+Cassandra and Other Distributed Systems
+=======================================
+
+A large part of taking a point in time backup of atlas is taking a backup of your underlying storage.  Many distributed systems, like cassandra, do not provide point in time backup utilities across multiple nodes.  Cassandra in particular can have each of its nodes "snapshot" at different real and logical points in time in a way that can affect the correctness or completeness of your atlas backup.  The steps in this page will attempt to address when this becomes a concern and how we can address it in our process.
+
+Taking a Backup
+===============
+
+First we need to define what the logical point in time of our backup is going to be.  We will call this the backup timestamp.  Any transactions that occur after the backup timestamp will not be valid or included in our "logical" backup of atlas, even if they complete succesfully before the rest of the backup completes.  To get the backup timestamp simply fetch a fresh timestamp using the CLI:
+
+.. code:: bash
+
+     $ ./bin/atlasdb --config <config-file> --config-root <path-to-atlas-block> timestamp fetch --file <backup-directory>/backup.timestamp
+
+Next, we back-up the underlying key value service we're using.  For the purposes of this documention, we will assume you can backup your specific key value service.
+
+Common KVS layers:
+
+-  Cassandra `backup <https://docs.datastax.com/en/cassandra/2.2/cassandra/operations/opsBackupTakesSnapshot.html>`__ and `restore <https://docs.datastax.com/en/cassandra/2.2/cassandra/operations/opsBackupSnapshotRestore.html>`__.
+-  Postgres `backup and restore <https://www.postgresql.org/docs/9.1/static/backup-dump.html>`__.
+-  If you are using RocksDB, you can simply compress the database files on disk with ``tar -czf backup.tgz path/to/data``.
+
+Finally, we take the fast-forward timestamp.  Like the backup timestamp, the fast-forward timestamp is simply another fresh one that we fetch from atlas.  The purpose of this timestamp is to have a logical point in time for which we can guarantee that any reads or writes that took place during the backup process happened before this.  Fetching it is similar to that of the backup timestamp:
+
+.. code:: bash
+
+     $ ./bin/atlasdb --config <config-file> --config-root <path-to-atlas-block> timestamp fetch --file <backup-directory>/fast-forward.timestamp
+
+These two timestamp files and the entirety of your underlying storage's backup are your entire atlasdb backup.
+
+Restoring from a Backup
+=======================
+
+The steps of a restore are assumed to be run entirely offline and on a complete empty key value service, i.e. if you're running against Cassandra, the keyspace being used should not exist and no other processes should attempt to create or interact with that keyspace during the duration of this process.
+
+First, restore your underlying key value service.  As mentioned `above <#cassandra-and-other-distributed-systems>`__, there are concerns around your underyling storage not being consistent across its distributed nodes.  In particular, we need to ensure a consistent view of atlas' _transactions table in order to provide a guarantee that our restore process happens correctly.  The actual steps to ensure this will vary between systems, but for cassandra this simply means running a full repair of that table on every node in your cluster.  An example of this on a single node is:
+
+.. code:: bash
+
+     $ ./bin/nodetool repair --partitioner-range --full -- <atlas-keyspace> _transactions
+
+Next, we want to clean out any transactions that were committed after our backup timestamp by deleting them from our _transactions table:
+
+.. code:: bash
+
+     $ ./bin/atlasdb --config <config-file> --config-root <path-to-atlas-block> timestamp clean-transactions --file <backup-directory>/backup.timestamp
+
+Finally, we fast-forward the timstamp service to the fast-forward timestamp to ensure that any future transactions we perform don't use a timestamp that could have potentially been used and written data to during the time after we took the backup timstamp but before our backup of our underlying kvs completed:
+
+.. code:: bash
+
+     $ ./bin/atlasdb --config <config-file> --config-root <path-to-atlas-block> timestamp fast-forward --file <backup-directory>/fast-forward.timestamp
+
+The AtlasDB restore is now complete.
diff --git a/docs/source/cluster_management/clis.rst b/docs/source/cluster_management/clis.rst
index e8b9a6c4374..3b17522e3fb 100644
--- a/docs/source/cluster_management/clis.rst
+++ b/docs/source/cluster_management/clis.rst
@@ -1,3 +1,5 @@
+.. _clis:
+
 ======================
 Command Line Utilities
 ======================
@@ -24,10 +26,10 @@ Right now, the best way to get the CLI is by cloning the atlasdb source code and
 .. code:: bash
 
      $ ./gradlew atlasdb-cli:distZip
-     
-     
-     
-Build In Commands
+
+This will create a zip file in ``atlasdb-cli/build/distributions``, which you can unzip on the machine where your AtlasDB server is installed.
+
+Built-In Commands
 =================
 
 The following useful commands come with the vanilla atlasdb-cli.
@@ -41,6 +43,6 @@ Sweep old table rows. This can be useful for improving performance if having too
 timestamp
 ---------
 
-Read or recalculate the immutable timestamp. Run ``./bin/atlasdb help timestamp`` for more information. 
+Read or recalculate the immutable timestamp. Run ``./bin/atlasdb help timestamp`` for more information.
 
 
diff --git a/docs/source/cluster_management/index.rst b/docs/source/cluster_management/index.rst
index b65b4061503..a39a9429344 100644
--- a/docs/source/cluster_management/index.rst
+++ b/docs/source/cluster_management/index.rst
@@ -6,5 +6,7 @@ Cluster Management
    :maxdepth: 1
    :titlesonly:
 
+   backup-restore
    clis
    console
+
diff --git a/docs/source/configuration/cassandra_KVS_configuration.rst b/docs/source/configuration/cassandra_KVS_configuration.rst
new file mode 100644
index 00000000000..62dce5e8f10
--- /dev/null
+++ b/docs/source/configuration/cassandra_KVS_configuration.rst
@@ -0,0 +1,95 @@
+=========================================
+Cassandra Key Value Service Configuration
+=========================================
+
+Enabling Cassandra for your Application
+=======================================
+
+To enable your application to be backed by cassandra, you just need to add Cassandra KVS as a runtime dependency. In gradle this looks like:
+
+.. code-block:: groovy
+
+  runtime 'com.palantir.atlasdb:atlasdb-cassandra:<atlas version>'
+
+e.g.
+
+.. code-block:: groovy
+
+  runtime 'com.palantir.atlasdb:atlasdb-cassandra:0.7.0'
+
+Configuring a Running Application to Use Cassandra
+==================================================
+
+A minimal AtlasDB configuration for running against cassandra will look like the below.
+
+Importantly - your lock creator must be consistent across all nodes. If you do not provide a lock creator, it will default to the first host
+in the leaders list. If you do not specify a lock creator, the leaders block should be exactly the same across all nodes.
+
+.. code-block:: yaml
+
+    atlasdb:
+      keyValueService:
+        type: cassandra
+        servers:
+          - cassandra:9160
+        poolSize: 20
+        keyspace: yourapp
+        credentials:
+          username: cassandra
+          password: cassandra
+        sslConfiguration:
+          trustStorePath: var/security/truststore.jks
+        replicationFactor: 1
+        mutationBatchCount: 10000
+        mutationBatchSizeBytes: 10000000
+        fetchBatchCount: 1000
+        safetyDisabled: false
+        autoRefreshNodes: false
+
+      leader:
+        # This should be at least half the number of nodes in your cluster
+        quorumSize: 2
+        learnerLogDir: var/data/paxosLogs
+        acceptorLogDir: var/data/paxosLogs
+        # This should be different for every node. If ssl is not enabled, then the host must be specified as http
+        localServer: https://<yourhost>:3828
+        # This should be the same for every node. If ssl is not enabled, then the host must be specified as http
+        lockCreator: https://host1:3828
+        # This should be the same for every node
+        leaders:
+          - https://host1:3828 # If ssl is not enabled, then the hosts must be specified as http
+          - https://host2:3828
+          - https://host3:3828
+
+.. _cass-config-ssl:
+
+For more details on the leader block, see :ref:`Leader Configuration <leader-config>`.
+
+Communicating Over SSL
+======================
+
+Atlas currently supports two different ways of specifying SSL options in the Cassandra KVS configuration: The ``sslConfiguration`` block and the ``ssl`` property.  Both means are supported but ``ssl`` is preferred and will always be respected in favor of ``sslConfiguration`` when both are specified.
+
+The following table summarizes whether SSL is enabled:
+
++-------------------+------------------+-----------------+
+|                   |sslConfiguration  |sslConfiguration |
+|                   |not present       |present          |
++===================+==================+=================+
+| ssl not present   | no               | yes             |
++-------------------+------------------+-----------------+
+| ssl is true       | yes              | yes             |
++-------------------+------------------+-----------------+
+| ssl is false      | no               | no              |
++-------------------+------------------+-----------------+
+
+sslConfiguration
+----------------
+
+This object is specified according to the `palantir/http-remoting <https://github.com/palantir/http-remoting/blob/develop/ssl-config/src/main/java/com/palantir/remoting1/config/ssl/SslConfiguration.java>`__ library. It directly specifies all aspects of the ssl configuration, instead of reading them from system properties.  The only required property is ``trustStorePath``, as seen in the example above.  In order to configure 2-way SSL, you would also have to set the optional properties ``keyStorePath`` and ``keyStorePassword``.
+
+ssl
+---
+
+This property is a boolean value saying whether or not to use ssl.  When ``true``, it will use java system properties that are passed in as jvm arguments to determine how to set up the ssl connection.  For example, you would use the jvm option ``-Djavax.net.ssl.trustStore=<path-to-truststore>`` to tell atlas where to find the truststore to use.
+
diff --git a/docs/source/configuration/enabling_cassandra_tracing.rst b/docs/source/configuration/enabling_cassandra_tracing.rst
index 28175648cb3..2aa28185d46 100644
--- a/docs/source/configuration/enabling_cassandra_tracing.rst
+++ b/docs/source/configuration/enabling_cassandra_tracing.rst
@@ -1,3 +1,5 @@
+.. _enabling-cassandra-tracing:
+
 ==========================
 Enabling Cassandra Tracing
 ==========================
@@ -6,25 +8,25 @@ Overview
 ========
 
 Sometimes in order to do deeper performance analysis of queries hitting
-your cassandra cluster, you'll want to enable tracing.  To learn more 
-about tracing itself check out datastax's `Request tracing in Cassandra 
+your Cassandra cluster, you'll want to enable tracing.  To learn more
+about tracing itself check out DataStax's `Request tracing in Cassandra
 1.2 <http://www.datastax.com/dev/blog/tracing-in-cassandra-1-2>`__ and `TRACING <https://docs.datastax.com/en/cql/3.3/cql/cql_reference/tracing_r.html>`__.
 
-To enable tracing you need to provide a configuration file called 
-``atlasdb_tracing.prefs`` and place it in the ``user.dir`` directory of your 
-java process, which is the directory from which java was executed.
+To enable tracing you need to provide a configuration file called
+``atlasdb_tracing.prefs`` and place it in the ``user.dir`` directory of your
+Java process, which is the directory from which java was executed.
 
-When a query is traced you will see the following line your log file:
+When a query is traced, you will see the following line your log file:
 ``Traced a call to <table-name> that took <duration> ms. It will appear in system_traces with UUID=<session-id-of-trace>``
 
-Generally it is important to note that tracing is expensive and can have 
-performance implications when reading/writing to cassandra, and thus the 
+Generally, it is important to note that tracing is expensive and can have
+performance implications when reading/writing to Cassandra, and thus the
 use of it should be minimized.
 
 The Prefs File
 ==============
 
-The ``atlas_tracing.prefs`` is a standard java properties file with 
+The ``atlas_tracing.prefs`` is a standard java properties file with
 the following parameters:
 
 .. code:: properties
@@ -37,18 +39,18 @@ the following parameters:
     # frequently enough to incur performance degradation
     trace_probability: 1.0
 
-    # a comma separated list of tables whose queries are eligible for tracing
+    # a comma-separated list of tables whose queries are eligible for tracing
     # for namespaced tables the table entry must be <namespace>.<table>
     # like "trace_probability", this is also a pre-filter
-    tables_to_trace: _transactions,namespaceOne.table_7,namespaceTwo.table_3    
+    tables_to_trace: _transactions,namespaceOne.table_7,namespaceTwo.table_3
 
     # the minimum amount of time a traced query has to take to actually be logged
     # this is a post-filter and so the trace is still done (and thus still incurs
     # a performance hit) even if you do not log it
     min_duration_to_log_ms: 1000
-    
+
 Understanding Namespaced Tables in Cassandra
 ============================================
-In cassandra an atlas namespaced table will look like ``<keyspace>.<namespace>__<table-name>``.
+In Cassandra, an AtlasDB namespaced table will look like ``<keyspace>.<namespace>__<table-name>``.
 As described in the prefs file's comment, to trace said table you would want to
 write it in the form of ``<namespace>.<table-name>`` in the comma-separated list.
diff --git a/docs/source/configuration/index.rst b/docs/source/configuration/index.rst
index 06480e34e4b..5b0385e2275 100644
--- a/docs/source/configuration/index.rst
+++ b/docs/source/configuration/index.rst
@@ -2,6 +2,8 @@
 Configuration
 =============
 
+The AtlasDB configuration has two main blocks - keyValueService and leader. Please look at the keyValueService config for the KVS(Cassandra/Postgres) you are using and the Leader configuration page for configuring the leader block.
+
 .. toctree::
    :maxdepth: 1
    :titlesonly:
@@ -9,3 +11,6 @@ Configuration
    cassandra_config
    enabling_cassandra_tracing
    postgres_key_value_service_config
+   cassandra_KVS_configuration
+   leader_config
+   logging
diff --git a/docs/source/configuration/leader_config.rst b/docs/source/configuration/leader_config.rst
new file mode 100644
index 00000000000..b945d6dd5b2
--- /dev/null
+++ b/docs/source/configuration/leader_config.rst
@@ -0,0 +1,44 @@
+.. _leader-config:
+
+====================
+Leader configuration
+====================
+
+A minimal AtlasDB configuration for the leader block will look like :
+
+.. code-block:: yaml
+
+  leader:
+    # This should be at least half the number of nodes in your cluster
+    quorumSize: 2
+    learnerLogDir: var/data/paxosLogs
+    acceptorLogDir: var/data/paxosLogs
+    # This should be different for every node. If ssl is not enabled, then the host must be specified as http
+    localServer: https://<yourhost>:3828
+    # This should be the same for every node. If ssl is not enabled, then the host must be specified as http
+    lockCreator: https://host1:3828
+    # This should be the same for every node
+    leaders:
+      - https://host1:3828 # If ssl is not enabled, then the hosts must be specified as http
+      - https://host2:3828
+      - https://host3:3828
+
+Leader
+======
+
+The leader block is where you specify the leaders (all hosts that participate in leader election) for paxos and a lockCreator for creating the schema mutation lock table.
+
+Required parameters:
+
+- ``quorumSize`` : Number of hosts that form a majority. This number must be greater than half of the total number of hosts.
+- ``leaders`` : A list of all hosts. The protocol must be http/https depending on if ssl is configured.
+- ``localhost`` : The ``protocol://hostname:port`` eg: ``https://myhost:3828`` of the host on which this config exists.
+
+Optional parameters:
+
+- ``learnerLogDir`` : Path to the paxos learner logs (defaults to var/data/paxos/learner)
+- ``acceptorLogDir`` : Path to the paxos acceptor logs (defaults to var/data/paxos/acceptor)
+- ``lockCreator`` : The host responsible for creation of the schema mutation lock table. If specified, this must be same across all hosts. (defaults to the first host in the sorted leaders list)
+- ``pingRateMs`` : defaults to 5000
+- ``randomWaitBeforeProposingLeadershipMs`` : defaults to 1000
+- ``leaderPingResponseWaitMs`` : defaults to 5000
diff --git a/docs/source/configuration/logging.rst b/docs/source/configuration/logging.rst
new file mode 100644
index 00000000000..0fa2939ba38
--- /dev/null
+++ b/docs/source/configuration/logging.rst
@@ -0,0 +1,17 @@
+.. _logging-configuration:
+
+=====================
+Logging Configuration
+=====================
+
+Profiling a Key Value Service
+=============================
+
+All Key Value Services created using ``TransactionManagers.create()`` will
+be wrapped in a ``ProfilingKeyValueService``.  This service will log out timing
+and metadata for requests made against the underlying KVS.  In order to activate
+the logging, simply enable ``TRACE`` logging for
+``com.palantir.atlasdb.keyvalue.impl.ProfilingKeyValueService``.
+
+If you are using ``CassandraKeyValueService``, you can use additional tracing for deeper analysis.
+For more information, see :ref:`enabling-cassandra-tracing`.
diff --git a/docs/source/configuration/postgres_key_value_service_config.rst b/docs/source/configuration/postgres_key_value_service_config.rst
index aeddb7227ad..6e55429583b 100644
--- a/docs/source/configuration/postgres_key_value_service_config.rst
+++ b/docs/source/configuration/postgres_key_value_service_config.rst
@@ -1,3 +1,5 @@
+.. _postgres-configuration:
+
 ========================================
 Postgres Key Value Service Configuration
 ========================================
@@ -20,18 +22,37 @@ e.g.
 Configuring a Running Application to Use Postgres
 =================================================
 
-A minimal atlas configuration for running against postgres will look like :
+A minimal AtlasDB configuration for running against postgres will look like :
 
 .. code-block:: yaml
 
-  keyValueService:
-    type: relational
-    ddl:
-      type: postgres
-    connection:
-      type: postgres
-      host: dbhost
-      port: 5432
-      dbName: atlas
-      dbLogin: palantir
-      dbPassword: palantir
+  atlasdb:
+    keyValueService:
+      type: relational
+      ddl:
+        type: postgres
+      connection:
+        type: postgres
+        host: dbhost
+        port: 5432
+        dbName: atlas
+        dbLogin: palantir
+        dbPassword: palantir
+
+    leader:
+        # This should be at least half the number of nodes in your cluster
+        quorumSize: 2
+        learnerLogDir: var/data/paxosLogs
+        acceptorLogDir: var/data/paxosLogs
+        # This should be different for every node. If ssl is not enabled, then the host must be specified as http
+        localServer: https://<yourhost>:3828
+        # This should be the same for every node. If ssl is not enabled, then the host must be specified as http
+        lockCreator: https://host1:3828
+        # This should be the same for every node
+        leaders:
+          - https://host1:3828 # If ssl is not enabled, then the hosts must be specified as http
+          - https://host2:3828
+          - https://host3:3828
+
+
+For more details on the leader block, see :ref:`Leader Configuration <leader-config>`.
diff --git a/docs/source/miscellaneous/contributing.rst b/docs/source/miscellaneous/contributing.rst
index 2b0f44a4aa0..299b050a4d8 100644
--- a/docs/source/miscellaneous/contributing.rst
+++ b/docs/source/miscellaneous/contributing.rst
@@ -2,10 +2,19 @@
 Contributing to AtlasDB
 =======================
 
+Contributing Code
+=================
+
 Follow the steps provided in :ref:`running-from-source`.
 We are happy to accept pull requests and could use help
 implementing the AtlasDB API for more underlying physical stores.
 
+In order to ensure your pull request is merged please keep the following in mind:
+
+* Assign a member of the team for review, if it is incorrect it will be triaged to the correct person
+* Update the :ref:`change-log` with the change if it is public facing.
+* If you are updating logic the expectation is that new tests will be added for the functionality, a lack of testing will likely delay the PR.
+
 Contributing Docs
 =================
 
@@ -18,7 +27,7 @@ If you would like to build the docs locally follow these steps:
 
 1. Clone the git repository:``git clone git@github.com:palantir/atlasdb.git; cd atlasdb``.
 2. Install sphinx and sphinx_rtd_theme if you don't have it.  Instructions can be found `here <http://www.sphinx-doc.org/en/stab/install.html>`__.  The easiest option for Mac users will be using pip.  Please be sure to update sphinx if you haven't used it in a while.  Also please be aware the exact commands to build the docs can be found in ``scripts/circle-ci/publish-github-pages.sh``.
-3. Confirm you installtion is working by running ``cd docs && make html``.  The freshly built documentation will be in ``docs/build/html``.
+3. Confirm you installation is working by running ``cd docs && make html``.  The freshly built documentation will be in ``docs/build/html``.
 4. Existing pages can be found in ``docs/source``. Create new pages by adding an .rst file to ``docs/source`` and then adding the file name to the appropriate .toctree in the parent file.
 5. Commit any changes to a ``docs/*`` branch and push them up to github for review.
 
diff --git a/docs/source/overview/atlas_server_api.rst b/docs/source/overview/atlasdb_service_api.rst
similarity index 93%
rename from docs/source/overview/atlas_server_api.rst
rename to docs/source/overview/atlasdb_service_api.rst
index 5ad8db16802..a509318f20a 100644
--- a/docs/source/overview/atlas_server_api.rst
+++ b/docs/source/overview/atlasdb_service_api.rst
@@ -1,8 +1,8 @@
-.. _atlas-server-api:
+.. _atlasdb-service-api:
 
-================
-Atlas Server Api
-================
+===================
+AtlasDB Service Api
+===================
 
 Table Requests
 ==============
diff --git a/docs/source/overview/getting_started.rst b/docs/source/overview/getting_started.rst
index 1ad71b31fc8..1611a8b97d6 100644
--- a/docs/source/overview/getting_started.rst
+++ b/docs/source/overview/getting_started.rst
@@ -10,7 +10,7 @@ Running from Source
 ===================
 
 1. Clone the git repository:
-   ``git clone git@github.com/palantir/atlasdb.git; cd atlasdb``.
+   ``git clone git@github.com:palantir/atlasdb.git; cd atlasdb``.
 2. Generate IDE configuration: ``./gradlew eclipse`` or
    ``./gradlew idea``.
 3. Import projects into Eclipse/Intellij.
@@ -27,23 +27,23 @@ Instructions for MacOS
 Mac users will need to install `docker-machine` and a virtualization environment as well to be able to run docker. Virtualbox is used in this example. Simplified set-up instructions are as follows:
 
 1. Install ``docker-machine``, ``docker`` and ``docker-compose``
-   
+
    .. code:: bash
-   
+
       brew install docker docker-machine docker-compose
 
 2. Set up a ``docker-machine`` for Virtualbox (named ``atlas`` in the example, name can be chosen freely by the user)
 
    .. code:: bash
-   
+
       docker-machine create atlas --driver virtualbox
 
 3. Set up the environment:
-   
+
    .. code:: bash
-   
-      eval $(docker-machine env atlas)  
-   
+
+      eval $(docker-machine env atlas)
+
    These environment variables need to always be set before running the tests through `gradle`, or set manually as environment variables for the launch configurations in any IDE.
 
 Depending on Published Artifacts
@@ -75,12 +75,12 @@ Standalone JSON/REST Server
 ===========================
 
 The standalone server is a lightweight way to try out AtlasDB and can be
-done by running AtlasDbServer in the atlasdb-server project.
+done by running AtlasDbServiceServer in the atlasdb-service-server project.
 
 .. code:: bash
 
-    AtlasDbServer server src/dist/atlasdb_standalone.yml
+    AtlasDbServiceServer server src/dist/atlasdb_standalone.yml
 
-This is dropwizard service that runs all the needed parts and doesn't
-force you to use the java client to get the benefits of atlas. See the
-:ref:`atlas-server-api` for more details.
+This is Dropwizard service that runs all the needed parts and doesn't
+force you to use the Java client to get the benefits of AtlasDB. See the
+ref:`atlasdb-service-api` for more details.
diff --git a/docs/source/overview/index.rst b/docs/source/overview/index.rst
index 47fdb7c147a..ef9b2a8089a 100644
--- a/docs/source/overview/index.rst
+++ b/docs/source/overview/index.rst
@@ -16,7 +16,5 @@ explicit and query time can easily be back of the enveloped.
    :titlesonly:
 
    benefits
-   atlas_server_api
+   atlasdb_service_api
    getting_started.rst
-
-
diff --git a/docs/source/release_notes/release-notes.rst b/docs/source/release_notes/release-notes.rst
index 35857c50f71..ddd54269b1a 100644
--- a/docs/source/release_notes/release-notes.rst
+++ b/docs/source/release_notes/release-notes.rst
@@ -1,8 +1,12 @@
+.. _change-log:
+
 *********
 Changelog
 *********
 
 .. role:: changetype
+.. role:: changetype-breaking
+    :class: changetype changetype-breaking
 .. role:: changetype-new
     :class: changetype changetype-new
 .. role:: changetype-fixed
@@ -11,11 +15,15 @@ Changelog
     :class: changetype changetype-changed
 .. role:: changetype-improved
     :class: changetype changetype-improved
+.. role:: changetype-deprecated
+    :class: changetype changetype-deprecated
 
+.. |breaking| replace:: :changetype-breaking:`BREAKING`
 .. |new| replace:: :changetype-new:`NEW`
 .. |fixed| replace:: :changetype-fixed:`FIXED`
 .. |changed| replace:: :changetype-changed:`CHANGED`
 .. |improved| replace:: :changetype-improved:`IMPROVED`
+.. |deprecated| replace:: :changetype-deprecated:`DEPRECATED`
 
 .. toctree::
   :hidden:
@@ -23,9 +31,262 @@ Changelog
 .. <<<<------------------------------------------------------------------------------------------------------------->>>>
 
 =======
-v0.8.0
+v0.13.0
+=======
+
+.. list-table::
+    :widths: 5 40
+    :header-rows: 1
+
+    *    - Type
+         - Change
+
+    *    - |breaking|
+         - ``AtlasDbServer`` has been renamed to ``AtlasDbServiceServer``. Any products that are using this should switch to using the Java Feign client instead.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/801>`__)
+
+.. <<<<------------------------------------------------------------------------------------------------------------->>>>
+
+=======
+v0.12.0
+=======
+
+.. list-table::
+    :widths: 5 40
+    :header-rows: 1
+
+    *    - Type
+         - Change
+
+    *    - |breaking|
+         - AtlasDB will always try to register timestamp and lock endpoints for your application, whereas previously this only occurred if you specify a :ref:`leader-config`.
+           This ensures that CLIs will be able to run against your service even in the single node case.
+           For Dropwizard applications, this is only a breaking change if you try to initialize your KeyValueService after having initialized the Dropwizard application.
+           Note: If you are initializing the KVS post-Dropwizard initialization, then your application will already fail when starting multiple AtlasDB clients.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/708>`__)
+
+    *    - |new|
+         - There is now a Dropwizard bundle which can be added to Dropwizard applications.
+           This will add startup commands to launch the AtlasDB console and :ref:`CLIs <clis>` suchs as ``sweep`` and ``timestamp``, which is needed to perform :ref:`live backups <backup-restore>`.
+           These commands will only work if the server is started with a leader block in its configuration.
+           (`Pull Request 1 <https://github.com/palantir/atlasdb/pull/629>`__ and `Pull Request 2 <https://github.com/palantir/atlasdb/pull/696>`__)
+
+    *    - |fixed|
+         - DB passwords are no longer output as part of the connection configuration ``toString()`` methods.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/755>`__)
+
+    *    - |new|
+         - All KVSs now come wrapped with ProfilingKeyValueService, which at the TRACE level provides timing information per KVS operation performed by AtlasDB.
+           See :ref:`logging-configuration` for more details.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/798>`__)
+
+.. <<<<------------------------------------------------------------------------------------------------------------->>>>
+
+=======
+v0.11.4
+=======
+
+.. list-table::
+    :widths: 5 40
+    :header-rows: 1
+
+    *    - Type
+         - Change
+
+    *    - |fixed|
+         - Correctly checks the Cassandra client version that determines if Cassandra supports Check And Set operations.
+           This is a critical bug fix that ensures we actually use our implementation from `#436 <https://github.com/palantir/atlasdb/pull/436>`__, which prevents the Cassandra concurrent table creation bug described in `#431 <https://github.com/palantir/atlasdb/issues/431>`__.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/751>`__)
+
+.. <<<<------------------------------------------------------------------------------------------------------------->>>>
+
+=======
+v0.11.2
+=======
+
+.. list-table::
+    :widths: 5 40
+    :header-rows: 1
+
+    *    - Type
+         - Change
+
+    *    - |changed|
+         - The ``ssl`` property now takes precedence over the new ``sslConfiguration`` block to allow back-compatibility.
+           This means that products can add default truststore and keystore configuration to their AtlasDB config without overriding previously made SSL decisions (setting ``ssl: false`` should cause SSL to not be used).
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/745>`__)
+
+.. <<<<------------------------------------------------------------------------------------------------------------->>>>
+
+=======
+v0.11.1
+=======
+
+.. list-table::
+    :widths: 5 40
+    :header-rows: 1
+
+    *    - Type
+         - Change
+
+    *    - |fixed|
+         - Removed a check enforcing a leader block config when one was not required.
+           This prevents AtlasDB 0.11.0 clients from starting if a leader configuration is not specified (i.e. single node clusters).
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/741>`__)
+
+    *    - |improved|
+         - Updated schema table generation to optimize reads with no ColumnSelection specified against tables with fixed columns.  To benefit from this improvement you will need to re-generate your schemas.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/713>`__)
+
+.. <<<<------------------------------------------------------------------------------------------------------------->>>>
+
+=======
+v0.11.0
 =======
 
+.. list-table::
+    :widths: 5 40
+    :header-rows: 1
+
+    *    - Type
+         - Change
+
+    *    - |improved|
+         - Clarified the logging when multiple timestamp servers are running to state that CLIs could be causing the issue.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/719>`__)
+
+    *    - |changed|
+         - Updated cassandra client from 2.2.1 to 2.2.7 and cassandra docker testing version from 2.2.6 to 2.2.7.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/699>`__)
+
+    *    - |fixed|
+         - The leader config now contains a new ``lockCreator`` option, which specifies the single node that creates the locks table when starting your cluster for the very first time.
+           This configuration prevents an extremely unlikely race condition where multiple clients can create the locks table simultaneously.
+           Full details on the failure scenario can be found on `#444 <https://github.com/palantir/atlasdb/issues/444#issuecomment-221612886>`__.
+
+           If left blank, ``lockCreator`` will default to the first host in the ``leaders`` list, but we recommend setting this explicitly to ensure that the lockCreater is the same value across all your clients for a specific service.
+           This configuration is only relevant for new clusters and does not affect existing AtlasDB clusters.
+
+           Full details for configuring the leader block, see `cassandra configuration <https://palantir.github.io/atlasdb/html/configuration/cassandra_KVS_configuration.html>`__.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/594>`__)
+
+    *    - |fixed|
+         - A utility method was removed in the previous release, breaking an internal product that relied on it.
+           This method has now been added back.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/661>`__)
+
+    *    - |fixed|
+         - Removed unnecessary error message for missing _timestamp metadata table.
+           _timestamp is a hidden table, and it is expected that _timestamp metadata should not be retrievable from public API.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/716>`__)
+
+    *    - |improved|
+         - Trace logging is more informative and will log all failed calls.
+           To enable trace logging, see `Enabling Cassandra Tracing <https://palantir.github.io/atlasdb/html/configuration/enabling_cassandra_tracing.html#enabling-cassandra-tracing>`__.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/700>`__)
+
+    *    - |deprecated|
+         - The Cassandra KVS now supports specifying SSL options via the new ``sslConfiguration`` block, which takes precedence over the now deprecated ``ssl`` property.
+           The ``ssl`` property will be removed in a future release, and consumers leveraging the Cassandra KVS are encouraged to use the ``sslConfiguration`` block instead.
+           See the `Cassandra SSL Configuration <https://palantir.github.io/atlasdb/html/configuration/cassandra_KVS_configuration.html#communicating-over-ssl>`__ documentation for more details.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/638>`__)
+
+.. <<<<------------------------------------------------------------------------------------------------------------->>>>
+
+=======
+v0.10.0
+=======
+
+.. list-table::
+    :widths: 5 40
+    :header-rows: 1
+
+    *    - Type
+         - Change
+
+    *    - |changed|
+         - Updated HikariCP dependency from 2.4.3 to 2.4.7 to comply with updates in internal products.
+           Details of the HikariCP changes can be found `here <https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES>`__.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/662>`__)
+
+    *    - |new|
+         - AtlasDB currently allows you to create dynamic columns (wide rows), but you can only retrieve entire rows or specific columns.
+           Typically with dynamic columns, you do not know all the columns you have in advance, and this features allows you to page through dynamic columns per row, reducing pressure on the underlying KVS.
+           Products or clients (such as AtlasDB Sweep) making use of wide rows should consider using ``getRowsColumnRange`` instead of ``getRows`` in ``KeyValueService``.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/582>`__)
+
+           Note: This is considered a beta feature and is not yet being used by AtlasDB Sweep.
+
+    *    - |fixed|
+         - We properly check that cells are not set to empty (zero-byte) or null.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/663>`__)
+
+    *    - |improved|
+         - Cassandra client connection pooling will now evict idle connections over a longer period of time and has improved logic
+           for deciding whether or not a node should be blacklisted.  This should result in less connection churn
+           and therefore lower latency.  (`Pull Request <https://github.com/palantir/atlasdb/pull/667>`__)
+
+.. <<<<------------------------------------------------------------------------------------------------------------->>>>
+
+======
+v0.9.0
+======
+
+.. list-table::
+    :widths: 5 40
+    :header-rows: 1
+
+    *    - Type
+         - Change
+
+    *    - |breaking|
+         - Inserting an empty (size = 0) value into a ``Cell`` will now throw an ``IllegalArgumentException``. (`#156 <https://github.com/palantir/atlasdb/issues/156>`__) Likely empty
+           values include empty strings and empty protobufs.
+
+           AtlasDB cannot currently distinguish between empty and deleted cells. In previous versions of AtlasDB, inserting
+           an empty value into a ``Cell`` would delete that cell. Thus, in this snippet,
+
+           .. code-block:: java
+
+               Transaction.put(table, ImmutableMap.of(myCell, new byte[0]))
+               Transaction.get(table, ImmutableSet.of(myCell)).get(myCell)
+
+           the second line will return ``null`` instead of a zero-length byte array.
+
+           To minimize confusion, we explicitly disallow inserting an empty value into a cell by throwing an
+           ``IllegalArgumentException``.
+
+           In particular, this change will break calls to ``Transaction.put(TableReference tableRef, Map<Cell, byte[]> values)``,
+           as well as generated code which uses this method, if any entry in ``values`` contains a zero-byte array. If your
+           product does not need to distinguish between empty and non-existent values, simply make sure all the ``values``
+           entries have positive length. If the distinction is necessary, you will need to explicitly differentiate the
+           two cases (for example, by introducing a sentinel value for empty cells).
+
+           If any code deletes cells by calling ``Transaction.put(...)`` with an empty array, use
+           ``Transaction.delete(...)`` instead.
+
+           *Note*: Existing cells with empty values will be interpreted as deleted cells, and will not lead to Exceptions when read.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/524>`__)
+
+    *    - |improved|
+         - The warning emitted when an attempted leadership election fails is now more descriptive.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/630>`__)
+
+    *    - |fixed|
+         - Code generation for the ``hashCode`` of ``*IdxColumn`` classes now uses ``deepHashCode`` for its arrays such that it returns
+           consistent hash codes for use with hash-based collections (HashMap, HashSet, HashTable).
+           This issue will only appear if you are instantiating columns in multiple places and storing columns in hash collections.
+
+           If you are using `Indices <https://palantir.github.io/atlasdb/html/schemas/tables_and_indices.html#indices>`__ we recommend you upgrade as a precaution and ensure you are not relying on logic related to the ``hashCode`` of auto-generated ``*IdxColumn`` classes.
+           You will need to regenerate your schema code in order to see this fix.
+           (`Pull Request <https://github.com/palantir/atlasdb/pull/600>`__)
+
+.. <<<<------------------------------------------------------------------------------------------------------------->>>>
+
+======
+v0.8.0
+======
+
 .. list-table::
     :widths: 5 40
     :header-rows: 1
@@ -39,9 +300,9 @@ v0.8.0
 
 .. <<<<------------------------------------------------------------------------------------------------------------->>>>
 
-=======
+======
 v0.7.0
-=======
+======
 
 .. list-table::
     :widths: 5 40
@@ -51,8 +312,8 @@ v0.7.0
          - Change
 
     *    - |new|
-         - Atlas can now be backed by Postgres via DB KVS. This is a very early release for this feature, so please contact us if you
-           plan on using it. Please see `the documentation <http://palantir.github.io/atlasdb/html/configuration/postgres_key_value_service_config.html>`_ for more details.
+         - AtlasDB can now be backed by Postgres via DB KVS. This is a very early release for this feature, so please contact us if you
+           plan on using it. Please see :ref:`the documentation <postgres-configuration>` for more details.
 
     *    - |fixed|
          - The In Memory Key Value Service now makes defensive copies of any data stored or retrieved. This may lead to a slight performance degradation to users of In Memory Key Value Service.
@@ -60,7 +321,7 @@ v0.7.0
            (`Pull Request <https://github.com/palantir/atlasdb/pull/552>`__)
 
     *    - |fixed|
-         - Atlas will no longer log incorrect errors stating "Couldn't grab new token ranges for token aware cassandra mapping" when running against a single node and single token Cassandra cluster.
+         - AtlasDB will no longer log incorrect errors stating "Couldn't grab new token ranges for token aware cassandra mapping" when running against a single node and single token Cassandra cluster.
            (`Pull Request <https://github.com/palantir/atlasdb/pull/634>`__)
 
     *    - |improved|
@@ -70,9 +331,9 @@ v0.7.0
 
 .. <<<<------------------------------------------------------------------------------------------------------------>>>>
 
-=======
+======
 v0.6.0
-=======
+======
 
 .. list-table::
     :widths: 5 40
@@ -96,9 +357,9 @@ v0.6.0
 
 .. <<<<------------------------------------------------------------------------------------------------------------->>>>
 
-=======
+======
 v0.5.0
-=======
+======
 
 .. list-table::
     :widths: 5 40
@@ -112,9 +373,9 @@ v0.5.0
 
 .. <<<<------------------------------------------------------------------------------------------------------------->>>>
 
-=======
+======
 v0.4.1
-=======
+======
 
 .. list-table::
     :widths: 5 40
diff --git a/docs/source/schemas/index.rst b/docs/source/schemas/index.rst
index 5a9d4cb76bc..9f911a6286e 100644
--- a/docs/source/schemas/index.rst
+++ b/docs/source/schemas/index.rst
@@ -77,27 +77,27 @@ Sample Schema File
         private BlankSchema() {
             //private
         }
-     
+
         private static final Schema SCHEMA = generateSchema();
-     
+
         private static Schema generateSchema() {
             // Define the prefix and package for generated code
             Schema schema = new Schema("BlankSchema", "com.palantir.atlasdb.blankschema");
-             
+
             /* Schema definition start */
             schema.addTableDefinition("TableName", new TableDefinition() {{
                 ...
             }});
-     
+
             schema.addIndexDefinition("IndexName", new IndexDefinition() {{
                 ..
             }});
             /* Schema definition end */
-     
+
             schema.validate() // ensure that the schema as constructed is valid.
             return schema;
         }
-     
+
         public static void main (String[] args) {
             // generate the java classes, and write them to the specified source folder.
             SCHEMA.renderTablesWithNamespace(new File("src"), Namespace.create("pt_met"));
@@ -118,48 +118,56 @@ buffer GeneratedMessages, and palantir Persistables.
 Primitive ValueTypes
 ~~~~~~~~~~~~~~~~~~~~
 
-For simple data types, AtlasDB represents them by ValueType. Note that a
-java primitive type can have multiple ValueTypes associated with it.
+AtlasDB represents simple data types by ValueType. Note that a
+Java primitive type can have multiple ValueTypes associated with it.
 Each ValueType represents a different method of storing that type in the
 database, and thus affects storage efficiency and search
-characteristics, among others. The types are:
-
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| Name                          | Java Type    | Format        | Anywhere in table?   | Range Scans?   |
-+===============================+==============+===============+======================+================+
-| FIXED\_LONG                   | long         | byte[8]       | YES                  | YES            |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| FIXED\_LONG\_LITTLE\_ENDIAN   | long         | byte[8]       | YES                  | NO             |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| NULLABLE\_FIXED\_LONG         | long         | byte[9]       | YES                  | YES            |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| VAR\_LONG                     | long         | byte[len]\*   | YES                  | YES            |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| VAR\_SIGNED\_LONG             | long         | byte[len\*]   | YES                  | YES            |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| SHA\_256\_HASH                | Sha256Hash   | byte[32]      | YES                  | YES            |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| STRING                        | String       | byte[]        | NO\*\*               | YES            |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| VAR\_STRING                   | String       | byte[len]     | YES                  | NO             |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| BLOB                          | byte[]       | byte[]        | NO\*\*               | YES            |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-| SIZED\_BLOB                   | byte[]       | byte[len]     | YES                  | NO             |
-+-------------------------------+--------------+---------------+----------------------+----------------+
-
-note: \* var long: the smaller the value, the fewer bytes used. For
-signed, the closer to zero, the fewer bytes used. negative values for
-VAR\_LONG are always 10 bytes. 0 to 127 are 1 byte for VAR\_LONG. -64 to
-63 are 1 byte or SIGNED\_VAR\_LONG
-
-note: \*\* can only be a row or column component if it is the last
-component of the component list.
-
-Note that all long data types are signed, but VAR\_SIGNED\_LONG is
-encoded in a manner which stores negative numbers more efficiently than
-VAR\_LONG. (The latter will always use 10 bytes to encode negative
-values, but the former will not.)
+characteristics, among other things. The supported types are:
+
++-------------------------------+--------------+---------------+----------------+----------+
+| Name                          | Java Type    | Format        | Anywhere in    | Range    |
+|                               |              |               | table?         | Scans?   |
++===============================+==============+===============+================+==========+
+| FIXED\_LONG                   | long         | byte[8]       | YES            | YES      |
++-------------------------------+--------------+---------------+----------------+----------+
+| FIXED\_LONG\_LITTLE\_ENDIAN   | long         | byte[8]       | YES            | NO       |
+| [3]_                          |              |               |                |          |
++-------------------------------+--------------+---------------+----------------+----------+
+| NULLABLE\_FIXED\_LONG         | long         | byte[9]       | YES            | YES      |
++-------------------------------+--------------+---------------+----------------+----------+
+| VAR\_LONG                     | long         | byte[len] [1]_| YES            | YES      |
++-------------------------------+--------------+---------------+----------------+----------+
+| VAR\_SIGNED\_LONG             | long         | byte[len] [1]_| YES            | YES      |
++-------------------------------+--------------+---------------+----------------+----------+
+| UUID                          | UUID         | byte[16]      | YES            | YES      |
++-------------------------------+--------------+---------------+----------------+----------+
+| SHA\_256\_HASH                | Sha256Hash   | byte[32]      | YES            | YES      |
++-------------------------------+--------------+---------------+----------------+----------+
+| STRING                        | String       | byte[]        | NO [2]_        | YES      |
++-------------------------------+--------------+---------------+----------------+----------+
+| VAR\_STRING                   | String       | byte[len]     | YES            | NO       |
++-------------------------------+--------------+---------------+----------------+----------+
+| BLOB                          | byte[]       | byte[]        | NO [2]_        | YES      |
++-------------------------------+--------------+---------------+----------------+----------+
+| SIZED\_BLOB                   | byte[]       | byte[len]     | YES            | NO       |
++-------------------------------+--------------+---------------+----------------+----------+
+
+.. [1]
+  All long data types are signed, but VAR\_SIGNED\_LONG is
+  encoded in a manner which stores negative numbers more efficiently than
+  VAR\_LONG.
+  In particular, 0 to 127 are 1 byte for VAR\_LONG and -64 to 63 are 1 byte for
+  VAR\_SIGNED\_LONG. VAR\_LONG will always use 10 bytes to encode negative
+  numbers.
+
+.. [2]
+  A STRING or BLOB can only be a row or column component
+  if it is the last component of the component list.
+
+.. [3]
+  This type can be useful on some key value stores because keys next
+  to each other won't be written next to each other.  This can be good because
+  it will spread out the load of writes to many different ranges.
 
 Protobufs and Persistables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamHashAidxTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamHashAidxTable.java
index b038bc7b0b4..30b28ed168b 100644
--- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamHashAidxTable.java
+++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamHashAidxTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -94,6 +96,7 @@ public final class UserPhotosStreamHashAidxTable implements
     private final List<UserPhotosStreamHashAidxTrigger> triggers;
     private final static String rawTableName = "user_photos_stream_hash_aidx";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = ColumnSelection.all();
 
     static UserPhotosStreamHashAidxTable of(Transaction t, Namespace namespace) {
         return new UserPhotosStreamHashAidxTable(t, namespace, ImmutableList.<UserPhotosStreamHashAidxTrigger>of());
@@ -557,7 +560,7 @@ public Multimap<UserPhotosStreamHashAidxRow, UserPhotosStreamHashAidxColumnValue
 
     @Override
     public List<UserPhotosStreamHashAidxColumnValue> getRowColumns(UserPhotosStreamHashAidxRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -579,7 +582,7 @@ public List<UserPhotosStreamHashAidxColumnValue> getRowColumns(UserPhotosStreamH
 
     @Override
     public Multimap<UserPhotosStreamHashAidxRow, UserPhotosStreamHashAidxColumnValue> getRowsMultimap(Iterable<UserPhotosStreamHashAidxRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -589,7 +592,7 @@ public Multimap<UserPhotosStreamHashAidxRow, UserPhotosStreamHashAidxColumnValue
 
     @Override
     public Multimap<UserPhotosStreamHashAidxRow, UserPhotosStreamHashAidxColumnValue> getAsyncRowsMultimap(Iterable<UserPhotosStreamHashAidxRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -622,8 +625,24 @@ private static Multimap<UserPhotosStreamHashAidxRow, UserPhotosStreamHashAidxCol
         return rowMap;
     }
 
+    @Override
+    public Map<UserPhotosStreamHashAidxRow, BatchingVisitable<UserPhotosStreamHashAidxColumnValue>> getRowsColumnRange(Iterable<UserPhotosStreamHashAidxRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<UserPhotosStreamHashAidxRow, BatchingVisitable<UserPhotosStreamHashAidxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            UserPhotosStreamHashAidxRow row = UserPhotosStreamHashAidxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<UserPhotosStreamHashAidxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                UserPhotosStreamHashAidxColumn col = UserPhotosStreamHashAidxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                Long val = UserPhotosStreamHashAidxColumnValue.hydrateValue(result.getValue());
+                return UserPhotosStreamHashAidxColumnValue.of(col, val);
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<UserPhotosStreamHashAidxRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<UserPhotosStreamHashAidxRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -674,6 +693,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -731,5 +752,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "b9hBaFb3UVNOtnjdYnV/GA==";
+    static String __CLASS_HASH = "4JTMvIn1sB7maj1CtAeBPQ==";
 }
diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamIdxTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamIdxTable.java
index 56137de2e1c..3ad81c60570 100644
--- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamIdxTable.java
+++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamIdxTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -94,6 +96,7 @@ public final class UserPhotosStreamIdxTable implements
     private final List<UserPhotosStreamIdxTrigger> triggers;
     private final static String rawTableName = "user_photos_stream_idx";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = ColumnSelection.all();
 
     static UserPhotosStreamIdxTable of(Transaction t, Namespace namespace) {
         return new UserPhotosStreamIdxTable(t, namespace, ImmutableList.<UserPhotosStreamIdxTrigger>of());
@@ -557,7 +560,7 @@ public Multimap<UserPhotosStreamIdxRow, UserPhotosStreamIdxColumnValue> call() {
 
     @Override
     public List<UserPhotosStreamIdxColumnValue> getRowColumns(UserPhotosStreamIdxRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -579,7 +582,7 @@ public List<UserPhotosStreamIdxColumnValue> getRowColumns(UserPhotosStreamIdxRow
 
     @Override
     public Multimap<UserPhotosStreamIdxRow, UserPhotosStreamIdxColumnValue> getRowsMultimap(Iterable<UserPhotosStreamIdxRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -589,7 +592,7 @@ public Multimap<UserPhotosStreamIdxRow, UserPhotosStreamIdxColumnValue> getRowsM
 
     @Override
     public Multimap<UserPhotosStreamIdxRow, UserPhotosStreamIdxColumnValue> getAsyncRowsMultimap(Iterable<UserPhotosStreamIdxRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -622,8 +625,24 @@ private static Multimap<UserPhotosStreamIdxRow, UserPhotosStreamIdxColumnValue>
         return rowMap;
     }
 
+    @Override
+    public Map<UserPhotosStreamIdxRow, BatchingVisitable<UserPhotosStreamIdxColumnValue>> getRowsColumnRange(Iterable<UserPhotosStreamIdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<UserPhotosStreamIdxRow, BatchingVisitable<UserPhotosStreamIdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            UserPhotosStreamIdxRow row = UserPhotosStreamIdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<UserPhotosStreamIdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                UserPhotosStreamIdxColumn col = UserPhotosStreamIdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                Long val = UserPhotosStreamIdxColumnValue.hydrateValue(result.getValue());
+                return UserPhotosStreamIdxColumnValue.of(col, val);
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<UserPhotosStreamIdxRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<UserPhotosStreamIdxRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -674,6 +693,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -731,5 +752,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "asYmdnhJ1RKLZyhlbIWYOg==";
+    static String __CLASS_HASH = "E4N+Li7uHO5Wea0vTA8yEw==";
 }
diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamMetadataTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamMetadataTable.java
index 9c75b062ab8..b410d5912c5 100644
--- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamMetadataTable.java
+++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamMetadataTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class UserPhotosStreamMetadataTable implements
     private final List<UserPhotosStreamMetadataTrigger> triggers;
     private final static String rawTableName = "user_photos_stream_metadata";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(UserPhotosStreamMetadataNamedColumn.values());
 
     static UserPhotosStreamMetadataTable of(Transaction t, Namespace namespace) {
         return new UserPhotosStreamMetadataTable(t, namespace, ImmutableList.<UserPhotosStreamMetadataTrigger>of());
@@ -494,7 +497,7 @@ public void delete(Iterable<UserPhotosStreamMetadataRow> rows) {
 
     @Override
     public Optional<UserPhotosStreamMetadataRowResult> getRow(UserPhotosStreamMetadataRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -510,7 +513,7 @@ public Optional<UserPhotosStreamMetadataRowResult> getRow(UserPhotosStreamMetada
 
     @Override
     public List<UserPhotosStreamMetadataRowResult> getRows(Iterable<UserPhotosStreamMetadataRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -525,7 +528,7 @@ public List<UserPhotosStreamMetadataRowResult> getRows(Iterable<UserPhotosStream
 
     @Override
     public List<UserPhotosStreamMetadataRowResult> getAsyncRows(Iterable<UserPhotosStreamMetadataRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -542,7 +545,7 @@ public List<UserPhotosStreamMetadataRowResult> call() {
 
     @Override
     public List<UserPhotosStreamMetadataNamedColumnValue<?>> getRowColumns(UserPhotosStreamMetadataRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -562,7 +565,7 @@ public List<UserPhotosStreamMetadataNamedColumnValue<?>> getRowColumns(UserPhoto
 
     @Override
     public Multimap<UserPhotosStreamMetadataRow, UserPhotosStreamMetadataNamedColumnValue<?>> getRowsMultimap(Iterable<UserPhotosStreamMetadataRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -572,7 +575,7 @@ public Multimap<UserPhotosStreamMetadataRow, UserPhotosStreamMetadataNamedColumn
 
     @Override
     public Multimap<UserPhotosStreamMetadataRow, UserPhotosStreamMetadataNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<UserPhotosStreamMetadataRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -603,8 +606,22 @@ private static Multimap<UserPhotosStreamMetadataRow, UserPhotosStreamMetadataNam
         return rowMap;
     }
 
+    @Override
+    public Map<UserPhotosStreamMetadataRow, BatchingVisitable<UserPhotosStreamMetadataNamedColumnValue<?>>> getRowsColumnRange(Iterable<UserPhotosStreamMetadataRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<UserPhotosStreamMetadataRow, BatchingVisitable<UserPhotosStreamMetadataNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            UserPhotosStreamMetadataRow row = UserPhotosStreamMetadataRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<UserPhotosStreamMetadataNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<UserPhotosStreamMetadataRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<UserPhotosStreamMetadataRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -655,6 +672,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -712,5 +731,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "yb8E+Pjp0nu98IMik1pLVA==";
+    static String __CLASS_HASH = "3hm9ct5gSUntg95L4JJxoA==";
 }
diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamValueTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamValueTable.java
index 45a96acd58c..3ef4971e844 100644
--- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamValueTable.java
+++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserPhotosStreamValueTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class UserPhotosStreamValueTable implements
     private final List<UserPhotosStreamValueTrigger> triggers;
     private final static String rawTableName = "user_photos_stream_value";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(UserPhotosStreamValueNamedColumn.values());
 
     static UserPhotosStreamValueTable of(Transaction t, Namespace namespace) {
         return new UserPhotosStreamValueTable(t, namespace, ImmutableList.<UserPhotosStreamValueTrigger>of());
@@ -222,7 +225,7 @@ public boolean equals(Object obj) {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(id, blockId);
+            return Arrays.deepHashCode(new Object[]{ id, blockId });
         }
 
         @Override
@@ -482,7 +485,7 @@ public void delete(Iterable<UserPhotosStreamValueRow> rows) {
 
     @Override
     public Optional<UserPhotosStreamValueRowResult> getRow(UserPhotosStreamValueRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -498,7 +501,7 @@ public Optional<UserPhotosStreamValueRowResult> getRow(UserPhotosStreamValueRow
 
     @Override
     public List<UserPhotosStreamValueRowResult> getRows(Iterable<UserPhotosStreamValueRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -513,7 +516,7 @@ public List<UserPhotosStreamValueRowResult> getRows(Iterable<UserPhotosStreamVal
 
     @Override
     public List<UserPhotosStreamValueRowResult> getAsyncRows(Iterable<UserPhotosStreamValueRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -530,7 +533,7 @@ public List<UserPhotosStreamValueRowResult> call() {
 
     @Override
     public List<UserPhotosStreamValueNamedColumnValue<?>> getRowColumns(UserPhotosStreamValueRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -550,7 +553,7 @@ public List<UserPhotosStreamValueNamedColumnValue<?>> getRowColumns(UserPhotosSt
 
     @Override
     public Multimap<UserPhotosStreamValueRow, UserPhotosStreamValueNamedColumnValue<?>> getRowsMultimap(Iterable<UserPhotosStreamValueRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -560,7 +563,7 @@ public Multimap<UserPhotosStreamValueRow, UserPhotosStreamValueNamedColumnValue<
 
     @Override
     public Multimap<UserPhotosStreamValueRow, UserPhotosStreamValueNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<UserPhotosStreamValueRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -591,8 +594,22 @@ private static Multimap<UserPhotosStreamValueRow, UserPhotosStreamValueNamedColu
         return rowMap;
     }
 
+    @Override
+    public Map<UserPhotosStreamValueRow, BatchingVisitable<UserPhotosStreamValueNamedColumnValue<?>>> getRowsColumnRange(Iterable<UserPhotosStreamValueRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<UserPhotosStreamValueRow, BatchingVisitable<UserPhotosStreamValueNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            UserPhotosStreamValueRow row = UserPhotosStreamValueRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<UserPhotosStreamValueNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     public BatchingVisitableView<UserPhotosStreamValueRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<UserPhotosStreamValueRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -643,6 +660,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -700,5 +719,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "UzI7TXUlWL5M9KqjP/k4WA==";
+    static String __CLASS_HASH = "jHXwPpmc5Ay3gKn9eZC8Gg==";
 }
diff --git a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserProfileTable.java b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserProfileTable.java
index 36f8445e10e..6fae4ffcd33 100644
--- a/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserProfileTable.java
+++ b/examples/profile-client/src/main/java/com/palantir/example/profile/schema/generated/UserProfileTable.java
@@ -44,6 +44,8 @@
 import com.palantir.atlasdb.compress.CompressionUtils;
 import com.palantir.atlasdb.encoding.PtBytes;
 import com.palantir.atlasdb.keyvalue.api.Cell;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelection;
+import com.palantir.atlasdb.keyvalue.api.ColumnRangeSelections;
 import com.palantir.atlasdb.keyvalue.api.ColumnSelection;
 import com.palantir.atlasdb.keyvalue.api.Namespace;
 import com.palantir.atlasdb.keyvalue.api.Prefix;
@@ -96,6 +98,7 @@ public final class UserProfileTable implements
     private final List<UserProfileTrigger> triggers;
     private final static String rawTableName = "user_profile";
     private final TableReference tableRef;
+    private final static ColumnSelection allColumns = getColumnSelection(UserProfileNamedColumn.values());
 
     static UserProfileTable of(Transaction t, Namespace namespace) {
         return new UserProfileTable(t, namespace, ImmutableList.<UserProfileTrigger>of());
@@ -1008,7 +1011,7 @@ public void delete(Iterable<UserProfileRow> rows) {
 
     @Override
     public Optional<UserProfileRowResult> getRow(UserProfileRow row) {
-        return getRow(row, ColumnSelection.all());
+        return getRow(row, allColumns);
     }
 
     @Override
@@ -1024,7 +1027,7 @@ public Optional<UserProfileRowResult> getRow(UserProfileRow row, ColumnSelection
 
     @Override
     public List<UserProfileRowResult> getRows(Iterable<UserProfileRow> rows) {
-        return getRows(rows, ColumnSelection.all());
+        return getRows(rows, allColumns);
     }
 
     @Override
@@ -1039,7 +1042,7 @@ public List<UserProfileRowResult> getRows(Iterable<UserProfileRow> rows, ColumnS
 
     @Override
     public List<UserProfileRowResult> getAsyncRows(Iterable<UserProfileRow> rows, ExecutorService exec) {
-        return getAsyncRows(rows, ColumnSelection.all(), exec);
+        return getAsyncRows(rows, allColumns, exec);
     }
 
     @Override
@@ -1056,7 +1059,7 @@ public List<UserProfileRowResult> call() {
 
     @Override
     public List<UserProfileNamedColumnValue<?>> getRowColumns(UserProfileRow row) {
-        return getRowColumns(row, ColumnSelection.all());
+        return getRowColumns(row, allColumns);
     }
 
     @Override
@@ -1076,7 +1079,7 @@ public List<UserProfileNamedColumnValue<?>> getRowColumns(UserProfileRow row, Co
 
     @Override
     public Multimap<UserProfileRow, UserProfileNamedColumnValue<?>> getRowsMultimap(Iterable<UserProfileRow> rows) {
-        return getRowsMultimapInternal(rows, ColumnSelection.all());
+        return getRowsMultimapInternal(rows, allColumns);
     }
 
     @Override
@@ -1086,7 +1089,7 @@ public Multimap<UserProfileRow, UserProfileNamedColumnValue<?>> getRowsMultimap(
 
     @Override
     public Multimap<UserProfileRow, UserProfileNamedColumnValue<?>> getAsyncRowsMultimap(Iterable<UserProfileRow> rows, ExecutorService exec) {
-        return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+        return getAsyncRowsMultimap(rows, allColumns, exec);
     }
 
     @Override
@@ -1117,6 +1120,20 @@ private static Multimap<UserProfileRow, UserProfileNamedColumnValue<?>> getRowMa
         return rowMap;
     }
 
+    @Override
+    public Map<UserProfileRow, BatchingVisitable<UserProfileNamedColumnValue<?>>> getRowsColumnRange(Iterable<UserProfileRow> rows, ColumnRangeSelection columnRangeSelection) {
+        Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+        Map<UserProfileRow, BatchingVisitable<UserProfileNamedColumnValue<?>>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+        for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+            UserProfileRow row = UserProfileRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+            BatchingVisitable<UserProfileNamedColumnValue<?>> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                return shortNameToHydrator.get(PtBytes.toString(result.getKey().getColumnName())).hydrateFromBytes(result.getValue());
+            });
+            transformed.put(row, bv);
+        }
+        return transformed;
+    }
+
     private Multimap<UserProfileRow, UserProfileNamedColumnValue<?>> getAffectedCells(Multimap<UserProfileRow, ? extends UserProfileNamedColumnValue<?>> rows) {
         Multimap<UserProfileRow, UserProfileNamedColumnValue<?>> oldData = getRowsMultimap(rows.keySet());
         Multimap<UserProfileRow, UserProfileNamedColumnValue<?>> cellsAffected = ArrayListMultimap.create();
@@ -1188,7 +1205,7 @@ private void deleteUserBirthdaysIdx(Multimap<UserProfileRow, UserProfileNamedCol
     }
 
     public BatchingVisitableView<UserProfileRowResult> getAllRowsUnordered() {
-        return getAllRowsUnordered(ColumnSelection.all());
+        return getAllRowsUnordered(allColumns);
     }
 
     public BatchingVisitableView<UserProfileRowResult> getAllRowsUnordered(ColumnSelection columns) {
@@ -1224,6 +1241,7 @@ public static final class CookiesIdxTable implements
         private final List<CookiesIdxTrigger> triggers;
         private final static String rawTableName = "cookies_idx";
         private final TableReference tableRef;
+        private final static ColumnSelection allColumns = ColumnSelection.all();
 
         public static CookiesIdxTable of(UserProfileTable table) {
             return new CookiesIdxTable(table.t, table.tableRef.getNamespace(), ImmutableList.<CookiesIdxTrigger>of());
@@ -1435,6 +1453,28 @@ public CookiesIdxColumn hydrateFromBytes(byte[] __input) {
                 }
             };
 
+            public static ColumnRangeSelection createPrefixRangeUnsorted(byte[] rowName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes), batchSize);
+            }
+
+            public static Prefix prefixUnsorted(byte[] rowName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return new Prefix(EncodingUtils.add(rowNameBytes));
+            }
+
+            public static ColumnRangeSelection createPrefixRange(byte[] rowName, byte[] columnName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes, columnNameBytes), batchSize);
+            }
+
+            public static Prefix prefix(byte[] rowName, byte[] columnName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return new Prefix(EncodingUtils.add(rowNameBytes, columnNameBytes));
+            }
+
             @Override
             public String toString() {
                 return MoreObjects.toStringHelper(getClass().getSimpleName())
@@ -1461,7 +1501,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(rowName, columnName, id);
+                return Arrays.deepHashCode(new Object[]{ rowName, columnName, id });
             }
 
             @Override
@@ -1722,7 +1762,7 @@ public Multimap<CookiesIdxRow, CookiesIdxColumnValue> call() {
 
         @Override
         public List<CookiesIdxColumnValue> getRowColumns(CookiesIdxRow row) {
-            return getRowColumns(row, ColumnSelection.all());
+            return getRowColumns(row, allColumns);
         }
 
         @Override
@@ -1744,7 +1784,7 @@ public List<CookiesIdxColumnValue> getRowColumns(CookiesIdxRow row, ColumnSelect
 
         @Override
         public Multimap<CookiesIdxRow, CookiesIdxColumnValue> getRowsMultimap(Iterable<CookiesIdxRow> rows) {
-            return getRowsMultimapInternal(rows, ColumnSelection.all());
+            return getRowsMultimapInternal(rows, allColumns);
         }
 
         @Override
@@ -1754,7 +1794,7 @@ public Multimap<CookiesIdxRow, CookiesIdxColumnValue> getRowsMultimap(Iterable<C
 
         @Override
         public Multimap<CookiesIdxRow, CookiesIdxColumnValue> getAsyncRowsMultimap(Iterable<CookiesIdxRow> rows, ExecutorService exec) {
-            return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+            return getAsyncRowsMultimap(rows, allColumns, exec);
         }
 
         @Override
@@ -1787,9 +1827,25 @@ private static Multimap<CookiesIdxRow, CookiesIdxColumnValue> getRowMapFromRowRe
             return rowMap;
         }
 
+        @Override
+        public Map<CookiesIdxRow, BatchingVisitable<CookiesIdxColumnValue>> getRowsColumnRange(Iterable<CookiesIdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+            Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+            Map<CookiesIdxRow, BatchingVisitable<CookiesIdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+            for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+                CookiesIdxRow row = CookiesIdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+                BatchingVisitable<CookiesIdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                    CookiesIdxColumn col = CookiesIdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                    Long val = CookiesIdxColumnValue.hydrateValue(result.getValue());
+                    return CookiesIdxColumnValue.of(col, val);
+                });
+                transformed.put(row, bv);
+            }
+            return transformed;
+        }
+
         public BatchingVisitableView<CookiesIdxRowResult> getRange(RangeRequest range) {
             if (range.getColumnNames().isEmpty()) {
-                range = range.getBuilder().retainColumns(ColumnSelection.all()).build();
+                range = range.getBuilder().retainColumns(allColumns).build();
             }
             return BatchingVisitables.transform(t.getRange(tableRef, range), new Function<RowResult<byte[]>, CookiesIdxRowResult>() {
                 @Override
@@ -1860,6 +1916,7 @@ public static final class CreatedIdxTable implements
         private final List<CreatedIdxTrigger> triggers;
         private final static String rawTableName = "created_idx";
         private final TableReference tableRef;
+        private final static ColumnSelection allColumns = ColumnSelection.all();
 
         public static CreatedIdxTable of(UserProfileTable table) {
             return new CreatedIdxTable(table.t, table.tableRef.getNamespace(), ImmutableList.<CreatedIdxTrigger>of());
@@ -2071,6 +2128,28 @@ public CreatedIdxColumn hydrateFromBytes(byte[] __input) {
                 }
             };
 
+            public static ColumnRangeSelection createPrefixRangeUnsorted(byte[] rowName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes), batchSize);
+            }
+
+            public static Prefix prefixUnsorted(byte[] rowName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return new Prefix(EncodingUtils.add(rowNameBytes));
+            }
+
+            public static ColumnRangeSelection createPrefixRange(byte[] rowName, byte[] columnName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes, columnNameBytes), batchSize);
+            }
+
+            public static Prefix prefix(byte[] rowName, byte[] columnName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return new Prefix(EncodingUtils.add(rowNameBytes, columnNameBytes));
+            }
+
             @Override
             public String toString() {
                 return MoreObjects.toStringHelper(getClass().getSimpleName())
@@ -2097,7 +2176,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(rowName, columnName, id);
+                return Arrays.deepHashCode(new Object[]{ rowName, columnName, id });
             }
 
             @Override
@@ -2358,7 +2437,7 @@ public Multimap<CreatedIdxRow, CreatedIdxColumnValue> call() {
 
         @Override
         public List<CreatedIdxColumnValue> getRowColumns(CreatedIdxRow row) {
-            return getRowColumns(row, ColumnSelection.all());
+            return getRowColumns(row, allColumns);
         }
 
         @Override
@@ -2380,7 +2459,7 @@ public List<CreatedIdxColumnValue> getRowColumns(CreatedIdxRow row, ColumnSelect
 
         @Override
         public Multimap<CreatedIdxRow, CreatedIdxColumnValue> getRowsMultimap(Iterable<CreatedIdxRow> rows) {
-            return getRowsMultimapInternal(rows, ColumnSelection.all());
+            return getRowsMultimapInternal(rows, allColumns);
         }
 
         @Override
@@ -2390,7 +2469,7 @@ public Multimap<CreatedIdxRow, CreatedIdxColumnValue> getRowsMultimap(Iterable<C
 
         @Override
         public Multimap<CreatedIdxRow, CreatedIdxColumnValue> getAsyncRowsMultimap(Iterable<CreatedIdxRow> rows, ExecutorService exec) {
-            return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+            return getAsyncRowsMultimap(rows, allColumns, exec);
         }
 
         @Override
@@ -2423,9 +2502,25 @@ private static Multimap<CreatedIdxRow, CreatedIdxColumnValue> getRowMapFromRowRe
             return rowMap;
         }
 
+        @Override
+        public Map<CreatedIdxRow, BatchingVisitable<CreatedIdxColumnValue>> getRowsColumnRange(Iterable<CreatedIdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+            Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+            Map<CreatedIdxRow, BatchingVisitable<CreatedIdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+            for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+                CreatedIdxRow row = CreatedIdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+                BatchingVisitable<CreatedIdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                    CreatedIdxColumn col = CreatedIdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                    Long val = CreatedIdxColumnValue.hydrateValue(result.getValue());
+                    return CreatedIdxColumnValue.of(col, val);
+                });
+                transformed.put(row, bv);
+            }
+            return transformed;
+        }
+
         public BatchingVisitableView<CreatedIdxRowResult> getRange(RangeRequest range) {
             if (range.getColumnNames().isEmpty()) {
-                range = range.getBuilder().retainColumns(ColumnSelection.all()).build();
+                range = range.getBuilder().retainColumns(allColumns).build();
             }
             return BatchingVisitables.transform(t.getRange(tableRef, range), new Function<RowResult<byte[]>, CreatedIdxRowResult>() {
                 @Override
@@ -2496,6 +2591,7 @@ public static final class UserBirthdaysIdxTable implements
         private final List<UserBirthdaysIdxTrigger> triggers;
         private final static String rawTableName = "user_birthdays_idx";
         private final TableReference tableRef;
+        private final static ColumnSelection allColumns = ColumnSelection.all();
 
         public static UserBirthdaysIdxTable of(UserProfileTable table) {
             return new UserBirthdaysIdxTable(table.t, table.tableRef.getNamespace(), ImmutableList.<UserBirthdaysIdxTrigger>of());
@@ -2707,6 +2803,28 @@ public UserBirthdaysIdxColumn hydrateFromBytes(byte[] __input) {
                 }
             };
 
+            public static ColumnRangeSelection createPrefixRangeUnsorted(byte[] rowName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes), batchSize);
+            }
+
+            public static Prefix prefixUnsorted(byte[] rowName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                return new Prefix(EncodingUtils.add(rowNameBytes));
+            }
+
+            public static ColumnRangeSelection createPrefixRange(byte[] rowName, byte[] columnName, int batchSize) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return ColumnRangeSelections.createPrefixRange(EncodingUtils.add(rowNameBytes, columnNameBytes), batchSize);
+            }
+
+            public static Prefix prefix(byte[] rowName, byte[] columnName) {
+                byte[] rowNameBytes = EncodingUtils.encodeSizedBytes(rowName);
+                byte[] columnNameBytes = EncodingUtils.encodeSizedBytes(columnName);
+                return new Prefix(EncodingUtils.add(rowNameBytes, columnNameBytes));
+            }
+
             @Override
             public String toString() {
                 return MoreObjects.toStringHelper(getClass().getSimpleName())
@@ -2733,7 +2851,7 @@ public boolean equals(Object obj) {
 
             @Override
             public int hashCode() {
-                return Objects.hashCode(rowName, columnName, id);
+                return Arrays.deepHashCode(new Object[]{ rowName, columnName, id });
             }
 
             @Override
@@ -2994,7 +3112,7 @@ public Multimap<UserBirthdaysIdxRow, UserBirthdaysIdxColumnValue> call() {
 
         @Override
         public List<UserBirthdaysIdxColumnValue> getRowColumns(UserBirthdaysIdxRow row) {
-            return getRowColumns(row, ColumnSelection.all());
+            return getRowColumns(row, allColumns);
         }
 
         @Override
@@ -3016,7 +3134,7 @@ public List<UserBirthdaysIdxColumnValue> getRowColumns(UserBirthdaysIdxRow row,
 
         @Override
         public Multimap<UserBirthdaysIdxRow, UserBirthdaysIdxColumnValue> getRowsMultimap(Iterable<UserBirthdaysIdxRow> rows) {
-            return getRowsMultimapInternal(rows, ColumnSelection.all());
+            return getRowsMultimapInternal(rows, allColumns);
         }
 
         @Override
@@ -3026,7 +3144,7 @@ public Multimap<UserBirthdaysIdxRow, UserBirthdaysIdxColumnValue> getRowsMultima
 
         @Override
         public Multimap<UserBirthdaysIdxRow, UserBirthdaysIdxColumnValue> getAsyncRowsMultimap(Iterable<UserBirthdaysIdxRow> rows, ExecutorService exec) {
-            return getAsyncRowsMultimap(rows, ColumnSelection.all(), exec);
+            return getAsyncRowsMultimap(rows, allColumns, exec);
         }
 
         @Override
@@ -3059,9 +3177,25 @@ private static Multimap<UserBirthdaysIdxRow, UserBirthdaysIdxColumnValue> getRow
             return rowMap;
         }
 
+        @Override
+        public Map<UserBirthdaysIdxRow, BatchingVisitable<UserBirthdaysIdxColumnValue>> getRowsColumnRange(Iterable<UserBirthdaysIdxRow> rows, ColumnRangeSelection columnRangeSelection) {
+            Map<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> results = t.getRowsColumnRange(tableRef, Persistables.persistAll(rows), columnRangeSelection);
+            Map<UserBirthdaysIdxRow, BatchingVisitable<UserBirthdaysIdxColumnValue>> transformed = Maps.newHashMapWithExpectedSize(results.size());
+            for (Entry<byte[], BatchingVisitable<Map.Entry<Cell, byte[]>>> e : results.entrySet()) {
+                UserBirthdaysIdxRow row = UserBirthdaysIdxRow.BYTES_HYDRATOR.hydrateFromBytes(e.getKey());
+                BatchingVisitable<UserBirthdaysIdxColumnValue> bv = BatchingVisitables.transform(e.getValue(), result -> {
+                    UserBirthdaysIdxColumn col = UserBirthdaysIdxColumn.BYTES_HYDRATOR.hydrateFromBytes(result.getKey().getColumnName());
+                    Long val = UserBirthdaysIdxColumnValue.hydrateValue(result.getValue());
+                    return UserBirthdaysIdxColumnValue.of(col, val);
+                });
+                transformed.put(row, bv);
+            }
+            return transformed;
+        }
+
         public BatchingVisitableView<UserBirthdaysIdxRowResult> getRange(RangeRequest range) {
             if (range.getColumnNames().isEmpty()) {
-                range = range.getBuilder().retainColumns(ColumnSelection.all()).build();
+                range = range.getBuilder().retainColumns(allColumns).build();
             }
             return BatchingVisitables.transform(t.getRange(tableRef, range), new Function<RowResult<byte[]>, UserBirthdaysIdxRowResult>() {
                 @Override
@@ -3147,6 +3281,8 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link Cells}
      * {@link Collection}
      * {@link Collections2}
+     * {@link ColumnRangeSelection}
+     * {@link ColumnRangeSelections}
      * {@link ColumnSelection}
      * {@link ColumnValue}
      * {@link ColumnValues}
@@ -3204,5 +3340,5 @@ public List<String> findConstraintFailuresNoRead(Map<Cell, byte[]> writes,
      * {@link UnsignedBytes}
      * {@link ValueType}
      */
-    static String __CLASS_HASH = "O3BBdePYKzyTMAnT96FW7Q==";
+    static String __CLASS_HASH = "bsX4j+YZsGdVXg0UYcXoJA==";
 }
diff --git a/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java b/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java
new file mode 100644
index 00000000000..ffe05c860fd
--- /dev/null
+++ b/examples/profile-client/src/test/java/com/palantir/example/profile/CookiesIdxColumnTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2016 Palantir Technologies
+ * ​
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * ​
+ * http://opensource.org/licenses/BSD-3-Clause
+ * ​
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.palantir.example.profile;
+
+import static com.palantir.example.profile.schema.generated.UserProfileTable.CookiesIdxTable.CookiesIdxColumn;
+
+import java.util.UUID;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CookiesIdxColumnTest {
+    @Test
+    public void testHashCode() {
+        UUID uuid = new UUID(3, 4);
+        CookiesIdxColumn a = CookiesIdxColumn.of(new byte[]{1}, new byte[]{2, 4}, uuid);
+        CookiesIdxColumn b = CookiesIdxColumn.of(new byte[]{1}, new byte[]{2, 4}, uuid);
+        Assert.assertEquals(a.hashCode(), b.hashCode());
+    }
+
+    @Test
+    public void testHashCodeUnequal() {
+        UUID uuid = new UUID(5, 6);
+        CookiesIdxColumn a = CookiesIdxColumn.of(new byte[]{1, 3}, new byte[]{2, 4}, uuid);
+        CookiesIdxColumn b = CookiesIdxColumn.of(new byte[]{1, 2}, new byte[]{2, 4}, uuid);
+        Assert.assertNotEquals(a.hashCode(), b.hashCode());
+    }
+}
diff --git a/gradle/baseline.gradle b/gradle/baseline.gradle
new file mode 100644
index 00000000000..6f50378569d
--- /dev/null
+++ b/gradle/baseline.gradle
@@ -0,0 +1,48 @@
+List<String> blacklistedBaselineProjects = [
+        'atlasdb-cassandra-tests',
+        'atlasdb-cli',
+        'atlasdb-client',
+        'atlasdb-client-protobufs',
+        'atlasdb-commons',
+        'atlasdb-console',
+        'atlasdb-dbkvs-hikari',
+        'atlasdb-dropwizard-tests',
+        'atlasdb-ete-test-utils',
+        'atlasdb-ete-tests',
+        'atlasdb-exec',
+        'atlasdb-jdbc',
+        'atlasdb-jdbc-tests',
+        'atlasdb-lock-api',
+        'atlasdb-partition-manager',
+        'atlasdb-rocksdb',
+        'atlasdb-rocksdb-tests',
+        'atlasdb-service',
+        'atlasdb-service-server',
+        'atlasdb-tests-shared',
+        'atlasdb-timelock-ete',
+        'atlasdb-timelock-server',
+        'cassandra-partitioner',
+        'commons-annotations',
+        'commons-api',
+        'commons-db',
+        'commons-executors',
+        'commons-proxy',
+        'leader-election-api',
+        'leader-election-api-protobufs',
+        'leader-election-impl',
+        'lock-api',
+        'lock-impl',
+        'papaya',
+        'profile-client',
+        'profile-client-protobufs',
+        'timestamp-api',
+        'timestamp-impl']
+
+
+if (!blacklistedBaselineProjects.contains(project.name)) {
+    apply plugin: 'com.palantir.baseline-checkstyle'
+    apply plugin: 'com.palantir.baseline-findbugs'
+}
+
+apply plugin: 'com.palantir.baseline-eclipse'
+apply plugin: 'com.palantir.baseline-idea'
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index a24aedd1bd4..9033345a789 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -6,6 +6,11 @@ task sourceJar(type: Jar) {
     classifier 'sources'
 }
 
+task testJar(type: Jar) {
+    from project.sourceSets.test.output
+    classifier 'tests'
+}
+
 publishing {
     publications {
         bintray(MavenPublication) {
@@ -13,6 +18,9 @@ publishing {
             artifact(sourceJar) {
                 classifier 'sources'
             }
+            artifact(testJar) {
+                classifier 'tests'
+            }
             pom.withXml {
                 def scm = asNode().appendNode('scm')
                 scm.appendNode('url', 'https://github.com/palantir/atlasdb')
@@ -44,5 +52,6 @@ bintrayUpload.onlyIf {
 
 bintrayUpload.dependsOn { generatePomFileForBintrayPublication }
 bintrayUpload.dependsOn { sourceJar }
+bintrayUpload.dependsOn { testJar }
 bintrayUpload.dependsOn { build }
 
diff --git a/gradle/shared.gradle b/gradle/shared.gradle
index 6ff6c631f33..d0b96042c18 100644
--- a/gradle/shared.gradle
+++ b/gradle/shared.gradle
@@ -2,9 +2,11 @@ apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'eclipse'
 apply plugin: 'checkstyle'
-apply plugin: 'jacoco-coverage'
+apply plugin: 'com.palantir.jacoco-coverage'
 apply plugin: 'com.github.hierynomus.license'
 
+apply from: "${rootDir}/gradle/versions.gradle"
+apply from: "${rootDir}/gradle/baseline.gradle"
 apply from: "${rootDir}/gradle/publish.gradle"
 
 sourceCompatibility = 1.8
@@ -20,18 +22,29 @@ repositories {
 }
 
 checkstyle {
-    toolVersion = 6.17
+    toolVersion = libVersions.checkstyle
     configFile rootProject.file('config/checkstyle/checkstyle.xml')
 }
 
-apply from: rootProject.file('gradle/versions.gradle')
+jacoco {
+    toolVersion = libVersions.jacoco
+}
+
 libsDirName = file('build/artifacts')
 
 dependencies {
-    checkstyle 'com.puppycrawl.tools:checkstyle:6.6'
+    checkstyle group: 'com.puppycrawl.tools', name: 'checkstyle', version: libVersions.checkstyle
     testCompile group: 'junit', name: 'junit', version: libVersions.junit
 }
 
+configurations.matching({ it.name in ['compile', 'runtime'] }).all {
+    resolutionStrategy {
+            force 'net.java.dev.jna:jna:' + libVersions.jna
+            force 'com.google.code.findbugs:jsr305:' + libVersions.jsr305
+            force 'org.slf4j:slf4j-api:' + libVersions.slf4j
+        }
+}
+
 apply from: rootProject.file('gradle/javadoc.gradle'), to: javadoc
 
 license {
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index a9cf5369f82..05e044cd198 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -2,13 +2,15 @@ ext.libVersions =
   [
     guava:   '18.0',
     slf4j:   '1.7.5',
+    jna:     '4.1.0',
     jsr305:  '1.3.9',
     junit:   '4.12',
     jmock:   '2.8.2',
     logback: '1.1.3',
     mockito: '1.10.17',
+    assertj: '3.5.2',
     dropwizard:   '0.8.2',
-    dockerComposeRule: '0.16.0',
+    dockerComposeRule: '0.18.0',
     commons_codec: '1.6',
     commons_lang: '2.6',
     commons_lang3: '3.1',
@@ -17,9 +19,11 @@ ext.libVersions =
     joda_time: '2.7',
     json_simple: '1.1.1',
     snappy: '1.1.1.7',
+    immutables: '2.2.8',
     jackson: '2.5.1',
     jackson_annotation: '2.5.0',
-    cassandra: '2.2.1',
+    jacoco: '0.7.7.201606060606',
+    cassandra: '2.2.7',
     cassandra_driver_core: '2.2.0-rc3',
     groovy: '2.4.4',
     hamcrest: '1.3',
@@ -27,8 +31,10 @@ ext.libVersions =
     libthrift: '0.9.2',
     protobuf: '2.6.0',
     findbugs: '1.3.9',
-    hikariCP: '2.4.5',
+    hikariCP: '2.4.7',
+    checkstyle: '6.18',
     snakeyaml: '1.12',
+    findbugsAnnotations: '2.0.3',
 
     // Danger, Will Robinson!
     //
@@ -36,7 +42,7 @@ ext.libVersions =
     // Severe performance regressions in 1202,3,4.
     // Severe correctness issues in 1204,5,6.
     // Update with care and caution.
-    postgresql: '9.4.1207.jre7',
+    postgresql: '9.4.1209',
 
     c3p0: '0.9.5.1',
     log4j: '1.2.17'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index fd7e590e515..3baa851b28c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 866833a5f0d..46ce1d081f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 07 11:47:36 PST 2016
+#Tue Aug 16 17:01:34 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
diff --git a/gradlew.bat b/gradlew.bat
index c1aeb59e9a9..f6d5974e72f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx1024m"
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args
diff --git a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java
index 23fc32c9ee5..c9e4f90d29c 100644
--- a/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java
+++ b/leader-election-impl/src/main/java/com/palantir/leader/PaxosLeaderElectionService.java
@@ -345,7 +345,12 @@ private void proposeLeadership(LeadershipToken token) {
             proposer.propose(seq, null);
         } catch (PaxosRoundFailureException e) {
             // We have failed trying to become the leader.
-            leaderLog.warn("Leadership was not gained", e);
+            leaderLog.warn("Leadership was not gained.\n"
+                    + "We should recover automatically. If this recurs often, try to \n"
+                    + "  (1) ensure that most other nodes are reachable over the network, and \n"
+                    + "  (2) increase the randomWaitBeforeProposingLeadershipMs timeout in your configuration.\n"
+                    + "See the debug-level log for more details.");
+            leaderLog.debug("Specifically, leadership was not gained because of the following exception", e);
             return;
         } finally {
             lock.unlock();
diff --git a/scripts/circle-ci/run-circle-tests.sh b/scripts/circle-ci/run-circle-tests.sh
index 81712b5eaad..2e288bcac6b 100755
--- a/scripts/circle-ci/run-circle-tests.sh
+++ b/scripts/circle-ci/run-circle-tests.sh
@@ -14,10 +14,14 @@ CONTAINER_1=(':atlasdb-cassandra-tests:check')
 CONTAINER_2=(':atlasdb-tests-shared:check' ':atlasdb-ete-tests:check')
 
 #Container 3
-CONTAINER_3=(':atlasdb-timelock-ete:check' ':atlasdb-dropwizard-tests:check' ':lock-impl:check' ':atlasdb-dbkvs-tests:check')
+CONTAINER_3=(':atlasdb-timelock-ete:check' ':lock-impl:check' ':atlasdb-dbkvs-tests:check')
+
+CONTAINER_4=(':atlasdb-dropwizard-tests:check')
+
+CONTAINER_5=(':atlasdb-cassandra-multinode-tests:check')
 
 # Container 0 - runs tasks not found in the below containers
-CONTAINER_0_EXCLUDE=("${CONTAINER_1[@]}" "${CONTAINER_2[@]}" "${CONTAINER_3[@]}")
+CONTAINER_0_EXCLUDE=("${CONTAINER_1[@]}" "${CONTAINER_2[@]}" "${CONTAINER_3[@]}" "${CONTAINER_4[@]}"  "${CONTAINER_5[@]}")
 
 for task in "${CONTAINER_0_EXCLUDE[@]}"
 do
@@ -26,7 +30,9 @@ done
 
 case $CIRCLE_NODE_INDEX in
     0) ./gradlew --profile --continue check $CONTAINER_0_EXCLUDE_ARGS ;;
-    1) ./gradlew --continue --parallel ${CONTAINER_1[@]} ;;
-    2) ./gradlew --continue --parallel ${CONTAINER_2[@]} ;;
-    3) ./gradlew --continue ${CONTAINER_3[@]} && checkDocsBuild ;;
+    1) ./gradlew --profile --continue --parallel ${CONTAINER_1[@]} ;;
+    2) ./gradlew --profile --continue --parallel ${CONTAINER_2[@]} ;;
+    3) ./gradlew --profile --continue ${CONTAINER_3[@]} && checkDocsBuild ;;
+    4) ./gradlew --profile --continue --parallel ${CONTAINER_4[@]} ;;
+    5) ./gradlew --profile --continue --parallel ${CONTAINER_5[@]} ;;
 esac
diff --git a/scripts/getAtlasDBProductVersions b/scripts/getAtlasDBProductVersions
index e330d84fc3b..2374c1586f6 100755
--- a/scripts/getAtlasDBProductVersions
+++ b/scripts/getAtlasDBProductVersions
@@ -1,5 +1,6 @@
 #!/usr/local/bin/python
 
+from __future__ import print_function
 import requests
 import json
 import base64
@@ -20,10 +21,16 @@ githubUrl = protocol + domain + baseUrl
 repoUrl = githubUrl + 'repos/'
 auth = (sys.argv[2], sys.argv[3])
 
+def eprint(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
+
 def getAtlasVersion(res):
     jsonRes = json.loads(res.text)
     decodedContent = base64.b64decode(jsonRes['content'])
     match = re.search('atlasVersion|atlasDbVersion', decodedContent)
+    if match == None:
+        eprint("Couldn't find version in <" + decodedContent + ">")
+        return "No AtlasDB version found"
     return decodedContent[match.start():].splitlines()[0]
 
 def requestFile(repo, tag, filePath):
@@ -57,5 +64,3 @@ for productInfo in products:
     for release in getReleases(productInfo):
         versionFile = requestFile(productInfo, release['tag_name'], 'gradle.properties')
         print(productInfo + ':' + release['tag_name'] + ':' + getAtlasVersion(versionFile))
-        
-    
diff --git a/settings.gradle b/settings.gradle
index 0f9d9ccf833..9acabd3c8f2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,11 +1,13 @@
 include ":atlasdb-api"
 include ":atlasdb-cassandra"
 include ":atlasdb-cassandra-tests"
+include ":atlasdb-cassandra-multinode-tests"
 include ":atlasdb-cli"
 include ":atlasdb-client"
 include ":atlasdb-client-protobufs"
 include ":atlasdb-config"
 include ":atlasdb-console"
+include ":atlasdb-dropwizard-bundle"
 include ":atlasdb-dropwizard-tests"
 include ":atlasdb-dbkvs"
 include ":atlasdb-dbkvs-tests"
@@ -22,15 +24,13 @@ include ":atlasdb-tests-shared"
 include ":atlasdb-lock-api"
 include ":atlasdb-rocksdb"
 include ":atlasdb-rocksdb-tests"
-include ":atlasdb-spi"
 include ":atlasdb-timelock-ete"
 include ":atlasdb-timelock-server"
 include ":atlasdb-commons"
 include ":atlasdb-partition-manager"
 include ":atlasdb-perf"
-include ":atlasdb-server"
-include ":atlasdb-server-dropwizard"
-include ":atlasdb-server-with-endpoint"
+include ":atlasdb-service"
+include ":atlasdb-service-server"
 include ":commons-annotations"
 include ":commons-api"
 include ":commons-db"
diff --git a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java
index 9d61f155392..e1faa44f587 100644
--- a/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java
+++ b/timestamp-api/src/main/java/com/palantir/timestamp/TimestampRange.java
@@ -67,4 +67,9 @@ public long getLowerBound() {
     public long getUpperBound() {
         return upper;
     }
+
+    public long size() {
+        // Need to add 1 as both bounds are inclusive
+        return upper - lower + 1;
+    }
 }
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/AvailableTimestamps.java b/timestamp-impl/src/main/java/com/palantir/timestamp/AvailableTimestamps.java
new file mode 100644
index 00000000000..60d2160e9fb
--- /dev/null
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/AvailableTimestamps.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+public class AvailableTimestamps {
+    static final long ALLOCATION_BUFFER_SIZE = 1000 * 1000;
+    private static final long MINIMUM_BUFFER = ALLOCATION_BUFFER_SIZE / 2;
+    private static final long MAX_TIMESTAMPS_TO_HAND_OUT = 10 * 1000;
+
+    private final LastReturnedTimestamp lastReturnedTimestamp;
+    private final PersistentUpperLimit upperLimit;
+
+    public AvailableTimestamps(LastReturnedTimestamp lastReturnedTimestamp, PersistentUpperLimit upperLimit) {
+        this.lastReturnedTimestamp = lastReturnedTimestamp;
+        this.upperLimit = upperLimit;
+    }
+
+    public synchronized TimestampRange handOut(long numberToHandOut) {
+        checkArgument(
+                numberToHandOut <= MAX_TIMESTAMPS_TO_HAND_OUT,
+                "Can only hand out %s timestamps at a time, but %s were requested",
+                MAX_TIMESTAMPS_TO_HAND_OUT, numberToHandOut);
+
+        return handOutTimestamp(lastHandedOut() + numberToHandOut);
+    }
+
+    public synchronized void refreshBuffer() {
+        long buffer = upperLimit.get() - lastHandedOut();
+
+        if (buffer < MINIMUM_BUFFER || !upperLimit.hasIncreasedWithin(1, MINUTES)) {
+            allocateEnoughTimestampsToHandOut(lastHandedOut() + ALLOCATION_BUFFER_SIZE);
+        }
+    }
+
+    public synchronized void fastForwardTo(long newMinimum) {
+        lastReturnedTimestamp.increaseToAtLeast(newMinimum);
+        upperLimit.increaseToAtLeast(newMinimum + ALLOCATION_BUFFER_SIZE);
+    }
+
+    private long lastHandedOut() {
+        return lastReturnedTimestamp.get();
+    }
+
+    private synchronized TimestampRange handOutTimestamp(long targetTimestamp) {
+        checkArgument(
+                targetTimestamp > lastHandedOut(),
+                "Could not hand out timestamp '%s' as it was earlier than the last handed out timestamp: %s",
+                targetTimestamp, lastHandedOut());
+
+        TimestampRange rangeToHandOut = TimestampRange.createInclusiveRange(lastHandedOut() + 1, targetTimestamp);
+
+        allocateEnoughTimestampsToHandOut(targetTimestamp);
+        lastReturnedTimestamp.increaseToAtLeast(targetTimestamp);
+
+        return rangeToHandOut;
+    }
+
+    private void allocateEnoughTimestampsToHandOut(long timestamp) {
+        upperLimit.increaseToAtLeast(timestamp);
+    }
+
+    public long getUpperLimit() {
+        return upperLimit.get();
+    }
+}
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/LastReturnedTimestamp.java b/timestamp-impl/src/main/java/com/palantir/timestamp/LastReturnedTimestamp.java
new file mode 100644
index 00000000000..18d803e1fe9
--- /dev/null
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/LastReturnedTimestamp.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+public class LastReturnedTimestamp {
+    private long timestamp;
+
+    public LastReturnedTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public synchronized void increaseToAtLeast(long newTimestamp) {
+        this.timestamp = Math.max(this.timestamp, newTimestamp);
+    }
+
+    public long get() {
+        return this.timestamp;
+    }
+}
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampService.java b/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampService.java
index b32bd59d138..90c2e662446 100644
--- a/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampService.java
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentTimestampService.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2015 Palantir Technologies
- *
+ * <p>
  * Licensed under the BSD-3 License (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * <p>
  * http://opensource.org/licenses/BSD-3-Clause
- *
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,207 +16,81 @@
 package com.palantir.timestamp;
 
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
 
 import javax.annotation.concurrent.ThreadSafe;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.common.remoting.ServiceNotAvailableException;
-import com.palantir.common.time.Clock;
-import com.palantir.exception.PalantirInterruptedException;
 
 @ThreadSafe
 public class PersistentTimestampService implements TimestampService {
-    private static final Logger log = LoggerFactory.getLogger(PersistentTimestampService.class);
-
     private static final int MAX_REQUEST_RANGE_SIZE = 10 * 1000;
-    static final long ALLOCATION_BUFFER_SIZE = 1000 * 1000;
-    private static final int ONE_MINUTE_IN_MILLIS = 60000;
-
-    private final TimestampBoundStore store;
-
-    private final AtomicLong lastReturnedTimestamp;
-    private final AtomicLong upperLimitToHandOutInclusive;
 
     private final ExecutorService executor;
-    private final AtomicBoolean isAllocationTaskSubmitted;
-
-    private Clock clock;
-    private long lastAllocatedTime;
+    private final AvailableTimestamps availableTimestamps;
 
-    public static PersistentTimestampService create(TimestampBoundStore tbs) {
-        return create(
-                tbs,
-                new Clock() {
-                    @Override
-                    public long getTimeMillis() {
-                        return System.currentTimeMillis();
-                    }
-                });
+    public PersistentTimestampService(AvailableTimestamps availableTimestamps, ExecutorService executor) {
+        this.availableTimestamps = availableTimestamps;
+        this.executor = executor;
     }
 
-    @VisibleForTesting
-    protected static PersistentTimestampService create(TimestampBoundStore tbs, Clock clock) {
-        return new PersistentTimestampService(tbs, tbs.getUpperLimit(), clock);
-    }
+    public static PersistentTimestampService create(TimestampBoundStore tbs) {
+        PersistentUpperLimit upperLimit = new PersistentUpperLimit(tbs);
+        LastReturnedTimestamp lastReturned = new LastReturnedTimestamp(upperLimit.get());
+        AvailableTimestamps availableTimestamps = new AvailableTimestamps(lastReturned, upperLimit);
+        ExecutorService executor = PTExecutors.newSingleThreadExecutor(PTExecutors.newThreadFactory("Timestamp allocator", Thread.NORM_PRIORITY, true));
 
-    private PersistentTimestampService(TimestampBoundStore tbs, long lastUpperBound, Clock clock) {
-        store = tbs;
-        lastReturnedTimestamp = new AtomicLong(lastUpperBound);
-        upperLimitToHandOutInclusive = new AtomicLong(lastUpperBound);
-        executor = PTExecutors.newSingleThreadExecutor(PTExecutors.newThreadFactory("Timestamp allocator", Thread.NORM_PRIORITY, true));
-        isAllocationTaskSubmitted = new AtomicBoolean(false);
-        this.clock = clock;
-        lastAllocatedTime = clock.getTimeMillis();
+        return new PersistentTimestampService(availableTimestamps, executor);
     }
 
     public long getUpperLimitTimestampToHandOutInclusive() {
-        return upperLimitToHandOutInclusive.get();
-    }
-
-    private synchronized void allocateMoreTimestamps() {
-        long newLimit = lastReturnedTimestamp.get() + ALLOCATION_BUFFER_SIZE;
-        store.storeUpperLimit(newLimit);
-        // Prevent upper limit from falling behind stored upper limit.
-        advanceAtomicLongToValue(upperLimitToHandOutInclusive, newLimit);
-    }
-
-    private static void advanceAtomicLongToValue(AtomicLong toAdvance, long val) {
-        while (true) {
-            long oldUpper = toAdvance.get();
-            if (val <= oldUpper || toAdvance.compareAndSet(oldUpper, val)) {
-                return;
-            }
-        }
-    }
-
-    volatile Throwable allocationFailure = null;
-    private void submitAllocationTask() {
-        if (isAllocationRequired(lastReturnedTimestamp.get(), upperLimitToHandOutInclusive.get()) && isAllocationTaskSubmitted.compareAndSet(false, true)) {
-            final Exception createdException = new Exception("allocation task called from here");
-            executor.submit(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        if (allocationFailure instanceof MultipleRunningTimestampServiceError) {
-                            // We cannot allocate timestamps anymore because another server is running.
-                            return;
-                        }
-                        allocateMoreTimestamps();
-                        lastAllocatedTime = clock.getTimeMillis();
-                        allocationFailure = null;
-                    } catch (Throwable e) { // (authorized)
-                        createdException.initCause(e);
-                        if (allocationFailure != null
-                                && e.getClass().equals(allocationFailure.getClass())) {
-                            // QA-75825: don't keep logging error if we keep failing to allocate.
-                            log.info("Throwable while allocating timestamps.", createdException);
-                        } else {
-                            log.error("Throwable while allocating timestamps.", createdException);
-                        }
-                        allocationFailure = e;
-                    } finally {
-                        isAllocationTaskSubmitted.set(false);
-                    }
-                }
-            });
-        }
-    }
-
-    private boolean isAllocationRequired(long lastVal, long upperLimit) {
-        // we allocate new timestamps if we have less than half of our allocation buffer left
-        // or we haven't allocated timestamps in the last sixty seconds. The latter case
-        // exists in order to log errors faster against the class of bugs where your
-        // timestamp limit changed unexpectedly (usually, multiple TS against the same DB)
-        return exceededUpperLimit(lastVal, upperLimit)
-                || exceededHalfOfBuffer(lastVal, upperLimit)
-                || exceededLastAllocationTime();
-    }
-
-    private boolean exceededHalfOfBuffer(long lastVal, long upperLimit) {
-        return (upperLimit - lastVal) <= ALLOCATION_BUFFER_SIZE / 2;
-    }
-
-    private boolean exceededUpperLimit(long lastVal, long upperLimit) {
-        return lastVal >= upperLimit;
-    }
-
-    private boolean exceededLastAllocationTime() {
-        return lastAllocatedTime + ONE_MINUTE_IN_MILLIS < clock.getTimeMillis();
+        return availableTimestamps.getUpperLimit();
     }
 
     @Override
     public long getFreshTimestamp() {
-        long ret = getFreshTimestamps(1).getLowerBound();
-        return ret;
+        return getFreshTimestamps(1).getLowerBound();
     }
 
     @Override
-    public TimestampRange getFreshTimestamps(int numTimestampsRequested) {
-        Preconditions.checkArgument(numTimestampsRequested > 0,
-                "Number of timestamps requested must be greater than zero, was %s",
-                numTimestampsRequested);
-
-        if (numTimestampsRequested > MAX_REQUEST_RANGE_SIZE) {
-            numTimestampsRequested = MAX_REQUEST_RANGE_SIZE;
-        }
-        boolean hasLogged = false;
-        while (true) {
-            long upperLimit = upperLimitToHandOutInclusive.get();
-            long lastVal = lastReturnedTimestamp.get();
-            if (lastVal >= upperLimit) {
-                submitAllocationTask();
-                Throwable possibleFailure = allocationFailure;
-                if (possibleFailure instanceof MultipleRunningTimestampServiceError) {
-                    throw new ServiceNotAvailableException("This server is no longer valid because another is running.", possibleFailure);
-                } else if (possibleFailure != null) {
-                    throw new RuntimeException("failed to allocate more timestamps", possibleFailure);
-                }
-                if (!hasLogged) {
-                    log.info("Not enough timestamps were preallocated, so we requested a new batch");
-                    hasLogged = true;
-                }
-                if (Thread.interrupted()) {
-                    Thread.currentThread().interrupt();
-                    throw new PalantirInterruptedException("Interrupted while waiting for timestamp allocation.");
-                }
-                continue;
-            }
-            long newVal = Math.min(upperLimit, lastVal + numTimestampsRequested);
-            if (lastReturnedTimestamp.compareAndSet(lastVal, newVal)) {
-                if (isAllocationRequired(newVal, upperLimit)) {
-                    submitAllocationTask();
-                }
-                return TimestampRange.createInclusiveRange(lastVal + 1, newVal);
-            }
-        }
+    public synchronized TimestampRange getFreshTimestamps(int numTimestampsRequested) {
+        int numTimestampsToHandOut = cleanUpTimestampRequest(numTimestampsRequested);
+        TimestampRange handedOut = availableTimestamps.handOut(numTimestampsToHandOut);
+        asynchronouslyRefreshBuffer();
+        return handedOut;
     }
-    
+
     /**
      * Fast forwards the timestamp to the specified one so that no one can be served fresh timestamps prior
      * to it from now on.
      *
-     * Sets the upper limit in the TimestampBoundStore as well as increases the minimum timestamp that can 
+     * Sets the upper limit in the TimestampBoundStore as well as increases the minimum timestamp that can
      * be allocated from this instantiation of the TimestampService moving forward.
      *
      * The caller of this is responsible for not using any of the fresh timestamps previously served to it,
      * and must call getFreshTimestamps() to ensure it is using timestamps after the fastforward point.
      *
-     * @param timestamp
+     * @param newMinimumTimestamp
      */
-    public synchronized void fastForwardTimestamp(long timestamp) {
-        long upperLimit = timestamp + ALLOCATION_BUFFER_SIZE;
-        store.storeUpperLimit(upperLimit);
-        // Prevent upper limit from falling behind stored upper limit.
-        advanceAtomicLongToValue(upperLimitToHandOutInclusive, upperLimit);
-
-        // Prevent ourselves from serving any of the bad (read: pre-fastForward) timestamps
-        advanceAtomicLongToValue(lastReturnedTimestamp, timestamp);
+    public void fastForwardTimestamp(long newMinimumTimestamp) {
+        availableTimestamps.fastForwardTo(newMinimumTimestamp);
     }
+
+    private int cleanUpTimestampRequest(int numTimestampsRequested) {
+        Preconditions.checkArgument(numTimestampsRequested > 0,
+                "Number of timestamps requested must be greater than zero, was %s",
+                numTimestampsRequested);
+
+        return Math.min(numTimestampsRequested, MAX_REQUEST_RANGE_SIZE);
+    }
+
+    private void asynchronouslyRefreshBuffer() {
+        executor.submit(new Runnable() {
+            @Override
+            public void run() {
+                availableTimestamps.refreshBuffer();
+            }
+        });
+    }
+
 }
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentUpperLimit.java b/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentUpperLimit.java
new file mode 100644
index 00000000000..9379b7a6be0
--- /dev/null
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/PersistentUpperLimit.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.concurrent.GuardedBy;
+
+import com.palantir.common.time.Clock;
+import com.palantir.common.time.SystemClock;
+import com.palantir.exception.PalantirInterruptedException;
+
+public class PersistentUpperLimit {
+
+    private final TimestampBoundStore tbs;
+    private final Clock clock;
+    private final TimestampAllocationFailures allocationFailures;
+
+    @GuardedBy("this")
+    private volatile long cachedValue;
+    private volatile long lastIncreasedTime;
+
+    public PersistentUpperLimit(TimestampBoundStore tbs, Clock clock, TimestampAllocationFailures allocationFailures) {
+        this.tbs = tbs;
+        this.clock = clock;
+        this.allocationFailures = checkNotNull(allocationFailures);
+
+        cachedValue = tbs.getUpperLimit();
+        lastIncreasedTime = clock.getTimeMillis();
+    }
+
+    public PersistentUpperLimit(TimestampBoundStore boundStore) {
+        this(boundStore, new SystemClock(), new TimestampAllocationFailures());
+    }
+
+    public long get() {
+        return cachedValue;
+    }
+
+    public synchronized void increaseToAtLeast(long minimum) {
+        if(cachedValue < minimum) {
+            store(minimum);
+        }
+    }
+
+    public boolean hasIncreasedWithin(int time, TimeUnit unit) {
+        long durationInMillis = unit.toMillis(time);
+        long timeSinceIncrease = clock.getTimeMillis() - lastIncreasedTime;
+
+        return timeSinceIncrease < durationInMillis;
+    }
+
+    private synchronized void store(long upperLimit) {
+        checkWeHaveNotBeenInterrupted();
+        allocationFailures.verifyWeShouldTryToAllocateMoreTimestamps();
+        persistNewUpperLimit(upperLimit);
+        cachedValue = upperLimit;
+        lastIncreasedTime = clock.getTimeMillis();
+    }
+
+    private void checkWeHaveNotBeenInterrupted() {
+        if (Thread.currentThread().isInterrupted()) {
+            throw new PalantirInterruptedException("Was interrupted while trying to allocate more timestamps");
+        }
+    }
+
+    private void persistNewUpperLimit(long upperLimit) {
+        try {
+            tbs.storeUpperLimit(upperLimit);
+        } catch (Throwable error) {
+            throw allocationFailures.responseTo(error);
+        }
+    }
+
+}
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/RateLimitedTimestampService.java b/timestamp-impl/src/main/java/com/palantir/timestamp/RateLimitedTimestampService.java
index 0a3c9c18f0c..3aba596e197 100644
--- a/timestamp-impl/src/main/java/com/palantir/timestamp/RateLimitedTimestampService.java
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/RateLimitedTimestampService.java
@@ -78,7 +78,7 @@ public long getFreshTimestamp() {
             try {
                 batch.awaitPopulation();
             } catch (InterruptedException e) {
-                log.error("Interrupted waiting for timestamp batch to populate. Trying another batch.", e);
+                log.warn("Interrupted waiting for timestamp batch to populate. Trying another batch.", e);
                 throw Throwables.rewrapAndThrowUncheckedException(e);
             }
             if (!batch.isFailed()) {
diff --git a/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java b/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java
new file mode 100644
index 00000000000..183906fc9cc
--- /dev/null
+++ b/timestamp-impl/src/main/java/com/palantir/timestamp/TimestampAllocationFailures.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+import javax.annotation.concurrent.GuardedBy;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.palantir.common.remoting.ServiceNotAvailableException;
+
+public class TimestampAllocationFailures {
+    private static final String SERVICE_UNAVAILABLE_ERROR =
+            "This server is no longer usable as there appears to be another timestamp server running.";
+    private static final String MULTIPLE_RUNNING_TIMESTAMP_SERVICES_MESSAGE = "This server is no longer usable as there appears to be another timestamp server running.";
+    private final Logger log;
+
+    @GuardedBy("this")
+    private Throwable previousAllocationFailure;
+
+    public TimestampAllocationFailures(Logger log) {
+        this.log = log;
+    }
+
+    public TimestampAllocationFailures() {
+        this(LoggerFactory.getLogger(TimestampAllocationFailures.class));
+    }
+
+
+    public synchronized RuntimeException responseTo(Throwable newFailure) {
+        logNewFailure(newFailure);
+        previousAllocationFailure = newFailure;
+
+        if (newFailure instanceof MultipleRunningTimestampServiceError) {
+            return wrapMultipleRunningTImestampServiceError(newFailure);
+        }
+
+        return new RuntimeException("Could not allocate more timestamps", newFailure);
+   }
+
+    public synchronized void verifyWeShouldTryToAllocateMoreTimestamps() {
+        if(previousAllocationFailure instanceof MultipleRunningTimestampServiceError) {
+            throw wrapMultipleRunningTImestampServiceError(previousAllocationFailure);
+        }
+    }
+
+    private void logNewFailure(Throwable newFailure) {
+        String message = "We encountered an error while trying to allocate more timestamps. ";
+        if(isSameAsPreviousFailure(newFailure)) {
+            log.info(message + "This is a repeat of the previous failure", newFailure);
+        } else {
+            log.error(message + "If this failure repeats it will be logged at the INFO level", newFailure);
+        }
+    }
+
+    private boolean isSameAsPreviousFailure(Throwable newFailure) {
+        if(previousAllocationFailure == null) {
+            return false;
+        }
+
+        return newFailure.getClass().equals(previousAllocationFailure.getClass());
+    }
+
+    private ServiceNotAvailableException wrapMultipleRunningTImestampServiceError(Throwable newFailure) {
+        return new ServiceNotAvailableException(MULTIPLE_RUNNING_TIMESTAMP_SERVICES_MESSAGE, newFailure);
+    }
+}
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/AvailableTimestampsTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/AvailableTimestampsTest.java
new file mode 100644
index 00000000000..e412653dc7e
--- /dev/null
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/AvailableTimestampsTest.java
@@ -0,0 +1,137 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.core.Is.is;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.longThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class AvailableTimestampsTest {
+
+    public static final long UPPER_LIMIT = 1000 * 1000;
+    public static final long LAST_RETURNED =  UPPER_LIMIT - 1000;
+    public static final long INITIAL_REMAINING_TIMESTAMPS = UPPER_LIMIT - LAST_RETURNED;
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    private final LastReturnedTimestamp lastReturnedTimestamp = new LastReturnedTimestamp(LAST_RETURNED);
+    private final PersistentUpperLimit persistentUpperLimit = upperLimitOf(UPPER_LIMIT);
+
+    private final AvailableTimestamps availableTimestamps = new AvailableTimestamps(
+            lastReturnedTimestamp,
+            persistentUpperLimit
+    );
+
+    @Test
+    public void shouldHandOutNonOverLappingTimestampRanges() {
+        TimestampRange first = availableTimestamps.handOut(10);
+        TimestampRange second = availableTimestamps.handOut(10);
+
+        assertThat(first.getUpperBound(), is(lessThan(second.getUpperBound())));
+    }
+
+    @Test
+    public void shouldHandOutRangesOfTheCorrectSize() {
+        assertThat(availableTimestamps.handOut(10).size(), is(10L));
+    }
+
+    @Test public void
+    shouldRefreshTheBufferIfHalfOfItIsUsedUp() {
+        availableTimestamps.handOut(INITIAL_REMAINING_TIMESTAMPS - 10);
+        availableTimestamps.refreshBuffer();
+
+        verify(persistentUpperLimit).increaseToAtLeast(
+                UPPER_LIMIT - 10 + AvailableTimestamps.ALLOCATION_BUFFER_SIZE
+        );
+    }
+
+    @Test public void
+    shouldRefreshTheBufferIfNoIncreaseHasHappenedWithin1Minute() {
+        when(persistentUpperLimit.hasIncreasedWithin(1, MINUTES)).thenReturn(false);
+
+        availableTimestamps.refreshBuffer();
+
+        verify(persistentUpperLimit).increaseToAtLeast(
+                longThat(is(greaterThan(UPPER_LIMIT)))
+        );
+    }
+
+    @Test public void
+    shouldNotRefreshTheBufferIfMoreThanHalfIsLeftAndWeHaveUpdatedRecently() {
+        when(persistentUpperLimit.hasIncreasedWithin(1, MINUTES)).thenReturn(true);
+        when(persistentUpperLimit.get()).thenReturn(2 * UPPER_LIMIT);
+
+        availableTimestamps.refreshBuffer();
+
+        verify(persistentUpperLimit, never()).increaseToAtLeast(anyLong());
+    }
+
+    @Test public void
+    shouldIncreaseUpperLimitIfNecessaryToHandOutNewTimestamps() {
+        assertThat(
+                availableTimestamps.handOut(INITIAL_REMAINING_TIMESTAMPS + 10).getUpperBound(),
+                is(UPPER_LIMIT + 10));
+
+        verify(persistentUpperLimit).increaseToAtLeast(UPPER_LIMIT + 10);
+    }
+
+    @Test public void
+    shouldNotHandOutMoreThanTenThousandTimestampsAtATime() {
+        exception.expect(IllegalArgumentException.class);
+        exception.expectMessage("Can only hand out 10000 timestamps at a time");
+        exception.expectMessage("20000");
+
+        availableTimestamps.handOut(20*1000);
+    }
+
+    @Test public void
+    shouldHandOutExactlyTenThousandTimestamps() {
+        availableTimestamps.handOut(10*1000);
+    }
+
+    @Test public void
+    canFastForwardToANewMinimumTimestamp() {
+        long newMinimum = 2 * UPPER_LIMIT;
+        availableTimestamps.fastForwardTo(newMinimum);
+
+        assertThat(lastReturnedTimestamp.get(), is(newMinimum));
+        verify(persistentUpperLimit).increaseToAtLeast(longGreaterThan(newMinimum));
+    }
+
+    private long longGreaterThan(long n) {
+        return longThat(is(greaterThan(n)));
+    }
+
+    private PersistentUpperLimit upperLimitOf(long timestamp) {
+        PersistentUpperLimit upperLimit = mock(PersistentUpperLimit.class);
+        when(upperLimit.get()).thenReturn(timestamp);
+        return upperLimit;
+    }
+}
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/InMemoryTimestampBoundStore.java b/timestamp-impl/src/test/java/com/palantir/timestamp/InMemoryTimestampBoundStore.java
new file mode 100644
index 00000000000..50ba69d4691
--- /dev/null
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/InMemoryTimestampBoundStore.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+
+import com.google.common.base.Optional;
+
+public class InMemoryTimestampBoundStore implements TimestampBoundStore {
+    private volatile long upperLimit = 0;
+    private volatile int numberOfAllocations = 0;
+    private boolean shouldThrowErrorMultipleServerError = false;
+    private Optional<RuntimeException> error = Optional.absent();
+
+    @Override
+    public long getUpperLimit() {
+        return upperLimit;
+    }
+
+    @Override
+    public void storeUpperLimit(long newLimit) throws MultipleRunningTimestampServiceError {
+        if(shouldThrowErrorMultipleServerError) {
+            throw new MultipleRunningTimestampServiceError("error");
+        }
+
+        if(error.isPresent()) {
+            throw error.orNull();
+        }
+        numberOfAllocations++;
+        upperLimit = newLimit;
+    }
+
+    public void pretendMultipleServersAreRunning() {
+        this.shouldThrowErrorMultipleServerError = true;
+    }
+
+    public int numberOfAllocations() {
+        return numberOfAllocations;
+    }
+
+    public void failWith(RuntimeException e) {
+        this.error = Optional.of(e);
+    }
+}
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/LastReturnedTimestampTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/LastReturnedTimestampTest.java
new file mode 100644
index 00000000000..b40a89f419d
--- /dev/null
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/LastReturnedTimestampTest.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.junit.Test;
+
+public class LastReturnedTimestampTest {
+    private static final long INITIAL_VALUE = 100;
+
+    LastReturnedTimestamp timestamp = new LastReturnedTimestamp(INITIAL_VALUE);
+    private ExecutorService executor = Executors.newFixedThreadPool(4);
+
+    @Test
+    public void shouldIncreaseTheValueToAHigherNumber() {
+        timestamp.increaseToAtLeast(INITIAL_VALUE + 10);
+
+        assertThat(timestamp.get(), is(INITIAL_VALUE + 10));
+    }
+
+    @Test
+    public void shouldNotIncreaseTheValueToALowerNumber() {
+        timestamp.increaseToAtLeast(INITIAL_VALUE - 10);
+
+        assertThat(timestamp.get(), is(INITIAL_VALUE));
+    }
+
+    @Test
+    public void handleConcurrentlyIncreasingTheValue() throws InterruptedException {
+        for(int i = 0; i <= 100; i++) {
+            final int value = i;
+            executor.submit(new Runnable() {
+                @Override
+                public void run() {
+                    timestamp.increaseToAtLeast(INITIAL_VALUE + value);
+                }
+            });
+        }
+
+        waitForExecutorToFinish();
+
+        assertThat(timestamp.get(), is(INITIAL_VALUE + 100));
+    }
+
+    private void waitForExecutorToFinish() throws InterruptedException {
+        executor.shutdown();
+        executor.awaitTermination(10, SECONDS);
+    }
+}
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceIntegrationTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceIntegrationTest.java
new file mode 100644
index 00000000000..132d609a283
--- /dev/null
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceIntegrationTest.java
@@ -0,0 +1,164 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.lessThan;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeoutException;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import com.palantir.common.remoting.ServiceNotAvailableException;
+
+public class PersistentTimestampServiceIntegrationTest {
+    private static final long ONE_MILLION = 1000 * 1000;
+    private static final long TWO_MILLION = 2 * ONE_MILLION;
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    private InMemoryTimestampBoundStore timestampBoundStore = new InMemoryTimestampBoundStore();
+    private PersistentTimestampService persistentTimestampService = PersistentTimestampService.create(timestampBoundStore);
+    private ExecutorService executor = Executors.newFixedThreadPool(16);
+
+    @Test public void
+    tiemstampsAreReturnedInOrder() {
+        List<Long> timestamps = new ArrayList<>();
+
+        timestamps.add(persistentTimestampService.getFreshTimestamp());
+        timestamps.add(persistentTimestampService.getFreshTimestamp());
+        timestamps.add(persistentTimestampService.getFreshTimestamp());
+
+        assertThat(timestamps, contains(1L, 2L, 3L));
+    }
+
+    @Test public void
+    timestampRangesAreReturnedInNonOverlappingOrder() {
+        List<TimestampRange> timestampRanges = new ArrayList<>();
+
+        timestampRanges.add(persistentTimestampService.getFreshTimestamps(10));
+        timestampRanges.add(persistentTimestampService.getFreshTimestamps(10));
+
+        long firstUpperBound = timestampRanges.get(0).getUpperBound();
+        long secondLowerBound = timestampRanges.get(1).getLowerBound();
+
+        assertThat(firstUpperBound, is(lessThan(secondLowerBound)));
+    }
+
+
+    @Test public void
+    canRequestMoreTimestampsThanAreAllocatedAtOnce() {
+        for(int i = 0; i < ONE_MILLION / 1000; i++) {
+            persistentTimestampService.getFreshTimestamps(1000);
+        }
+
+        assertThat(persistentTimestampService.getFreshTimestamp(), is(ONE_MILLION + 1));
+    }
+
+    @Test public void
+    shouldLimitRequestsForMoreThanTenThousandTimestamps() {
+        assertThat(
+                persistentTimestampService.getFreshTimestamps(100 * 1000).size(),
+                is(10 * 1000L)
+        );
+    }
+
+    @Test public void
+    willNotHandOutTimestampsEarlierThanAFastForward() {
+        persistentTimestampService.fastForwardTimestamp(TWO_MILLION);
+
+        assertThat(
+                persistentTimestampService.getFreshTimestamp(),
+                is(greaterThan(TWO_MILLION)));
+    }
+
+    @Test public void
+    canReturnManyUniqueTimestampsInParallel() throws InterruptedException, TimeoutException {
+        Set<Long> uniqueTimestamps = new ConcurrentSkipListSet<>();
+
+        repeat(TWO_MILLION, new Runnable() {
+            @Override
+            public void run() {
+                uniqueTimestamps.add(persistentTimestampService.getFreshTimestamp());
+            }
+        });
+
+        assertThat(uniqueTimestamps.size(), is((int) TWO_MILLION));
+    }
+
+    @Test(expected = ServiceNotAvailableException.class) public void
+    throwsAserviceNotAvailableExceptionIfThereAreMultipleServersRunning() {
+        timestampBoundStore.pretendMultipleServersAreRunning();
+
+        persistentTimestampService.getFreshTimestamp();
+    }
+
+    @Test public void
+    shouldRethrowAllocationExceptions() {
+        final IllegalArgumentException failure = new IllegalArgumentException();
+        exception.expect(RuntimeException.class);
+        exception.expectCause(is(failure));
+
+        timestampBoundStore.failWith(failure);
+
+        persistentTimestampService.getFreshTimestamp();
+    }
+
+    @Test public void
+    shouldNotTryToStoreANewBoundIfMultipleServicesAreRunning() {
+        timestampBoundStore.pretendMultipleServersAreRunning();
+
+        getTimestampAndIgnoreErrors();
+        getTimestampAndIgnoreErrors();
+
+        assertThat(timestampBoundStore.numberOfAllocations(), is(lessThan(2)));
+    }
+
+    private void repeat(long count, Runnable task) throws InterruptedException, TimeoutException {
+        for(int i = 0; i < count; i++) {
+            executor.submit(task);
+        }
+
+        executor.shutdown();
+        executor.awaitTermination(1, MINUTES);
+
+        if(!executor.isTerminated()) {
+            throw new TimeoutException("Timed out waiting for the executor to terminate");
+        }
+    }
+
+    private void getTimestampAndIgnoreErrors() {
+        try {
+            persistentTimestampService.getFreshTimestamp();
+        } catch (Exception e) {
+            // expected
+        }
+    }
+}
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTest.java
index b2136b4bda7..d91d3bf11de 100644
--- a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTest.java
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentTimestampServiceTest.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2015 Palantir Technologies
- *
+ * <p>
  * Licensed under the BSD-3 License (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * <p>
  * http://opensource.org/licenses/BSD-3-Clause
- *
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,214 +15,80 @@
  */
 package com.palantir.timestamp;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
 import static org.mockito.Matchers.anyLong;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.atMost;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.lib.concurrent.Synchroniser;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.exceptions.verification.TooLittleActualInvocations;
 
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.Futures;
-import com.jayway.awaitility.Awaitility;
-import com.jayway.awaitility.Duration;
-import com.palantir.common.concurrent.PTExecutors;
-import com.palantir.common.remoting.ServiceNotAvailableException;
-import com.palantir.common.time.Clock;
+import org.junit.Test;
 
 public class PersistentTimestampServiceTest {
 
-    @Rule
-    public final ExpectedException expectedException = ExpectedException.none();
+    private static final long INITIAL_TIMESTAMP = 12345L;
+    private static final long TIMESTAMP = 100 * 1000;
+    private static final TimestampRange SINGLE_TIMESTAMP_RANGE = TimestampRange.createInclusiveRange(TIMESTAMP, TIMESTAMP);
 
-    @Test
-    public void testFastForward() {
-        Mockery m = new Mockery();
-        m.setThreadingPolicy(new Synchroniser());
-        final TimestampBoundStore tbsMock = m.mock(TimestampBoundStore.class);
-        final long initialValue = 1234567L;
-        final long futureTimestamp = 12345678L;
-        m.checking(new Expectations() {{
-            oneOf(tbsMock).getUpperLimit(); will(returnValue(initialValue));
-            oneOf(tbsMock).storeUpperLimit(initialValue + PersistentTimestampService.ALLOCATION_BUFFER_SIZE);
-            oneOf(tbsMock).storeUpperLimit(futureTimestamp + PersistentTimestampService.ALLOCATION_BUFFER_SIZE);
-        }});
-
-        final PersistentTimestampService ptsService = PersistentTimestampService.create(tbsMock);
-        for (int i = 1; i <= 1000; i++) {
-            assertEquals(initialValue+i, ptsService.getFreshTimestamp());
-        }
-
-        ptsService.fastForwardTimestamp(futureTimestamp);
-        for (int i = 1; i <= 1000; i++) {
-            assertEquals(futureTimestamp+i, ptsService.getFreshTimestamp());
-        }
-
-        m.assertIsSatisfied();
-    }
+    private static final TimestampRange RANGE = TimestampRange.createInclusiveRange(100, 200);
+
+    private AvailableTimestamps availableTimestamps = mock(AvailableTimestamps.class);
+    private ExecutorService executor = Executors.newSingleThreadExecutor();
+    private PersistentTimestampService timestampService = new PersistentTimestampService(availableTimestamps, executor);
 
     @Test
-    public void incrementUpperLimitIfOneMinuteElapsedSinceLastUpdate() throws InterruptedException {
-        Clock clock = mock(Clock.class);
-        when(clock.getTimeMillis())
-                .thenReturn(0L,
-                        minutesToMillis(2),
-                        minutesToMillis(4),
-                        minutesToMillis(6));
-        TimestampBoundStore timestampBoundStore = initialTimestampBoundStore();
-        PersistentTimestampService persistentTimestampService = PersistentTimestampService.create(timestampBoundStore, clock);
-
-        persistentTimestampService.getFreshTimestamp();
-        persistentTimestampService.getFreshTimestamp();
-        Awaitility
-                .await("awaitStoreUpperLimitCalledAtLeastTwice")
-                .timeout(Duration.ONE_MINUTE)
-                .ignoreExceptionsMatching(e -> e.getCause() instanceof TooLittleActualInvocations)
-                .until(() -> {
-                    try {
-                        verify(timestampBoundStore, atLeast(2)).storeUpperLimit(anyLong());
-                    } catch (TooLittleActualInvocations e) {
-                        throw new RuntimeException(e);
-                    }
-                });
+    public void
+    shouldDelegateFastForwardingToAvailableTimestamps() {
+        timestampService.fastForwardTimestamp(INITIAL_TIMESTAMP + 1000);
+        verify(availableTimestamps).fastForwardTo(INITIAL_TIMESTAMP + 1000);
     }
 
     @Test
-    public void doNotIncrementUpperLimitTooManyTimes() {
-        // In the current implementation, it is possible for a single call to getFreshTimestamp to invoke storeUpperLimit more than once.
-        // However, the number of such invocations should not be massive
-        TimestampBoundStore timestampBoundStore = initialTimestampBoundStore();
-        PersistentTimestampService persistentTimestampService = PersistentTimestampService.create(timestampBoundStore);
+    public void shouldRequestABufferRefreshAfterEveryTimestampRequest() throws InterruptedException {
+        when(availableTimestamps.handOut(1)).thenReturn(SINGLE_TIMESTAMP_RANGE);
 
-        persistentTimestampService.getFreshTimestamp();
-
-        verify(timestampBoundStore, atMost(2)).storeUpperLimit(anyLong());
+        timestampService.getFreshTimestamp();
+        waitForExecutorToFinish();
+        verify(availableTimestamps).refreshBuffer();
     }
 
     @Test
-    public void incrementUpperLimitOnFirstFreshTimestampRequest() {
-        TimestampBoundStore timestampBoundStore = initialTimestampBoundStore();
-        PersistentTimestampService persistentTimestampService = PersistentTimestampService.create(timestampBoundStore);
+    public void shouldLimitRequestsTo10000Timestamps() throws InterruptedException {
+        when(availableTimestamps.handOut(anyLong())).thenReturn(RANGE);
 
-        persistentTimestampService.getFreshTimestamp();
+        timestampService.getFreshTimestamps(20000);
 
-        verify(timestampBoundStore).storeUpperLimit(PersistentTimestampService.ALLOCATION_BUFFER_SIZE);
+        verify(availableTimestamps).handOut(10000);
     }
 
-    @Test
-    public void multipleFreshTimestampRequestsShouldIncreaseUpperLimitOnlyOnce() {
-        TimestampBoundStore timestampBoundStore = initialTimestampBoundStore();
-        PersistentTimestampService persistentTimestampService = PersistentTimestampService.create(timestampBoundStore);
-
-        getFreshTimestampsInParallel(persistentTimestampService, 20);
-
-        verify(timestampBoundStore, times(1)).storeUpperLimit(PersistentTimestampService.ALLOCATION_BUFFER_SIZE);
+    @Test(expected = IllegalArgumentException.class)
+    public void willRejectRequestsForLessThan1Timestamp() throws InterruptedException {
+        timestampService.getFreshTimestamps(0);
     }
 
     @Test
-    public void throwOnTimestampRequestIfBoundStoreCannotStoreNewUpperLimit() {
-        PersistentTimestampService persistentTimestampService = PersistentTimestampService.create(failingTimestampBoundStore());
+    public void shouldRequestTheRightTimestampFromTheAvailableTimestamps() {
+        when(availableTimestamps.handOut(10)).thenReturn(RANGE);
 
-        expectedException.expect(ServiceNotAvailableException.class);
-        persistentTimestampService.getFreshTimestamp();
+        assertThat(timestampService.getFreshTimestamps(10), is(RANGE));
     }
 
     @Test
-    public void testLimit() throws InterruptedException {
-        Mockery m = new Mockery();
-        m.setThreadingPolicy(new Synchroniser());
-        final TimestampBoundStore tbsMock = m.mock(TimestampBoundStore.class);
-        final long initialValue = 72;
-        m.checking(new Expectations() {{
-            oneOf(tbsMock).getUpperLimit(); will(returnValue(initialValue));
-            oneOf(tbsMock).storeUpperLimit(with(any(Long.class)));
-            // Throws exceptions after here, which will prevent allocating more timestamps.
-        }});
-
-        // Use up all initially-allocated timestamps.
-        final TimestampService tsService = PersistentTimestampService.create(tbsMock);
-        for (int i = 1; i <= PersistentTimestampService.ALLOCATION_BUFFER_SIZE; ++i) {
-            assertEquals(initialValue+i, tsService.getFreshTimestamp());
-        }
-
-        ExecutorService exec = PTExecutors.newSingleThreadExecutor();
-        Future<?> f = exec.submit(new Runnable() {
-            @Override
-            public void run() {
-                // This will block.
-                tsService.getFreshTimestamp();
-            }
-        });
-
-        try {
-            f.get(10, TimeUnit.MILLISECONDS);
-            fail("We should be blocking");
-        } catch (ExecutionException e) {
-            // we expect this failure because we can't allocate timestamps
-        } catch (TimeoutException e) {
-            // We expect this timeout, as we're blocking.
-        } finally {
-            f.cancel(true);
-            exec.shutdown();
-        }
-    }
+    public void shouldRequestOnlyRequestASingleTimestampIfOnGetFreshTimestamp() {
+        when(availableTimestamps.handOut(1)).thenReturn(SINGLE_TIMESTAMP_RANGE);
 
-    private void getFreshTimestampsInParallel(PersistentTimestampService persistentTimestampService, int numTimes) {
-        ExecutorService executorService = Executors.newFixedThreadPool(numTimes / 2);
-        try {
-            List<Future<Long>> futures = Lists.newArrayListWithExpectedSize(numTimes);
-            for (int i = 0; i < numTimes; i++) {
-                Future<Long> future = executorService.submit(new Callable<Long>() {
-                    @Override
-                    public Long call() throws Exception {
-                        return persistentTimestampService.getFreshTimestamp();
-                    }
-                });
-                futures.add(future);
-            }
-            for (int i = 0; i < futures.size(); i++) {
-                Futures.getUnchecked(futures.get(i));
-            }
-        } finally {
-            executorService.shutdown();
-        }
+        assertThat(timestampService.getFreshTimestamp(), is(TIMESTAMP));
     }
 
-    private TimestampBoundStore initialTimestampBoundStore() {
-        TimestampBoundStore timestampBoundStore = mock(TimestampBoundStore.class);
-        when(timestampBoundStore.getUpperLimit()).thenReturn(0L);
-        return timestampBoundStore;
+    private void waitForExecutorToFinish() throws InterruptedException {
+        executor.shutdown();
+        executor.awaitTermination(10, SECONDS);
     }
 
-    private TimestampBoundStore failingTimestampBoundStore() {
-        TimestampBoundStore timestampBoundStore = mock(TimestampBoundStore.class);
-        when(timestampBoundStore.getUpperLimit()).thenReturn(0L);
-        doThrow(new MultipleRunningTimestampServiceError("error")).when(timestampBoundStore).storeUpperLimit(anyLong());
-        return timestampBoundStore;
-    }
-
-    private static long minutesToMillis(long minutes) {
-        return TimeUnit.MINUTES.toMillis(minutes);
-    }
 }
+
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentUpperLimitTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentUpperLimitTest.java
new file mode 100644
index 00000000000..82c87691ea1
--- /dev/null
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/PersistentUpperLimitTest.java
@@ -0,0 +1,195 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import com.palantir.common.time.Clock;
+import com.palantir.exception.PalantirInterruptedException;
+
+public class PersistentUpperLimitTest {
+    private static final long TIMESTAMP = 12345L;
+    private static final long INITIAL_UPPER_LIMIT = 10L;
+
+    private final Clock clock = mock(Clock.class);
+    private TimestampBoundStore boundStore;
+    private PersistentUpperLimit upperLimit;
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+    private final TimestampAllocationFailures allocationFailures = mock(TimestampAllocationFailures.class);
+
+    @Before
+    public void setup() {
+        boundStore = mock(TimestampBoundStore.class);
+        when(boundStore.getUpperLimit()).thenReturn(INITIAL_UPPER_LIMIT);
+        upperLimit = new PersistentUpperLimit(boundStore, clock, allocationFailures);
+    }
+
+    @Test
+    public void shouldStartWithTheCurrentStoredLimit() {
+        when(boundStore.getUpperLimit()).thenReturn(TIMESTAMP);
+
+        PersistentUpperLimit brandNewUpperLimit = new PersistentUpperLimit(boundStore, clock, new TimestampAllocationFailures());
+
+        assertThat(brandNewUpperLimit.get(), is(TIMESTAMP));
+    }
+
+    @Test
+    public void shouldOnlyMakeOneGetCallToTheUnderlyingStore() {
+        upperLimit.get();
+        upperLimit.get();
+
+        verify(boundStore, times(1)).getUpperLimit();
+    }
+
+    @Test
+    public void shouldIncreaseTheUpperLimitIfTheNewLimitIsBigger() {
+        upperLimit.increaseToAtLeast(TIMESTAMP);
+
+        upperLimit.increaseToAtLeast(TIMESTAMP + 1000);
+        assertThat(upperLimit.get(), is(TIMESTAMP + 1000));
+    }
+
+    @Test
+    public void shouldNotIncreaseTheUpperLimitIfTheNewLimitIsSmaller() {
+        upperLimit.increaseToAtLeast(TIMESTAMP);
+
+        upperLimit.increaseToAtLeast(TIMESTAMP - 1000);
+        assertThat(upperLimit.get(), is(TIMESTAMP));
+    }
+
+    @Test
+    public void shouldPersistAnIncreasedTimestamp() {
+        upperLimit.increaseToAtLeast(TIMESTAMP);
+
+        upperLimit.increaseToAtLeast(TIMESTAMP + 1000);
+        verify(boundStore).storeUpperLimit(TIMESTAMP + 1000);
+    }
+
+    @Test
+    public void shouldNotChangeTheCurrentUpperLimitIfItFailsToPersist() {
+        doThrow(RuntimeException.class).when(boundStore).storeUpperLimit(anyLong());
+
+        try {
+            upperLimit.increaseToAtLeast(INITIAL_UPPER_LIMIT + 10);
+        } catch (Exception e) {
+            // We expect this to throw
+        }
+
+        assertThat(upperLimit.get(), is(INITIAL_UPPER_LIMIT));
+    }
+
+    @Test
+    public void shouldKnowIfItWasUpdateWithinACertainTimeframe() {
+        whenTheTimeIs(1, MINUTES);
+
+        upperLimit.increaseToAtLeast(TIMESTAMP);
+
+        whenTheTimeIs(4, MINUTES);
+
+        assertThat(upperLimit.hasIncreasedWithin(2, MINUTES), is(false));
+    }
+
+    @Test
+    public void shouldKnowIfItWasNotUpdateWithinACertainTimeframe() {
+        whenTheTimeIs(1, MINUTES);
+
+        upperLimit.increaseToAtLeast(TIMESTAMP);
+
+        whenTheTimeIs(2, MINUTES);
+
+        assertThat(upperLimit.hasIncreasedWithin(2, MINUTES), is(true));
+    }
+
+    @Test
+    public void shouldDelegateHandlingOfAllocationFailures() {
+        RuntimeException failure = new RuntimeException();
+        RuntimeException expectedException = new RuntimeException();
+
+        doThrow(failure).when(boundStore).storeUpperLimit(anyLong());
+        when(allocationFailures.responseTo(failure)).thenReturn(expectedException);
+
+        exception.expect(is(expectedException));
+
+        upperLimit.increaseToAtLeast(INITIAL_UPPER_LIMIT + 10);
+    }
+
+    @Test
+    public void shouldNotAllocateTimestampsIfAllocationFailuresDisallowsIt() {
+        doThrow(RuntimeException.class).when(allocationFailures).verifyWeShouldTryToAllocateMoreTimestamps();
+
+        try {
+            upperLimit.increaseToAtLeast(INITIAL_UPPER_LIMIT + 10);
+        } catch (Exception e) {
+            // ignore expected exception
+        }
+
+        verify(boundStore, never()).storeUpperLimit(anyLong());
+    }
+
+    @Test
+    public void shouldThrowAnInterruptedExceptionIfTheThreadIsInterrupted() {
+        try {
+            exception.expect(PalantirInterruptedException.class);
+
+            Thread.currentThread().interrupt();
+
+            upperLimit.increaseToAtLeast(INITIAL_UPPER_LIMIT + 10);
+        } finally {
+            // Clear the interrupt
+            Thread.interrupted();
+        }
+    }
+
+    @Test
+    public void shouldNotTryToPersistANewLimitIfInterrupted() {
+        try {
+            Thread.currentThread().interrupt();
+            upperLimit.increaseToAtLeast(INITIAL_UPPER_LIMIT + 10);
+        } catch (Exception e) {
+            // Ingnore expected exception
+        } finally {
+            // Clear the interrupt
+            Thread.interrupted();
+        }
+
+        verify(boundStore, never()).storeUpperLimit(anyLong());
+    }
+
+    private void whenTheTimeIs(long time, TimeUnit unit) {
+        when(clock.getTimeMillis()).thenReturn(unit.toMillis(time));
+    }
+
+
+}
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java
new file mode 100644
index 00000000000..5f14fbc5c83
--- /dev/null
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampAllocationFailuresTest.java
@@ -0,0 +1,115 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.Is.isA;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.slf4j.Logger;
+
+import com.palantir.common.remoting.ServiceNotAvailableException;
+
+public class TimestampAllocationFailuresTest {
+    private static final RuntimeException FAILURE = new IllegalStateException();
+    private static final MultipleRunningTimestampServiceError MULTIPLE_RUNNING_SERVICES_FAILURE =
+            new MultipleRunningTimestampServiceError("error");
+
+    private final Logger log = mock(Logger.class);
+    private final TimestampAllocationFailures allocationFailures = new TimestampAllocationFailures(log);
+
+    @Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @Test public void
+    shouldRethrowExceptions() {
+        RuntimeException response = allocationFailures.responseTo(FAILURE);
+
+        assertThat(response.getCause(), is(FAILURE));
+        assertThat(response, isA(RuntimeException.class));
+        assertThat(response.getMessage(), containsString("Could not allocate more timestamps"));
+
+    }
+
+    @Test public void
+    shouldRethrowMultipleRunningTimestampServiceErrorsAsServiceNotAvailableExceptions() {
+        RuntimeException response = allocationFailures.responseTo(MULTIPLE_RUNNING_SERVICES_FAILURE);
+
+        assertThat(response instanceof ServiceNotAvailableException, is(true));
+        assertThat(response.getCause(), is(MULTIPLE_RUNNING_SERVICES_FAILURE));
+    }
+
+    @Test public void
+    shouldAllowTryingToAllocateMoreTimestampsAfterANormalRuntimeException() {
+        ignoringExceptions(() -> allocationFailures.responseTo(FAILURE));
+        allocationFailures.verifyWeShouldTryToAllocateMoreTimestamps();
+    }
+
+    @Test public void
+    shouldDisallowTryingToAllocateMoreTimestampsAfterAMultipleRunningTimestampServicesFailure() {
+        ignoringExceptions(() -> allocationFailures.responseTo(MULTIPLE_RUNNING_SERVICES_FAILURE));
+
+        exception.expectCause(is(MULTIPLE_RUNNING_SERVICES_FAILURE));
+        exception.expect(ServiceNotAvailableException.class);
+
+        allocationFailures.verifyWeShouldTryToAllocateMoreTimestamps();
+    }
+
+    @Test public void
+    shouldLogTheFirstOfATypeOfExceptionToError() {
+        ignoringExceptions(() -> allocationFailures.responseTo(FAILURE));
+
+        verify(log).error(anyString(), eq(FAILURE));
+    }
+
+    @Test public void
+    shouldLogTheSecondOfATypeOfExceptionToInfo() {
+        ignoringExceptions(() -> allocationFailures.responseTo(FAILURE));
+        ignoringExceptions(() -> allocationFailures.responseTo(FAILURE));
+
+        verify(log).info(anyString(), eq(FAILURE));
+    }
+
+    @Test public void
+    shouldLog2DifferentExceptionsToError() {
+        ignoringExceptions(() -> allocationFailures.responseTo(FAILURE));
+        ignoringExceptions(() -> allocationFailures.responseTo(MULTIPLE_RUNNING_SERVICES_FAILURE));
+
+        verify(log).error(anyString(), eq(FAILURE));
+        verify(log).error(anyString(), eq(MULTIPLE_RUNNING_SERVICES_FAILURE));
+    }
+
+    @FunctionalInterface
+    interface Action {
+        void perform();
+    }
+
+    private void ignoringExceptions(Action action) {
+        try {
+            action.perform();
+        } catch (Exception e) {
+            // Do nothing with expected exception
+        }
+    }
+}
diff --git a/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangeTest.java b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangeTest.java
new file mode 100644
index 00000000000..8c22b4e845d
--- /dev/null
+++ b/timestamp-impl/src/test/java/com/palantir/timestamp/TimestampRangeTest.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright 2016 Palantir Technologies
+ *
+ * Licensed under the BSD-3 License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.palantir.timestamp;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.core.Is.is;
+
+import org.junit.Test;
+
+public class TimestampRangeTest {
+    @Test
+    public void shouldHaveASizeOf1WhenCreatedWithTheSameUpperAndLowerBounds() {
+        assertThat(TimestampRange.createInclusiveRange(10,10).size(), is(1L));
+    }
+
+    @Test
+    public void shouldHaveASizeThatInludesBothEndpoints() {
+        assertThat(TimestampRange.createInclusiveRange(10,12).size(), is(3L));
+    }
+
+    @Test
+    public void shouldHaveTheSameSizeWhicheverWayRoundTheBoundsArePassed() {
+        long upper = 10;
+        long lower = 1;
+        TimestampRange lowerUpper = TimestampRange.createInclusiveRange(lower, upper);
+        TimestampRange upperLower = TimestampRange.createInclusiveRange(upper, lower);
+
+        assertThat(lowerUpper.size(), is(equalTo(upperLower.size())));
+    }
+}