3 files changed, 17 insertions, 1 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index 4e3251d4..ddad1a61 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -78,6 +78,11 @@ library
                      , HTTP       >= 4000.2
                      , krpc
 
+                       -- conduits
+                     , conduit              == 1.*
+                     , network-conduit      == 1.*
+                     , cereal-conduit       >= 0.5
+
                      , cryptohash
                      , filepath    >= 1
                      , bits-atomic >= 0.1
diff --git a/src/Network/BitTorrent/PeerWire.hs b/src/Network/BitTorrent/PeerWire.hs
index b048fe1f..08e3f388 100644
--- a/src/Network/BitTorrent/PeerWire.hs
+++ b/src/Network/BitTorrent/PeerWire.hs
@@ -10,3 +10,14 @@ module Network.BitTorrent.PeerWire (module PW) where
 
 import Network.BitTorrent.PeerWire.Selection as PW
 import Network.BitTorrent.PeerWire.Protocol as PW
+
+{-
+
+newtype P2P a = P2P {
+    getP2P :: ReaderT PSession State PState (Conduit Message IO Message) a
+  }
+
+runP2P :: PConnection -> P2P a -> IO a
+recvMessage :: P2P Message
+sendMessage :: Message -> P2P ()
+-}
\ No newline at end of file
diff --git a/src/Network/BitTorrent/PeerWire/Protocol.hs b/src/Network/BitTorrent/PeerWire/Protocol.hs
index b40676ca..cab54ef5 100644
--- a/src/Network/BitTorrent/PeerWire/Protocol.hs
+++ b/src/Network/BitTorrent/PeerWire/Protocol.hs
@@ -22,7 +22,7 @@ module Network.BitTorrent.PeerWire.Protocol
        , handshakeMaxSize
 
          -- * Block
-       , BlockLIx, PieceLIx
+       , PieceIx, BlockLIx, PieceLIx
        , BlockIx(..), ppBlockIx
        , Block(..),  ppBlock ,blockSize
        , pieceIx, blockIx