diff --git a/lib/exw3.ex b/lib/exw3.ex
index 7c304e7..0322e5e 100644
--- a/lib/exw3.ex
+++ b/lib/exw3.ex
@@ -1,55 +1,5 @@
 defmodule ExW3 do
 
-  defmodule Contract do
-    use Agent
-    
-    def at(abi, address) do
-      { :ok, pid } = Agent.start_link(fn -> %{abi: abi, address: address} end)
-      pid
-    end
-
-    def get(contract, key) do
-      Agent.get(contract, &Map.get(&1, key))
-    end
-
-    @doc """
-    Puts the `value` for the given `key` in the `contract`.
-    """
-    def put(contract, key, value) do
-      Agent.update(contract, &Map.put(&1, key, value))
-    end
-
-    def deploy(bin_filename, options) do
-      {:ok, bin} = File.read(Path.join(System.cwd(), bin_filename))
-      tx = %{
-        from: options[:from],
-        data: bin,
-        gas: options[:gas]
-      }
-      {:ok, tx_receipt_id} = Ethereumex.HttpClient.eth_send_transaction(tx)
-      {:ok, tx_receipt} = Ethereumex.HttpClient.eth_get_transaction_receipt(tx_receipt_id)
-
-      tx_receipt["contractAddress"]
-    end
-
-    def method(contract_agent, name, args \\ [], options \\ %{}) do
-      if get(contract_agent, :abi)[name]["constant"] do
-        data = ExW3.encode_inputs(get(contract_agent, :abi), name, args)
-        {:ok, output } = Ethereumex.HttpClient.eth_call(%{
-          to: get(contract_agent, :address),
-          data: data
-        })
-        [ :ok ] ++ ExW3.decode_output(get(contract_agent, :abi), name, output) |> List.to_tuple
-      else
-        Ethereumex.HttpClient.eth_send_transaction(Map.merge(%{
-          to: get(contract_agent, :address),
-          data: ExW3.encode_inputs(get(contract_agent, :abi), name, args)
-        }, options))
-      end
-    end
-
-  end
-
   def reformat_abi abi do
     Map.new Enum.map(abi, fn x -> {x["name"], x} end)
   end
@@ -116,7 +66,8 @@ defmodule ExW3 do
   def tx_receipt tx_hash do
     case Ethereumex.HttpClient.eth_get_transaction_receipt(tx_hash) do
       {:ok, receipt} -> 
-        Map.merge receipt, keys_to_decimal(receipt, ["blockNumber", "cumulativeGasUsed", "gasUsed"])
+        receipt
+        #Map.merge receipt, keys_to_decimal(receipt, ["blockNumber", "cumulativeGasUsed", "gasUsed"])
       err -> err
     end
   end
@@ -138,6 +89,119 @@ defmodule ExW3 do
     ExthCrypto.Hash.Keccak.kec(signature) |> Base.encode16(case: :lower)
   end
 
+  defmodule Contract do
+    use Agent
+    
+    def at(abi, address) do
+      { :ok, pid } = Agent.start_link(fn -> %{abi: abi, address: address} end)
+      pid
+    end
 
+    def get(contract, key) do
+      Agent.get(contract, &Map.get(&1, key))
+    end
 
