diff --git a/glide.lock b/glide.lock
index 51b7db0b86..84aac00a8b 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: 2b4ad3bf1489a7cb5e62c6cb4c1fa976d4ae21993743e4968418c4e81925fb99
-updated: 2018-02-19T17:13:04.368106064Z
+hash: 89fd2ad769c283b6b29b02b84dd6459a40a47de5dfdfb15d7ced95d53ee9ec18
+updated: 2018-02-21T10:37:20.800957+01:00
 imports:
 - name: github.com/btcsuite/btcd
   version: 50de9da05b50eb15658bb350f6ea24368a111ab7
@@ -9,6 +9,8 @@ imports:
   version: 346938d642f2ec3594ed81d874461961cd0faa76
   subpackages:
   - spew
+- name: github.com/ebuchman/fail-test
+  version: 95f809107225be108efcf10a3509e4ea6ceef3c4
 - name: github.com/fsnotify/fsnotify
   version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
 - name: github.com/go-kit/kit
@@ -40,6 +42,8 @@ imports:
   - ptypes/timestamp
 - name: github.com/golang/snappy
   version: 553a641470496b2327abcac10b36396bd98e45c9
+- name: github.com/gorilla/websocket
+  version: ea4d1f681babbce9545c9c5f3d5194a789c89f5b
 - name: github.com/hashicorp/hcl
   version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8
   subpackages:
@@ -51,6 +55,8 @@ imports:
   - json/parser
   - json/scanner
   - json/token
+- name: github.com/howeyc/crc16
+  version: 96a97a1abb579c7ff1a8ffa77f2e72d1c314b57f
 - name: github.com/inconshreveable/mousetrap
   version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
 - name: github.com/jmhodges/levigo
@@ -65,6 +71,8 @@ imports:
   version: acdc4509485b587f5e675510c4f2c63e90ff68a8
 - name: github.com/pkg/errors
   version: 645ef00459ed84a119197bfb8d8205042c6df63d
+- name: github.com/rcrowley/go-metrics
+  version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c
 - name: github.com/rigelrozanski/common
   version: f691f115798593d783b9999b1263c2f4ffecc439
 - name: github.com/spf13/afero
@@ -97,8 +105,11 @@ imports:
   - leveldb/table
   - leveldb/util
 - name: github.com/tendermint/abci
-  version: c960c5275617ef141c92c3d7fc65a396c97662df
+  version: 68592f4d8ee34e97db94b7a7976b1309efdb7eb9
   subpackages:
+  - client
+  - example/code
+  - example/dummy
   - server
   - types
 - name: github.com/tendermint/ed25519
@@ -108,21 +119,72 @@ imports:
   - extra25519
 - name: github.com/tendermint/go-crypto
   version: 4fc3055dbd17aa1203d0abc64b9293f378da22ec
+  subpackages:
+  - keys
+  - keys/bcrypt
+  - keys/words
+  - keys/words/wordlist
 - name: github.com/tendermint/go-wire
   version: 5d7845f24b843c914cf571dad2ca13c91cf70f0d
 - name: github.com/tendermint/iavl
   version: 1a59ec0c82dc940c25339dd7c834df5cb76a95cb
-- name: github.com/tendermint/tmlibs
-  version: a0f652dc2e131be86fc8d9e4e2beec9831a8a6ec
+- name: github.com/tendermint/tendermint
+  version: edeebb7d202467179d1cf6372fd014d36bebf961
   subpackages:
+  - blockchain
+  - cmd/tendermint/commands
+  - config
+  - consensus
+  - consensus/types
+  - evidence
+  - lite
+  - lite/client
+  - lite/errors
+  - lite/files
+  - lite/proxy
+  - mempool
+  - node
+  - p2p
+  - p2p/conn
+  - p2p/pex
+  - p2p/trust
+  - p2p/upnp
+  - proxy
+  - rpc/client
+  - rpc/core
+  - rpc/core/types
+  - rpc/grpc
+  - rpc/lib
+  - rpc/lib/client
+  - rpc/lib/server
+  - rpc/lib/types
+  - state
+  - state/txindex
+  - state/txindex/kv
+  - state/txindex/null
+  - types
+  - version
+  - wire
+- name: github.com/tendermint/tmlibs
+  version: 1b9b5652a199ab0be2e781393fb275b66377309d
+  subpackages:
+  - autofile
   - cli
+  - cli/flags
+  - clist
   - common
   - db
+  - flowrate
   - log
   - merkle
+  - pubsub
+  - pubsub/query
 - name: golang.org/x/crypto
   version: 1875d0a70c90e57f11972aefd42276df65e895b9
   subpackages:
+  - blowfish
+  - curve25519
+  - nacl/box
   - nacl/secretbox
   - openpgp/armor
   - openpgp/errors
diff --git a/glide.yaml b/glide.yaml
index 276513b2ce..b6f950f2e3 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -25,6 +25,14 @@ import:
   - db
   - log
   - merkle
+- package: github.com/tendermint/tendermint
+  version: breaking/wire-sdk2
+  subpackages:
+  - cmd/tendermint/commands
+  - config
+  - lite
+  - rpc/client
+  - types
 - package: golang.org/x/crypto
   subpackages:
   - ripemd160
diff --git a/server/init.go b/server/init.go
index 374e3cb3fe..7372509384 100644
--- a/server/init.go
+++ b/server/init.go
@@ -12,6 +12,7 @@ import (
 	"github.com/tendermint/go-crypto/keys/words"
 	tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
 	tmtypes "github.com/tendermint/tendermint/types"
+	dbm "github.com/tendermint/tmlibs/db"
 )
 
 // InitCmd will initialize all files for tendermint,