diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..e93cefcbc
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "lldb-mi",
+      "request": "launch",
+      "name": "debug nim",
+      "target": "${fileDirname}/${fileBasenameNoExtension}",
+      "cwd": "${workspaceRoot}",
+      "valuesFormatting": "parseText"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..7a73a41bf
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 000000000..85ff1b28c
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,23 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558 
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "nim-build-file",
+      "type": "shell",
+      "command": "nimble c --d:debug --linedir:on --debuginfo --debugger:native --verbose ${file}",
+      "problemMatcher": [],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    },
+    {
+      "label": "nim-clean-file",
+      "type": "shell",
+      "command": "rm ${fileBasename}",
+      "problemMatcher": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/chronos b/chronos
new file mode 160000
index 000000000..6d7864aa8
--- /dev/null
+++ b/chronos
@@ -0,0 +1 @@
+Subproject commit 6d7864aa84010271cb8a4a8614c722bae50702cd
diff --git a/libp2p/chronosstream.nim b/libp2p/chronosstream.nim
new file mode 100644
index 000000000..bbfd9ad86
--- /dev/null
+++ b/libp2p/chronosstream.nim
@@ -0,0 +1,59 @@
+## Nim-LibP2P
+## Copyright (c) 2018 Status Research & Development GmbH
+## Licensed under either of
+##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
+##  * MIT license ([LICENSE-MIT](LICENSE-MIT))
+## at your option.
+## This file may not be copied, modified, or distributed except according to
+## those terms.
+
+import chronos
+import readerwriter
+
+type ChronosStream* = ref object of ReadWrite
+    reader: AsyncStreamReader
+    writer: AsyncStreamWriter
+    server: StreamServer
+    client: StreamTransport
+
+proc newChronosStream*(server: StreamServer, 
+                       client: StreamTransport): ChronosStream =
+  new result
+  result.server = server
+  result.client = client
+  result.reader = newAsyncStreamReader(client)
+  result.writer = newAsyncStreamWriter(client)
+
+method read*(s: ChronosStream, n = -1): Future[seq[byte]] {.async.} = 
+  result = await s.reader.read(n)
+
+method readExactly*(s: ChronosStream, pbytes: pointer, nbytes: int): Future[void] {.async.} =
+  result = s.readExactly(pbytes, nbytes)
+
+method readLine*(s: ChronosStream, limit = 0, sep = "\r\n"): Future[string] {.async.} =
+  result = await s.reader.readLine(limit, sep)
+
+method readOnce*(s: ChronosStream, pbytes: pointer, nbytes: int): Future[int] {.async.} =
+  result = await s.reader.readOnce(pbytes, nbytes)
+
+method readUntil*(s: ChronosStream, pbytes: pointer, nbytes: int, sep: seq[byte]): Future[int] {.async.} =
+  result = await s.reader.readUntil(pbytes, nbytes, sep)
+
+method write*(s: ChronosStream, pbytes: pointer, nbytes: int) {.async.} =
+  result = s.writer.write(pbytes, nbytes)
+
+method write*(s: ChronosStream, msg: string, msglen = -1) {.async.} =
+  result = s.writer.write(msg, msglen)
+
+method write*(s: ChronosStream, msg: seq[byte], msglen = -1) {.async.} =
+  result = s.writer.write(msg, msglen)
+
+method close*(s: ChronosStream) {.async.} =
+  await s.reader.closeWait()
+
+  await s.writer.finish()
+  await s.writer.closeWait()
+
+  await s.client.closeWait()
+  s.server.stop()
+  s.server.close()
diff --git a/libp2p/connection.nim b/libp2p/connection.nim
index 1d5dec2ec..523e01ce6 100644
--- a/libp2p/connection.nim
+++ b/libp2p/connection.nim
@@ -7,47 +7,47 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-import chronos, peerinfo, multiaddress
+import chronos
+import peerinfo, multiaddress, readerwriter, peerinfo
 
 const DefaultReadSize = 1024
 
 type
-  Connection* = ref object of RootObj
-    reader: AsyncStreamReader
-    writer: AsyncStreamWriter
-    server: StreamServer
-    client: StreamTransport
-    isOpen*: bool
+  Connection* = ref object of ReadWrite
+    peerInfo*: PeerInfo
+    stream: ReadWrite
 
-proc newConnection*(server: StreamServer,
-                    client: StreamTransport): Connection = 
-  ## create a new Connection for the specified async stream reader/writer
+proc newConnection*(stream: ReadWrite): Connection = 
+  ## create a new Connection for the specified async reader/writer
   new result
-  result.isOpen = false
-  result.server = server
-  result.client = client
+  result.stream = stream
 
-  result.reader = newAsyncStreamReader(client)
-  result.writer = newAsyncStreamWriter(client)
+method read*(s: Connection, n = -1): Future[seq[byte]] {.async.} = 
+  result = await s.stream.read(n)
 
-method read* (c: Connection, size: int = DefaultReadSize): Future[seq[byte]] {.base, async, gcsafe.} = 
-  ## read DefaultReadSize (1024) bytes or `size` bytes if specified
-  result = await c.reader.read(size)
+method readExactly*(s: Connection, pbytes: pointer, nbytes: int): Future[void] {.async.} =
+  result = s.stream.readExactly(pbytes, nbytes)
 
-method write* (c: Connection, data: pointer, size: int): Future[void] {.base, async.} = 
-  ## write bytes pointed to by `data` up to `size` size
-  discard c.writer.write(data, size)
+method readLine*(s: Connection, limit = 0, sep = "\r\n"): Future[string] {.async.} =
+  result = await s.stream.readLine(limit, sep)
 
-method close* (c: Connection): Future[void] {.base, async.} = 
-  ## close connection
-  await c.reader.closeWait()
+method readOnce*(s: Connection, pbytes: pointer, nbytes: int): Future[int] {.async.} =
+  result = await s.stream.readOnce(pbytes, nbytes)
 
-  await c.writer.finish()
-  await c.writer.closeWait()
+method readUntil*(s: Connection, pbytes: pointer, nbytes: int, sep: seq[byte]): Future[int] {.async.} =
+  result = await s.stream.readUntil(pbytes, nbytes, sep)
 
-  await c.client.closeWait()
-  c.server.stop()
-  c.server.close()
+method write*(s: Connection, pbytes: pointer, nbytes: int) {.async.} =
+  result = s.stream.write(pbytes, nbytes)
+
+method write*(s: Connection, msg: string, msglen = -1) {.async.} =
+  result = s.stream.write(msg, msglen)
+
+method write*[T](s: Connection, msg: seq[T], msglen = -1) {.async.} =
+  result = s.stream.write(msg, msglen)
+
+method close*(s: Connection) {.async.} =
+  result = s.stream.close()
 
 method getPeerInfo* (c: Connection): Future[PeerInfo] {.base, async.} = 
   ## get up to date peer info
diff --git a/libp2p/crypto/BearSSL b/libp2p/crypto/BearSSL
new file mode 160000
index 000000000..2893441f2
--- /dev/null
+++ b/libp2p/crypto/BearSSL
@@ -0,0 +1 @@
+Subproject commit 2893441f2efd4603ddd6d7f49011bdda096a4a87
diff --git a/libp2p/multistreamselect.nim b/libp2p/multistreamselect.nim
new file mode 100644
index 000000000..4e38d2abf
--- /dev/null
+++ b/libp2p/multistreamselect.nim
@@ -0,0 +1,11 @@
+## Nim-LibP2P
+## Copyright (c) 2018 Status Research & Development GmbH
+## Licensed under either of
+##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
+##  * MIT license ([LICENSE-MIT](LICENSE-MIT))
+## at your option.
+## This file may not be copied, modified, or distributed except according to
+## those terms.
+
+type MultisteamSelect = ref object of RootObj
+  
diff --git a/libp2p/readerwriter.nim b/libp2p/readerwriter.nim
new file mode 100644
index 000000000..761c94468
--- /dev/null
+++ b/libp2p/readerwriter.nim
@@ -0,0 +1,48 @@
+## Nim-LibP2P
+## Copyright (c) 2018 Status Research & Development GmbH
+## Licensed under either of
+##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
+##  * MIT license ([LICENSE-MIT](LICENSE-MIT))
+## at your option.
+## This file may not be copied, modified, or distributed except according to
+## those terms.
+
+import chronos
+
+type ReadWrite* = ref object of RootObj
+
+method read*(s: ReadWrite, n = -1): Future[seq[byte]] 
+  {.base, async.} =
+  discard
+
+method readExactly*(s: ReadWrite, pbytes: pointer, nbytes: int): Future[void] 
+  {.base, async.} =
+  discard
+
+method readLine*(s: ReadWrite, limit = 0, sep = "\r\n"): Future[string] 
+  {.base, async.} = 
+  discard
+
+method readOnce*(s: ReadWrite, pbytes: pointer, nbytes: int): Future[int] 
+  {.base, async.} = 
+  discard
+
+method readUntil*(s: ReadWrite, pbytes: pointer, nbytes: int, sep: seq[byte]): Future[int] 
+  {.base, async.} = 
+  discard
+
+method write*(w: ReadWrite, pbytes: pointer, nbytes: int)
+  {.base, async.} = 
+  discard
+
+method write*(w: ReadWrite, msg: string, msglen = -1)
+  {.base, async.} = 
+  discard
+
+method write*(w: ReadWrite, msg: seq[byte], msglen = -1)
+  {.base, async.} = 
+  discard
+
+method close*(w: ReadWrite) 
+  {.base, async.} = 
+  discard
diff --git a/libp2p/tcptransport.nim b/libp2p/tcptransport.nim
index 80daf6c87..afb93bb44 100644
--- a/libp2p/tcptransport.nim
+++ b/libp2p/tcptransport.nim
@@ -8,11 +8,21 @@
 ## those terms.
 
 import chronos
-import transport, wire, connection, multiaddress, connection, multicodec
+import transport, wire, connection, multiaddress, connection, multicodec, chronosstream
 
 type TcpTransport* = ref object of Transport
   server*: StreamServer
 
+method connHandler*(t: Transport,
+                    server: StreamServer,
+                    client: StreamTransport): Future[Connection] {.base, gcsafe, async.} =
+  let conn: Connection = newConnection(newChronosStream(server, client))
+  let handlerFut = if t.handler == nil: nil else: t.handler(conn)
+  let connHolder: ConnHolder = ConnHolder(connection: conn,
+                                          connFuture: handlerFut)
+  t.connections.add(connHolder)
+  result = conn
+
 proc connCb(server: StreamServer,
             client: StreamTransport) {.gcsafe, async.} =
   let t: Transport = cast[Transport](server.udata)
diff --git a/libp2p/transport b/libp2p/transport
new file mode 100755
index 000000000..5899b9087
Binary files /dev/null and b/libp2p/transport differ
diff --git a/libp2p/transport.nim b/libp2p/transport.nim
index ad546532d..76286e14a 100644
--- a/libp2p/transport.nim
+++ b/libp2p/transport.nim
@@ -8,7 +8,7 @@
 ## those terms.
 
 import chronos
-import peerinfo, connection, multiaddress, multicodec
+import peerinfo, connection, multiaddress, multicodec, readerwriter
 
 type
   ConnHandler* = proc (conn: Connection): Future[void] {.gcsafe.}
@@ -23,16 +23,6 @@ type
     handler*: ConnHandler
     multicodec*: MultiCodec
 
-method connHandler*(t: Transport,
-                    server: StreamServer,
-                    client: StreamTransport): Future[Connection] {.base, gcsafe, async.} =
-  let conn: Connection = newConnection(server, client)
-  let handlerFut = if t.handler == nil: nil else: t.handler(conn)
-  let connHolder: ConnHolder = ConnHolder(connection: conn,
-                                          connFuture: handlerFut)
-  t.connections.add(connHolder)
-  result = conn
-
 method init*(t: Transport) {.base, error: "not implemented".} = 
   ## perform protocol initialization
   discard
@@ -45,8 +35,7 @@ method close*(t: Transport) {.base, async.} =
   ## stop and cleanup the transport
   ## including all outstanding connections
   for c in t.connections:
-    if c.connection.isOpen:
-      await c.connection.close()
+    await c.connection.close()
 
 method listen*(t: Transport, ma: MultiAddress, handler: ConnHandler) {.base, async.} =
   ## listen for incoming connections
diff --git a/tests/testtransport b/tests/testtransport
index 2ee668af6..748b0e086 100755
Binary files a/tests/testtransport and b/tests/testtransport differ