+    @doc """
+    Puts the `value` for the given `key` in the `contract`.
+    """
+    def put(contract, key, value) do
+      Agent.update(contract, &Map.put(&1, key, value))
+    end
+
+    def deploy(bin_filename, options) do
+      {:ok, bin} = File.read(Path.join(System.cwd(), bin_filename))
+      tx = %{
+        from: options[:from],
+        data: bin,
+        gas: options[:gas]
+      }
+      {:ok, tx_receipt_id} = Ethereumex.HttpClient.eth_send_transaction(tx)
+      {:ok, tx_receipt} = Ethereumex.HttpClient.eth_get_transaction_receipt(tx_receipt_id)
+
+      tx_receipt["contractAddress"]
+    end
+
+    def method(contract_agent, name, args \\ [], options \\ %{}) do
+      if get(contract_agent, :abi)[name]["constant"] do
+        data = ExW3.encode_inputs(get(contract_agent, :abi), name, args)
+        {:ok, output } = Ethereumex.HttpClient.eth_call(%{
+          to: get(contract_agent, :address),
+          data: data
+        })
+        [ :ok ] ++ ExW3.decode_output(get(contract_agent, :abi), name, output) |> List.to_tuple
+      else
+        Ethereumex.HttpClient.eth_send_transaction(Map.merge(%{
+          to: get(contract_agent, :address),
+          data: ExW3.encode_inputs(get(contract_agent, :abi), name, args)
+        }, options))
+      end
+    end
+
+  end
+
+  defmodule EventPublisher do
+    use GenServer
+
+    def start_link do
+      GenServer.start_link(__MODULE__, %{ block_number: ExW3.block_number})
+    end
+
+    def init(state) do
+      PubSub.start_link()
+      schedule_block()
+      {:ok, state}
+    end
+
+    def subscribe(subscriber, event_signature) do
+      PubSub.subscribe(subscriber, event_signature)
+    end
+
+    def handle_info(:block, state) do
+      block_number = ExW3.block_number
+      block = ExW3.block block_number
+
+      tx_receipts = Enum.map block["transactions"], fn tx -> ExW3.tx_receipt(tx["hash"]) end
+
+      for logs <- Enum.map(tx_receipts, fn receipt -> receipt["logs"] end) do
+        for log <- logs do
+          for topic <- log["topics"] do
+
+            PubSub.publish String.slice(topic, 2..-1), log["data"]
+          end
+        end
+      end
+
+      schedule_block()
+      {:noreply, Map.merge(state, %{block_number: block_number})}
+    end
+
+    defp schedule_block() do
+      Process.send_after(self(), :block, 1000)
+    end
+
+  end
+
+  defmodule EventSubscriber do
+      
+    def start(state) do
+      spawn(fn -> loop(state) end)
+    end
+
+    def loop(state) do
+      receive do
+        message ->
+          apply(state[:callback], [message])
+          loop(state)
+      end
+    end
+    
+  end
+
+  def subscribe signature, callback do
+
+    pid = ExW3.EventSubscriber.start %{callback: callback}
+
+    ExW3.EventPublisher.subscribe pid, ExW3.encode_event(signature)
+
+  end
 end
\ No newline at end of file
diff --git a/mix.exs b/mix.exs
index 5e648df..68c6f7a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -30,7 +30,8 @@ defmodule ExW3.Mixfile do
     [
       {:ethereumex, "~> 0.3.2"},
       {:abi, "~> 0.1.8"},
-      {:poison, "~> 3.1"}
+      {:poison, "~> 3.1"},
+      {:pubsub, "~> 1.0"}
     ]
   end
 end
diff --git a/mix.lock b/mix.lock
index dcb3eaf..cfba413 100644
--- a/mix.lock
+++ b/mix.lock
@@ -13,6 +13,7 @@
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm"},
   "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], [], "hexpm"},
   "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
+  "pubsub": {:hex, :pubsub, "1.1.0", "1c368aa02f58027e6f84c8d4b61e75f90c6db6fe531a00839834bd06d0b8f83a", [:mix], [], "hexpm"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], [], "hexpm"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.3.1", "a1f612a7b512638634a603c8f401892afbf99b8ce93a45041f8aaca99cadb85e", [:rebar3], [], "hexpm"},
 }
diff --git a/test/exw3_test.exs b/test/exw3_test.exs
index 83267db..8e59884 100644
--- a/test/exw3_test.exs
+++ b/test/exw3_test.exs
@@ -77,6 +77,10 @@ defmodule EXW3Test do
 
     event_tester = ExW3.Contract.at context[:event_tester_abi], contract_address
 
+    {:ok, event_pub} = ExW3.EventPublisher.start_link
+
+    ExW3.subscribe("Simple(uint256,bytes32)", fn event -> IO.inspect event end)
+
     {:ok, tx_hash} = ExW3.Contract.method(event_tester, "simple", ["hello, there!"], %{from: Enum.at(context[:accounts], 0)})
 
     receipt = ExW3.tx_receipt tx_hash
@@ -87,6 +91,8 @@ defmodule EXW3Test do
 
     assert String.slice(Enum.at(topic, 0), 2..-1) == ExW3.encode_event("Simple(uint256,bytes32)")
 
+    :timer.sleep(5000)
+
   end
 
   test "deploys array tester and uses it", context do