diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go
index 8f923c76bb1eaf00923775c826ba9ac0700e0463..8bd61a85d4336a36f8899a47c9fc8246c8da69c4 100644
--- a/blockservice/blockservice.go
+++ b/blockservice/blockservice.go
@@ -35,6 +35,8 @@ func (s *BlockService) AddBlock(b *blocks.Block) (u.Key, error) {
 	k := b.Key()
 	dsk := ds.NewKey(string(k))
 	u.DOut("storing [%s] in datastore\n", k.Pretty())
+	// TODO(brian): define a block datastore with a Put method which accepts a
+	// block parameter
 	err := s.Datastore.Put(dsk, b.Data)
 	if err != nil {
 		return k, err
diff --git a/core/core.go b/core/core.go
index fe91ff8e8c579d8c042e40c8eecd71198dbf0ba3..d93c6f7b478fa681634bcffccc503912c6caf4b1 100644
--- a/core/core.go
+++ b/core/core.go
@@ -105,6 +105,8 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
 		go initConnections(cfg, route)
 	}
 
+	// TODO(brian): when offline instantiate the BlockService with a bitswap
+	// session that simply doesn't return blocks
 	bs, err := bserv.NewBlockService(d, bitswapSession)
 	if err != nil {
 		return nil, err