From f7a71996fbbe9cea4445600ffa3c232a6cf42803 Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Sun, 30 Aug 2015 10:04:59 +0200
Subject: [PATCH 1/3] core, event/filter, xeth: refactored filter system

Moved the filtering system from `event` to `eth/filters` package and
removed the `core.Filter` object. The `filters.Filter` object now
requires a `common.Database` rather than a `eth.Backend` and invokes the
`core.GetBlockByX` directly rather than thru a "manager".
---
 {core => eth/filters}/filter.go |  29 ++++---
 eth/filters/filter_system.go    | 133 ++++++++++++++++++++++++++++++++
 event/filter/eth_filter.go      | 127 ------------------------------
 xeth/xeth.go                    |  31 ++++----
 4 files changed, 162 insertions(+), 158 deletions(-)
 rename {core => eth/filters}/filter.go (89%)
 create mode 100644 eth/filters/filter_system.go
 delete mode 100644 event/filter/eth_filter.go

diff --git a/core/filter.go b/eth/filters/filter.go
similarity index 89%
rename from core/filter.go
rename to eth/filters/filter.go
index b328ffff30..b7f795607b 100644
--- a/core/filter.go
+++ b/eth/filters/filter.go
@@ -14,16 +14,15 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-package core
+package filters
 
 import (
 	"math"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/logger"
-	"github.com/ethereum/go-ethereum/logger/glog"
 )
 
 type AccountChange struct {
@@ -32,7 +31,7 @@ type AccountChange struct {
 
 // Filtering interface
 type Filter struct {
-	eth      Backend
+	db       common.Database
 	earliest int64
 	latest   int64
 	skip     int
@@ -47,8 +46,8 @@ type Filter struct {
 
 // Create a new filter which uses a bloom filter on blocks to figure out whether a particular block
 // is interesting or not.
-func NewFilter(eth Backend) *Filter {
-	return &Filter{eth: eth}
+func New(db common.Database) *Filter {
+	return &Filter{db: db}
 }
 
 // Set the earliest and latest block for filtering.
@@ -80,7 +79,7 @@ func (self *Filter) SetSkip(skip int) {
 
 // Run filters logs with the current parameters set
 func (self *Filter) Find() state.Logs {
-	earliestBlock := self.eth.ChainManager().CurrentBlock()
+	earliestBlock := core.GetCurrentBlock(self.db)
 	var earliestBlockNo uint64 = uint64(self.earliest)
 	if self.earliest == -1 {
 		earliestBlockNo = earliestBlock.NumberU64()
@@ -92,7 +91,7 @@ func (self *Filter) Find() state.Logs {
 
 	var (
 		logs  state.Logs
-		block = self.eth.ChainManager().GetBlockByNumber(latestBlockNo)
+		block = core.GetBlockByNumber(self.db, latestBlockNo)
 	)
 
 done:
@@ -111,17 +110,17 @@ done:
 		// current parameters
 		if self.bloomFilter(block) {
 			// Get the logs of the block
-			unfiltered, err := self.eth.BlockProcessor().GetLogs(block)
-			if err != nil {
-				glog.V(logger.Warn).Infoln("err: filter get logs ", err)
-
-				break
+			var (
+				receipts   = core.GetBlockReceipts(self.db, block.Hash())
+				unfiltered state.Logs
+			)
+			for _, receipt := range receipts {
+				unfiltered = append(unfiltered, receipt.Logs()...)
 			}
-
 			logs = append(logs, self.FilterLogs(unfiltered)...)
 		}
 
-		block = self.eth.ChainManager().GetBlock(block.ParentHash())
+		block = core.GetBlockByHash(self.db, block.ParentHash())
 	}
 
 	skip := int(math.Min(float64(len(logs)), float64(self.skip)))
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go
new file mode 100644
index 0000000000..9ad73a8967
--- /dev/null
+++ b/eth/filters/filter_system.go
@@ -0,0 +1,133 @@
+// Copyright 2014 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+// package filters implements an ethereum filtering system for block,
+// transactions and log events.
+package filters
+
+import (
+	"sync"
+
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/event"
+)
+
+// FilterSystem manages filters that filter specific events such as
+// block, transaction and log events. The Filtering system can be used to listen
+// for specific LOG events fires by the EVM (Ethereum Virtual Machine).
+type FilterSystem struct {
+	eventMux *event.TypeMux
+
+	filterMu sync.RWMutex
+	filterId int
+	filters  map[int]*Filter
+
+	quit chan struct{}
+}
+
+// NewFilterSystem returns a newly allocated filter manager
+func NewFilterSystem(mux *event.TypeMux) *FilterSystem {
+	fs := &FilterSystem{
+		eventMux: mux,
+		filters:  make(map[int]*Filter),
+	}
+	go fs.filterLoop()
+	return fs
+}
+
+// Stop quits the filter loop required for polling events
+func (fs *FilterSystem) Stop() {
+	close(fs.quit)
+}
+
+// Add adds a filter to the filter manager
+func (fs *FilterSystem) Add(filter *Filter) (id int) {
+	fs.filterMu.Lock()
+	defer fs.filterMu.Unlock()
+	id = fs.filterId
+	fs.filters[id] = filter
+	fs.filterId++
+
+	return id
+}
+
+// Remove removes a filter by filter id
+func (fs *FilterSystem) Remove(id int) {
+	fs.filterMu.Lock()
+	defer fs.filterMu.Unlock()
+	if _, ok := fs.filters[id]; ok {
+		delete(fs.filters, id)
+	}
+}
+
+// Get retrieves a filter installed using Add The filter may not be modified.
+func (fs *FilterSystem) Get(id int) *Filter {
+	fs.filterMu.RLock()
+	defer fs.filterMu.RUnlock()
+	return fs.filters[id]
+}
+
+// filterLoop waits for specific events from ethereum and fires their handlers
+// when the filter matches the requirements.
+func (fs *FilterSystem) filterLoop() {
+	// Subscribe to events
+	events := fs.eventMux.Subscribe(
+		//core.PendingBlockEvent{},
+		core.ChainEvent{},
+		core.TxPreEvent{},
+		state.Logs(nil))
+
+out:
+	for {
+		select {
+		case <-fs.quit:
+			break out
+		case event := <-events.Chan():
+			switch event := event.(type) {
+			case core.ChainEvent:
+				fs.filterMu.RLock()
+				for _, filter := range fs.filters {
+					if filter.BlockCallback != nil {
+						filter.BlockCallback(event.Block, event.Logs)
+					}
+				}
+				fs.filterMu.RUnlock()
+
+			case core.TxPreEvent:
+				fs.filterMu.RLock()
+				for _, filter := range fs.filters {
+					if filter.TransactionCallback != nil {
+						filter.TransactionCallback(event.Tx)
+					}
+				}
+				fs.filterMu.RUnlock()
+
+			case state.Logs:
+				fs.filterMu.RLock()
+				for _, filter := range fs.filters {
+					if filter.LogsCallback != nil {
+						msgs := filter.FilterLogs(event)
+						if len(msgs) > 0 {
+							filter.LogsCallback(msgs)
+						}
+					}
+				}
+				fs.filterMu.RUnlock()
+			}
+		}
+	}
+}
diff --git a/event/filter/eth_filter.go b/event/filter/eth_filter.go
deleted file mode 100644
index 6f61e2b608..0000000000
--- a/event/filter/eth_filter.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2014 The go-ethereum Authors
-// This file is part of the go-ethereum library.
-//
-// The go-ethereum library is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The go-ethereum library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
-
-package filter
-
-// TODO make use of the generic filtering system
-
-import (
-	"sync"
-
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/event"
-)
-
-type FilterManager struct {
-	eventMux *event.TypeMux
-
-	filterMu sync.RWMutex
-	filterId int
-	filters  map[int]*core.Filter
-
-	quit chan struct{}
-}
-
-func NewFilterManager(mux *event.TypeMux) *FilterManager {
-	return &FilterManager{
-		eventMux: mux,
-		filters:  make(map[int]*core.Filter),
-	}
-}
-
-func (self *FilterManager) Start() {
-	go self.filterLoop()
-}
-
-func (self *FilterManager) Stop() {
-	close(self.quit)
-}
-
-func (self *FilterManager) InstallFilter(filter *core.Filter) (id int) {
-	self.filterMu.Lock()
-	defer self.filterMu.Unlock()
-	id = self.filterId
-	self.filters[id] = filter
-	self.filterId++
-
-	return id
-}
-
-func (self *FilterManager) UninstallFilter(id int) {
-	self.filterMu.Lock()
-	defer self.filterMu.Unlock()
-	if _, ok := self.filters[id]; ok {
-		delete(self.filters, id)
-	}
-}
-
-// GetFilter retrieves a filter installed using InstallFilter.
-// The filter may not be modified.
-func (self *FilterManager) GetFilter(id int) *core.Filter {
-	self.filterMu.RLock()
-	defer self.filterMu.RUnlock()
-	return self.filters[id]
-}
-
-func (self *FilterManager) filterLoop() {
-	// Subscribe to events
-	events := self.eventMux.Subscribe(
-		//core.PendingBlockEvent{},
-		core.ChainEvent{},
-		core.TxPreEvent{},
-		state.Logs(nil))
-
-out:
-	for {
-		select {
-		case <-self.quit:
-			break out
-		case event := <-events.Chan():
-			switch event := event.(type) {
-			case core.ChainEvent:
-				self.filterMu.RLock()
-				for _, filter := range self.filters {
-					if filter.BlockCallback != nil {
-						filter.BlockCallback(event.Block, event.Logs)
-					}
-				}
-				self.filterMu.RUnlock()
-
-			case core.TxPreEvent:
-				self.filterMu.RLock()
-				for _, filter := range self.filters {
-					if filter.TransactionCallback != nil {
-						filter.TransactionCallback(event.Tx)
-					}
-				}
-				self.filterMu.RUnlock()
-
-			case state.Logs:
-				self.filterMu.RLock()
-				for _, filter := range self.filters {
-					if filter.LogsCallback != nil {
-						msgs := filter.FilterLogs(event)
-						if len(msgs) > 0 {
-							filter.LogsCallback(msgs)
-						}
-					}
-				}
-				self.filterMu.RUnlock()
-			}
-		}
-	}
-}
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 623b3a9634..0494342a38 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -35,7 +35,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/eth"
-	"github.com/ethereum/go-ethereum/event/filter"
+	"github.com/ethereum/go-ethereum/eth/filters"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
 	"github.com/ethereum/go-ethereum/miner"
@@ -75,7 +75,7 @@ type XEth struct {
 	whisper *Whisper
 
 	quit          chan struct{}
-	filterManager *filter.FilterManager
+	filterManager *filters.FilterSystem
 
 	logMu    sync.RWMutex
 	logQueue map[int]*logQueue
@@ -111,7 +111,7 @@ func New(ethereum *eth.Ethereum, frontend Frontend) *XEth {
 		backend:          ethereum,
 		frontend:         frontend,
 		quit:             make(chan struct{}),
-		filterManager:    filter.NewFilterManager(ethereum.EventMux()),
+		filterManager:    filters.NewFilterSystem(ethereum.EventMux()),
 		logQueue:         make(map[int]*logQueue),
 		blockQueue:       make(map[int]*hashQueue),
 		transactionQueue: make(map[int]*hashQueue),
@@ -128,7 +128,6 @@ func New(ethereum *eth.Ethereum, frontend Frontend) *XEth {
 	xeth.state = NewState(xeth, xeth.backend.ChainManager().State())
 
 	go xeth.start()
-	go xeth.filterManager.Start()
 
 	return xeth
 }
@@ -142,7 +141,7 @@ done:
 			self.logMu.Lock()
 			for id, filter := range self.logQueue {
 				if time.Since(filter.timeout) > filterTickerTime {
-					self.filterManager.UninstallFilter(id)
+					self.filterManager.Remove(id)
 					delete(self.logQueue, id)
 				}
 			}
@@ -151,7 +150,7 @@ done:
 			self.blockMu.Lock()
 			for id, filter := range self.blockQueue {
 				if time.Since(filter.timeout) > filterTickerTime {
-					self.filterManager.UninstallFilter(id)
+					self.filterManager.Remove(id)
 					delete(self.blockQueue, id)
 				}
 			}
@@ -160,7 +159,7 @@ done:
 			self.transactionMu.Lock()
 			for id, filter := range self.transactionQueue {
 				if time.Since(filter.timeout) > filterTickerTime {
-					self.filterManager.UninstallFilter(id)
+					self.filterManager.Remove(id)
 					delete(self.transactionQueue, id)
 				}
 			}
@@ -504,7 +503,7 @@ func (self *XEth) IsContract(address string) bool {
 }
 
 func (self *XEth) UninstallFilter(id int) bool {
-	defer self.filterManager.UninstallFilter(id)
+	defer self.filterManager.Remove(id)
 
 	if _, ok := self.logQueue[id]; ok {
 		self.logMu.Lock()
@@ -532,8 +531,8 @@ func (self *XEth) NewLogFilter(earliest, latest int64, skip, max int, address []
 	self.logMu.Lock()
 	defer self.logMu.Unlock()
 
-	filter := core.NewFilter(self.backend)
-	id := self.filterManager.InstallFilter(filter)
+	filter := filters.New(self.backend.ChainDb())
+	id := self.filterManager.Add(filter)
 	self.logQueue[id] = &logQueue{timeout: time.Now()}
 
 	filter.SetEarliestBlock(earliest)
@@ -558,8 +557,8 @@ func (self *XEth) NewTransactionFilter() int {
 	self.transactionMu.Lock()
 	defer self.transactionMu.Unlock()
 
-	filter := core.NewFilter(self.backend)
-	id := self.filterManager.InstallFilter(filter)
+	filter := filters.New(self.backend.ChainDb())
+	id := self.filterManager.Add(filter)
 	self.transactionQueue[id] = &hashQueue{timeout: time.Now()}
 
 	filter.TransactionCallback = func(tx *types.Transaction) {
@@ -577,8 +576,8 @@ func (self *XEth) NewBlockFilter() int {
 	self.blockMu.Lock()
 	defer self.blockMu.Unlock()
 
-	filter := core.NewFilter(self.backend)
-	id := self.filterManager.InstallFilter(filter)
+	filter := filters.New(self.backend.ChainDb())
+	id := self.filterManager.Add(filter)
 	self.blockQueue[id] = &hashQueue{timeout: time.Now()}
 
 	filter.BlockCallback = func(block *types.Block, logs state.Logs) {
@@ -635,7 +634,7 @@ func (self *XEth) TransactionFilterChanged(id int) []common.Hash {
 }
 
 func (self *XEth) Logs(id int) state.Logs {
-	filter := self.filterManager.GetFilter(id)
+	filter := self.filterManager.Get(id)
 	if filter != nil {
 		return filter.Find()
 	}
@@ -644,7 +643,7 @@ func (self *XEth) Logs(id int) state.Logs {
 }
 
 func (self *XEth) AllLogs(earliest, latest int64, skip, max int, address []string, topics [][]string) state.Logs {
-	filter := core.NewFilter(self.backend)
+	filter := filters.New(self.backend.ChainDb())
 	filter.SetEarliestBlock(earliest)
 	filter.SetLatestBlock(latest)
 	filter.SetSkip(skip)

From 361082ec4b942aea7c01fcb1be1782cb68b6fe3a Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Sun, 30 Aug 2015 10:19:10 +0200
Subject: [PATCH 2/3] cmd/evm, core/vm, test: refactored VM and core

* Moved `vm.Transfer` to `core` package and changed execution to call
`env.Transfer` instead of `core.Transfer` directly.
* core/vm: byte code VM moved to jump table instead of switch
* Moved `vm.Transfer` to `core` package and changed execution to call
  `env.Transfer` instead of `core.Transfer` directly.
* Byte code VM now shares the same code as the JITVM
* Renamed Context to Contract
* Changed initialiser of state transition & unexported methods
* Removed the Execution object and refactor `Call`, `CallCode` &
  `Create` in to their own functions instead of being methods.
* Removed the hard dep on the state for the VM. The VM now
  depends on a Database interface returned by the environment. In the
  process the core now depends less on the statedb by usage of the env
* Moved `Log` from package `core/state` to package `core/vm`.
---
 cmd/evm/main.go                     |  64 ++-
 core/block_processor.go             |   9 +-
 core/block_processor_test.go        |   3 +-
 core/chain_manager_test.go          |   4 +-
 core/events.go                      |  10 +-
 core/execution.go                   | 114 +++--
 core/state/statedb.go               |  41 +-
 core/state_transition.go            |  67 +--
 core/types/bloom9.go                |   4 +-
 core/types/common.go                |   8 +-
 core/types/receipt.go               |  14 +-
 core/vm/asm.go                      |   2 +
 core/vm/common.go                   |  55 ++-
 core/vm/{context.go => contract.go} |  52 ++-
 core/vm/contracts.go                |  10 +-
 core/vm/{settings.go => doc.go}     |  21 +-
 core/vm/environment.go              |  83 +++-
 core/vm/gas.go                      |   2 +
 core/vm/instructions.go             | 257 ++++++-----
 core/vm/jit.go                      | 111 ++---
 core/vm/jit_test.go                 |  92 +++-
 core/vm/jump_table.go               | 143 ++++++
 core/{state => vm}/log.go           |   2 +-
 core/vm/logger.go                   |   1 +
 core/vm/memory.go                   |   7 +
 core/vm/opcodes.go                  |   2 +-
 core/vm/virtual_machine.go          |   3 +-
 core/vm/vm.go                       | 683 +++++-----------------------
 core/vm/vm_jit.go                   |   3 +-
 core/vm_env.go                      |  34 +-
 eth/filters/filter.go               |  16 +-
 eth/filters/filter_system.go        |   6 +-
 miner/worker.go                     |   3 +-
 rpc/api/eth_args.go                 |   6 +-
 tests/state_test_util.go            |   4 +-
 tests/util.go                       |  47 +-
 tests/vm_test.go                    |   4 +-
 tests/vm_test_util.go               |   4 +-
 xeth/xeth.go                        |  17 +-
 39 files changed, 946 insertions(+), 1062 deletions(-)
 rename core/vm/{context.go => contract.go} (59%)
 rename core/vm/{settings.go => doc.go} (51%)
 create mode 100644 core/vm/jump_table.go
 rename core/{state => vm}/log.go (99%)

diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 243dd62669..bf24da9820 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -80,12 +80,17 @@ var (
 		Name:  "sysstat",
 		Usage: "display system stats",
 	}
+	VerbosityFlag = cli.IntFlag{
+		Name:  "verbosity",
+		Usage: "sets the verbosity level",
+	}
 )
 
 func init() {
 	app = utils.NewApp("0.2", "the evm command line interface")
 	app.Flags = []cli.Flag{
 		DebugFlag,
+		VerbosityFlag,
 		ForceJitFlag,
 		DisableJitFlag,
 		SysStatFlag,
@@ -105,6 +110,7 @@ func run(ctx *cli.Context) {
 	vm.EnableJit = !ctx.GlobalBool(DisableJitFlag.Name)
 
 	glog.SetToStderr(true)
+	glog.SetV(ctx.GlobalInt(VerbosityFlag.Name))
 
 	db, _ := ethdb.NewMemDatabase()
 	statedb := state.New(common.Hash{}, db)
@@ -179,18 +185,20 @@ func NewEnv(state *state.StateDB, transactor common.Address, value *big.Int) *VM
 	}
 }
 
-func (self *VMEnv) State() *state.StateDB    { return self.state }
-func (self *VMEnv) Origin() common.Address   { return *self.transactor }
-func (self *VMEnv) BlockNumber() *big.Int    { return common.Big0 }
-func (self *VMEnv) Coinbase() common.Address { return *self.transactor }
-func (self *VMEnv) Time() *big.Int           { return self.time }
-func (self *VMEnv) Difficulty() *big.Int     { return common.Big1 }
-func (self *VMEnv) BlockHash() []byte        { return make([]byte, 32) }
-func (self *VMEnv) Value() *big.Int          { return self.value }
-func (self *VMEnv) GasLimit() *big.Int       { return big.NewInt(1000000000) }
-func (self *VMEnv) VmType() vm.Type          { return vm.StdVmTy }
-func (self *VMEnv) Depth() int               { return 0 }
-func (self *VMEnv) SetDepth(i int)           { self.depth = i }
+func (self *VMEnv) Db() vm.Database            { return self.state }
+func (self *VMEnv) MakeSnapshot() vm.Database  { return self.state.Copy() }
+func (self *VMEnv) SetSnapshot(db vm.Database) { self.state.Set(db.(*state.StateDB)) }
+func (self *VMEnv) Origin() common.Address     { return *self.transactor }
+func (self *VMEnv) BlockNumber() *big.Int      { return common.Big0 }
+func (self *VMEnv) Coinbase() common.Address   { return *self.transactor }
+func (self *VMEnv) Time() *big.Int             { return self.time }
+func (self *VMEnv) Difficulty() *big.Int       { return common.Big1 }
+func (self *VMEnv) BlockHash() []byte          { return make([]byte, 32) }
+func (self *VMEnv) Value() *big.Int            { return self.value }
+func (self *VMEnv) GasLimit() *big.Int         { return big.NewInt(1000000000) }
+func (self *VMEnv) VmType() vm.Type            { return vm.StdVmTy }
+func (self *VMEnv) Depth() int                 { return 0 }
+func (self *VMEnv) SetDepth(i int)             { self.depth = i }
 func (self *VMEnv) GetHash(n uint64) common.Hash {
 	if self.block.Number().Cmp(big.NewInt(int64(n))) == 0 {
 		return self.block.Hash()
@@ -203,34 +211,24 @@ func (self *VMEnv) AddStructLog(log vm.StructLog) {
 func (self *VMEnv) StructLogs() []vm.StructLog {
 	return self.logs
 }
-func (self *VMEnv) AddLog(log *state.Log) {
+func (self *VMEnv) AddLog(log *vm.Log) {
 	self.state.AddLog(log)
 }
-func (self *VMEnv) CanTransfer(from vm.Account, balance *big.Int) bool {
-	return from.Balance().Cmp(balance) >= 0
+func (self *VMEnv) CanTransfer(from common.Address, balance *big.Int) bool {
+	return self.state.GetBalance(from).Cmp(balance) >= 0
 }
 func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
-	return vm.Transfer(from, to, amount)
-}
-
-func (self *VMEnv) vm(addr *common.Address, data []byte, gas, price, value *big.Int) *core.Execution {
-	return core.NewExecution(self, addr, data, gas, price, value)
+	return core.Transfer(from, to, amount)
 }
 
-func (self *VMEnv) Call(caller vm.ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
-	exe := self.vm(&addr, data, gas, price, value)
-	ret, err := exe.Call(addr, caller)
-	self.Gas = exe.Gas
-
-	return ret, err
+func (self *VMEnv) Call(caller vm.ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
+	self.Gas = gas
+	return core.Call(self, caller, addr, data, gas, price, value)
 }
-func (self *VMEnv) CallCode(caller vm.ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
-	a := caller.Address()
-	exe := self.vm(&a, data, gas, price, value)
-	return exe.Call(addr, caller)
+func (self *VMEnv) CallCode(caller vm.ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
+	return core.CallCode(self, caller, addr, data, gas, price, value)
 }
 
-func (self *VMEnv) Create(caller vm.ContextRef, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
-	exe := self.vm(nil, data, gas, price, value)
-	return exe.Create(caller)
+func (self *VMEnv) Create(caller vm.ContractRef, data []byte, gas, price, value *big.Int) ([]byte, common.Address, error) {
+	return core.Create(self, caller, data, gas, price, value)
 }
diff --git a/core/block_processor.go b/core/block_processor.go
index 40590bdc59..40e3931baf 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -25,6 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
@@ -163,7 +164,7 @@ func (self *BlockProcessor) ApplyTransactions(gp GasPool, statedb *state.StateDB
 	return receipts, err
 }
 
-func (sm *BlockProcessor) RetryProcess(block *types.Block) (logs state.Logs, err error) {
+func (sm *BlockProcessor) RetryProcess(block *types.Block) (logs vm.Logs, err error) {
 	// Processing a blocks may never happen simultaneously
 	sm.mutex.Lock()
 	defer sm.mutex.Unlock()
@@ -188,7 +189,7 @@ func (sm *BlockProcessor) RetryProcess(block *types.Block) (logs state.Logs, err
 // Process block will attempt to process the given block's transactions and applies them
 // on top of the block's parent state (given it exists) and will return wether it was
 // successful or not.
-func (sm *BlockProcessor) Process(block *types.Block) (logs state.Logs, receipts types.Receipts, err error) {
+func (sm *BlockProcessor) Process(block *types.Block) (logs vm.Logs, receipts types.Receipts, err error) {
 	// Processing a blocks may never happen simultaneously
 	sm.mutex.Lock()
 	defer sm.mutex.Unlock()
@@ -204,7 +205,7 @@ func (sm *BlockProcessor) Process(block *types.Block) (logs state.Logs, receipts
 	return sm.processWithParent(block, parent)
 }
 
-func (sm *BlockProcessor) processWithParent(block, parent *types.Block) (logs state.Logs, receipts types.Receipts, err error) {
+func (sm *BlockProcessor) processWithParent(block, parent *types.Block) (logs vm.Logs, receipts types.Receipts, err error) {
 	// Create a new state based on the parent's root (e.g., create copy)
 	state := state.New(parent.Root(), sm.chainDb)
 	header := block.Header()
@@ -356,7 +357,7 @@ func (sm *BlockProcessor) GetBlockReceipts(bhash common.Hash) types.Receipts {
 // GetLogs returns the logs of the given block. This method is using a two step approach
 // where it tries to get it from the (updated) method which gets them from the receipts or
 // the depricated way by re-processing the block.
-func (sm *BlockProcessor) GetLogs(block *types.Block) (logs state.Logs, err error) {
+func (sm *BlockProcessor) GetLogs(block *types.Block) (logs vm.Logs, err error) {
 	receipts := GetBlockReceipts(sm.chainDb, block.Hash())
 	// coalesce logs
 	for _, receipt := range receipts {
diff --git a/core/block_processor_test.go b/core/block_processor_test.go
index 538cf4ee50..5735b8d0aa 100644
--- a/core/block_processor_test.go
+++ b/core/block_processor_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/pow/ezp"
@@ -69,7 +70,7 @@ func TestPutReceipt(t *testing.T) {
 	hash[0] = 2
 
 	receipt := new(types.Receipt)
-	receipt.SetLogs(state.Logs{&state.Log{
+	receipt.SetLogs(vm.Logs{&vm.Log{
 		Address:   addr,
 		Topics:    []common.Hash{hash},
 		Data:      []byte("hi"),
diff --git a/core/chain_manager_test.go b/core/chain_manager_test.go
index 6cfafb8c0f..40286190bf 100644
--- a/core/chain_manager_test.go
+++ b/core/chain_manager_test.go
@@ -28,8 +28,8 @@ import (
 
 	"github.com/ethereum/ethash"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
@@ -361,7 +361,7 @@ func TestChainMultipleInsertions(t *testing.T) {
 
 type bproc struct{}
 
-func (bproc) Process(*types.Block) (state.Logs, types.Receipts, error) { return nil, nil, nil }
+func (bproc) Process(*types.Block) (vm.Logs, types.Receipts, error) { return nil, nil, nil }
 
 func makeChainWithDiff(genesis *types.Block, d []int, seed byte) []*types.Block {
 	var chain []*types.Block
diff --git a/core/events.go b/core/events.go
index e142b6dbaa..8cf230dda4 100644
--- a/core/events.go
+++ b/core/events.go
@@ -20,8 +20,8 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 // TxPreEvent is posted when a transaction enters the transaction pool.
@@ -42,23 +42,23 @@ type RemovedTransactionEvent struct{ Txs types.Transactions }
 // ChainSplit is posted when a new head is detected
 type ChainSplitEvent struct {
 	Block *types.Block
-	Logs  state.Logs
+	Logs  vm.Logs
 }
 
 type ChainEvent struct {
 	Block *types.Block
 	Hash  common.Hash
-	Logs  state.Logs
+	Logs  vm.Logs
 }
 
 type ChainSideEvent struct {
 	Block *types.Block
-	Logs  state.Logs
+	Logs  vm.Logs
 }
 
 type PendingBlockEvent struct {
 	Block *types.Block
-	Logs  state.Logs
+	Logs  vm.Logs
 }
 
 type ChainUncleEvent struct {
diff --git a/core/execution.go b/core/execution.go
index 3a136515df..e3c00a2ead 100644
--- a/core/execution.go
+++ b/core/execution.go
@@ -17,108 +17,104 @@
 package core
 
 import (
+	"errors"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
 )
 
-// Execution is the execution environment for the given call or create action.
-type Execution struct {
-	env     vm.Environment
-	address *common.Address
-	input   []byte
-	evm     vm.VirtualMachine
-
-	Gas, price, value *big.Int
+// Call executes within the given contract
+func Call(env vm.Environment, caller vm.ContractRef, addr common.Address, input []byte, gas, gasPrice, value *big.Int) (ret []byte, err error) {
+	ret, _, err = exec(env, caller, &addr, &addr, input, env.Db().GetCode(addr), gas, gasPrice, value)
+	return ret, err
 }
 
-// NewExecution returns a new execution environment that handles all calling
-// and creation logic defined by the YP.
-func NewExecution(env vm.Environment, address *common.Address, input []byte, gas, gasPrice, value *big.Int) *Execution {
-	exe := &Execution{env: env, address: address, input: input, Gas: gas, price: gasPrice, value: value}
-	exe.evm = vm.NewVm(env)
-	return exe
+// CallCode executes the given address' code as the given contract address
+func CallCode(env vm.Environment, caller vm.ContractRef, addr common.Address, input []byte, gas, gasPrice, value *big.Int) (ret []byte, err error) {
+	prev := caller.Address()
+	ret, _, err = exec(env, caller, &prev, &addr, input, env.Db().GetCode(addr), gas, gasPrice, value)
+	return ret, err
 }
 
-// Call executes within the given context
-func (self *Execution) Call(codeAddr common.Address, caller vm.ContextRef) ([]byte, error) {
-	// Retrieve the executing code
-	code := self.env.State().GetCode(codeAddr)
-
-	return self.exec(&codeAddr, code, caller)
-}
-
-// Create creates a new contract and runs the initialisation procedure of the
-// contract. This returns the returned code for the contract and is stored
-// elsewhere.
-func (self *Execution) Create(caller vm.ContextRef) (ret []byte, err error, account *state.StateObject) {
-	// Input must be nil for create
-	code := self.input
-	self.input = nil
-	ret, err = self.exec(nil, code, caller)
+// Create creates a new contract with the given code
+func Create(env vm.Environment, caller vm.ContractRef, code []byte, gas, gasPrice, value *big.Int) (ret []byte, address common.Address, err error) {
+	ret, address, err = exec(env, caller, nil, nil, nil, code, gas, gasPrice, value)
 	// Here we get an error if we run into maximum stack depth,
 	// See: https://github.com/ethereum/yellowpaper/pull/131
 	// and YP definitions for CREATE instruction
 	if err != nil {
-		return nil, err, nil
+		return nil, address, err
 	}
-	account = self.env.State().GetStateObject(*self.address)
-	return
+	return ret, address, err
 }
 
-// exec executes the given code and executes within the contextAddr context.
-func (self *Execution) exec(contextAddr *common.Address, code []byte, caller vm.ContextRef) (ret []byte, err error) {
-	env := self.env
-	evm := self.evm
+func exec(env vm.Environment, caller vm.ContractRef, address, codeAddr *common.Address, input, code []byte, gas, gasPrice, value *big.Int) (ret []byte, addr common.Address, err error) {
+	evm := vm.NewVm(env)
+
 	// Depth check execution. Fail if we're trying to execute above the
 	// limit.
 	if env.Depth() > int(params.CallCreateDepth.Int64()) {
-		caller.ReturnGas(self.Gas, self.price)
+		caller.ReturnGas(gas, gasPrice)
 
-		return nil, vm.DepthError
+		return nil, common.Address{}, vm.DepthError
 	}
 
-	if !env.CanTransfer(env.State().GetStateObject(caller.Address()), self.value) {
-		caller.ReturnGas(self.Gas, self.price)
+	if !env.CanTransfer(caller.Address(), value) {
+		caller.ReturnGas(gas, gasPrice)
 
-		return nil, ValueTransferErr("insufficient funds to transfer value. Req %v, has %v", self.value, env.State().GetBalance(caller.Address()))
+		return nil, common.Address{}, ValueTransferErr("insufficient funds to transfer value. Req %v, has %v", value, env.Db().GetBalance(caller.Address()))
 	}
 
 	var createAccount bool
-	if self.address == nil {
+	if address == nil {
 		// Generate a new address
-		nonce := env.State().GetNonce(caller.Address())
-		env.State().SetNonce(caller.Address(), nonce+1)
+		nonce := env.Db().GetNonce(caller.Address())
+		env.Db().SetNonce(caller.Address(), nonce+1)
 
-		addr := crypto.CreateAddress(caller.Address(), nonce)
+		addr = crypto.CreateAddress(caller.Address(), nonce)
 
-		self.address = &addr
+		address = &addr
 		createAccount = true
 	}
-	snapshot := env.State().Copy()
+	snapshot := env.MakeSnapshot()
 
 	var (
-		from = env.State().GetStateObject(caller.Address())
-		to   *state.StateObject
+		from = env.Db().GetAccount(caller.Address())
+		to   vm.Account
 	)
 	if createAccount {
-		to = env.State().CreateAccount(*self.address)
+		to = env.Db().CreateAccount(*address)
 	} else {
-		to = env.State().GetOrNewStateObject(*self.address)
+		if !env.Db().Exist(*address) {
+			to = env.Db().CreateAccount(*address)
+		} else {
+			to = env.Db().GetAccount(*address)
+		}
 	}
-	vm.Transfer(from, to, self.value)
+	env.Transfer(from, to, value)
 
-	context := vm.NewContext(caller, to, self.value, self.Gas, self.price)
-	context.SetCallCode(contextAddr, code)
+	contract := vm.NewContract(caller, to, value, gas, gasPrice)
+	contract.SetCallCode(codeAddr, code)
 
-	ret, err = evm.Run(context, self.input)
+	ret, err = evm.Run(contract, input)
 	if err != nil {
-		env.State().Set(snapshot)
+		env.SetSnapshot(snapshot) //env.Db().Set(snapshot)
 	}
 
-	return
+	return ret, addr, err
+}
+
+// generic transfer method
+func Transfer(from, to vm.Account, amount *big.Int) error {
+	if from.Balance().Cmp(amount) < 0 {
+		return errors.New("Insufficient balance in account")
+	}
+
+	from.SubBalance(amount)
+	to.AddBalance(amount)
+
+	return nil
 }
diff --git a/core/state/statedb.go b/core/state/statedb.go
index 4233c763bf..499ea5f524 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -21,6 +21,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
@@ -42,7 +43,7 @@ type StateDB struct {
 
 	thash, bhash common.Hash
 	txIndex      int
-	logs         map[common.Hash]Logs
+	logs         map[common.Hash]vm.Logs
 	logSize      uint
 }
 
@@ -59,7 +60,7 @@ func New(root common.Hash, db ethdb.Database) *StateDB {
 		trie:         tr,
 		stateObjects: make(map[string]*StateObject),
 		refund:       new(big.Int),
-		logs:         make(map[common.Hash]Logs),
+		logs:         make(map[common.Hash]vm.Logs),
 	}
 }
 
@@ -69,7 +70,7 @@ func (self *StateDB) StartRecord(thash, bhash common.Hash, ti int) {
 	self.txIndex = ti
 }
 
-func (self *StateDB) AddLog(log *Log) {
+func (self *StateDB) AddLog(log *vm.Log) {
 	log.TxHash = self.thash
 	log.BlockHash = self.bhash
 	log.TxIndex = uint(self.txIndex)
@@ -78,30 +79,34 @@ func (self *StateDB) AddLog(log *Log) {
 	self.logSize++
 }
 
-func (self *StateDB) GetLogs(hash common.Hash) Logs {
+func (self *StateDB) GetLogs(hash common.Hash) vm.Logs {
 	return self.logs[hash]
 }
 
-func (self *StateDB) Logs() Logs {
-	var logs Logs
+func (self *StateDB) Logs() vm.Logs {
+	var logs vm.Logs
 	for _, lgs := range self.logs {
 		logs = append(logs, lgs...)
 	}
 	return logs
 }
 
-func (self *StateDB) Refund(gas *big.Int) {
+func (self *StateDB) AddRefund(gas *big.Int) {
 	self.refund.Add(self.refund, gas)
 }
 
-/*
- * GETTERS
- */
-
 func (self *StateDB) HasAccount(addr common.Address) bool {
 	return self.GetStateObject(addr) != nil
 }
 
+func (self *StateDB) Exist(addr common.Address) bool {
+	return self.GetStateObject(addr) != nil
+}
+
+func (self *StateDB) GetAccount(addr common.Address) vm.Account {
+	return self.GetStateObject(addr)
+}
+
 // Retrieve the balance from the given address or 0 if object not found
 func (self *StateDB) GetBalance(addr common.Address) *big.Int {
 	stateObject := self.GetStateObject(addr)
@@ -245,7 +250,7 @@ func (self *StateDB) SetStateObject(object *StateObject) {
 func (self *StateDB) GetOrNewStateObject(addr common.Address) *StateObject {
 	stateObject := self.GetStateObject(addr)
 	if stateObject == nil || stateObject.deleted {
-		stateObject = self.CreateAccount(addr)
+		stateObject = self.CreateStateObject(addr)
 	}
 
 	return stateObject
@@ -264,7 +269,7 @@ func (self *StateDB) newStateObject(addr common.Address) *StateObject {
 }
 
 // Creates creates a new state object and takes ownership. This is different from "NewStateObject"
-func (self *StateDB) CreateAccount(addr common.Address) *StateObject {
+func (self *StateDB) CreateStateObject(addr common.Address) *StateObject {
 	// Get previous (if any)
 	so := self.GetStateObject(addr)
 	// Create a new one
@@ -278,6 +283,10 @@ func (self *StateDB) CreateAccount(addr common.Address) *StateObject {
 	return newSo
 }
 
+func (self *StateDB) CreateAccount(addr common.Address) vm.Account {
+	return self.CreateStateObject(addr)
+}
+
 //
 // Setting, copying of the state methods
 //
@@ -292,7 +301,7 @@ func (self *StateDB) Copy() *StateDB {
 	state.refund.Set(self.refund)
 
 	for hash, logs := range self.logs {
-		state.logs[hash] = make(Logs, len(logs))
+		state.logs[hash] = make(vm.Logs, len(logs))
 		copy(state.logs[hash], logs)
 	}
 	state.logSize = self.logSize
@@ -309,6 +318,10 @@ func (self *StateDB) Set(state *StateDB) {
 	self.logSize = state.logSize
 }
 
+func (self *StateDB) GetRefund() *big.Int {
+	return self.refund
+}
+
 // IntermediateRoot computes the current root hash of the state trie.
 // It is called in between transactions to get the root hash that
 // goes into transaction receipts.
diff --git a/core/state_transition.go b/core/state_transition.go
index 6ff7fa1ffd..e830192292 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -51,7 +51,7 @@ type StateTransition struct {
 	initialGas    *big.Int
 	value         *big.Int
 	data          []byte
-	state         *state.StateDB
+	state         vm.Database
 
 	env vm.Environment
 }
@@ -95,11 +95,7 @@ func IntrinsicGas(data []byte) *big.Int {
 }
 
 func ApplyMessage(env vm.Environment, msg Message, gp GasPool) ([]byte, *big.Int, error) {
-	return NewStateTransition(env, msg, gp).transitionState()
-}
-
-func NewStateTransition(env vm.Environment, msg Message, gp GasPool) *StateTransition {
-	return &StateTransition{
+	var st = StateTransition{
 		gp:         gp,
 		env:        env,
 		msg:        msg,
@@ -108,18 +104,22 @@ func NewStateTransition(env vm.Environment, msg Message, gp GasPool) *StateTrans
 		initialGas: new(big.Int),
 		value:      msg.Value(),
 		data:       msg.Data(),
-		state:      env.State(),
+		state:      env.Db(),
 	}
+	return st.transitionDb()
 }
 
-func (self *StateTransition) From() (*state.StateObject, error) {
+func (self *StateTransition) from() (vm.Account, error) {
 	f, err := self.msg.From()
 	if err != nil {
 		return nil, err
 	}
-	return self.state.GetOrNewStateObject(f), nil
+	if !self.state.Exist(f) {
+		return self.state.CreateAccount(f), nil
+	}
+	return self.state.GetAccount(f), nil
 }
-func (self *StateTransition) To() *state.StateObject {
+func (self *StateTransition) to() vm.Account {
 	if self.msg == nil {
 		return nil
 	}
@@ -127,10 +127,14 @@ func (self *StateTransition) To() *state.StateObject {
 	if to == nil {
 		return nil // contract creation
 	}
-	return self.state.GetOrNewStateObject(*to)
+
+	if !self.state.Exist(*to) {
+		return self.state.CreateAccount(*to)
+	}
+	return self.state.GetAccount(*to)
 }
 
-func (self *StateTransition) UseGas(amount *big.Int) error {
+func (self *StateTransition) useGas(amount *big.Int) error {
 	if self.gas.Cmp(amount) < 0 {
 		return vm.OutOfGasError
 	}
@@ -139,15 +143,15 @@ func (self *StateTransition) UseGas(amount *big.Int) error {
 	return nil
 }
 
-func (self *StateTransition) AddGas(amount *big.Int) {
+func (self *StateTransition) addGas(amount *big.Int) {
 	self.gas.Add(self.gas, amount)
 }
 
-func (self *StateTransition) BuyGas() error {
+func (self *StateTransition) buyGas() error {
 	mgas := self.msg.Gas()
 	mgval := new(big.Int).Mul(mgas, self.gasPrice)
 
-	sender, err := self.From()
+	sender, err := self.from()
 	if err != nil {
 		return err
 	}
@@ -157,7 +161,7 @@ func (self *StateTransition) BuyGas() error {
 	if err = self.gp.SubGas(mgas, self.gasPrice); err != nil {
 		return err
 	}
-	self.AddGas(mgas)
+	self.addGas(mgas)
 	self.initialGas.Set(mgas)
 	sender.SubBalance(mgval)
 	return nil
@@ -165,18 +169,19 @@ func (self *StateTransition) BuyGas() error {
 
 func (self *StateTransition) preCheck() (err error) {
 	msg := self.msg
-	sender, err := self.From()
+	sender, err := self.from()
 	if err != nil {
 		return err
 	}
 
 	// Make sure this transaction's nonce is correct
-	if sender.Nonce() != msg.Nonce() {
-		return NonceError(msg.Nonce(), sender.Nonce())
+	//if sender.Nonce() != msg.Nonce() {
+	if n := self.state.GetNonce(sender.Address()); n != msg.Nonce() {
+		return NonceError(msg.Nonce(), n)
 	}
 
 	// Pre-pay gas / Buy gas of the coinbase account
-	if err = self.BuyGas(); err != nil {
+	if err = self.buyGas(); err != nil {
 		if state.IsGasLimitErr(err) {
 			return err
 		}
@@ -186,28 +191,28 @@ func (self *StateTransition) preCheck() (err error) {
 	return nil
 }
 
-func (self *StateTransition) transitionState() (ret []byte, usedGas *big.Int, err error) {
+func (self *StateTransition) transitionDb() (ret []byte, usedGas *big.Int, err error) {
 	if err = self.preCheck(); err != nil {
 		return
 	}
 
 	msg := self.msg
-	sender, _ := self.From() // err checked in preCheck
+	sender, _ := self.from() // err checked in preCheck
 
 	// Pay intrinsic gas
-	if err = self.UseGas(IntrinsicGas(self.data)); err != nil {
+	if err = self.useGas(IntrinsicGas(self.data)); err != nil {
 		return nil, nil, InvalidTxError(err)
 	}
 
 	vmenv := self.env
-	var ref vm.ContextRef
+	var addr common.Address
 	if MessageCreatesContract(msg) {
-		ret, err, ref = vmenv.Create(sender, self.data, self.gas, self.gasPrice, self.value)
+		ret, addr, err = vmenv.Create(sender, self.data, self.gas, self.gasPrice, self.value)
 		if err == nil {
 			dataGas := big.NewInt(int64(len(ret)))
 			dataGas.Mul(dataGas, params.CreateDataGas)
-			if err := self.UseGas(dataGas); err == nil {
-				ref.SetCode(ret)
+			if err := self.useGas(dataGas); err == nil {
+				self.state.SetCode(addr, ret)
 			} else {
 				ret = nil // does not affect consensus but useful for StateTests validations
 				glog.V(logger.Core).Infoln("Insufficient gas for creating code. Require", dataGas, "and have", self.gas)
@@ -216,8 +221,8 @@ func (self *StateTransition) transitionState() (ret []byte, usedGas *big.Int, er
 		glog.V(logger.Core).Infoln("VM create err:", err)
 	} else {
 		// Increment the nonce for the next transaction
-		self.state.SetNonce(sender.Address(), sender.Nonce()+1)
-		ret, err = vmenv.Call(sender, self.To().Address(), self.data, self.gas, self.gasPrice, self.value)
+		self.state.SetNonce(sender.Address(), self.state.GetNonce(sender.Address())+1)
+		ret, err = vmenv.Call(sender, self.to().Address(), self.data, self.gas, self.gasPrice, self.value)
 		glog.V(logger.Core).Infoln("VM call err:", err)
 	}
 
@@ -241,13 +246,13 @@ func (self *StateTransition) transitionState() (ret []byte, usedGas *big.Int, er
 }
 
 func (self *StateTransition) refundGas() {
-	sender, _ := self.From() // err already checked
+	sender, _ := self.from() // err already checked
 	// Return remaining gas
 	remaining := new(big.Int).Mul(self.gas, self.gasPrice)
 	sender.AddBalance(remaining)
 
 	uhalf := remaining.Div(self.gasUsed(), common.Big2)
-	refund := common.BigMin(uhalf, self.state.Refunds())
+	refund := common.BigMin(uhalf, self.state.GetRefund())
 	self.gas.Add(self.gas, refund)
 	self.state.AddBalance(sender.Address(), refund.Mul(refund, self.gasPrice))
 
diff --git a/core/types/bloom9.go b/core/types/bloom9.go
index 0629b31d45..f87ae58e6a 100644
--- a/core/types/bloom9.go
+++ b/core/types/bloom9.go
@@ -20,7 +20,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
@@ -37,7 +37,7 @@ func CreateBloom(receipts Receipts) Bloom {
 	return BytesToBloom(bin.Bytes())
 }
 
-func LogsBloom(logs state.Logs) *big.Int {
+func LogsBloom(logs vm.Logs) *big.Int {
 	bin := new(big.Int)
 	for _, log := range logs {
 		data := make([]common.Hash, len(log.Topics))
diff --git a/core/types/common.go b/core/types/common.go
index de6efcd86b..dc428c00c4 100644
--- a/core/types/common.go
+++ b/core/types/common.go
@@ -19,14 +19,14 @@ package types
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
-
 	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 type BlockProcessor interface {
-	Process(*Block) (state.Logs, Receipts, error)
+	Process(*Block) (vm.Logs, Receipts, error)
 }
 
 const bloomLength = 256
diff --git a/core/types/receipt.go b/core/types/receipt.go
index e01d690052..bcb4bd8a5b 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -23,7 +23,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/rlp"
 )
 
@@ -33,7 +33,7 @@ type Receipt struct {
 	Bloom             Bloom
 	TxHash            common.Hash
 	ContractAddress   common.Address
-	logs              state.Logs
+	logs              vm.Logs
 	GasUsed           *big.Int
 }
 
@@ -41,11 +41,11 @@ func NewReceipt(root []byte, cumalativeGasUsed *big.Int) *Receipt {
 	return &Receipt{PostState: common.CopyBytes(root), CumulativeGasUsed: new(big.Int).Set(cumalativeGasUsed)}
 }
 
-func (self *Receipt) SetLogs(logs state.Logs) {
+func (self *Receipt) SetLogs(logs vm.Logs) {
 	self.logs = logs
 }
 
-func (self *Receipt) Logs() state.Logs {
+func (self *Receipt) Logs() vm.Logs {
 	return self.logs
 }
 
@@ -60,7 +60,7 @@ func (self *Receipt) DecodeRLP(s *rlp.Stream) error {
 		Bloom             Bloom
 		TxHash            common.Hash
 		ContractAddress   common.Address
-		Logs              state.Logs
+		Logs              vm.Logs
 		GasUsed           *big.Int
 	}
 	if err := s.Decode(&r); err != nil {
@@ -74,9 +74,9 @@ func (self *Receipt) DecodeRLP(s *rlp.Stream) error {
 type ReceiptForStorage Receipt
 
 func (self *ReceiptForStorage) EncodeRLP(w io.Writer) error {
-	storageLogs := make([]*state.LogForStorage, len(self.logs))
+	storageLogs := make([]*vm.LogForStorage, len(self.logs))
 	for i, log := range self.logs {
-		storageLogs[i] = (*state.LogForStorage)(log)
+		storageLogs[i] = (*vm.LogForStorage)(log)
 	}
 	return rlp.Encode(w, []interface{}{self.PostState, self.CumulativeGasUsed, self.Bloom, self.TxHash, self.ContractAddress, storageLogs, self.GasUsed})
 }
diff --git a/core/vm/asm.go b/core/vm/asm.go
index 639201e50b..065d3eb974 100644
--- a/core/vm/asm.go
+++ b/core/vm/asm.go
@@ -23,6 +23,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
+// Dissassemble dissassembles the byte code and returns the string
+// representation (human readable opcodes).
 func Disassemble(script []byte) (asm []string) {
 	pc := new(big.Int)
 	for {
diff --git a/core/vm/common.go b/core/vm/common.go
index 2e03ec80bb..b52b598bad 100644
--- a/core/vm/common.go
+++ b/core/vm/common.go
@@ -22,34 +22,34 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/logger/glog"
+	"github.com/ethereum/go-ethereum/params"
 )
 
 // Global Debug flag indicating Debug VM (full logging)
 var Debug bool
 
+// Type is the VM type accepted by **NewVm**
 type Type byte
 
 const (
-	StdVmTy Type = iota
-	JitVmTy
+	StdVmTy Type = iota // Default standard VM
+	JitVmTy             // LLVM JIT VM
 	MaxVmTy
-
-	LogTyPretty byte = 0x1
-	LogTyDiff   byte = 0x2
 )
 
 var (
-	Pow256 = common.BigPow(2, 256)
+	Pow256 = common.BigPow(2, 256) // Pew256 is 2**256
 
-	U256 = common.U256
-	S256 = common.S256
+	U256 = common.U256 // Shortcut to common.U256
+	S256 = common.S256 // Shortcut to common.S256
 
-	Zero = common.Big0
-	One  = common.Big1
+	Zero = common.Big0 // Shortcut to common.Big0
+	One  = common.Big1 // Shortcut to common.Big1
 
-	max = big.NewInt(math.MaxInt64)
+	max = big.NewInt(math.MaxInt64) // Maximum 256 bit integer
 )
 
+// NewVm returns a new VM based on the Environment
 func NewVm(env Environment) VirtualMachine {
 	switch env.VmType() {
 	case JitVmTy:
@@ -62,6 +62,7 @@ func NewVm(env Environment) VirtualMachine {
 	}
 }
 
+// calculates the memory size required for a step
 func calcMemSize(off, l *big.Int) *big.Int {
 	if l.Cmp(common.Big0) == 0 {
 		return common.Big0
@@ -70,6 +71,32 @@ func calcMemSize(off, l *big.Int) *big.Int {
 	return new(big.Int).Add(off, l)
 }
 
+// calculates the quadratic gas
+func quadMemGas(mem *Memory, newMemSize, gas *big.Int) {
+	if newMemSize.Cmp(common.Big0) > 0 {
+		newMemSizeWords := toWordSize(newMemSize)
+		newMemSize.Mul(newMemSizeWords, u256(32))
+
+		if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
+			// be careful reusing variables here when changing.
+			// The order has been optimised to reduce allocation
+			oldSize := toWordSize(big.NewInt(int64(mem.Len())))
+			pow := new(big.Int).Exp(oldSize, common.Big2, Zero)
+			linCoef := oldSize.Mul(oldSize, params.MemoryGas)
+			quadCoef := new(big.Int).Div(pow, params.QuadCoeffDiv)
+			oldTotalFee := new(big.Int).Add(linCoef, quadCoef)
+
+			pow.Exp(newMemSizeWords, common.Big2, Zero)
+			linCoef = linCoef.Mul(newMemSizeWords, params.MemoryGas)
+			quadCoef = quadCoef.Div(pow, params.QuadCoeffDiv)
+			newTotalFee := linCoef.Add(linCoef, quadCoef)
+
+			fee := newTotalFee.Sub(newTotalFee, oldTotalFee)
+			gas.Add(gas, fee)
+		}
+	}
+}
+
 // Simple helper
 func u256(n int64) *big.Int {
 	return big.NewInt(n)
@@ -86,6 +113,8 @@ func toValue(val *big.Int) interface{} {
 	return val
 }
 
+// getData returns a slice from the data based on the start and size and pads
+// up to size with zero's. This function is overflow safe.
 func getData(data []byte, start, size *big.Int) []byte {
 	dlen := big.NewInt(int64(len(data)))
 
@@ -94,7 +123,9 @@ func getData(data []byte, start, size *big.Int) []byte {
 	return common.RightPadBytes(data[s.Uint64():e.Uint64()], int(size.Uint64()))
 }
 
-func UseGas(gas, amount *big.Int) bool {
+// useGas attempts to subtract the amount of gas and returns whether it was
+// successful
+func useGas(gas, amount *big.Int) bool {
 	if gas.Cmp(amount) < 0 {
 		return false
 	}
diff --git a/core/vm/context.go b/core/vm/contract.go
similarity index 59%
rename from core/vm/context.go
rename to core/vm/contract.go
index d17934ba59..8460cc47bb 100644
--- a/core/vm/context.go
+++ b/core/vm/contract.go
@@ -22,15 +22,18 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-type ContextRef interface {
+// ContractRef is a reference to the contract's backing object
+type ContractRef interface {
 	ReturnGas(*big.Int, *big.Int)
 	Address() common.Address
 	SetCode([]byte)
 }
 
-type Context struct {
-	caller ContextRef
-	self   ContextRef
+// Contract represents an ethereum contract in the state database. It contains
+// the the contract code, calling arguments. Contract implements ContractReg
+type Contract struct {
+	caller ContractRef
+	self   ContractRef
 
 	jumpdests destinations // result of JUMPDEST analysis.
 
@@ -44,10 +47,10 @@ type Context struct {
 }
 
 // Create a new context for the given data items.
-func NewContext(caller ContextRef, object ContextRef, value, gas, price *big.Int) *Context {
-	c := &Context{caller: caller, self: object, Args: nil}
+func NewContract(caller ContractRef, object ContractRef, value, gas, price *big.Int) *Contract {
+	c := &Contract{caller: caller, self: object, Args: nil}
 
-	if parent, ok := caller.(*Context); ok {
+	if parent, ok := caller.(*Contract); ok {
 		// Reuse JUMPDEST analysis from parent context if available.
 		c.jumpdests = parent.jumpdests
 	} else {
@@ -66,11 +69,13 @@ func NewContext(caller ContextRef, object ContextRef, value, gas, price *big.Int
 	return c
 }
 
-func (c *Context) GetOp(n uint64) OpCode {
+// GetOp returns the n'th element in the contract's byte array
+func (c *Contract) GetOp(n uint64) OpCode {
 	return OpCode(c.GetByte(n))
 }
 
-func (c *Context) GetByte(n uint64) byte {
+// GetByte returns the n'th byte in the contract's byte array
+func (c *Contract) GetByte(n uint64) byte {
 	if n < uint64(len(c.Code)) {
 		return c.Code[n]
 	}
@@ -78,43 +83,44 @@ func (c *Context) GetByte(n uint64) byte {
 	return 0
 }
 
-func (c *Context) Return(ret []byte) []byte {
+// Return returns the given ret argument and returns any remaining gas to the
+// caller
+func (c *Contract) Return(ret []byte) []byte {
 	// Return the remaining gas to the caller
 	c.caller.ReturnGas(c.Gas, c.Price)
 
 	return ret
 }
 
-/*
- * Gas functions
- */
-func (c *Context) UseGas(gas *big.Int) (ok bool) {
-	ok = UseGas(c.Gas, gas)
+// UseGas attempts the use gas and subtracts it and returns true on success
+func (c *Contract) UseGas(gas *big.Int) (ok bool) {
+	ok = useGas(c.Gas, gas)
 	if ok {
 		c.UsedGas.Add(c.UsedGas, gas)
 	}
 	return
 }
 
-// Implement the caller interface
-func (c *Context) ReturnGas(gas, price *big.Int) {
+// ReturnGas adds the given gas back to itself.
+func (c *Contract) ReturnGas(gas, price *big.Int) {
 	// Return the gas to the context
 	c.Gas.Add(c.Gas, gas)
 	c.UsedGas.Sub(c.UsedGas, gas)
 }
 
-/*
- * Set / Get
- */
-func (c *Context) Address() common.Address {
+// Address returns the contracts address
+func (c *Contract) Address() common.Address {
 	return c.self.Address()
 }
 
-func (self *Context) SetCode(code []byte) {
+// SetCode sets the code to the contract
+func (self *Contract) SetCode(code []byte) {
 	self.Code = code
 }
 
-func (self *Context) SetCallCode(addr *common.Address, code []byte) {
+// SetCallCode sets the address of the code address and sets the code
+// of the contract according to the backing database.
+func (self *Contract) SetCallCode(addr *common.Address, code []byte) {
 	self.Code = code
 	self.CodeAddr = addr
 }
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index b965fa095c..22cb9eab2b 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -26,22 +26,22 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 )
 
-type Address interface {
-	Call(in []byte) []byte
-}
-
+// PrecompiledAccount represents a native ethereum contract
 type PrecompiledAccount struct {
 	Gas func(l int) *big.Int
 	fn  func(in []byte) []byte
 }
 
+// Call calls the native function
 func (self PrecompiledAccount) Call(in []byte) []byte {
 	return self.fn(in)
 }
 
+// Precompiled contains the default set of ethereum contracts
 var Precompiled = PrecompiledContracts()
 
-// XXX Could set directly. Testing requires resetting and setting of pre compiled contracts.
+// PrecompiledContracts returns the default set of precompiled ethereum
+// contracts defined by the ethereum yellow paper.
 func PrecompiledContracts() map[string]*PrecompiledAccount {
 	return map[string]*PrecompiledAccount{
 		// ECRECOVER
diff --git a/core/vm/settings.go b/core/vm/doc.go
similarity index 51%
rename from core/vm/settings.go
rename to core/vm/doc.go
index f9296f6c8b..4deb7761d9 100644
--- a/core/vm/settings.go
+++ b/core/vm/doc.go
@@ -14,12 +14,19 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-package vm
+/*
+Package vm implements the Ethereum Virtual Machine.
 
-var (
-	EnableJit   bool // Enables the JIT VM
-	ForceJit    bool // Force the JIT, skip byte VM
-	MaxProgSize int  // Max cache size for JIT Programs
-)
+The vm package implements two EVMs, a byte code VM and a JIT VM. The BC
+(Byte Code) VM loops over a set of bytes and executes them according to a set
+of rules defined in the Ethereum yellow paper. When the BC VM is invokes it
+invokes the JIT VM in a seperate goroutine and compiles the byte code in JIT
+instructions.
 
-const defaultJitMaxCache int = 64
+The JIT VM, when invoked, loops around a set of pre-defined instructions until
+it either runs of gas, causes an internel error, returns or stops. At a later
+stage the JIT VM will see some additional features that will cause sets of
+instructions to be compiled down to segments. Segments are sets of instructions
+that can be ran in one go saving precious time during execution.
+*/
+package vm
diff --git a/core/vm/environment.go b/core/vm/environment.go
index 916081f513..606518fd46 100644
--- a/core/vm/environment.go
+++ b/core/vm/environment.go
@@ -17,39 +17,86 @@
 package vm
 
 import (
-	"errors"
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
 )
 
 // Environment is is required by the virtual machine to get information from
-// it's own isolated environment. For an example see `core.VMEnv`
-type Environment interface {
-	State() *state.StateDB
+// it's own isolated environment.
 
+// Environment is an EVM requirement and helper which allows access to outside
+// information such like states.
+type Environment interface {
+	// The state database
+	Db() Database
+	// Creates a restorable snapshot
+	MakeSnapshot() Database
+	// Set database to previous snapshot
+	SetSnapshot(Database)
+	// Address of the original invoker (first occurance of the VM invoker)
 	Origin() common.Address
+	// The block number this VM is invoken on
 	BlockNumber() *big.Int
+	// The n'th hash ago from this block number
 	GetHash(n uint64) common.Hash
+	// The handler's address
 	Coinbase() common.Address
+	// The current time (block time)
 	Time() *big.Int
+	// Difficulty set on the current block
 	Difficulty() *big.Int
+	// The gas limit of the block
 	GasLimit() *big.Int
-	CanTransfer(from Account, balance *big.Int) bool
+	// Determines whether it's possible to transact
+	CanTransfer(from common.Address, balance *big.Int) bool
+	// Transfer from to to with amount set
 	Transfer(from, to Account, amount *big.Int) error
-	AddLog(*state.Log)
+	// Adds a LOG to the state
+	AddLog(*Log)
+	// Adds a structured log to the env
 	AddStructLog(StructLog)
+	// Returns all coalesced structured logs
 	StructLogs() []StructLog
 
+	// Type of the VM
 	VmType() Type
 
+	// Current calling depth
 	Depth() int
 	SetDepth(i int)
 
-	Call(me ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error)
-	CallCode(me ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error)
-	Create(me ContextRef, data []byte, gas, price, value *big.Int) ([]byte, error, ContextRef)
+	// Call another contract
+	Call(me ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error)
+	// Take another's contract code and execute within our own context
+	CallCode(me ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error)
+	// Create a new contract
+	Create(me ContractRef, data []byte, gas, price, value *big.Int) ([]byte, common.Address, error)
+}
+
+// Database is a EVM database for full state querying
+type Database interface {
+	GetAccount(common.Address) Account
+	CreateAccount(common.Address) Account
+
+	AddBalance(common.Address, *big.Int)
+	GetBalance(common.Address) *big.Int
+
+	GetNonce(common.Address) uint64
+	SetNonce(common.Address, uint64)
+
+	GetCode(common.Address) []byte
+	SetCode(common.Address, []byte)
+
+	AddRefund(*big.Int)
+	GetRefund() *big.Int
+
+	GetState(common.Address, common.Hash) common.Hash
+	SetState(common.Address, common.Hash, common.Hash)
+
+	Delete(common.Address) bool
+	Exist(common.Address) bool
+	IsDeleted(common.Address) bool
 }
 
 // StructLog is emited to the Environment each cycle and lists information about the curent internal state
@@ -68,18 +115,10 @@ type StructLog struct {
 type Account interface {
 	SubBalance(amount *big.Int)
 	AddBalance(amount *big.Int)
+	SetBalance(*big.Int)
+	SetNonce(uint64)
 	Balance() *big.Int
 	Address() common.Address
-}
-
-// generic transfer method
-func Transfer(from, to Account, amount *big.Int) error {
-	if from.Balance().Cmp(amount) < 0 {
-		return errors.New("Insufficient balance in account")
-	}
-
-	from.SubBalance(amount)
-	to.AddBalance(amount)
-
-	return nil
+	ReturnGas(*big.Int, *big.Int)
+	SetCode([]byte)
 }
diff --git a/core/vm/gas.go b/core/vm/gas.go
index b2f068e6e1..bff0ac91b4 100644
--- a/core/vm/gas.go
+++ b/core/vm/gas.go
@@ -37,6 +37,7 @@ var (
 	GasContractByte = big.NewInt(200)
 )
 
+// baseCheck checks for any stack error underflows
 func baseCheck(op OpCode, stack *stack, gas *big.Int) error {
 	// PUSH and DUP are a bit special. They all cost the same but we do want to have checking on stack push limit
 	// PUSH is also allowed to calculate the same price for all PUSHes
@@ -63,6 +64,7 @@ func baseCheck(op OpCode, stack *stack, gas *big.Int) error {
 	return nil
 }
 
+// casts a arbitrary number to the amount of words (sets of 32 bytes)
 func toWordSize(size *big.Int) *big.Int {
 	tmp := new(big.Int)
 	tmp.Add(size, u256(31))
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
index aa0117cc85..6c6039f746 100644
--- a/core/vm/instructions.go
+++ b/core/vm/instructions.go
@@ -20,46 +20,52 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
 )
 
-type instrFn func(instr instruction, env Environment, context *Context, memory *Memory, stack *stack)
-type instrExFn func(instr instruction, ret *big.Int, env Environment, context *Context, memory *Memory, stack *stack)
+type programInstruction interface {
+	Do(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack)
+}
+
+type instrFn func(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack)
+
+// Do executes the function. This implements programInstruction
+func (fn instrFn) Do(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	fn(instr, pc, env, contract, memory, stack)
+}
 
 type instruction struct {
-	op     OpCode
-	pc     uint64
-	fn     instrFn
-	specFn instrExFn
-	data   *big.Int
+	op   OpCode
+	pc   uint64
+	fn   instrFn
+	data *big.Int
 
 	gas   *big.Int
 	spop  int
 	spush int
 }
 
-func opStaticJump(instr instruction, ret *big.Int, env Environment, context *Context, memory *Memory, stack *stack) {
+func opStaticJump(instr instruction, pc *uint64, ret *big.Int, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	ret.Set(instr.data)
 }
 
-func opAdd(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opAdd(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	stack.push(U256(x.Add(x, y)))
 }
 
-func opSub(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSub(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	stack.push(U256(x.Sub(x, y)))
 }
 
-func opMul(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opMul(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	stack.push(U256(x.Mul(x, y)))
 }
 
-func opDiv(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opDiv(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	if y.Cmp(common.Big0) != 0 {
 		stack.push(U256(x.Div(x, y)))
@@ -68,7 +74,7 @@ func opDiv(instr instruction, env Environment, context *Context, memory *Memory,
 	}
 }
 
-func opSdiv(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSdiv(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := S256(stack.pop()), S256(stack.pop())
 	if y.Cmp(common.Big0) == 0 {
 		stack.push(new(big.Int))
@@ -88,7 +94,7 @@ func opSdiv(instr instruction, env Environment, context *Context, memory *Memory
 	}
 }
 
-func opMod(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opMod(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	if y.Cmp(common.Big0) == 0 {
 		stack.push(new(big.Int))
@@ -97,7 +103,7 @@ func opMod(instr instruction, env Environment, context *Context, memory *Memory,
 	}
 }
 
-func opSmod(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSmod(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := S256(stack.pop()), S256(stack.pop())
 
 	if y.Cmp(common.Big0) == 0 {
@@ -117,12 +123,12 @@ func opSmod(instr instruction, env Environment, context *Context, memory *Memory
 	}
 }
 
-func opExp(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opExp(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	stack.push(U256(x.Exp(x, y, Pow256)))
 }
 
-func opSignExtend(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSignExtend(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	back := stack.pop()
 	if back.Cmp(big.NewInt(31)) < 0 {
 		bit := uint(back.Uint64()*8 + 7)
@@ -139,12 +145,12 @@ func opSignExtend(instr instruction, env Environment, context *Context, memory *
 	}
 }
 
-func opNot(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opNot(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x := stack.pop()
 	stack.push(U256(x.Not(x)))
 }
 
-func opLt(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opLt(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	if x.Cmp(y) < 0 {
 		stack.push(big.NewInt(1))
@@ -153,7 +159,7 @@ func opLt(instr instruction, env Environment, context *Context, memory *Memory,
 	}
 }
 
-func opGt(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opGt(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	if x.Cmp(y) > 0 {
 		stack.push(big.NewInt(1))
@@ -162,7 +168,7 @@ func opGt(instr instruction, env Environment, context *Context, memory *Memory,
 	}
 }
 
-func opSlt(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSlt(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := S256(stack.pop()), S256(stack.pop())
 	if x.Cmp(S256(y)) < 0 {
 		stack.push(big.NewInt(1))
@@ -171,7 +177,7 @@ func opSlt(instr instruction, env Environment, context *Context, memory *Memory,
 	}
 }
 
-func opSgt(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSgt(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := S256(stack.pop()), S256(stack.pop())
 	if x.Cmp(y) > 0 {
 		stack.push(big.NewInt(1))
@@ -180,7 +186,7 @@ func opSgt(instr instruction, env Environment, context *Context, memory *Memory,
 	}
 }
 
-func opEq(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opEq(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	if x.Cmp(y) == 0 {
 		stack.push(big.NewInt(1))
@@ -189,7 +195,7 @@ func opEq(instr instruction, env Environment, context *Context, memory *Memory,
 	}
 }
 
-func opIszero(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opIszero(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x := stack.pop()
 	if x.Cmp(common.Big0) > 0 {
 		stack.push(new(big.Int))
@@ -198,19 +204,19 @@ func opIszero(instr instruction, env Environment, context *Context, memory *Memo
 	}
 }
 
-func opAnd(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opAnd(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	stack.push(x.And(x, y))
 }
-func opOr(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opOr(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	stack.push(x.Or(x, y))
 }
-func opXor(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opXor(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y := stack.pop(), stack.pop()
 	stack.push(x.Xor(x, y))
 }
-func opByte(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opByte(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	th, val := stack.pop(), stack.pop()
 	if th.Cmp(big.NewInt(32)) < 0 {
 		byte := big.NewInt(int64(common.LeftPadBytes(val.Bytes(), 32)[th.Int64()]))
@@ -219,7 +225,7 @@ func opByte(instr instruction, env Environment, context *Context, memory *Memory
 		stack.push(new(big.Int))
 	}
 }
-func opAddmod(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opAddmod(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y, z := stack.pop(), stack.pop(), stack.pop()
 	if z.Cmp(Zero) > 0 {
 		add := x.Add(x, y)
@@ -229,7 +235,7 @@ func opAddmod(instr instruction, env Environment, context *Context, memory *Memo
 		stack.push(new(big.Int))
 	}
 }
-func opMulmod(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opMulmod(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	x, y, z := stack.pop(), stack.pop(), stack.pop()
 	if z.Cmp(Zero) > 0 {
 		mul := x.Mul(x, y)
@@ -240,92 +246,92 @@ func opMulmod(instr instruction, env Environment, context *Context, memory *Memo
 	}
 }
 
-func opSha3(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSha3(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	offset, size := stack.pop(), stack.pop()
 	hash := crypto.Sha3(memory.Get(offset.Int64(), size.Int64()))
 
 	stack.push(common.BytesToBig(hash))
 }
 
-func opAddress(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
-	stack.push(common.Bytes2Big(context.Address().Bytes()))
+func opAddress(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	stack.push(common.Bytes2Big(contract.Address().Bytes()))
 }
 
-func opBalance(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opBalance(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	addr := common.BigToAddress(stack.pop())
-	balance := env.State().GetBalance(addr)
+	balance := env.Db().GetBalance(addr)
 
 	stack.push(new(big.Int).Set(balance))
 }
 
-func opOrigin(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opOrigin(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.push(env.Origin().Big())
 }
 
-func opCaller(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
-	stack.push(common.Bytes2Big(context.caller.Address().Bytes()))
+func opCaller(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	stack.push(common.Bytes2Big(contract.caller.Address().Bytes()))
 }
 
-func opCallValue(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
-	stack.push(new(big.Int).Set(context.value))
+func opCallValue(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	stack.push(new(big.Int).Set(contract.value))
 }
 
-func opCalldataLoad(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
-	stack.push(common.Bytes2Big(getData(context.Input, stack.pop(), common.Big32)))
+func opCalldataLoad(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	stack.push(common.Bytes2Big(getData(contract.Input, stack.pop(), common.Big32)))
 }
 
-func opCalldataSize(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
-	stack.push(big.NewInt(int64(len(context.Input))))
+func opCalldataSize(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	stack.push(big.NewInt(int64(len(contract.Input))))
 }
 
-func opCalldataCopy(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opCalldataCopy(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	var (
 		mOff = stack.pop()
 		cOff = stack.pop()
 		l    = stack.pop()
 	)
-	memory.Set(mOff.Uint64(), l.Uint64(), getData(context.Input, cOff, l))
+	memory.Set(mOff.Uint64(), l.Uint64(), getData(contract.Input, cOff, l))
 }
 
-func opExtCodeSize(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opExtCodeSize(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	addr := common.BigToAddress(stack.pop())
-	l := big.NewInt(int64(len(env.State().GetCode(addr))))
+	l := big.NewInt(int64(len(env.Db().GetCode(addr))))
 	stack.push(l)
 }
 
-func opCodeSize(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
-	l := big.NewInt(int64(len(context.Code)))
+func opCodeSize(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	l := big.NewInt(int64(len(contract.Code)))
 	stack.push(l)
 }
 
-func opCodeCopy(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opCodeCopy(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	var (
 		mOff = stack.pop()
 		cOff = stack.pop()
 		l    = stack.pop()
 	)
-	codeCopy := getData(context.Code, cOff, l)
+	codeCopy := getData(contract.Code, cOff, l)
 
 	memory.Set(mOff.Uint64(), l.Uint64(), codeCopy)
 }
 
-func opExtCodeCopy(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opExtCodeCopy(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	var (
 		addr = common.BigToAddress(stack.pop())
 		mOff = stack.pop()
 		cOff = stack.pop()
 		l    = stack.pop()
 	)
-	codeCopy := getData(env.State().GetCode(addr), cOff, l)
+	codeCopy := getData(env.Db().GetCode(addr), cOff, l)
 
 	memory.Set(mOff.Uint64(), l.Uint64(), codeCopy)
 }
 
-func opGasprice(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
-	stack.push(new(big.Int).Set(context.Price))
+func opGasprice(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	stack.push(new(big.Int).Set(contract.Price))
 }
 
-func opBlockhash(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opBlockhash(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	num := stack.pop()
 
 	n := new(big.Int).Sub(env.BlockNumber(), common.Big257)
@@ -336,43 +342,43 @@ func opBlockhash(instr instruction, env Environment, context *Context, memory *M
 	}
 }
 
-func opCoinbase(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opCoinbase(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.push(env.Coinbase().Big())
 }
 
-func opTimestamp(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opTimestamp(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.push(U256(new(big.Int).Set(env.Time())))
 }
 
-func opNumber(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opNumber(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.push(U256(new(big.Int).Set(env.BlockNumber())))
 }
 
-func opDifficulty(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opDifficulty(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.push(U256(new(big.Int).Set(env.Difficulty())))
 }
 
-func opGasLimit(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opGasLimit(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.push(U256(new(big.Int).Set(env.GasLimit())))
 }
 
-func opPop(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opPop(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.pop()
 }
 
-func opPush(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opPush(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.push(new(big.Int).Set(instr.data))
 }
 
-func opDup(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opDup(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.dup(int(instr.data.Int64()))
 }
 
-func opSwap(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSwap(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.swap(int(instr.data.Int64()))
 }
 
-func opLog(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opLog(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	n := int(instr.data.Int64())
 	topics := make([]common.Hash, n)
 	mStart, mSize := stack.pop(), stack.pop()
@@ -381,85 +387,88 @@ func opLog(instr instruction, env Environment, context *Context, memory *Memory,
 	}
 
 	d := memory.Get(mStart.Int64(), mSize.Int64())
-	log := state.NewLog(context.Address(), topics, d, env.BlockNumber().Uint64())
+	log := NewLog(contract.Address(), topics, d, env.BlockNumber().Uint64())
 	env.AddLog(log)
 }
 
-func opMload(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opMload(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	offset := stack.pop()
 	val := common.BigD(memory.Get(offset.Int64(), 32))
 	stack.push(val)
 }
 
-func opMstore(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opMstore(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	// pop value of the stack
 	mStart, val := stack.pop(), stack.pop()
 	memory.Set(mStart.Uint64(), 32, common.BigToBytes(val, 256))
 }
 
-func opMstore8(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opMstore8(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	off, val := stack.pop().Int64(), stack.pop().Int64()
 	memory.store[off] = byte(val & 0xff)
 }
 
-func opSload(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSload(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	loc := common.BigToHash(stack.pop())
-	val := env.State().GetState(context.Address(), loc).Big()
+	val := env.Db().GetState(contract.Address(), loc).Big()
 	stack.push(val)
 }
 
-func opSstore(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opSstore(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	loc := common.BigToHash(stack.pop())
 	val := stack.pop()
 
-	env.State().SetState(context.Address(), loc, common.BigToHash(val))
+	env.Db().SetState(contract.Address(), loc, common.BigToHash(val))
 }
 
-func opJump(instr instruction, env Environment, context *Context, memory *Memory, stack *stack)     {}
-func opJumpi(instr instruction, env Environment, context *Context, memory *Memory, stack *stack)    {}
-func opJumpdest(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {}
+func opJump(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+}
+func opJumpi(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+}
+func opJumpdest(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+}
 
-func opPc(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opPc(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.push(new(big.Int).Set(instr.data))
 }
 
-func opMsize(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opMsize(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	stack.push(big.NewInt(int64(memory.Len())))
 }
 
-func opGas(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
-	stack.push(new(big.Int).Set(context.Gas))
+func opGas(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	stack.push(new(big.Int).Set(contract.Gas))
 }
 
-func opCreate(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opCreate(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	var (
 		value        = stack.pop()
 		offset, size = stack.pop(), stack.pop()
 		input        = memory.Get(offset.Int64(), size.Int64())
-		gas          = new(big.Int).Set(context.Gas)
+		gas          = new(big.Int).Set(contract.Gas)
 		addr         common.Address
+		ret          []byte
+		suberr       error
 	)
 
-	context.UseGas(context.Gas)
-	ret, suberr, ref := env.Create(context, input, gas, context.Price, value)
+	contract.UseGas(contract.Gas)
+	ret, addr, suberr = env.Create(contract, input, gas, contract.Price, value)
 	if suberr != nil {
 		stack.push(new(big.Int))
-
 	} else {
 		// gas < len(ret) * Createinstr.dataGas == NO_CODE
 		dataGas := big.NewInt(int64(len(ret)))
 		dataGas.Mul(dataGas, params.CreateDataGas)
-		if context.UseGas(dataGas) {
-			ref.SetCode(ret)
+		if contract.UseGas(dataGas) {
+			env.Db().SetCode(addr, ret)
 		}
-		addr = ref.Address()
 
 		stack.push(addr.Big())
 
 	}
 }
 
-func opCall(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opCall(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	gas := stack.pop()
 	// pop gas and value of the stack.
 	addr, value := stack.pop(), stack.pop()
@@ -478,7 +487,7 @@ func opCall(instr instruction, env Environment, context *Context, memory *Memory
 		gas.Add(gas, params.CallStipend)
 	}
 
-	ret, err := env.Call(context, address, args, gas, context.Price, value)
+	ret, err := env.Call(contract, address, args, gas, contract.Price, value)
 
 	if err != nil {
 		stack.push(new(big.Int))
@@ -490,7 +499,7 @@ func opCall(instr instruction, env Environment, context *Context, memory *Memory
 	}
 }
 
-func opCallCode(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
+func opCallCode(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
 	gas := stack.pop()
 	// pop gas and value of the stack.
 	addr, value := stack.pop(), stack.pop()
@@ -509,7 +518,7 @@ func opCallCode(instr instruction, env Environment, context *Context, memory *Me
 		gas.Add(gas, params.CallStipend)
 	}
 
-	ret, err := env.CallCode(context, address, args, gas, context.Price, value)
+	ret, err := env.CallCode(contract, address, args, gas, contract.Price, value)
 
 	if err != nil {
 		stack.push(new(big.Int))
@@ -521,14 +530,58 @@ func opCallCode(instr instruction, env Environment, context *Context, memory *Me
 	}
 }
 
-func opReturn(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {}
-func opStop(instr instruction, env Environment, context *Context, memory *Memory, stack *stack)   {}
+func opReturn(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+}
+func opStop(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+}
+
+func opSuicide(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+	//receiver := env.Db().GetOrNewStateObject(common.BigToAddress(stack.pop()))
+	//receiver.AddBalance(balance)
+	balance := env.Db().GetBalance(contract.Address())
+	env.Db().AddBalance(common.BigToAddress(stack.pop()), balance)
+
+	env.Db().Delete(contract.Address())
+}
+
+// following functions are used by the instruction jump  table
+
+// make log instruction function
+func makeLog(size int) instrFn {
+	return func(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+		topics := make([]common.Hash, size)
+		mStart, mSize := stack.pop(), stack.pop()
+		for i := 0; i < size; i++ {
+			topics[i] = common.BigToHash(stack.pop())
+		}
+
+		d := memory.Get(mStart.Int64(), mSize.Int64())
+		log := NewLog(contract.Address(), topics, d, env.BlockNumber().Uint64())
+		env.AddLog(log)
+	}
+}
 
-func opSuicide(instr instruction, env Environment, context *Context, memory *Memory, stack *stack) {
-	receiver := env.State().GetOrNewStateObject(common.BigToAddress(stack.pop()))
-	balance := env.State().GetBalance(context.Address())
+// make push instruction function
+func makePush(size uint64, bsize *big.Int) instrFn {
+	return func(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+		byts := getData(contract.Code, new(big.Int).SetUint64(*pc+1), bsize)
+		stack.push(common.Bytes2Big(byts))
+		*pc += size
+	}
+}
 
-	receiver.AddBalance(balance)
+// make push instruction function
+func makeDup(size int64) instrFn {
+	return func(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+		stack.dup(int(size))
+	}
+}
 
-	env.State().Delete(context.Address())
+// make swap instruction function
+func makeSwap(size int64) instrFn {
+	// switch n + 1 otherwise n would be swapped with n
+	size += 1
+	return func(instr instruction, pc *uint64, env Environment, contract *Contract, memory *Memory, stack *stack) {
+		stack.swap(int(size))
+	}
 }
diff --git a/core/vm/jit.go b/core/vm/jit.go
index 084d2a3f33..6ad5749174 100644
--- a/core/vm/jit.go
+++ b/core/vm/jit.go
@@ -20,10 +20,12 @@ import (
 	"fmt"
 	"math/big"
 	"sync/atomic"
+	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/logger/glog"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/hashicorp/golang-lru"
 )
@@ -35,6 +37,14 @@ const (
 	progCompile
 	progReady
 	progError
+
+	defaultJitMaxCache int = 64
+)
+
+var (
+	EnableJit   bool // Enables the JIT VM
+	ForceJit    bool // Force the JIT, skip byte VM
+	MaxProgSize int  // Max cache size for JIT Programs
 )
 
 var programs *lru.Cache
@@ -74,7 +84,7 @@ type Program struct {
 	Id     common.Hash // Id of the program
 	status int32       // status should be accessed atomically
 
-	context *Context
+	contract *Contract
 
 	instructions []instruction       // instruction set
 	mapping      map[uint64]int      // real PC mapping to array indices
@@ -108,7 +118,7 @@ func (p *Program) addInstr(op OpCode, pc uint64, fn instrFn, data *big.Int) {
 		baseOp = DUP1
 	}
 	base := _baseCheck[baseOp]
-	instr := instruction{op, pc, fn, nil, data, base.gas, base.stackPop, base.stackPush}
+	instr := instruction{op, pc, fn, data, base.gas, base.stackPop, base.stackPush}
 
 	p.instructions = append(p.instructions, instr)
 	p.mapping[pc] = len(p.instructions) - 1
@@ -127,6 +137,13 @@ func CompileProgram(program *Program) (err error) {
 			atomic.StoreInt32(&program.status, int32(progReady))
 		}
 	}()
+	if glog.V(logger.Debug) {
+		glog.Infof("compiling %x\n", program.Id[:4])
+		tstart := time.Now()
+		defer func() {
+			glog.Infof("compiled  %x instrc: %d time: %v\n", program.Id[:4], len(program.instructions), time.Since(tstart))
+		}()
+	}
 
 	// loop thru the opcodes and "compile" in to instructions
 	for pc := uint64(0); pc < uint64(len(program.code)); pc++ {
@@ -264,7 +281,7 @@ func CompileProgram(program *Program) (err error) {
 			program.addInstr(op, pc, opReturn, nil)
 		case SUICIDE:
 			program.addInstr(op, pc, opSuicide, nil)
-		case STOP: // Stop the context
+		case STOP: // Stop the contract
 			program.addInstr(op, pc, opStop, nil)
 		default:
 			program.addInstr(op, pc, nil, nil)
@@ -274,23 +291,24 @@ func CompileProgram(program *Program) (err error) {
 	return nil
 }
 
-// RunProgram runs the program given the enviroment and context and returns an
+// RunProgram runs the program given the enviroment and contract and returns an
 // error if the execution failed (non-consensus)
-func RunProgram(program *Program, env Environment, context *Context, input []byte) ([]byte, error) {
-	return runProgram(program, 0, NewMemory(), newstack(), env, context, input)
+func RunProgram(program *Program, env Environment, contract *Contract, input []byte) ([]byte, error) {
+	return runProgram(program, 0, NewMemory(), newstack(), env, contract, input)
 }
 
-func runProgram(program *Program, pcstart uint64, mem *Memory, stack *stack, env Environment, context *Context, input []byte) ([]byte, error) {
-	context.Input = input
+func runProgram(program *Program, pcstart uint64, mem *Memory, stack *stack, env Environment, contract *Contract, input []byte) ([]byte, error) {
+	contract.Input = input
 
 	var (
-		caller      = context.caller
-		statedb     = env.State()
-		pc      int = program.mapping[pcstart]
+		caller         = contract.caller
+		statedb        = env.Db()
+		pc         int = program.mapping[pcstart]
+		instrCount     = 0
 
 		jump = func(to *big.Int) error {
 			if !validDest(program.destinations, to) {
-				nop := context.GetOp(to.Uint64())
+				nop := contract.GetOp(to.Uint64())
 				return fmt.Errorf("invalid jump destination (%v) %v", nop, to)
 			}
 
@@ -300,18 +318,28 @@ func runProgram(program *Program, pcstart uint64, mem *Memory, stack *stack, env
 		}
 	)
 
+	if glog.V(logger.Debug) {
+		glog.Infof("running JIT program %x\n", program.Id[:4])
+		tstart := time.Now()
+		defer func() {
+			glog.Infof("JIT program %x done. time: %v instrc: %v\n", program.Id[:4], time.Since(tstart), instrCount)
+		}()
+	}
+
 	for pc < len(program.instructions) {
+		instrCount++
+
 		instr := program.instructions[pc]
 
 		// calculate the new memory size and gas price for the current executing opcode
-		newMemSize, cost, err := jitCalculateGasAndSize(env, context, caller, instr, statedb, mem, stack)
+		newMemSize, cost, err := jitCalculateGasAndSize(env, contract, caller, instr, statedb, mem, stack)
 		if err != nil {
 			return nil, err
 		}
 
 		// Use the calculated gas. When insufficient gas is present, use all gas and return an
 		// Out Of Gas error
-		if !context.UseGas(cost) {
+		if !contract.UseGas(cost) {
 			return nil, OutOfGasError
 		}
 		// Resize the memory calculated previously
@@ -338,27 +366,27 @@ func runProgram(program *Program, pcstart uint64, mem *Memory, stack *stack, env
 			offset, size := stack.pop(), stack.pop()
 			ret := mem.GetPtr(offset.Int64(), size.Int64())
 
-			return context.Return(ret), nil
+			return contract.Return(ret), nil
 		case SUICIDE:
-			instr.fn(instr, env, context, mem, stack)
+			instr.fn(instr, nil, env, contract, mem, stack)
 
-			return context.Return(nil), nil
+			return contract.Return(nil), nil
 		case STOP:
-			return context.Return(nil), nil
+			return contract.Return(nil), nil
 		default:
 			if instr.fn == nil {
 				return nil, fmt.Errorf("Invalid opcode %x", instr.op)
 			}
 
-			instr.fn(instr, env, context, mem, stack)
+			instr.fn(instr, nil, env, contract, mem, stack)
 		}
 
 		pc++
 	}
 
-	context.Input = nil
+	contract.Input = nil
 
-	return context.Return(nil), nil
+	return contract.Return(nil), nil
 }
 
 // validDest checks if the given distination is a valid one given the
@@ -375,7 +403,7 @@ func validDest(dests map[uint64]struct{}, dest *big.Int) bool {
 
 // jitCalculateGasAndSize calculates the required given the opcode and stack items calculates the new memorysize for
 // the operation. This does not reduce gas or resizes the memory.
-func jitCalculateGasAndSize(env Environment, context *Context, caller ContextRef, instr instruction, statedb *state.StateDB, mem *Memory, stack *stack) (*big.Int, *big.Int, error) {
+func jitCalculateGasAndSize(env Environment, contract *Contract, caller ContractRef, instr instruction, statedb Database, mem *Memory, stack *stack) (*big.Int, *big.Int, error) {
 	var (
 		gas                 = new(big.Int)
 		newMemSize *big.Int = new(big.Int)
@@ -426,27 +454,25 @@ func jitCalculateGasAndSize(env Environment, context *Context, caller ContextRef
 
 		var g *big.Int
 		y, x := stack.data[stack.len()-2], stack.data[stack.len()-1]
-		val := statedb.GetState(context.Address(), common.BigToHash(x))
+		val := statedb.GetState(contract.Address(), common.BigToHash(x))
 
 		// This checks for 3 scenario's and calculates gas accordingly
 		// 1. From a zero-value address to a non-zero value         (NEW VALUE)
 		// 2. From a non-zero value address to a zero-value address (DELETE)
 		// 3. From a nen-zero to a non-zero                         (CHANGE)
 		if common.EmptyHash(val) && !common.EmptyHash(common.BigToHash(y)) {
-			// 0 => non 0
 			g = params.SstoreSetGas
 		} else if !common.EmptyHash(val) && common.EmptyHash(common.BigToHash(y)) {
-			statedb.Refund(params.SstoreRefundGas)
+			statedb.AddRefund(params.SstoreRefundGas)
 
 			g = params.SstoreClearGas
 		} else {
-			// non 0 => non 0 (or 0 => 0)
 			g = params.SstoreClearGas
 		}
 		gas.Set(g)
 	case SUICIDE:
-		if !statedb.IsDeleted(context.Address()) {
-			statedb.Refund(params.SuicideRefundGas)
+		if !statedb.IsDeleted(contract.Address()) {
+			statedb.AddRefund(params.SuicideRefundGas)
 		}
 	case MLOAD:
 		newMemSize = calcMemSize(stack.peek(), u256(32))
@@ -483,7 +509,8 @@ func jitCalculateGasAndSize(env Environment, context *Context, caller ContextRef
 		gas.Add(gas, stack.data[stack.len()-1])
 
 		if op == CALL {
-			if env.State().GetStateObject(common.BigToAddress(stack.data[stack.len()-2])) == nil {
+			//if env.Db().GetStateObject(common.BigToAddress(stack.data[stack.len()-2])) == nil {
+			if !env.Db().Exist(common.BigToAddress(stack.data[stack.len()-2])) {
 				gas.Add(gas, params.CallNewAccountGas)
 			}
 		}
@@ -497,29 +524,7 @@ func jitCalculateGasAndSize(env Environment, context *Context, caller ContextRef
 
 		newMemSize = common.BigMax(x, y)
 	}
-
-	if newMemSize.Cmp(common.Big0) > 0 {
-		newMemSizeWords := toWordSize(newMemSize)
-		newMemSize.Mul(newMemSizeWords, u256(32))
-
-		if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
-			// be careful reusing variables here when changing.
-			// The order has been optimised to reduce allocation
-			oldSize := toWordSize(big.NewInt(int64(mem.Len())))
-			pow := new(big.Int).Exp(oldSize, common.Big2, Zero)
-			linCoef := oldSize.Mul(oldSize, params.MemoryGas)
-			quadCoef := new(big.Int).Div(pow, params.QuadCoeffDiv)
-			oldTotalFee := new(big.Int).Add(linCoef, quadCoef)
-
-			pow.Exp(newMemSizeWords, common.Big2, Zero)
-			linCoef = linCoef.Mul(newMemSizeWords, params.MemoryGas)
-			quadCoef = quadCoef.Div(pow, params.QuadCoeffDiv)
-			newTotalFee := linCoef.Add(linCoef, quadCoef)
-
-			fee := newTotalFee.Sub(newTotalFee, oldTotalFee)
-			gas.Add(gas, fee)
-		}
-	}
+	quadMemGas(mem, newMemSize, gas)
 
 	return newMemSize, gas, nil
 }
diff --git a/core/vm/jit_test.go b/core/vm/jit_test.go
index d8e4426379..8c45f2ce72 100644
--- a/core/vm/jit_test.go
+++ b/core/vm/jit_test.go
@@ -21,13 +21,56 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethdb"
 )
 
 const maxRun = 1000
 
+func TestCompiling(t *testing.T) {
+	prog := NewProgram([]byte{0x60, 0x10})
+	err := CompileProgram(prog)
+	if err != nil {
+		t.Error("didn't expect compile error")
+	}
+
+	if len(prog.instructions) != 1 {
+		t.Error("exected 1 compiled instruction, got", len(prog.instructions))
+	}
+}
+
+func TestResetInput(t *testing.T) {
+	var sender account
+
+	env := NewEnv()
+	contract := NewContract(sender, sender, big.NewInt(100), big.NewInt(10000), big.NewInt(0))
+	contract.CodeAddr = &common.Address{}
+
+	program := NewProgram([]byte{})
+	RunProgram(program, env, contract, []byte{0xbe, 0xef})
+	if contract.Input != nil {
+		t.Errorf("expected input to be nil, got %x", contract.Input)
+	}
+}
+
+func TestPcMappingToInstruction(t *testing.T) {
+	program := NewProgram([]byte{byte(PUSH2), 0xbe, 0xef, byte(ADD)})
+	CompileProgram(program)
+	if program.mapping[3] != 1 {
+		t.Error("expected mapping PC 4 to me instr no. 2, got", program.mapping[4])
+	}
+}
+
+var benchmarks = map[string]vmBench{
+	"pushes": vmBench{
+		false, false, false,
+		common.Hex2Bytes("600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01"), nil,
+	},
+}
+
+func BenchmarkPushes(b *testing.B) {
+	runVmBench(benchmarks["pushes"], b)
+}
+
 type vmBench struct {
 	precompile bool // compile prior to executing
 	nojit      bool // ignore jit (sets DisbaleJit = true
@@ -37,9 +80,19 @@ type vmBench struct {
 	input []byte
 }
 
+type account struct{}
+
+func (account) SubBalance(amount *big.Int)   {}
+func (account) AddBalance(amount *big.Int)   {}
+func (account) SetBalance(*big.Int)          {}
+func (account) SetNonce(uint64)              {}
+func (account) Balance() *big.Int            { return nil }
+func (account) Address() common.Address      { return common.Address{} }
+func (account) ReturnGas(*big.Int, *big.Int) {}
+func (account) SetCode([]byte)               {}
+
 func runVmBench(test vmBench, b *testing.B) {
-	db, _ := ethdb.NewMemDatabase()
-	sender := state.NewStateObject(common.Address{}, db)
+	var sender account
 
 	if test.precompile && !test.forcejit {
 		NewProgram(test.code)
@@ -52,7 +105,7 @@ func runVmBench(test vmBench, b *testing.B) {
 	b.ResetTimer()
 
 	for i := 0; i < b.N; i++ {
-		context := NewContext(sender, sender, big.NewInt(100), big.NewInt(10000), big.NewInt(0))
+		context := NewContract(sender, sender, big.NewInt(100), big.NewInt(10000), big.NewInt(0))
 		context.Code = test.code
 		context.CodeAddr = &common.Address{}
 		_, err := New(env).Run(context, test.input)
@@ -63,17 +116,6 @@ func runVmBench(test vmBench, b *testing.B) {
 	}
 }
 
-var benchmarks = map[string]vmBench{
-	"pushes": vmBench{
-		false, false, false,
-		common.Hex2Bytes("600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01600a600a01"), nil,
-	},
-}
-
-func BenchmarkPushes(b *testing.B) {
-	runVmBench(benchmarks["pushes"], b)
-}
-
 type Env struct {
 	gasLimit *big.Int
 	depth    int
@@ -93,30 +135,32 @@ func (self *Env) StructLogs() []StructLog {
 
 //func (self *Env) PrevHash() []byte      { return self.parent }
 func (self *Env) Coinbase() common.Address { return common.Address{} }
+func (self *Env) MakeSnapshot() Database   { return nil }
+func (self *Env) SetSnapshot(Database)     {}
 func (self *Env) Time() *big.Int           { return big.NewInt(time.Now().Unix()) }
 func (self *Env) Difficulty() *big.Int     { return big.NewInt(0) }
-func (self *Env) State() *state.StateDB    { return nil }
+func (self *Env) Db() Database             { return nil }
 func (self *Env) GasLimit() *big.Int       { return self.gasLimit }
 func (self *Env) VmType() Type             { return StdVmTy }
 func (self *Env) GetHash(n uint64) common.Hash {
 	return common.BytesToHash(crypto.Sha3([]byte(big.NewInt(int64(n)).String())))
 }
-func (self *Env) AddLog(log *state.Log) {
+func (self *Env) AddLog(log *Log) {
 }
 func (self *Env) Depth() int     { return self.depth }
 func (self *Env) SetDepth(i int) { self.depth = i }
-func (self *Env) CanTransfer(from Account, balance *big.Int) bool {
-	return from.Balance().Cmp(balance) >= 0
+func (self *Env) CanTransfer(from common.Address, balance *big.Int) bool {
+	return true
 }
 func (self *Env) Transfer(from, to Account, amount *big.Int) error {
 	return nil
 }
-func (self *Env) Call(caller ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
+func (self *Env) Call(caller ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
 	return nil, nil
 }
-func (self *Env) CallCode(caller ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
+func (self *Env) CallCode(caller ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
 	return nil, nil
 }
-func (self *Env) Create(caller ContextRef, data []byte, gas, price, value *big.Int) ([]byte, error, ContextRef) {
-	return nil, nil, nil
+func (self *Env) Create(caller ContractRef, data []byte, gas, price, value *big.Int) ([]byte, common.Address, error) {
+	return nil, common.Address{}, nil
 }
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
new file mode 100644
index 0000000000..ab899647f4
--- /dev/null
+++ b/core/vm/jump_table.go
@@ -0,0 +1,143 @@
+package vm
+
+import "math/big"
+
+type jumpPtr struct {
+	fn    instrFn
+	valid bool
+}
+
+var jumpTable [256]jumpPtr
+
+func init() {
+	jumpTable[ADD] = jumpPtr{opAdd, true}
+	jumpTable[SUB] = jumpPtr{opSub, true}
+	jumpTable[MUL] = jumpPtr{opMul, true}
+	jumpTable[DIV] = jumpPtr{opDiv, true}
+	jumpTable[SDIV] = jumpPtr{opSdiv, true}
+	jumpTable[MOD] = jumpPtr{opMod, true}
+	jumpTable[SMOD] = jumpPtr{opSmod, true}
+	jumpTable[EXP] = jumpPtr{opExp, true}
+	jumpTable[SIGNEXTEND] = jumpPtr{opSignExtend, true}
+	jumpTable[NOT] = jumpPtr{opNot, true}
+	jumpTable[LT] = jumpPtr{opLt, true}
+	jumpTable[GT] = jumpPtr{opGt, true}
+	jumpTable[SLT] = jumpPtr{opSlt, true}
+	jumpTable[SGT] = jumpPtr{opSgt, true}
+	jumpTable[EQ] = jumpPtr{opEq, true}
+	jumpTable[ISZERO] = jumpPtr{opIszero, true}
+	jumpTable[AND] = jumpPtr{opAnd, true}
+	jumpTable[OR] = jumpPtr{opOr, true}
+	jumpTable[XOR] = jumpPtr{opXor, true}
+	jumpTable[BYTE] = jumpPtr{opByte, true}
+	jumpTable[ADDMOD] = jumpPtr{opAddmod, true}
+	jumpTable[MULMOD] = jumpPtr{opMulmod, true}
+	jumpTable[SHA3] = jumpPtr{opSha3, true}
+	jumpTable[ADDRESS] = jumpPtr{opAddress, true}
+	jumpTable[BALANCE] = jumpPtr{opBalance, true}
+	jumpTable[ORIGIN] = jumpPtr{opOrigin, true}
+	jumpTable[CALLER] = jumpPtr{opCaller, true}
+	jumpTable[CALLVALUE] = jumpPtr{opCallValue, true}
+	jumpTable[CALLDATALOAD] = jumpPtr{opCalldataLoad, true}
+	jumpTable[CALLDATASIZE] = jumpPtr{opCalldataSize, true}
+	jumpTable[CALLDATACOPY] = jumpPtr{opCalldataCopy, true}
+	jumpTable[CODESIZE] = jumpPtr{opCodeSize, true}
+	jumpTable[EXTCODESIZE] = jumpPtr{opExtCodeSize, true}
+	jumpTable[CODECOPY] = jumpPtr{opCodeCopy, true}
+	jumpTable[EXTCODECOPY] = jumpPtr{opExtCodeCopy, true}
+	jumpTable[GASPRICE] = jumpPtr{opGasprice, true}
+	jumpTable[BLOCKHASH] = jumpPtr{opBlockhash, true}
+	jumpTable[COINBASE] = jumpPtr{opCoinbase, true}
+	jumpTable[TIMESTAMP] = jumpPtr{opTimestamp, true}
+	jumpTable[NUMBER] = jumpPtr{opNumber, true}
+	jumpTable[DIFFICULTY] = jumpPtr{opDifficulty, true}
+	jumpTable[GASLIMIT] = jumpPtr{opGasLimit, true}
+	jumpTable[POP] = jumpPtr{opPop, true}
+	jumpTable[MLOAD] = jumpPtr{opMload, true}
+	jumpTable[MSTORE] = jumpPtr{opMstore, true}
+	jumpTable[MSTORE8] = jumpPtr{opMstore8, true}
+	jumpTable[SLOAD] = jumpPtr{opSload, true}
+	jumpTable[SSTORE] = jumpPtr{opSstore, true}
+	jumpTable[JUMPDEST] = jumpPtr{opJumpdest, true}
+	jumpTable[PC] = jumpPtr{nil, true}
+	jumpTable[MSIZE] = jumpPtr{opMsize, true}
+	jumpTable[GAS] = jumpPtr{opGas, true}
+	jumpTable[CREATE] = jumpPtr{opCreate, true}
+	jumpTable[CALL] = jumpPtr{opCall, true}
+	jumpTable[CALLCODE] = jumpPtr{opCallCode, true}
+	jumpTable[LOG0] = jumpPtr{makeLog(0), true}
+	jumpTable[LOG1] = jumpPtr{makeLog(1), true}
+	jumpTable[LOG2] = jumpPtr{makeLog(2), true}
+	jumpTable[LOG3] = jumpPtr{makeLog(3), true}
+	jumpTable[LOG4] = jumpPtr{makeLog(4), true}
+	jumpTable[SWAP1] = jumpPtr{makeSwap(1), true}
+	jumpTable[SWAP2] = jumpPtr{makeSwap(2), true}
+	jumpTable[SWAP3] = jumpPtr{makeSwap(3), true}
+	jumpTable[SWAP4] = jumpPtr{makeSwap(4), true}
+	jumpTable[SWAP5] = jumpPtr{makeSwap(5), true}
+	jumpTable[SWAP6] = jumpPtr{makeSwap(6), true}
+	jumpTable[SWAP7] = jumpPtr{makeSwap(7), true}
+	jumpTable[SWAP8] = jumpPtr{makeSwap(8), true}
+	jumpTable[SWAP9] = jumpPtr{makeSwap(9), true}
+	jumpTable[SWAP10] = jumpPtr{makeSwap(10), true}
+	jumpTable[SWAP11] = jumpPtr{makeSwap(11), true}
+	jumpTable[SWAP12] = jumpPtr{makeSwap(12), true}
+	jumpTable[SWAP13] = jumpPtr{makeSwap(13), true}
+	jumpTable[SWAP14] = jumpPtr{makeSwap(14), true}
+	jumpTable[SWAP15] = jumpPtr{makeSwap(15), true}
+	jumpTable[SWAP16] = jumpPtr{makeSwap(16), true}
+	jumpTable[PUSH1] = jumpPtr{makePush(1, big.NewInt(1)), true}
+	jumpTable[PUSH2] = jumpPtr{makePush(2, big.NewInt(2)), true}
+	jumpTable[PUSH3] = jumpPtr{makePush(3, big.NewInt(3)), true}
+	jumpTable[PUSH4] = jumpPtr{makePush(4, big.NewInt(4)), true}
+	jumpTable[PUSH5] = jumpPtr{makePush(5, big.NewInt(5)), true}
+	jumpTable[PUSH6] = jumpPtr{makePush(6, big.NewInt(6)), true}
+	jumpTable[PUSH7] = jumpPtr{makePush(7, big.NewInt(7)), true}
+	jumpTable[PUSH8] = jumpPtr{makePush(8, big.NewInt(8)), true}
+	jumpTable[PUSH9] = jumpPtr{makePush(9, big.NewInt(9)), true}
+	jumpTable[PUSH10] = jumpPtr{makePush(10, big.NewInt(10)), true}
+	jumpTable[PUSH11] = jumpPtr{makePush(11, big.NewInt(11)), true}
+	jumpTable[PUSH12] = jumpPtr{makePush(12, big.NewInt(12)), true}
+	jumpTable[PUSH13] = jumpPtr{makePush(13, big.NewInt(13)), true}
+	jumpTable[PUSH14] = jumpPtr{makePush(14, big.NewInt(14)), true}
+	jumpTable[PUSH15] = jumpPtr{makePush(15, big.NewInt(15)), true}
+	jumpTable[PUSH16] = jumpPtr{makePush(16, big.NewInt(16)), true}
+	jumpTable[PUSH17] = jumpPtr{makePush(17, big.NewInt(17)), true}
+	jumpTable[PUSH18] = jumpPtr{makePush(18, big.NewInt(18)), true}
+	jumpTable[PUSH19] = jumpPtr{makePush(19, big.NewInt(19)), true}
+	jumpTable[PUSH20] = jumpPtr{makePush(20, big.NewInt(20)), true}
+	jumpTable[PUSH21] = jumpPtr{makePush(21, big.NewInt(21)), true}
+	jumpTable[PUSH22] = jumpPtr{makePush(22, big.NewInt(22)), true}
+	jumpTable[PUSH23] = jumpPtr{makePush(23, big.NewInt(23)), true}
+	jumpTable[PUSH24] = jumpPtr{makePush(24, big.NewInt(24)), true}
+	jumpTable[PUSH25] = jumpPtr{makePush(25, big.NewInt(25)), true}
+	jumpTable[PUSH26] = jumpPtr{makePush(26, big.NewInt(26)), true}
+	jumpTable[PUSH27] = jumpPtr{makePush(27, big.NewInt(27)), true}
+	jumpTable[PUSH28] = jumpPtr{makePush(28, big.NewInt(28)), true}
+	jumpTable[PUSH29] = jumpPtr{makePush(29, big.NewInt(29)), true}
+	jumpTable[PUSH30] = jumpPtr{makePush(30, big.NewInt(30)), true}
+	jumpTable[PUSH31] = jumpPtr{makePush(31, big.NewInt(31)), true}
+	jumpTable[PUSH32] = jumpPtr{makePush(32, big.NewInt(32)), true}
+	jumpTable[DUP1] = jumpPtr{makeDup(1), true}
+	jumpTable[DUP2] = jumpPtr{makeDup(2), true}
+	jumpTable[DUP3] = jumpPtr{makeDup(3), true}
+	jumpTable[DUP4] = jumpPtr{makeDup(4), true}
+	jumpTable[DUP5] = jumpPtr{makeDup(5), true}
+	jumpTable[DUP6] = jumpPtr{makeDup(6), true}
+	jumpTable[DUP7] = jumpPtr{makeDup(7), true}
+	jumpTable[DUP8] = jumpPtr{makeDup(8), true}
+	jumpTable[DUP9] = jumpPtr{makeDup(9), true}
+	jumpTable[DUP10] = jumpPtr{makeDup(10), true}
+	jumpTable[DUP11] = jumpPtr{makeDup(11), true}
+	jumpTable[DUP12] = jumpPtr{makeDup(12), true}
+	jumpTable[DUP13] = jumpPtr{makeDup(13), true}
+	jumpTable[DUP14] = jumpPtr{makeDup(14), true}
+	jumpTable[DUP15] = jumpPtr{makeDup(15), true}
+	jumpTable[DUP16] = jumpPtr{makeDup(16), true}
+
+	jumpTable[RETURN] = jumpPtr{nil, true}
+	jumpTable[SUICIDE] = jumpPtr{nil, true}
+	jumpTable[JUMP] = jumpPtr{nil, true}
+	jumpTable[JUMPI] = jumpPtr{nil, true}
+	jumpTable[STOP] = jumpPtr{nil, true}
+}
diff --git a/core/state/log.go b/core/vm/log.go
similarity index 99%
rename from core/state/log.go
rename to core/vm/log.go
index 5d7d7357dd..354f0ad35b 100644
--- a/core/state/log.go
+++ b/core/vm/log.go
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-package state
+package vm
 
 import (
 	"fmt"
diff --git a/core/vm/logger.go b/core/vm/logger.go
index 736f595f6b..2bd02319f6 100644
--- a/core/vm/logger.go
+++ b/core/vm/logger.go
@@ -24,6 +24,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
+// StdErrFormat formats a slice of StructLogs to human readable format
 func StdErrFormat(logs []StructLog) {
 	fmt.Fprintf(os.Stderr, "VM STAT %d OPs\n", len(logs))
 	for _, log := range logs {
diff --git a/core/vm/memory.go b/core/vm/memory.go
index 0109050d7c..101ec75cbd 100644
--- a/core/vm/memory.go
+++ b/core/vm/memory.go
@@ -18,6 +18,7 @@ package vm
 
 import "fmt"
 
+// Memory implements ethereum RAM backed by a simple byte slice
 type Memory struct {
 	store []byte
 }
@@ -26,6 +27,7 @@ func NewMemory() *Memory {
 	return &Memory{nil}
 }
 
+// Set sets offset + size to value
 func (m *Memory) Set(offset, size uint64, value []byte) {
 	// length of store may never be less than offset + size.
 	// The store should be resized PRIOR to setting the memory
@@ -40,12 +42,14 @@ func (m *Memory) Set(offset, size uint64, value []byte) {
 	}
 }
 
+// Resize resizes the memory to size
 func (m *Memory) Resize(size uint64) {
 	if uint64(m.Len()) < size {
 		m.store = append(m.store, make([]byte, size-uint64(m.Len()))...)
 	}
 }
 
+// Get returns offset + size as a new slice
 func (self *Memory) Get(offset, size int64) (cpy []byte) {
 	if size == 0 {
 		return nil
@@ -61,6 +65,7 @@ func (self *Memory) Get(offset, size int64) (cpy []byte) {
 	return
 }
 
+// GetPtr returns the offset + size
 func (self *Memory) GetPtr(offset, size int64) []byte {
 	if size == 0 {
 		return nil
@@ -73,10 +78,12 @@ func (self *Memory) GetPtr(offset, size int64) []byte {
 	return nil
 }
 
+// Len returns the length of the backing slice
 func (m *Memory) Len() int {
 	return len(m.store)
 }
 
+// Data returns the backing slice
 func (m *Memory) Data() []byte {
 	return m.store
 }
diff --git a/core/vm/opcodes.go b/core/vm/opcodes.go
index ecced3650b..986c35ef8c 100644
--- a/core/vm/opcodes.go
+++ b/core/vm/opcodes.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 )
 
+// OpCode is an EVM opcode
 type OpCode byte
 
-// Op codes
 const (
 	// 0x0 range - arithmetic ops
 	STOP OpCode = iota
diff --git a/core/vm/virtual_machine.go b/core/vm/virtual_machine.go
index 047723744e..9b3340bb21 100644
--- a/core/vm/virtual_machine.go
+++ b/core/vm/virtual_machine.go
@@ -16,7 +16,8 @@
 
 package vm
 
+// VirtualMachine is an EVM interface
 type VirtualMachine interface {
 	Env() Environment
-	Run(context *Context, data []byte) ([]byte, error)
+	Run(*Contract, []byte) ([]byte, error)
 }
diff --git a/core/vm/vm.go b/core/vm/vm.go
index d9e1a0ce50..57dd4dac38 100644
--- a/core/vm/vm.go
+++ b/core/vm/vm.go
@@ -14,33 +14,32 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
-// Package vm implements the Ethereum Virtual Machine.
 package vm
 
 import (
 	"fmt"
 	"math/big"
+	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
 	"github.com/ethereum/go-ethereum/params"
 )
 
-// Vm implements VirtualMachine
+// Vm is an EVM and implements VirtualMachine
 type Vm struct {
 	env Environment
 }
 
-// New returns a new Virtual Machine
+// New returns a new Vm
 func New(env Environment) *Vm {
 	return &Vm{env: env}
 }
 
 // Run loops and evaluates the contract's code with the given input data
-func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
+func (self *Vm) Run(contract *Contract, input []byte) (ret []byte, err error) {
 	self.env.SetDepth(self.env.Depth() + 1)
 	defer self.env.SetDepth(self.env.Depth() - 1)
 
@@ -48,42 +47,48 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
 	defer func() {
 		if err != nil {
 			// In case of a VM exception (known exceptions) all gas consumed (panics NOT included).
-			context.UseGas(context.Gas)
+			contract.UseGas(contract.Gas)
 
-			ret = context.Return(nil)
+			ret = contract.Return(nil)
 		}
 	}()
 
-	if context.CodeAddr != nil {
-		if p := Precompiled[context.CodeAddr.Str()]; p != nil {
-			return self.RunPrecompiled(p, input, context)
+	if contract.CodeAddr != nil {
+		if p := Precompiled[contract.CodeAddr.Str()]; p != nil {
+			return self.RunPrecompiled(p, input, contract)
 		}
 	}
 
+	// Don't bother with the execution if there's no code.
+	if len(contract.Code) == 0 {
+		return contract.Return(nil), nil
+	}
+
 	var (
-		codehash = crypto.Sha3Hash(context.Code) // codehash is used when doing jump dest caching
+		codehash = crypto.Sha3Hash(contract.Code) // codehash is used when doing jump dest caching
 		program  *Program
 	)
 	if EnableJit {
-		// Fetch program status.
-		// * If ready run using JIT
-		// * If unknown, compile in a seperate goroutine
-		// * If forced wait for compilation and run once done
-		if status := GetProgramStatus(codehash); status == progReady {
-			return RunProgram(GetProgram(codehash), self.env, context, input)
-		} else if status == progUnknown {
+		// If the JIT is enabled check the status of the JIT program,
+		// if it doesn't exist compile a new program in a seperate
+		// goroutine or wait for compilation to finish if the JIT is
+		// forced.
+		switch GetProgramStatus(codehash) {
+		case progReady:
+			return RunProgram(GetProgram(codehash), self.env, contract, input)
+		case progUnknown:
 			if ForceJit {
 				// Create and compile program
-				program = NewProgram(context.Code)
+				program = NewProgram(contract.Code)
 				perr := CompileProgram(program)
 				if perr == nil {
-					return RunProgram(program, self.env, context, input)
+					return RunProgram(program, self.env, contract, input)
 				}
 				glog.V(logger.Info).Infoln("error compiling program", err)
 			} else {
 				// create and compile the program. Compilation
 				// is done in a seperate goroutine
-				program = NewProgram(context.Code)
+				program = NewProgram(contract.Code)
 				go func() {
 					err := CompileProgram(program)
 					if err != nil {
@@ -96,15 +101,14 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
 	}
 
 	var (
-		caller = context.caller
-		code   = context.Code
-		value  = context.value
-		price  = context.Price
-
-		op      OpCode             // current opcode
-		mem     = NewMemory()      // bound memory
-		stack   = newstack()       // local stack
-		statedb = self.env.State() // current state
+		caller     = contract.caller
+		code       = contract.Code
+		instrCount = 0
+
+		op      OpCode          // current opcode
+		mem     = NewMemory()   // bound memory
+		stack   = newstack()    // local stack
+		statedb = self.env.Db() // current state
 		// For optimisation reason we're using uint64 as the program counter.
 		// It's theoretically possible to go above 2^64. The YP defines the PC to be uint256. Pratically much less so feasible.
 		pc = uint64(0) // program counter
@@ -112,8 +116,8 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
 		// jump evaluates and checks whether the given jump destination is a valid one
 		// if valid move the `pc` otherwise return an error.
 		jump = func(from uint64, to *big.Int) error {
-			if !context.jumpdests.has(codehash, code, to) {
-				nop := context.GetOp(to.Uint64())
+			if !contract.jumpdests.has(codehash, code, to) {
+				nop := contract.GetOp(to.Uint64())
 				return fmt.Errorf("invalid jump destination (%v) %v", nop, to)
 			}
 
@@ -125,552 +129,92 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
 		newMemSize *big.Int
 		cost       *big.Int
 	)
+	contract.Input = input
 
 	// User defer pattern to check for an error and, based on the error being nil or not, use all gas and return.
 	defer func() {
 		if err != nil {
-			self.log(pc, op, context.Gas, cost, mem, stack, context, err)
+			self.log(pc, op, contract.Gas, cost, mem, stack, contract, err)
 		}
 	}()
 
-	// Don't bother with the execution if there's no code.
-	if len(code) == 0 {
-		return context.Return(nil), nil
+	if glog.V(logger.Debug) {
+		glog.Infof("running byte VM %x\n", codehash[:4])
+		tstart := time.Now()
+		defer func() {
+			glog.Infof("byte VM %x done. time: %v instrc: %v\n", codehash[:4], time.Since(tstart), instrCount)
+		}()
 	}
 
-	for {
-		// Overhead of the atomic read might not be worth it
-		/* TODO this still causes a few issues in the tests
-		if program != nil && progStatus(atomic.LoadInt32(&program.status)) == progReady {
-			// move execution
-			glog.V(logger.Info).Infoln("Moved execution to JIT")
-			return runProgram(program, pc, mem, stack, self.env, context, input)
-		}
+	for ; ; instrCount++ {
+		/*
+			if EnableJit && it%100 == 0 {
+				if program != nil && progStatus(atomic.LoadInt32(&program.status)) == progReady {
+					// move execution
+					fmt.Println("moved", it)
+					glog.V(logger.Info).Infoln("Moved execution to JIT")
+					return runProgram(program, pc, mem, stack, self.env, contract, input)
+				}
+			}
 		*/
-		// The base for all big integer arithmetic
-		base := new(big.Int)
 
 		// Get the memory location of pc
-		op = context.GetOp(pc)
+		op = contract.GetOp(pc)
 
 		// calculate the new memory size and gas price for the current executing opcode
-		newMemSize, cost, err = calculateGasAndSize(self.env, context, caller, op, statedb, mem, stack)
+		newMemSize, cost, err = calculateGasAndSize(self.env, contract, caller, op, statedb, mem, stack)
 		if err != nil {
 			return nil, err
 		}
 
 		// Use the calculated gas. When insufficient gas is present, use all gas and return an
 		// Out Of Gas error
-		if !context.UseGas(cost) {
+		if !contract.UseGas(cost) {
 			return nil, OutOfGasError
 		}
 
 		// Resize the memory calculated previously
 		mem.Resize(newMemSize.Uint64())
 		// Add a log message
-		self.log(pc, op, context.Gas, cost, mem, stack, context, nil)
-
-		switch op {
-		case ADD:
-			x, y := stack.pop(), stack.pop()
-
-			base.Add(x, y)
-
-			U256(base)
-
-			// pop result back on the stack
-			stack.push(base)
-		case SUB:
-			x, y := stack.pop(), stack.pop()
-
-			base.Sub(x, y)
-
-			U256(base)
-
-			// pop result back on the stack
-			stack.push(base)
-		case MUL:
-			x, y := stack.pop(), stack.pop()
-
-			base.Mul(x, y)
-
-			U256(base)
-
-			// pop result back on the stack
-			stack.push(base)
-		case DIV:
-			x, y := stack.pop(), stack.pop()
-
-			if y.Cmp(common.Big0) != 0 {
-				base.Div(x, y)
-			}
-
-			U256(base)
-
-			// pop result back on the stack
-			stack.push(base)
-		case SDIV:
-			x, y := S256(stack.pop()), S256(stack.pop())
-
-			if y.Cmp(common.Big0) == 0 {
-				base.Set(common.Big0)
-			} else {
-				n := new(big.Int)
-				if new(big.Int).Mul(x, y).Cmp(common.Big0) < 0 {
-					n.SetInt64(-1)
-				} else {
-					n.SetInt64(1)
-				}
-
-				base.Div(x.Abs(x), y.Abs(y)).Mul(base, n)
-
-				U256(base)
-			}
-
-			stack.push(base)
-		case MOD:
-			x, y := stack.pop(), stack.pop()
-
-			if y.Cmp(common.Big0) == 0 {
-				base.Set(common.Big0)
-			} else {
-				base.Mod(x, y)
-			}
-
-			U256(base)
-
-			stack.push(base)
-		case SMOD:
-			x, y := S256(stack.pop()), S256(stack.pop())
-
-			if y.Cmp(common.Big0) == 0 {
-				base.Set(common.Big0)
-			} else {
-				n := new(big.Int)
-				if x.Cmp(common.Big0) < 0 {
-					n.SetInt64(-1)
-				} else {
-					n.SetInt64(1)
-				}
-
-				base.Mod(x.Abs(x), y.Abs(y)).Mul(base, n)
-
-				U256(base)
-			}
-
-			stack.push(base)
-
-		case EXP:
-			x, y := stack.pop(), stack.pop()
-
-			base.Exp(x, y, Pow256)
-
-			U256(base)
-
-			stack.push(base)
-		case SIGNEXTEND:
-			back := stack.pop()
-			if back.Cmp(big.NewInt(31)) < 0 {
-				bit := uint(back.Uint64()*8 + 7)
-				num := stack.pop()
-				mask := new(big.Int).Lsh(common.Big1, bit)
-				mask.Sub(mask, common.Big1)
-				if common.BitTest(num, int(bit)) {
-					num.Or(num, mask.Not(mask))
-				} else {
-					num.And(num, mask)
-				}
-
-				num = U256(num)
-
-				stack.push(num)
-			}
-		case NOT:
-			stack.push(U256(new(big.Int).Not(stack.pop())))
-		case LT:
-			x, y := stack.pop(), stack.pop()
-
-			// x < y
-			if x.Cmp(y) < 0 {
-				stack.push(common.BigTrue)
-			} else {
-				stack.push(common.BigFalse)
-			}
-		case GT:
-			x, y := stack.pop(), stack.pop()
-
-			// x > y
-			if x.Cmp(y) > 0 {
-				stack.push(common.BigTrue)
-			} else {
-				stack.push(common.BigFalse)
-			}
-
-		case SLT:
-			x, y := S256(stack.pop()), S256(stack.pop())
-
-			// x < y
-			if x.Cmp(S256(y)) < 0 {
-				stack.push(common.BigTrue)
-			} else {
-				stack.push(common.BigFalse)
-			}
-		case SGT:
-			x, y := S256(stack.pop()), S256(stack.pop())
-
-			// x > y
-			if x.Cmp(y) > 0 {
-				stack.push(common.BigTrue)
-			} else {
-				stack.push(common.BigFalse)
-			}
-
-		case EQ:
-			x, y := stack.pop(), stack.pop()
-
-			// x == y
-			if x.Cmp(y) == 0 {
-				stack.push(common.BigTrue)
-			} else {
-				stack.push(common.BigFalse)
-			}
-		case ISZERO:
-			x := stack.pop()
-			if x.Cmp(common.BigFalse) > 0 {
-				stack.push(common.BigFalse)
-			} else {
-				stack.push(common.BigTrue)
-			}
-
-		case AND:
-			x, y := stack.pop(), stack.pop()
-
-			stack.push(base.And(x, y))
-		case OR:
-			x, y := stack.pop(), stack.pop()
-
-			stack.push(base.Or(x, y))
-		case XOR:
-			x, y := stack.pop(), stack.pop()
-
-			stack.push(base.Xor(x, y))
-		case BYTE:
-			th, val := stack.pop(), stack.pop()
-
-			if th.Cmp(big.NewInt(32)) < 0 {
-				byt := big.NewInt(int64(common.LeftPadBytes(val.Bytes(), 32)[th.Int64()]))
-
-				base.Set(byt)
-			} else {
-				base.Set(common.BigFalse)
-			}
-
-			stack.push(base)
-		case ADDMOD:
-			x := stack.pop()
-			y := stack.pop()
-			z := stack.pop()
-
-			if z.Cmp(Zero) > 0 {
-				add := new(big.Int).Add(x, y)
-				base.Mod(add, z)
-
-				base = U256(base)
-			}
-
-			stack.push(base)
-		case MULMOD:
-			x := stack.pop()
-			y := stack.pop()
-			z := stack.pop()
-
-			if z.Cmp(Zero) > 0 {
-				mul := new(big.Int).Mul(x, y)
-				base.Mod(mul, z)
-
-				U256(base)
-			}
-
-			stack.push(base)
-
-		case SHA3:
-			offset, size := stack.pop(), stack.pop()
-			data := crypto.Sha3(mem.Get(offset.Int64(), size.Int64()))
-
-			stack.push(common.BigD(data))
+		self.log(pc, op, contract.Gas, cost, mem, stack, contract, nil)
 
-		case ADDRESS:
-			stack.push(common.Bytes2Big(context.Address().Bytes()))
-
-		case BALANCE:
-			addr := common.BigToAddress(stack.pop())
-			balance := statedb.GetBalance(addr)
-
-			stack.push(new(big.Int).Set(balance))
-
-		case ORIGIN:
-			origin := self.env.Origin()
-
-			stack.push(origin.Big())
-
-		case CALLER:
-			caller := context.caller.Address()
-			stack.push(common.Bytes2Big(caller.Bytes()))
-
-		case CALLVALUE:
-			stack.push(new(big.Int).Set(value))
-
-		case CALLDATALOAD:
-			data := getData(input, stack.pop(), common.Big32)
-
-			stack.push(common.Bytes2Big(data))
-		case CALLDATASIZE:
-			l := int64(len(input))
-			stack.push(big.NewInt(l))
-
-		case CALLDATACOPY:
-			var (
-				mOff = stack.pop()
-				cOff = stack.pop()
-				l    = stack.pop()
-			)
-			data := getData(input, cOff, l)
-
-			mem.Set(mOff.Uint64(), l.Uint64(), data)
-
-		case CODESIZE, EXTCODESIZE:
-			var code []byte
-			if op == EXTCODESIZE {
-				addr := common.BigToAddress(stack.pop())
-
-				code = statedb.GetCode(addr)
-			} else {
-				code = context.Code
-			}
-
-			l := big.NewInt(int64(len(code)))
-			stack.push(l)
-
-		case CODECOPY, EXTCODECOPY:
-			var code []byte
-			if op == EXTCODECOPY {
-				addr := common.BigToAddress(stack.pop())
-				code = statedb.GetCode(addr)
+		if opPtr := jumpTable[op]; opPtr.valid {
+			if opPtr.fn != nil {
+				opPtr.fn(instruction{}, &pc, self.env, contract, mem, stack)
 			} else {
-				code = context.Code
-			}
-
-			var (
-				mOff = stack.pop()
-				cOff = stack.pop()
-				l    = stack.pop()
-			)
-
-			codeCopy := getData(code, cOff, l)
-
-			mem.Set(mOff.Uint64(), l.Uint64(), codeCopy)
-
-		case GASPRICE:
-			stack.push(new(big.Int).Set(context.Price))
-
-		case BLOCKHASH:
-			num := stack.pop()
-
-			n := new(big.Int).Sub(self.env.BlockNumber(), common.Big257)
-			if num.Cmp(n) > 0 && num.Cmp(self.env.BlockNumber()) < 0 {
-				stack.push(self.env.GetHash(num.Uint64()).Big())
-			} else {
-				stack.push(common.Big0)
-			}
-
-		case COINBASE:
-			coinbase := self.env.Coinbase()
-
-			stack.push(coinbase.Big())
-
-		case TIMESTAMP:
-			time := self.env.Time()
-
-			stack.push(new(big.Int).Set(time))
-
-		case NUMBER:
-			number := self.env.BlockNumber()
-
-			stack.push(U256(number))
-
-		case DIFFICULTY:
-			difficulty := self.env.Difficulty()
-
-			stack.push(new(big.Int).Set(difficulty))
-
-		case GASLIMIT:
-
-			stack.push(new(big.Int).Set(self.env.GasLimit()))
-
-		case PUSH1, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH17, PUSH18, PUSH19, PUSH20, PUSH21, PUSH22, PUSH23, PUSH24, PUSH25, PUSH26, PUSH27, PUSH28, PUSH29, PUSH30, PUSH31, PUSH32:
-			size := uint64(op - PUSH1 + 1)
-			byts := getData(code, new(big.Int).SetUint64(pc+1), new(big.Int).SetUint64(size))
-			// push value to stack
-			stack.push(common.Bytes2Big(byts))
-			pc += size
-
-		case POP:
-			stack.pop()
-		case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16:
-			n := int(op - DUP1 + 1)
-			stack.dup(n)
-
-		case SWAP1, SWAP2, SWAP3, SWAP4, SWAP5, SWAP6, SWAP7, SWAP8, SWAP9, SWAP10, SWAP11, SWAP12, SWAP13, SWAP14, SWAP15, SWAP16:
-			n := int(op - SWAP1 + 2)
-			stack.swap(n)
-
-		case LOG0, LOG1, LOG2, LOG3, LOG4:
-			n := int(op - LOG0)
-			topics := make([]common.Hash, n)
-			mStart, mSize := stack.pop(), stack.pop()
-			for i := 0; i < n; i++ {
-				topics[i] = common.BigToHash(stack.pop())
-			}
-
-			data := mem.Get(mStart.Int64(), mSize.Int64())
-			log := state.NewLog(context.Address(), topics, data, self.env.BlockNumber().Uint64())
-			self.env.AddLog(log)
-
-		case MLOAD:
-			offset := stack.pop()
-			val := common.BigD(mem.Get(offset.Int64(), 32))
-			stack.push(val)
-
-		case MSTORE:
-			// pop value of the stack
-			mStart, val := stack.pop(), stack.pop()
-			mem.Set(mStart.Uint64(), 32, common.BigToBytes(val, 256))
-
-		case MSTORE8:
-			off, val := stack.pop().Int64(), stack.pop().Int64()
-
-			mem.store[off] = byte(val & 0xff)
-
-		case SLOAD:
-			loc := common.BigToHash(stack.pop())
-			val := statedb.GetState(context.Address(), loc).Big()
-			stack.push(val)
+				switch op {
+				case PC:
+					opPc(instruction{data: new(big.Int).SetUint64(pc)}, &pc, self.env, contract, mem, stack)
+				case JUMP:
+					if err := jump(pc, stack.pop()); err != nil {
+						return nil, err
+					}
 
-		case SSTORE:
-			loc := common.BigToHash(stack.pop())
-			val := stack.pop()
+					continue
+				case JUMPI:
+					pos, cond := stack.pop(), stack.pop()
 
-			statedb.SetState(context.Address(), loc, common.BigToHash(val))
+					if cond.Cmp(common.BigTrue) >= 0 {
+						if err := jump(pc, pos); err != nil {
+							return nil, err
+						}
 
-		case JUMP:
-			if err := jump(pc, stack.pop()); err != nil {
-				return nil, err
-			}
+						continue
+					}
+				case RETURN:
+					offset, size := stack.pop(), stack.pop()
+					ret := mem.GetPtr(offset.Int64(), size.Int64())
 
-			continue
-		case JUMPI:
-			pos, cond := stack.pop(), stack.pop()
+					return contract.Return(ret), nil
+				case SUICIDE:
+					opSuicide(instruction{}, nil, self.env, contract, mem, stack)
 
-			if cond.Cmp(common.BigTrue) >= 0 {
-				if err := jump(pc, pos); err != nil {
-					return nil, err
+					fallthrough
+				case STOP: // Stop the contract
+					return contract.Return(nil), nil
 				}
-
-				continue
-			}
-
-		case JUMPDEST:
-		case PC:
-			stack.push(new(big.Int).SetUint64(pc))
-		case MSIZE:
-			stack.push(big.NewInt(int64(mem.Len())))
-		case GAS:
-			stack.push(new(big.Int).Set(context.Gas))
-		case CREATE:
-
-			var (
-				value        = stack.pop()
-				offset, size = stack.pop(), stack.pop()
-				input        = mem.Get(offset.Int64(), size.Int64())
-				gas          = new(big.Int).Set(context.Gas)
-				addr         common.Address
-			)
-
-			context.UseGas(context.Gas)
-			ret, suberr, ref := self.env.Create(context, input, gas, price, value)
-			if suberr != nil {
-				stack.push(common.BigFalse)
-
-			} else {
-				// gas < len(ret) * CreateDataGas == NO_CODE
-				dataGas := big.NewInt(int64(len(ret)))
-				dataGas.Mul(dataGas, params.CreateDataGas)
-				if context.UseGas(dataGas) {
-					ref.SetCode(ret)
-				}
-				addr = ref.Address()
-
-				stack.push(addr.Big())
-
-			}
-
-		case CALL, CALLCODE:
-			gas := stack.pop()
-			// pop gas and value of the stack.
-			addr, value := stack.pop(), stack.pop()
-			value = U256(value)
-			// pop input size and offset
-			inOffset, inSize := stack.pop(), stack.pop()
-			// pop return size and offset
-			retOffset, retSize := stack.pop(), stack.pop()
-
-			address := common.BigToAddress(addr)
-
-			// Get the arguments from the memory
-			args := mem.Get(inOffset.Int64(), inSize.Int64())
-
-			if len(value.Bytes()) > 0 {
-				gas.Add(gas, params.CallStipend)
-			}
-
-			var (
-				ret []byte
-				err error
-			)
-			if op == CALLCODE {
-				ret, err = self.env.CallCode(context, address, args, gas, price, value)
-			} else {
-				ret, err = self.env.Call(context, address, args, gas, price, value)
-			}
-
-			if err != nil {
-				stack.push(common.BigFalse)
-
-			} else {
-				stack.push(common.BigTrue)
-
-				mem.Set(retOffset.Uint64(), retSize.Uint64(), ret)
 			}
-
-		case RETURN:
-			offset, size := stack.pop(), stack.pop()
-			ret := mem.GetPtr(offset.Int64(), size.Int64())
-
-			return context.Return(ret), nil
-		case SUICIDE:
-			receiver := statedb.GetOrNewStateObject(common.BigToAddress(stack.pop()))
-			balance := statedb.GetBalance(context.Address())
-
-			receiver.AddBalance(balance)
-
-			statedb.Delete(context.Address())
-
-			fallthrough
-		case STOP: // Stop the context
-
-			return context.Return(nil), nil
-		default:
-
+		} else {
 			return nil, fmt.Errorf("Invalid opcode %x", op)
 		}
 
@@ -681,7 +225,7 @@ func (self *Vm) Run(context *Context, input []byte) (ret []byte, err error) {
 
 // calculateGasAndSize calculates the required given the opcode and stack items calculates the new memorysize for
 // the operation. This does not reduce gas or resizes the memory.
-func calculateGasAndSize(env Environment, context *Context, caller ContextRef, op OpCode, statedb *state.StateDB, mem *Memory, stack *stack) (*big.Int, *big.Int, error) {
+func calculateGasAndSize(env Environment, contract *Contract, caller ContractRef, op OpCode, statedb Database, mem *Memory, stack *stack) (*big.Int, *big.Int, error) {
 	var (
 		gas                 = new(big.Int)
 		newMemSize *big.Int = new(big.Int)
@@ -731,7 +275,7 @@ func calculateGasAndSize(env Environment, context *Context, caller ContextRef, o
 
 		var g *big.Int
 		y, x := stack.data[stack.len()-2], stack.data[stack.len()-1]
-		val := statedb.GetState(context.Address(), common.BigToHash(x))
+		val := statedb.GetState(contract.Address(), common.BigToHash(x))
 
 		// This checks for 3 scenario's and calculates gas accordingly
 		// 1. From a zero-value address to a non-zero value         (NEW VALUE)
@@ -741,7 +285,7 @@ func calculateGasAndSize(env Environment, context *Context, caller ContextRef, o
 			// 0 => non 0
 			g = params.SstoreSetGas
 		} else if !common.EmptyHash(val) && common.EmptyHash(common.BigToHash(y)) {
-			statedb.Refund(params.SstoreRefundGas)
+			statedb.AddRefund(params.SstoreRefundGas)
 
 			g = params.SstoreClearGas
 		} else {
@@ -750,8 +294,8 @@ func calculateGasAndSize(env Environment, context *Context, caller ContextRef, o
 		}
 		gas.Set(g)
 	case SUICIDE:
-		if !statedb.IsDeleted(context.Address()) {
-			statedb.Refund(params.SuicideRefundGas)
+		if !statedb.IsDeleted(contract.Address()) {
+			statedb.AddRefund(params.SuicideRefundGas)
 		}
 	case MLOAD:
 		newMemSize = calcMemSize(stack.peek(), u256(32))
@@ -788,7 +332,8 @@ func calculateGasAndSize(env Environment, context *Context, caller ContextRef, o
 		gas.Add(gas, stack.data[stack.len()-1])
 
 		if op == CALL {
-			if env.State().GetStateObject(common.BigToAddress(stack.data[stack.len()-2])) == nil {
+			//if env.Db().GetStateObject(common.BigToAddress(stack.data[stack.len()-2])) == nil {
+			if !env.Db().Exist(common.BigToAddress(stack.data[stack.len()-2])) {
 				gas.Add(gas, params.CallNewAccountGas)
 			}
 		}
@@ -802,38 +347,18 @@ func calculateGasAndSize(env Environment, context *Context, caller ContextRef, o
 
 		newMemSize = common.BigMax(x, y)
 	}
-
-	if newMemSize.Cmp(common.Big0) > 0 {
-		newMemSizeWords := toWordSize(newMemSize)
-		newMemSize.Mul(newMemSizeWords, u256(32))
-
-		if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
-			oldSize := toWordSize(big.NewInt(int64(mem.Len())))
-			pow := new(big.Int).Exp(oldSize, common.Big2, Zero)
-			linCoef := new(big.Int).Mul(oldSize, params.MemoryGas)
-			quadCoef := new(big.Int).Div(pow, params.QuadCoeffDiv)
-			oldTotalFee := new(big.Int).Add(linCoef, quadCoef)
-
-			pow.Exp(newMemSizeWords, common.Big2, Zero)
-			linCoef = new(big.Int).Mul(newMemSizeWords, params.MemoryGas)
-			quadCoef = new(big.Int).Div(pow, params.QuadCoeffDiv)
-			newTotalFee := new(big.Int).Add(linCoef, quadCoef)
-
-			fee := new(big.Int).Sub(newTotalFee, oldTotalFee)
-			gas.Add(gas, fee)
-		}
-	}
+	quadMemGas(mem, newMemSize, gas)
 
 	return newMemSize, gas, nil
 }
 
 // RunPrecompile runs and evaluate the output of a precompiled contract defined in contracts.go
-func (self *Vm) RunPrecompiled(p *PrecompiledAccount, input []byte, context *Context) (ret []byte, err error) {
+func (self *Vm) RunPrecompiled(p *PrecompiledAccount, input []byte, contract *Contract) (ret []byte, err error) {
 	gas := p.Gas(len(input))
-	if context.UseGas(gas) {
+	if contract.UseGas(gas) {
 		ret = p.Call(input)
 
-		return context.Return(ret), nil
+		return contract.Return(ret), nil
 	} else {
 		return nil, OutOfGasError
 	}
@@ -841,18 +366,20 @@ func (self *Vm) RunPrecompiled(p *PrecompiledAccount, input []byte, context *Con
 
 // log emits a log event to the environment for each opcode encountered. This is not to be confused with the
 // LOG* opcode.
-func (self *Vm) log(pc uint64, op OpCode, gas, cost *big.Int, memory *Memory, stack *stack, context *Context, err error) {
+func (self *Vm) log(pc uint64, op OpCode, gas, cost *big.Int, memory *Memory, stack *stack, contract *Contract, err error) {
 	if Debug {
 		mem := make([]byte, len(memory.Data()))
 		copy(mem, memory.Data())
 		stck := make([]*big.Int, len(stack.Data()))
 		copy(stck, stack.Data())
 
-		object := context.self.(*state.StateObject)
 		storage := make(map[common.Hash][]byte)
-		object.EachStorage(func(k, v []byte) {
-			storage[common.BytesToHash(k)] = v
-		})
+		/*
+			object := contract.self.(*state.StateObject)
+			object.EachStorage(func(k, v []byte) {
+				storage[common.BytesToHash(k)] = v
+			})
+		*/
 
 		self.env.AddStructLog(StructLog{pc, op, new(big.Int).Set(gas), cost, mem, stck, storage, err})
 	}
diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go
index 339cb8ea8a..07cb52d4a0 100644
--- a/core/vm/vm_jit.go
+++ b/core/vm/vm_jit.go
@@ -30,6 +30,7 @@ void  evmjit_destroy(void* _jit);
 */
 import "C"
 
+/*
 import (
 	"bytes"
 	"errors"
@@ -385,4 +386,4 @@ func env_extcode(_vm unsafe.Pointer, _addr unsafe.Pointer, o_size *uint64) *byte
 	code := vm.Env().State().GetCode(addr)
 	*o_size = uint64(len(code))
 	return getDataPtr(code)
-}
+}*/
diff --git a/core/vm_env.go b/core/vm_env.go
index a08f024fe7..dea2807464 100644
--- a/core/vm_env.go
+++ b/core/vm_env.go
@@ -53,7 +53,7 @@ func (self *VMEnv) Time() *big.Int           { return self.header.Time }
 func (self *VMEnv) Difficulty() *big.Int     { return self.header.Difficulty }
 func (self *VMEnv) GasLimit() *big.Int       { return self.header.GasLimit }
 func (self *VMEnv) Value() *big.Int          { return self.msg.Value() }
-func (self *VMEnv) State() *state.StateDB    { return self.state }
+func (self *VMEnv) Db() vm.Database          { return self.state }
 func (self *VMEnv) Depth() int               { return self.depth }
 func (self *VMEnv) SetDepth(i int)           { self.depth = i }
 func (self *VMEnv) VmType() vm.Type          { return self.typ }
@@ -66,30 +66,34 @@ func (self *VMEnv) GetHash(n uint64) common.Hash {
 	return common.Hash{}
 }
 
-func (self *VMEnv) AddLog(log *state.Log) {
+func (self *VMEnv) AddLog(log *vm.Log) {
 	self.state.AddLog(log)
 }
-func (self *VMEnv) CanTransfer(from vm.Account, balance *big.Int) bool {
-	return from.Balance().Cmp(balance) >= 0
+func (self *VMEnv) CanTransfer(from common.Address, balance *big.Int) bool {
+	return self.state.GetBalance(from).Cmp(balance) >= 0
+}
+
+func (self *VMEnv) MakeSnapshot() vm.Database {
+	return self.state.Copy()
+}
+
+func (self *VMEnv) SetSnapshot(copy vm.Database) {
+	self.state.Set(copy.(*state.StateDB))
 }
 
 func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
-	return vm.Transfer(from, to, amount)
+	return Transfer(from, to, amount)
 }
 
-func (self *VMEnv) Call(me vm.ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
-	exe := NewExecution(self, &addr, data, gas, price, value)
-	return exe.Call(addr, me)
+func (self *VMEnv) Call(me vm.ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
+	return Call(self, me, addr, data, gas, price, value)
 }
-func (self *VMEnv) CallCode(me vm.ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
-	maddr := me.Address()
-	exe := NewExecution(self, &maddr, data, gas, price, value)
-	return exe.Call(addr, me)
+func (self *VMEnv) CallCode(me vm.ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
+	return CallCode(self, me, addr, data, gas, price, value)
 }
 
-func (self *VMEnv) Create(me vm.ContextRef, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
-	exe := NewExecution(self, nil, data, gas, price, value)
-	return exe.Create(me)
+func (self *VMEnv) Create(me vm.ContractRef, data []byte, gas, price, value *big.Int) ([]byte, common.Address, error) {
+	return Create(self, me, data, gas, price, value)
 }
 
 func (self *VMEnv) StructLogs() []vm.StructLog {
diff --git a/eth/filters/filter.go b/eth/filters/filter.go
index b7f795607b..0b49116295 100644
--- a/eth/filters/filter.go
+++ b/eth/filters/filter.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 type AccountChange struct {
@@ -39,9 +39,9 @@ type Filter struct {
 	max      int
 	topics   [][]common.Hash
 
-	BlockCallback       func(*types.Block, state.Logs)
+	BlockCallback       func(*types.Block, vm.Logs)
 	TransactionCallback func(*types.Transaction)
-	LogsCallback        func(state.Logs)
+	LogsCallback        func(vm.Logs)
 }
 
 // Create a new filter which uses a bloom filter on blocks to figure out whether a particular block
@@ -78,7 +78,7 @@ func (self *Filter) SetSkip(skip int) {
 }
 
 // Run filters logs with the current parameters set
-func (self *Filter) Find() state.Logs {
+func (self *Filter) Find() vm.Logs {
 	earliestBlock := core.GetCurrentBlock(self.db)
 	var earliestBlockNo uint64 = uint64(self.earliest)
 	if self.earliest == -1 {
@@ -90,7 +90,7 @@ func (self *Filter) Find() state.Logs {
 	}
 
 	var (
-		logs  state.Logs
+		logs  vm.Logs
 		block = core.GetBlockByNumber(self.db, latestBlockNo)
 	)
 
@@ -112,7 +112,7 @@ done:
 			// Get the logs of the block
 			var (
 				receipts   = core.GetBlockReceipts(self.db, block.Hash())
-				unfiltered state.Logs
+				unfiltered vm.Logs
 			)
 			for _, receipt := range receipts {
 				unfiltered = append(unfiltered, receipt.Logs()...)
@@ -138,8 +138,8 @@ func includes(addresses []common.Address, a common.Address) bool {
 	return false
 }
 
-func (self *Filter) FilterLogs(logs state.Logs) state.Logs {
-	var ret state.Logs
+func (self *Filter) FilterLogs(logs vm.Logs) vm.Logs {
+	var ret vm.Logs
 
 	// Filter the logs for interesting stuff
 Logs:
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go
index 9ad73a8967..1c27c7be45 100644
--- a/eth/filters/filter_system.go
+++ b/eth/filters/filter_system.go
@@ -22,7 +22,7 @@ import (
 	"sync"
 
 	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/event"
 )
 
@@ -89,7 +89,7 @@ func (fs *FilterSystem) filterLoop() {
 		//core.PendingBlockEvent{},
 		core.ChainEvent{},
 		core.TxPreEvent{},
-		state.Logs(nil))
+		vm.Logs(nil))
 
 out:
 	for {
@@ -116,7 +116,7 @@ out:
 				}
 				fs.filterMu.RUnlock()
 
-			case state.Logs:
+			case vm.Logs:
 				fs.filterMu.RLock()
 				for _, filter := range fs.filters {
 					if filter.LogsCallback != nil {
diff --git a/miner/worker.go b/miner/worker.go
index 098f42a720..470f1f6763 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -29,6 +29,7 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/logger"
@@ -298,7 +299,7 @@ func (self *worker) wait() {
 				}
 
 				// broadcast before waiting for validation
-				go func(block *types.Block, logs state.Logs, receipts []*types.Receipt) {
+				go func(block *types.Block, logs vm.Logs, receipts []*types.Receipt) {
 					self.mux.Post(core.NewMinedBlockEvent{block})
 					self.mux.Post(core.ChainEvent{block, block.Hash(), logs})
 					if stat == core.CanonStatTy {
diff --git a/rpc/api/eth_args.go b/rpc/api/eth_args.go
index 8bd077e209..66c190a51b 100644
--- a/rpc/api/eth_args.go
+++ b/rpc/api/eth_args.go
@@ -24,8 +24,8 @@ import (
 	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/rpc/shared"
 )
 
@@ -830,7 +830,7 @@ type LogRes struct {
 	TransactionIndex *hexnum    `json:"transactionIndex"`
 }
 
-func NewLogRes(log *state.Log) LogRes {
+func NewLogRes(log *vm.Log) LogRes {
 	var l LogRes
 	l.Topics = make([]*hexdata, len(log.Topics))
 	for j, topic := range log.Topics {
@@ -847,7 +847,7 @@ func NewLogRes(log *state.Log) LogRes {
 	return l
 }
 
-func NewLogsRes(logs state.Logs) (ls []LogRes) {
+func NewLogsRes(logs vm.Logs) (ls []LogRes) {
 	ls = make([]LogRes, len(logs))
 
 	for i, log := range logs {
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index 3d8dfca317..a1c066c82d 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -168,7 +168,7 @@ func runStateTest(test VmTest) error {
 		ret []byte
 		// gas  *big.Int
 		// err  error
-		logs state.Logs
+		logs vm.Logs
 	)
 
 	ret, logs, _, _ = RunState(statedb, env, test.Transaction)
@@ -216,7 +216,7 @@ func runStateTest(test VmTest) error {
 	return nil
 }
 
-func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, state.Logs, *big.Int, error) {
+func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, vm.Logs, *big.Int, error) {
 	var (
 		data  = common.FromHex(tx["data"])
 		gas   = common.Big(tx["gasLimit"])
diff --git a/tests/util.go b/tests/util.go
index 72d927ada1..fb9e518c80 100644
--- a/tests/util.go
+++ b/tests/util.go
@@ -30,7 +30,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 )
 
-func checkLogs(tlog []Log, logs state.Logs) error {
+func checkLogs(tlog []Log, logs vm.Logs) error {
 
 	if len(tlog) != len(logs) {
 		return fmt.Errorf("log length mismatch. Expected %d, got %d", len(tlog), len(logs))
@@ -53,7 +53,7 @@ func checkLogs(tlog []Log, logs state.Logs) error {
 					}
 				}
 			}
-			genBloom := common.LeftPadBytes(types.LogsBloom(state.Logs{logs[i]}).Bytes(), 256)
+			genBloom := common.LeftPadBytes(types.LogsBloom(vm.Logs{logs[i]}).Bytes(), 256)
 
 			if !bytes.Equal(genBloom, common.Hex2Bytes(log.BloomF)) {
 				return fmt.Errorf("bloom mismatch")
@@ -181,18 +181,18 @@ func (self *Env) BlockNumber() *big.Int  { return self.number }
 func (self *Env) Coinbase() common.Address { return self.coinbase }
 func (self *Env) Time() *big.Int           { return self.time }
 func (self *Env) Difficulty() *big.Int     { return self.difficulty }
-func (self *Env) State() *state.StateDB    { return self.state }
+func (self *Env) Db() vm.Database          { return self.state }
 func (self *Env) GasLimit() *big.Int       { return self.gasLimit }
 func (self *Env) VmType() vm.Type          { return vm.StdVmTy }
 func (self *Env) GetHash(n uint64) common.Hash {
 	return common.BytesToHash(crypto.Sha3([]byte(big.NewInt(int64(n)).String())))
 }
-func (self *Env) AddLog(log *state.Log) {
+func (self *Env) AddLog(log *vm.Log) {
 	self.state.AddLog(log)
 }
 func (self *Env) Depth() int     { return self.depth }
 func (self *Env) SetDepth(i int) { self.depth = i }
-func (self *Env) CanTransfer(from vm.Account, balance *big.Int) bool {
+func (self *Env) CanTransfer(from common.Address, balance *big.Int) bool {
 	if self.skipTransfer {
 		if self.initial {
 			self.initial = false
@@ -200,58 +200,53 @@ func (self *Env) CanTransfer(from vm.Account, balance *big.Int) bool {
 		}
 	}
 
-	return from.Balance().Cmp(balance) >= 0
+	return self.state.GetBalance(from).Cmp(balance) >= 0
+}
+func (self *Env) MakeSnapshot() vm.Database {
+	return self.state.Copy()
+}
+func (self *Env) SetSnapshot(copy vm.Database) {
+	self.state.Set(copy.(*state.StateDB))
 }
 
 func (self *Env) Transfer(from, to vm.Account, amount *big.Int) error {
 	if self.skipTransfer {
 		return nil
 	}
-	return vm.Transfer(from, to, amount)
-}
-
-func (self *Env) vm(addr *common.Address, data []byte, gas, price, value *big.Int) *core.Execution {
-	exec := core.NewExecution(self, addr, data, gas, price, value)
-
-	return exec
+	return core.Transfer(from, to, amount)
 }
 
-func (self *Env) Call(caller vm.ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
+func (self *Env) Call(caller vm.ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
 	if self.vmTest && self.depth > 0 {
 		caller.ReturnGas(gas, price)
 
 		return nil, nil
 	}
-	exe := self.vm(&addr, data, gas, price, value)
-	ret, err := exe.Call(addr, caller)
-	self.Gas = exe.Gas
+	ret, err := core.Call(self, caller, addr, data, gas, price, value)
+	self.Gas = gas
 
 	return ret, err
 
 }
-func (self *Env) CallCode(caller vm.ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
+func (self *Env) CallCode(caller vm.ContractRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
 	if self.vmTest && self.depth > 0 {
 		caller.ReturnGas(gas, price)
 
 		return nil, nil
 	}
-
-	caddr := caller.Address()
-	exe := self.vm(&caddr, data, gas, price, value)
-	return exe.Call(addr, caller)
+	return core.CallCode(self, caller, addr, data, gas, price, value)
 }
 
-func (self *Env) Create(caller vm.ContextRef, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
-	exe := self.vm(nil, data, gas, price, value)
+func (self *Env) Create(caller vm.ContractRef, data []byte, gas, price, value *big.Int) ([]byte, common.Address, error) {
 	if self.vmTest {
 		caller.ReturnGas(gas, price)
 
 		nonce := self.state.GetNonce(caller.Address())
 		obj := self.state.GetOrNewStateObject(crypto.CreateAddress(caller.Address(), nonce))
 
-		return nil, nil, obj
+		return nil, obj.Address(), nil
 	} else {
-		return exe.Create(caller)
+		return core.Create(self, caller, data, gas, price, value)
 	}
 }
 
diff --git a/tests/vm_test.go b/tests/vm_test.go
index 96718db3ce..34beb85e5f 100644
--- a/tests/vm_test.go
+++ b/tests/vm_test.go
@@ -24,14 +24,14 @@ import (
 
 func BenchmarkVmAckermann32Tests(b *testing.B) {
 	fn := filepath.Join(vmTestDir, "vmPerformanceTest.json")
-	if err := BenchVmTest(fn, bconf{"ackermann32", true, os.Getenv("JITVM") == "true"}, b); err != nil {
+	if err := BenchVmTest(fn, bconf{"ackermann32", os.Getenv("JITFORCE") == "true", os.Getenv("JITVM") == "true"}, b); err != nil {
 		b.Error(err)
 	}
 }
 
 func BenchmarkVmFibonacci16Tests(b *testing.B) {
 	fn := filepath.Join(vmTestDir, "vmPerformanceTest.json")
-	if err := BenchVmTest(fn, bconf{"fibonacci16", true, os.Getenv("JITVM") == "true"}, b); err != nil {
+	if err := BenchVmTest(fn, bconf{"fibonacci16", os.Getenv("JITFORCE") == "true", os.Getenv("JITVM") == "true"}, b); err != nil {
 		b.Error(err)
 	}
 }
diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go
index 71a4f5e335..b61995e31e 100644
--- a/tests/vm_test_util.go
+++ b/tests/vm_test_util.go
@@ -185,7 +185,7 @@ func runVmTest(test VmTest) error {
 		ret  []byte
 		gas  *big.Int
 		err  error
-		logs state.Logs
+		logs vm.Logs
 	)
 
 	ret, logs, gas, err = RunVm(statedb, env, test.Exec)
@@ -234,7 +234,7 @@ func runVmTest(test VmTest) error {
 	return nil
 }
 
-func RunVm(state *state.StateDB, env, exec map[string]string) ([]byte, state.Logs, *big.Int, error) {
+func RunVm(state *state.StateDB, env, exec map[string]string) ([]byte, vm.Logs, *big.Int, error) {
 	var (
 		to    = common.HexToAddress(exec["address"])
 		from  = common.HexToAddress(exec["caller"])
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 0494342a38..9d366d2150 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -33,6 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/eth/filters"
@@ -541,7 +542,7 @@ func (self *XEth) NewLogFilter(earliest, latest int64, skip, max int, address []
 	filter.SetMax(max)
 	filter.SetAddress(cAddress(address))
 	filter.SetTopics(cTopics(topics))
-	filter.LogsCallback = func(logs state.Logs) {
+	filter.LogsCallback = func(logs vm.Logs) {
 		self.logMu.Lock()
 		defer self.logMu.Unlock()
 
@@ -580,7 +581,7 @@ func (self *XEth) NewBlockFilter() int {
 	id := self.filterManager.Add(filter)
 	self.blockQueue[id] = &hashQueue{timeout: time.Now()}
 
-	filter.BlockCallback = func(block *types.Block, logs state.Logs) {
+	filter.BlockCallback = func(block *types.Block, logs vm.Logs) {
 		self.blockMu.Lock()
 		defer self.blockMu.Unlock()
 
@@ -603,7 +604,7 @@ func (self *XEth) GetFilterType(id int) byte {
 	return UnknownFilterTy
 }
 
-func (self *XEth) LogFilterChanged(id int) state.Logs {
+func (self *XEth) LogFilterChanged(id int) vm.Logs {
 	self.logMu.Lock()
 	defer self.logMu.Unlock()
 
@@ -633,7 +634,7 @@ func (self *XEth) TransactionFilterChanged(id int) []common.Hash {
 	return nil
 }
 
-func (self *XEth) Logs(id int) state.Logs {
+func (self *XEth) Logs(id int) vm.Logs {
 	filter := self.filterManager.Get(id)
 	if filter != nil {
 		return filter.Find()
@@ -642,7 +643,7 @@ func (self *XEth) Logs(id int) state.Logs {
 	return nil
 }
 
-func (self *XEth) AllLogs(earliest, latest int64, skip, max int, address []string, topics [][]string) state.Logs {
+func (self *XEth) AllLogs(earliest, latest int64, skip, max int, address []string, topics [][]string) vm.Logs {
 	filter := filters.New(self.backend.ChainDb())
 	filter.SetEarliestBlock(earliest)
 	filter.SetLatestBlock(latest)
@@ -1029,19 +1030,19 @@ func (m callmsg) Data() []byte                  { return m.data }
 type logQueue struct {
 	mu sync.Mutex
 
-	logs    state.Logs
+	logs    vm.Logs
 	timeout time.Time
 	id      int
 }
 
-func (l *logQueue) add(logs ...*state.Log) {
+func (l *logQueue) add(logs ...*vm.Log) {
 	l.mu.Lock()
 	defer l.mu.Unlock()
 
 	l.logs = append(l.logs, logs...)
 }
 
-func (l *logQueue) get() state.Logs {
+func (l *logQueue) get() vm.Logs {
 	l.mu.Lock()
 	defer l.mu.Unlock()
 

From 7c7692933c21b77328a94eed714f66c276776197 Mon Sep 17 00:00:00 2001
From: Jeffrey Wilcke <geffobscura@gmail.com>
Date: Mon, 31 Aug 2015 17:09:50 +0200
Subject: [PATCH 3/3] cmd/geth, cmd/utils, core, rpc: renamed to blockchain

* Renamed ChainManager to BlockChain
* Checkpointing is no longer required and never really properly worked
when the state was corrupted.
---
 cmd/geth/blocktestcmd.go                      |   2 +-
 cmd/geth/js_test.go                           |   2 +-
 cmd/geth/main.go                              |   2 +-
 cmd/utils/cmd.go                              |  12 +-
 cmd/utils/flags.go                            |   4 +-
 core/bench_test.go                            |   2 +-
 core/block_processor.go                       |  10 +-
 core/block_processor_test.go                  |   6 +-
 core/{chain_manager.go => blockchain.go}      | 114 ++++---------
 ...ain_manager_test.go => blockchain_test.go} |  40 ++---
 core/chain_makers.go                          |   4 +-
 core/chain_makers_test.go                     |   2 +-
 core/helper_test.go                           |   6 +-
 core/manager.go                               |   2 +-
 core/vm/common.go                             |   4 +-
 core/vm/contract.go                           |   4 +-
 core/vm/doc.go                                |   8 +-
 core/vm/environment.go                        |   4 +-
 core/vm/memory.go                             |   2 +-
 core/vm_env.go                                |   4 +-
 eth/backend.go                                |  22 +--
 eth/filters/filter.go                         |  17 +-
 eth/filters/filter_system.go                  |   2 +-
 eth/gasprice.go                               |   4 +-
 eth/handler.go                                |  66 ++++----
 eth/handler_test.go                           | 158 +++++++++---------
 eth/helper_test.go                            |  20 +--
 eth/protocol_test.go                          |   2 +-
 eth/sync.go                                   |   2 +-
 miner/worker.go                               |   4 +-
 rpc/api/admin.go                              |   8 +-
 rpc/api/debug.go                              |   2 +-
 rpc/api/eth.go                                |   2 +-
 tests/block_test_util.go                      |   8 +-
 xeth/xeth.go                                  |  18 +-
 35 files changed, 267 insertions(+), 302 deletions(-)
 rename core/{chain_manager.go => blockchain.go} (85%)
 rename core/{chain_manager_test.go => blockchain_test.go} (94%)

diff --git a/cmd/geth/blocktestcmd.go b/cmd/geth/blocktestcmd.go
index d6195e0253..e0a5becdc0 100644
--- a/cmd/geth/blocktestcmd.go
+++ b/cmd/geth/blocktestcmd.go
@@ -118,7 +118,7 @@ func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, er
 		return ethereum, fmt.Errorf("InsertPreState: %v", err)
 	}
 
-	cm := ethereum.ChainManager()
+	cm := ethereum.BlockChain()
 	validBlocks, err := test.TryBlocksInsert(cm)
 	if err != nil {
 		return ethereum, fmt.Errorf("Block Test load error: %v", err)
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
index 1f5b28e3a5..2ad3d669ca 100644
--- a/cmd/geth/js_test.go
+++ b/cmd/geth/js_test.go
@@ -196,7 +196,7 @@ func TestBlockChain(t *testing.T) {
 	tmpfile := filepath.Join(extmp, "export.chain")
 	tmpfileq := strconv.Quote(tmpfile)
 
-	ethereum.ChainManager().Reset()
+	ethereum.BlockChain().Reset()
 
 	checkEvalJSON(t, repl, `admin.exportChain(`+tmpfileq+`)`, `true`)
 	if _, err := os.Stat(tmpfile); err != nil {
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index a9aa9f61fe..e8292fdf24 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -48,7 +48,7 @@ import (
 
 const (
 	ClientIdentifier = "Geth"
-	Version          = "1.2.0"
+	Version          = "1.2.0-dev"
 	VersionMajor     = 1
 	VersionMinor     = 2
 	VersionPatch     = 0
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 983762db8f..5e4bfc9376 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -169,7 +169,7 @@ func FormatTransactionData(data string) []byte {
 	return d
 }
 
-func ImportChain(chain *core.ChainManager, fn string) error {
+func ImportChain(chain *core.BlockChain, fn string) error {
 	// Watch for Ctrl-C while the import is running.
 	// If a signal is received, the import will stop at the next batch.
 	interrupt := make(chan os.Signal, 1)
@@ -244,7 +244,7 @@ func ImportChain(chain *core.ChainManager, fn string) error {
 	return nil
 }
 
-func hasAllBlocks(chain *core.ChainManager, bs []*types.Block) bool {
+func hasAllBlocks(chain *core.BlockChain, bs []*types.Block) bool {
 	for _, b := range bs {
 		if !chain.HasBlock(b.Hash()) {
 			return false
@@ -253,21 +253,21 @@ func hasAllBlocks(chain *core.ChainManager, bs []*types.Block) bool {
 	return true
 }
 
-func ExportChain(chainmgr *core.ChainManager, fn string) error {
+func ExportChain(blockchain *core.BlockChain, fn string) error {
 	glog.Infoln("Exporting blockchain to", fn)
 	fh, err := os.OpenFile(fn, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.ModePerm)
 	if err != nil {
 		return err
 	}
 	defer fh.Close()
-	if err := chainmgr.Export(fh); err != nil {
+	if err := blockchain.Export(fh); err != nil {
 		return err
 	}
 	glog.Infoln("Exported blockchain to", fn)
 	return nil
 }
 
-func ExportAppendChain(chainmgr *core.ChainManager, fn string, first uint64, last uint64) error {
+func ExportAppendChain(blockchain *core.BlockChain, fn string, first uint64, last uint64) error {
 	glog.Infoln("Exporting blockchain to", fn)
 	// TODO verify mode perms
 	fh, err := os.OpenFile(fn, os.O_CREATE|os.O_APPEND|os.O_WRONLY, os.ModePerm)
@@ -275,7 +275,7 @@ func ExportAppendChain(chainmgr *core.ChainManager, fn string, first uint64, las
 		return err
 	}
 	defer fh.Close()
-	if err := chainmgr.ExportN(fh, first, last); err != nil {
+	if err := blockchain.ExportN(fh, first, last); err != nil {
 		return err
 	}
 	glog.Infoln("Exported blockchain to", fn)
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index ad474f17d1..dea43bc5cf 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -508,7 +508,7 @@ func SetupEth(ctx *cli.Context) {
 }
 
 // MakeChain creates a chain manager from set command line flags.
-func MakeChain(ctx *cli.Context) (chain *core.ChainManager, chainDb ethdb.Database) {
+func MakeChain(ctx *cli.Context) (chain *core.BlockChain, chainDb ethdb.Database) {
 	datadir := MustDataDir(ctx)
 	cache := ctx.GlobalInt(CacheFlag.Name)
 
@@ -527,7 +527,7 @@ func MakeChain(ctx *cli.Context) (chain *core.ChainManager, chainDb ethdb.Databa
 	eventMux := new(event.TypeMux)
 	pow := ethash.New()
 	//genesis := core.GenesisBlock(uint64(ctx.GlobalInt(GenesisNonceFlag.Name)), blockDB)
-	chain, err = core.NewChainManager(chainDb, pow, eventMux)
+	chain, err = core.NewBlockChain(chainDb, pow, eventMux)
 	if err != nil {
 		Fatalf("Could not start chainmanager: %v", err)
 	}
diff --git a/core/bench_test.go b/core/bench_test.go
index def4f0d2a6..27f3e31584 100644
--- a/core/bench_test.go
+++ b/core/bench_test.go
@@ -168,7 +168,7 @@ func benchInsertChain(b *testing.B, disk bool, gen func(int, *BlockGen)) {
 	// Time the insertion of the new chain.
 	// State and blocks are stored in the same DB.
 	evmux := new(event.TypeMux)
-	chainman, _ := NewChainManager(db, FakePow{}, evmux)
+	chainman, _ := NewBlockChain(db, FakePow{}, evmux)
 	chainman.SetProcessor(NewBlockProcessor(db, FakePow{}, chainman, evmux))
 	defer chainman.Stop()
 	b.ReportAllocs()
diff --git a/core/block_processor.go b/core/block_processor.go
index 40e3931baf..783e156876 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -47,7 +47,7 @@ type BlockProcessor struct {
 	// Mutex for locking the block processor. Blocks can only be handled one at a time
 	mutex sync.Mutex
 	// Canonical block chain
-	bc *ChainManager
+	bc *BlockChain
 	// non-persistent key/value memory storage
 	mem map[string]*big.Int
 	// Proof of work used for validating
@@ -70,12 +70,12 @@ type GasPool interface {
 	SubGas(gas, price *big.Int) error
 }
 
-func NewBlockProcessor(db ethdb.Database, pow pow.PoW, chainManager *ChainManager, eventMux *event.TypeMux) *BlockProcessor {
+func NewBlockProcessor(db ethdb.Database, pow pow.PoW, blockchain *BlockChain, eventMux *event.TypeMux) *BlockProcessor {
 	sm := &BlockProcessor{
 		chainDb:  db,
 		mem:      make(map[string]*big.Int),
 		Pow:      pow,
-		bc:       chainManager,
+		bc:       blockchain,
 		eventMux: eventMux,
 	}
 	return sm
@@ -124,7 +124,7 @@ func (self *BlockProcessor) ApplyTransaction(gp GasPool, statedb *state.StateDB,
 
 	return receipt, gas, err
 }
-func (self *BlockProcessor) ChainManager() *ChainManager {
+func (self *BlockProcessor) BlockChain() *BlockChain {
 	return self.bc
 }
 
@@ -347,7 +347,7 @@ func (sm *BlockProcessor) VerifyUncles(statedb *state.StateDB, block, parent *ty
 
 // GetBlockReceipts returns the receipts beloniging to the block hash
 func (sm *BlockProcessor) GetBlockReceipts(bhash common.Hash) types.Receipts {
-	if block := sm.ChainManager().GetBlock(bhash); block != nil {
+	if block := sm.BlockChain().GetBlock(bhash); block != nil {
 		return GetBlockReceipts(sm.chainDb, block.Hash())
 	}
 
diff --git a/core/block_processor_test.go b/core/block_processor_test.go
index 5735b8d0aa..ba8bd7bcd5 100644
--- a/core/block_processor_test.go
+++ b/core/block_processor_test.go
@@ -30,16 +30,16 @@ import (
 	"github.com/ethereum/go-ethereum/pow/ezp"
 )
 
-func proc() (*BlockProcessor, *ChainManager) {
+func proc() (*BlockProcessor, *BlockChain) {
 	db, _ := ethdb.NewMemDatabase()
 	var mux event.TypeMux
 
 	WriteTestNetGenesisBlock(db, 0)
-	chainMan, err := NewChainManager(db, thePow(), &mux)
+	blockchain, err := NewBlockChain(db, thePow(), &mux)
 	if err != nil {
 		fmt.Println(err)
 	}
-	return NewBlockProcessor(db, ezp.New(), chainMan, &mux), chainMan
+	return NewBlockProcessor(db, ezp.New(), blockchain, &mux), blockchain
 }
 
 func TestNumber(t *testing.T) {
diff --git a/core/chain_manager.go b/core/blockchain.go
similarity index 85%
rename from core/chain_manager.go
rename to core/blockchain.go
index 49f831a59b..e8209f8e32 100644
--- a/core/chain_manager.go
+++ b/core/blockchain.go
@@ -55,11 +55,9 @@ const (
 	blockCacheLimit     = 256
 	maxFutureBlocks     = 256
 	maxTimeFutureBlocks = 30
-	checkpointLimit     = 200
 )
 
-type ChainManager struct {
-	//eth          EthManager
+type BlockChain struct {
 	chainDb      ethdb.Database
 	processor    types.BlockProcessor
 	eventMux     *event.TypeMux
@@ -69,7 +67,6 @@ type ChainManager struct {
 	chainmu sync.RWMutex
 	tsmu    sync.RWMutex
 
-	checkpoint      int // checkpoint counts towards the new checkpoint
 	td              *big.Int
 	currentBlock    *types.Block
 	currentGasLimit *big.Int
@@ -90,7 +87,7 @@ type ChainManager struct {
 	pow pow.PoW
 }
 
-func NewChainManager(chainDb ethdb.Database, pow pow.PoW, mux *event.TypeMux) (*ChainManager, error) {
+func NewBlockChain(chainDb ethdb.Database, pow pow.PoW, mux *event.TypeMux) (*BlockChain, error) {
 	headerCache, _ := lru.New(headerCacheLimit)
 	bodyCache, _ := lru.New(bodyCacheLimit)
 	bodyRLPCache, _ := lru.New(bodyCacheLimit)
@@ -98,7 +95,7 @@ func NewChainManager(chainDb ethdb.Database, pow pow.PoW, mux *event.TypeMux) (*
 	blockCache, _ := lru.New(blockCacheLimit)
 	futureBlocks, _ := lru.New(maxFutureBlocks)
 
-	bc := &ChainManager{
+	bc := &BlockChain{
 		chainDb:      chainDb,
 		eventMux:     mux,
 		quit:         make(chan struct{}),
@@ -144,7 +141,7 @@ func NewChainManager(chainDb ethdb.Database, pow pow.PoW, mux *event.TypeMux) (*
 	return bc, nil
 }
 
-func (bc *ChainManager) SetHead(head *types.Block) {
+func (bc *BlockChain) SetHead(head *types.Block) {
 	bc.mu.Lock()
 	defer bc.mu.Unlock()
 
@@ -163,80 +160,55 @@ func (bc *ChainManager) SetHead(head *types.Block) {
 	bc.setLastState()
 }
 
-func (self *ChainManager) Td() *big.Int {
+func (self *BlockChain) Td() *big.Int {
 	self.mu.RLock()
 	defer self.mu.RUnlock()
 
 	return new(big.Int).Set(self.td)
 }
 
-func (self *ChainManager) GasLimit() *big.Int {
+func (self *BlockChain) GasLimit() *big.Int {
 	self.mu.RLock()
 	defer self.mu.RUnlock()
 
 	return self.currentBlock.GasLimit()
 }
 
-func (self *ChainManager) LastBlockHash() common.Hash {
+func (self *BlockChain) LastBlockHash() common.Hash {
 	self.mu.RLock()
 	defer self.mu.RUnlock()
 
 	return self.currentBlock.Hash()
 }
 
-func (self *ChainManager) CurrentBlock() *types.Block {
+func (self *BlockChain) CurrentBlock() *types.Block {
 	self.mu.RLock()
 	defer self.mu.RUnlock()
 
 	return self.currentBlock
 }
 
-func (self *ChainManager) Status() (td *big.Int, currentBlock common.Hash, genesisBlock common.Hash) {
+func (self *BlockChain) Status() (td *big.Int, currentBlock common.Hash, genesisBlock common.Hash) {
 	self.mu.RLock()
 	defer self.mu.RUnlock()
 
 	return new(big.Int).Set(self.td), self.currentBlock.Hash(), self.genesisBlock.Hash()
 }
 
-func (self *ChainManager) SetProcessor(proc types.BlockProcessor) {
+func (self *BlockChain) SetProcessor(proc types.BlockProcessor) {
 	self.processor = proc
 }
 
-func (self *ChainManager) State() *state.StateDB {
+func (self *BlockChain) State() *state.StateDB {
 	return state.New(self.CurrentBlock().Root(), self.chainDb)
 }
 
-func (bc *ChainManager) recover() bool {
-	data, _ := bc.chainDb.Get([]byte("checkpoint"))
-	if len(data) != 0 {
-		block := bc.GetBlock(common.BytesToHash(data))
-		if block != nil {
-			if err := WriteCanonicalHash(bc.chainDb, block.Hash(), block.NumberU64()); err != nil {
-				glog.Fatalf("failed to write database head number: %v", err)
-			}
-			if err := WriteHeadBlockHash(bc.chainDb, block.Hash()); err != nil {
-				glog.Fatalf("failed to write database head hash: %v", err)
-			}
-			bc.currentBlock = block
-			return true
-		}
-	}
-	return false
-}
-
-func (bc *ChainManager) setLastState() error {
+func (bc *BlockChain) setLastState() error {
 	head := GetHeadBlockHash(bc.chainDb)
 	if head != (common.Hash{}) {
 		block := bc.GetBlock(head)
 		if block != nil {
 			bc.currentBlock = block
-		} else {
-			glog.Infof("LastBlock (%x) not found. Recovering...\n", head)
-			if bc.recover() {
-				glog.Infof("Recover successful")
-			} else {
-				glog.Fatalf("Recover failed. Please report")
-			}
 		}
 	} else {
 		bc.Reset()
@@ -252,13 +224,13 @@ func (bc *ChainManager) setLastState() error {
 }
 
 // Reset purges the entire blockchain, restoring it to its genesis state.
-func (bc *ChainManager) Reset() {
+func (bc *BlockChain) Reset() {
 	bc.ResetWithGenesisBlock(bc.genesisBlock)
 }
 
 // ResetWithGenesisBlock purges the entire blockchain, restoring it to the
 // specified genesis state.
-func (bc *ChainManager) ResetWithGenesisBlock(genesis *types.Block) {
+func (bc *BlockChain) ResetWithGenesisBlock(genesis *types.Block) {
 	bc.mu.Lock()
 	defer bc.mu.Unlock()
 
@@ -286,7 +258,7 @@ func (bc *ChainManager) ResetWithGenesisBlock(genesis *types.Block) {
 }
 
 // Export writes the active chain to the given writer.
-func (self *ChainManager) Export(w io.Writer) error {
+func (self *BlockChain) Export(w io.Writer) error {
 	if err := self.ExportN(w, uint64(0), self.currentBlock.NumberU64()); err != nil {
 		return err
 	}
@@ -294,7 +266,7 @@ func (self *ChainManager) Export(w io.Writer) error {
 }
 
 // ExportN writes a subset of the active chain to the given writer.
-func (self *ChainManager) ExportN(w io.Writer, first uint64, last uint64) error {
+func (self *BlockChain) ExportN(w io.Writer, first uint64, last uint64) error {
 	self.mu.RLock()
 	defer self.mu.RUnlock()
 
@@ -320,40 +292,28 @@ func (self *ChainManager) ExportN(w io.Writer, first uint64, last uint64) error
 
 // insert injects a block into the current chain block chain. Note, this function
 // assumes that the `mu` mutex is held!
-func (bc *ChainManager) insert(block *types.Block) {
+func (bc *BlockChain) insert(block *types.Block) {
 	// Add the block to the canonical chain number scheme and mark as the head
 	if err := WriteCanonicalHash(bc.chainDb, block.Hash(), block.NumberU64()); err != nil {
 		glog.Fatalf("failed to insert block number: %v", err)
 	}
-	if err := WriteHeadBlockHash(bc.chainDb, block.Hash()); err != nil {
-		glog.Fatalf("failed to insert block number: %v", err)
-	}
-	// Add a new restore point if we reached some limit
-	bc.checkpoint++
-	if bc.checkpoint > checkpointLimit {
-		if err := bc.chainDb.Put([]byte("checkpoint"), block.Hash().Bytes()); err != nil {
-			glog.Fatalf("failed to create checkpoint: %v", err)
-		}
-		bc.checkpoint = 0
-	}
-	// Update the internal internal state with the head block
 	bc.currentBlock = block
 }
 
 // Accessors
-func (bc *ChainManager) Genesis() *types.Block {
+func (bc *BlockChain) Genesis() *types.Block {
 	return bc.genesisBlock
 }
 
 // HasHeader checks if a block header is present in the database or not, caching
 // it if present.
-func (bc *ChainManager) HasHeader(hash common.Hash) bool {
+func (bc *BlockChain) HasHeader(hash common.Hash) bool {
 	return bc.GetHeader(hash) != nil
 }
 
 // GetHeader retrieves a block header from the database by hash, caching it if
 // found.
-func (self *ChainManager) GetHeader(hash common.Hash) *types.Header {
+func (self *BlockChain) GetHeader(hash common.Hash) *types.Header {
 	// Short circuit if the header's already in the cache, retrieve otherwise
 	if header, ok := self.headerCache.Get(hash); ok {
 		return header.(*types.Header)
@@ -369,7 +329,7 @@ func (self *ChainManager) GetHeader(hash common.Hash) *types.Header {
 
 // GetHeaderByNumber retrieves a block header from the database by number,
 // caching it (associated with its hash) if found.
-func (self *ChainManager) GetHeaderByNumber(number uint64) *types.Header {
+func (self *BlockChain) GetHeaderByNumber(number uint64) *types.Header {
 	hash := GetCanonicalHash(self.chainDb, number)
 	if hash == (common.Hash{}) {
 		return nil
@@ -379,7 +339,7 @@ func (self *ChainManager) GetHeaderByNumber(number uint64) *types.Header {
 
 // GetBody retrieves a block body (transactions and uncles) from the database by
 // hash, caching it if found.
-func (self *ChainManager) GetBody(hash common.Hash) *types.Body {
+func (self *BlockChain) GetBody(hash common.Hash) *types.Body {
 	// Short circuit if the body's already in the cache, retrieve otherwise
 	if cached, ok := self.bodyCache.Get(hash); ok {
 		body := cached.(*types.Body)
@@ -396,7 +356,7 @@ func (self *ChainManager) GetBody(hash common.Hash) *types.Body {
 
 // GetBodyRLP retrieves a block body in RLP encoding from the database by hash,
 // caching it if found.
-func (self *ChainManager) GetBodyRLP(hash common.Hash) rlp.RawValue {
+func (self *BlockChain) GetBodyRLP(hash common.Hash) rlp.RawValue {
 	// Short circuit if the body's already in the cache, retrieve otherwise
 	if cached, ok := self.bodyRLPCache.Get(hash); ok {
 		return cached.(rlp.RawValue)
@@ -412,7 +372,7 @@ func (self *ChainManager) GetBodyRLP(hash common.Hash) rlp.RawValue {
 
 // GetTd retrieves a block's total difficulty in the canonical chain from the
 // database by hash, caching it if found.
-func (self *ChainManager) GetTd(hash common.Hash) *big.Int {
+func (self *BlockChain) GetTd(hash common.Hash) *big.Int {
 	// Short circuit if the td's already in the cache, retrieve otherwise
 	if cached, ok := self.tdCache.Get(hash); ok {
 		return cached.(*big.Int)
@@ -428,12 +388,12 @@ func (self *ChainManager) GetTd(hash common.Hash) *big.Int {
 
 // HasBlock checks if a block is fully present in the database or not, caching
 // it if present.
-func (bc *ChainManager) HasBlock(hash common.Hash) bool {
+func (bc *BlockChain) HasBlock(hash common.Hash) bool {
 	return bc.GetBlock(hash) != nil
 }
 
 // GetBlock retrieves a block from the database by hash, caching it if found.
-func (self *ChainManager) GetBlock(hash common.Hash) *types.Block {
+func (self *BlockChain) GetBlock(hash common.Hash) *types.Block {
 	// Short circuit if the block's already in the cache, retrieve otherwise
 	if block, ok := self.blockCache.Get(hash); ok {
 		return block.(*types.Block)
@@ -449,7 +409,7 @@ func (self *ChainManager) GetBlock(hash common.Hash) *types.Block {
 
 // GetBlockByNumber retrieves a block from the database by number, caching it
 // (associated with its hash) if found.
-func (self *ChainManager) GetBlockByNumber(number uint64) *types.Block {
+func (self *BlockChain) GetBlockByNumber(number uint64) *types.Block {
 	hash := GetCanonicalHash(self.chainDb, number)
 	if hash == (common.Hash{}) {
 		return nil
@@ -459,7 +419,7 @@ func (self *ChainManager) GetBlockByNumber(number uint64) *types.Block {
 
 // GetBlockHashesFromHash retrieves a number of block hashes starting at a given
 // hash, fetching towards the genesis block.
-func (self *ChainManager) GetBlockHashesFromHash(hash common.Hash, max uint64) []common.Hash {
+func (self *BlockChain) GetBlockHashesFromHash(hash common.Hash, max uint64) []common.Hash {
 	// Get the origin header from which to fetch
 	header := self.GetHeader(hash)
 	if header == nil {
@@ -481,7 +441,7 @@ func (self *ChainManager) GetBlockHashesFromHash(hash common.Hash, max uint64) [
 
 // [deprecated by eth/62]
 // GetBlocksFromHash returns the block corresponding to hash and up to n-1 ancestors.
-func (self *ChainManager) GetBlocksFromHash(hash common.Hash, n int) (blocks []*types.Block) {
+func (self *BlockChain) GetBlocksFromHash(hash common.Hash, n int) (blocks []*types.Block) {
 	for i := 0; i < n; i++ {
 		block := self.GetBlock(hash)
 		if block == nil {
@@ -493,7 +453,7 @@ func (self *ChainManager) GetBlocksFromHash(hash common.Hash, n int) (blocks []*
 	return
 }
 
-func (self *ChainManager) GetUnclesInChain(block *types.Block, length int) (uncles []*types.Header) {
+func (self *BlockChain) GetUnclesInChain(block *types.Block, length int) (uncles []*types.Header) {
 	for i := 0; block != nil && i < length; i++ {
 		uncles = append(uncles, block.Uncles()...)
 		block = self.GetBlock(block.ParentHash())
@@ -504,11 +464,11 @@ func (self *ChainManager) GetUnclesInChain(block *types.Block, length int) (uncl
 
 // setTotalDifficulty updates the TD of the chain manager. Note, this function
 // assumes that the `mu` mutex is held!
-func (bc *ChainManager) setTotalDifficulty(td *big.Int) {
+func (bc *BlockChain) setTotalDifficulty(td *big.Int) {
 	bc.td = new(big.Int).Set(td)
 }
 
-func (bc *ChainManager) Stop() {
+func (bc *BlockChain) Stop() {
 	if !atomic.CompareAndSwapInt32(&bc.running, 0, 1) {
 		return
 	}
@@ -527,7 +487,7 @@ type queueEvent struct {
 	splitCount     int
 }
 
-func (self *ChainManager) procFutureBlocks() {
+func (self *BlockChain) procFutureBlocks() {
 	blocks := make([]*types.Block, self.futureBlocks.Len())
 	for i, hash := range self.futureBlocks.Keys() {
 		block, _ := self.futureBlocks.Get(hash)
@@ -549,7 +509,7 @@ const (
 )
 
 // WriteBlock writes the block to the chain.
-func (self *ChainManager) WriteBlock(block *types.Block) (status writeStatus, err error) {
+func (self *BlockChain) WriteBlock(block *types.Block) (status writeStatus, err error) {
 	self.wg.Add(1)
 	defer self.wg.Done()
 
@@ -599,7 +559,7 @@ func (self *ChainManager) WriteBlock(block *types.Block) (status writeStatus, er
 
 // InsertChain will attempt to insert the given chain in to the canonical chain or, otherwise, create a fork. It an error is returned
 // it will return the index number of the failing block as well an error describing what went wrong (for possible errors see core/errors.go).
-func (self *ChainManager) InsertChain(chain types.Blocks) (int, error) {
+func (self *BlockChain) InsertChain(chain types.Blocks) (int, error) {
 	self.wg.Add(1)
 	defer self.wg.Done()
 
@@ -730,7 +690,7 @@ func (self *ChainManager) InsertChain(chain types.Blocks) (int, error) {
 // reorgs takes two blocks, an old chain and a new chain and will reconstruct the blocks and inserts them
 // to be part of the new canonical chain and accumulates potential missing transactions and post an
 // event about them
-func (self *ChainManager) reorg(oldBlock, newBlock *types.Block) error {
+func (self *BlockChain) reorg(oldBlock, newBlock *types.Block) error {
 	self.mu.Lock()
 	defer self.mu.Unlock()
 
@@ -811,7 +771,7 @@ func (self *ChainManager) reorg(oldBlock, newBlock *types.Block) error {
 	return nil
 }
 
-func (self *ChainManager) update() {
+func (self *BlockChain) update() {
 	events := self.eventMux.Subscribe(queueEvent{})
 	futureTimer := time.Tick(5 * time.Second)
 out:
diff --git a/core/chain_manager_test.go b/core/blockchain_test.go
similarity index 94%
rename from core/chain_manager_test.go
rename to core/blockchain_test.go
index 40286190bf..e034417ce8 100644
--- a/core/chain_manager_test.go
+++ b/core/blockchain_test.go
@@ -48,19 +48,19 @@ func thePow() pow.PoW {
 	return pow
 }
 
-func theChainManager(db ethdb.Database, t *testing.T) *ChainManager {
+func theBlockChain(db ethdb.Database, t *testing.T) *BlockChain {
 	var eventMux event.TypeMux
 	WriteTestNetGenesisBlock(db, 0)
-	chainMan, err := NewChainManager(db, thePow(), &eventMux)
+	blockchain, err := NewBlockChain(db, thePow(), &eventMux)
 	if err != nil {
 		t.Error("failed creating chainmanager:", err)
 		t.FailNow()
 		return nil
 	}
-	blockMan := NewBlockProcessor(db, nil, chainMan, &eventMux)
-	chainMan.SetProcessor(blockMan)
+	blockMan := NewBlockProcessor(db, nil, blockchain, &eventMux)
+	blockchain.SetProcessor(blockMan)
 
-	return chainMan
+	return blockchain
 }
 
 // Test fork of length N starting from block i
@@ -104,7 +104,7 @@ func testFork(t *testing.T, bman *BlockProcessor, i, N int, f func(td1, td2 *big
 	// Loop over parents making sure reconstruction is done properly
 }
 
-func printChain(bc *ChainManager) {
+func printChain(bc *BlockChain) {
 	for i := bc.CurrentBlock().Number().Uint64(); i > 0; i-- {
 		b := bc.GetBlockByNumber(uint64(i))
 		fmt.Printf("\t%x %v\n", b.Hash(), b.Difficulty())
@@ -144,8 +144,8 @@ func loadChain(fn string, t *testing.T) (types.Blocks, error) {
 	return chain, nil
 }
 
-func insertChain(done chan bool, chainMan *ChainManager, chain types.Blocks, t *testing.T) {
-	_, err := chainMan.InsertChain(chain)
+func insertChain(done chan bool, blockchain *BlockChain, chain types.Blocks, t *testing.T) {
+	_, err := blockchain.InsertChain(chain)
 	if err != nil {
 		fmt.Println(err)
 		t.FailNow()
@@ -294,23 +294,23 @@ func TestChainInsertions(t *testing.T) {
 		t.FailNow()
 	}
 
-	chainMan := theChainManager(db, t)
+	blockchain := theBlockChain(db, t)
 
 	const max = 2
 	done := make(chan bool, max)
 
-	go insertChain(done, chainMan, chain1, t)
-	go insertChain(done, chainMan, chain2, t)
+	go insertChain(done, blockchain, chain1, t)
+	go insertChain(done, blockchain, chain2, t)
 
 	for i := 0; i < max; i++ {
 		<-done
 	}
 
-	if chain2[len(chain2)-1].Hash() != chainMan.CurrentBlock().Hash() {
+	if chain2[len(chain2)-1].Hash() != blockchain.CurrentBlock().Hash() {
 		t.Error("chain2 is canonical and shouldn't be")
 	}
 
-	if chain1[len(chain1)-1].Hash() != chainMan.CurrentBlock().Hash() {
+	if chain1[len(chain1)-1].Hash() != blockchain.CurrentBlock().Hash() {
 		t.Error("chain1 isn't canonical and should be")
 	}
 }
@@ -337,7 +337,7 @@ func TestChainMultipleInsertions(t *testing.T) {
 		}
 	}
 
-	chainMan := theChainManager(db, t)
+	blockchain := theBlockChain(db, t)
 
 	done := make(chan bool, max)
 	for i, chain := range chains {
@@ -345,7 +345,7 @@ func TestChainMultipleInsertions(t *testing.T) {
 		i := i
 		chain := chain
 		go func() {
-			insertChain(done, chainMan, chain, t)
+			insertChain(done, blockchain, chain, t)
 			fmt.Println(i, "done")
 		}()
 	}
@@ -354,7 +354,7 @@ func TestChainMultipleInsertions(t *testing.T) {
 		<-done
 	}
 
-	if chains[longest][len(chains[longest])-1].Hash() != chainMan.CurrentBlock().Hash() {
+	if chains[longest][len(chains[longest])-1].Hash() != blockchain.CurrentBlock().Hash() {
 		t.Error("Invalid canonical chain")
 	}
 }
@@ -382,9 +382,9 @@ func makeChainWithDiff(genesis *types.Block, d []int, seed byte) []*types.Block
 	return chain
 }
 
-func chm(genesis *types.Block, db ethdb.Database) *ChainManager {
+func chm(genesis *types.Block, db ethdb.Database) *BlockChain {
 	var eventMux event.TypeMux
-	bc := &ChainManager{chainDb: db, genesisBlock: genesis, eventMux: &eventMux, pow: FakePow{}}
+	bc := &BlockChain{chainDb: db, genesisBlock: genesis, eventMux: &eventMux, pow: FakePow{}}
 	bc.headerCache, _ = lru.New(100)
 	bc.bodyCache, _ = lru.New(100)
 	bc.bodyRLPCache, _ = lru.New(100)
@@ -459,7 +459,7 @@ func TestReorgBadHashes(t *testing.T) {
 	BadHashes[chain[3].Header().Hash()] = true
 
 	var eventMux event.TypeMux
-	ncm, err := NewChainManager(db, FakePow{}, &eventMux)
+	ncm, err := NewBlockChain(db, FakePow{}, &eventMux)
 	if err != nil {
 		t.Errorf("NewChainManager err: %s", err)
 	}
@@ -593,7 +593,7 @@ func TestChainTxReorgs(t *testing.T) {
 	})
 	// Import the chain. This runs all block validation rules.
 	evmux := &event.TypeMux{}
-	chainman, _ := NewChainManager(db, FakePow{}, evmux)
+	chainman, _ := NewBlockChain(db, FakePow{}, evmux)
 	chainman.SetProcessor(NewBlockProcessor(db, FakePow{}, chainman, evmux))
 	if i, err := chainman.InsertChain(chain); err != nil {
 		t.Fatalf("failed to insert original chain[%d]: %v", i, err)
diff --git a/core/chain_makers.go b/core/chain_makers.go
index 3af9b0b89c..ba09b30290 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -153,7 +153,7 @@ func (b *BlockGen) OffsetTime(seconds int64) {
 // and their coinbase will be the zero address.
 //
 // Blocks created by GenerateChain do not contain valid proof of work
-// values. Inserting them into ChainManager requires use of FakePow or
+// values. Inserting them into BlockChain requires use of FakePow or
 // a similar non-validating proof of work implementation.
 func GenerateChain(parent *types.Block, db ethdb.Database, n int, gen func(int, *BlockGen)) []*types.Block {
 	statedb := state.New(parent.Root(), db)
@@ -205,7 +205,7 @@ func newCanonical(n int, db ethdb.Database) (*BlockProcessor, error) {
 	evmux := &event.TypeMux{}
 
 	WriteTestNetGenesisBlock(db, 0)
-	chainman, _ := NewChainManager(db, FakePow{}, evmux)
+	chainman, _ := NewBlockChain(db, FakePow{}, evmux)
 	bman := NewBlockProcessor(db, FakePow{}, chainman, evmux)
 	bman.bc.SetProcessor(bman)
 	parent := bman.bc.CurrentBlock()
diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go
index ac18e5e0b8..b33af8d873 100644
--- a/core/chain_makers_test.go
+++ b/core/chain_makers_test.go
@@ -77,7 +77,7 @@ func ExampleGenerateChain() {
 
 	// Import the chain. This runs all block validation rules.
 	evmux := &event.TypeMux{}
-	chainman, _ := NewChainManager(db, FakePow{}, evmux)
+	chainman, _ := NewBlockChain(db, FakePow{}, evmux)
 	chainman.SetProcessor(NewBlockProcessor(db, FakePow{}, chainman, evmux))
 	if i, err := chainman.InsertChain(chain); err != nil {
 		fmt.Printf("insert error (block %d): %v\n", i, err)
diff --git a/core/helper_test.go b/core/helper_test.go
index 81ea6fc226..fd6a5491c5 100644
--- a/core/helper_test.go
+++ b/core/helper_test.go
@@ -34,7 +34,7 @@ type TestManager struct {
 
 	db         ethdb.Database
 	txPool     *TxPool
-	blockChain *ChainManager
+	blockChain *BlockChain
 	Blocks     []*types.Block
 }
 
@@ -54,7 +54,7 @@ func (s *TestManager) Peers() *list.List {
 	return list.New()
 }
 
-func (s *TestManager) ChainManager() *ChainManager {
+func (s *TestManager) BlockChain() *BlockChain {
 	return s.blockChain
 }
 
@@ -89,7 +89,7 @@ func NewTestManager() *TestManager {
 	testManager.eventMux = new(event.TypeMux)
 	testManager.db = db
 	// testManager.txPool = NewTxPool(testManager)
-	// testManager.blockChain = NewChainManager(testManager)
+	// testManager.blockChain = NewBlockChain(testManager)
 	// testManager.stateManager = NewStateManager(testManager)
 
 	return testManager
diff --git a/core/manager.go b/core/manager.go
index 0f108a6dec..289c87c112 100644
--- a/core/manager.go
+++ b/core/manager.go
@@ -26,7 +26,7 @@ import (
 type Backend interface {
 	AccountManager() *accounts.Manager
 	BlockProcessor() *BlockProcessor
-	ChainManager() *ChainManager
+	BlockChain() *BlockChain
 	TxPool() *TxPool
 	ChainDb() ethdb.Database
 	DappDb() ethdb.Database
diff --git a/core/vm/common.go b/core/vm/common.go
index b52b598bad..2d1aa93326 100644
--- a/core/vm/common.go
+++ b/core/vm/common.go
@@ -38,7 +38,7 @@ const (
 )
 
 var (
-	Pow256 = common.BigPow(2, 256) // Pew256 is 2**256
+	Pow256 = common.BigPow(2, 256) // Pow256 is 2**256
 
 	U256 = common.U256 // Shortcut to common.U256
 	S256 = common.S256 // Shortcut to common.S256
@@ -46,7 +46,7 @@ var (
 	Zero = common.Big0 // Shortcut to common.Big0
 	One  = common.Big1 // Shortcut to common.Big1
 
-	max = big.NewInt(math.MaxInt64) // Maximum 256 bit integer
+	max = big.NewInt(math.MaxInt64) // Maximum 64 bit integer
 )
 
 // NewVm returns a new VM based on the Environment
diff --git a/core/vm/contract.go b/core/vm/contract.go
index 8460cc47bb..95417e7471 100644
--- a/core/vm/contract.go
+++ b/core/vm/contract.go
@@ -118,8 +118,8 @@ func (self *Contract) SetCode(code []byte) {
 	self.Code = code
 }
 
-// SetCallCode sets the address of the code address and sets the code
-// of the contract according to the backing database.
+// SetCallCode sets the code of the contract and address of the backing data
+// object
 func (self *Contract) SetCallCode(addr *common.Address, code []byte) {
 	self.Code = code
 	self.CodeAddr = addr
diff --git a/core/vm/doc.go b/core/vm/doc.go
index 4deb7761d9..ab87bf9344 100644
--- a/core/vm/doc.go
+++ b/core/vm/doc.go
@@ -18,15 +18,15 @@
 Package vm implements the Ethereum Virtual Machine.
 
 The vm package implements two EVMs, a byte code VM and a JIT VM. The BC
-(Byte Code) VM loops over a set of bytes and executes them according to a set
-of rules defined in the Ethereum yellow paper. When the BC VM is invokes it
+(Byte Code) VM loops over a set of bytes and executes them according to the set
+of rules defined in the Ethereum yellow paper. When the BC VM is invoked it
 invokes the JIT VM in a seperate goroutine and compiles the byte code in JIT
 instructions.
 
 The JIT VM, when invoked, loops around a set of pre-defined instructions until
-it either runs of gas, causes an internel error, returns or stops. At a later
+it either runs of gas, causes an internal error, returns or stops. At a later
 stage the JIT VM will see some additional features that will cause sets of
 instructions to be compiled down to segments. Segments are sets of instructions
-that can be ran in one go saving precious time during execution.
+that can be run in one go saving precious time during execution.
 */
 package vm
diff --git a/core/vm/environment.go b/core/vm/environment.go
index 606518fd46..f8e19baeac 100644
--- a/core/vm/environment.go
+++ b/core/vm/environment.go
@@ -26,7 +26,7 @@ import (
 // it's own isolated environment.
 
 // Environment is an EVM requirement and helper which allows access to outside
-// information such like states.
+// information such as states.
 type Environment interface {
 	// The state database
 	Db() Database
@@ -50,7 +50,7 @@ type Environment interface {
 	GasLimit() *big.Int
 	// Determines whether it's possible to transact
 	CanTransfer(from common.Address, balance *big.Int) bool
-	// Transfer from to to with amount set
+	// Transfers amount from one account to the other
 	Transfer(from, to Account, amount *big.Int) error
 	// Adds a LOG to the state
 	AddLog(*Log)
diff --git a/core/vm/memory.go b/core/vm/memory.go
index 101ec75cbd..d011884173 100644
--- a/core/vm/memory.go
+++ b/core/vm/memory.go
@@ -18,7 +18,7 @@ package vm
 
 import "fmt"
 
-// Memory implements ethereum RAM backed by a simple byte slice
+// Memory implements a simple memory model for the ethereum virtual machine.
 type Memory struct {
 	store []byte
 }
diff --git a/core/vm_env.go b/core/vm_env.go
index dea2807464..467e34c6b9 100644
--- a/core/vm_env.go
+++ b/core/vm_env.go
@@ -30,13 +30,13 @@ type VMEnv struct {
 	header *types.Header
 	msg    Message
 	depth  int
-	chain  *ChainManager
+	chain  *BlockChain
 	typ    vm.Type
 	// structured logging
 	logs []vm.StructLog
 }
 
-func NewEnv(state *state.StateDB, chain *ChainManager, msg Message, header *types.Header) *VMEnv {
+func NewEnv(state *state.StateDB, chain *BlockChain, msg Message, header *types.Header) *VMEnv {
 	return &VMEnv{
 		chain:  chain,
 		state:  state,
diff --git a/eth/backend.go b/eth/backend.go
index 349dfa6133..a480b49310 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -217,7 +217,7 @@ type Ethereum struct {
 	// State manager for processing new blocks and managing the over all states
 	blockProcessor  *core.BlockProcessor
 	txPool          *core.TxPool
-	chainManager    *core.ChainManager
+	blockchain      *core.BlockChain
 	accountManager  *accounts.Manager
 	whisper         *whisper.Whisper
 	pow             *ethash.Ethash
@@ -365,7 +365,7 @@ func New(config *Config) (*Ethereum, error) {
 		eth.pow = ethash.New()
 	}
 	//genesis := core.GenesisBlock(uint64(config.GenesisNonce), stateDb)
-	eth.chainManager, err = core.NewChainManager(chainDb, eth.pow, eth.EventMux())
+	eth.blockchain, err = core.NewBlockChain(chainDb, eth.pow, eth.EventMux())
 	if err != nil {
 		if err == core.ErrNoGenesis {
 			return nil, fmt.Errorf(`Genesis block not found. Please supply a genesis block with the "--genesis /path/to/file" argument`)
@@ -373,11 +373,11 @@ func New(config *Config) (*Ethereum, error) {
 
 		return nil, err
 	}
-	eth.txPool = core.NewTxPool(eth.EventMux(), eth.chainManager.State, eth.chainManager.GasLimit)
+	eth.txPool = core.NewTxPool(eth.EventMux(), eth.blockchain.State, eth.blockchain.GasLimit)
 
-	eth.blockProcessor = core.NewBlockProcessor(chainDb, eth.pow, eth.chainManager, eth.EventMux())
-	eth.chainManager.SetProcessor(eth.blockProcessor)
-	eth.protocolManager = NewProtocolManager(config.NetworkId, eth.eventMux, eth.txPool, eth.pow, eth.chainManager, chainDb)
+	eth.blockProcessor = core.NewBlockProcessor(chainDb, eth.pow, eth.blockchain, eth.EventMux())
+	eth.blockchain.SetProcessor(eth.blockProcessor)
+	eth.protocolManager = NewProtocolManager(config.NetworkId, eth.eventMux, eth.txPool, eth.pow, eth.blockchain, chainDb)
 
 	eth.miner = miner.New(eth, eth.EventMux(), eth.pow)
 	eth.miner.SetGasPrice(config.GasPrice)
@@ -441,7 +441,7 @@ func (s *Ethereum) NodeInfo() *NodeInfo {
 		DiscPort:   int(node.UDP),
 		TCPPort:    int(node.TCP),
 		ListenAddr: s.net.ListenAddr,
-		Td:         s.ChainManager().Td().String(),
+		Td:         s.BlockChain().Td().String(),
 	}
 }
 
@@ -478,7 +478,7 @@ func (s *Ethereum) PeersInfo() (peersinfo []*PeerInfo) {
 }
 
 func (s *Ethereum) ResetWithGenesisBlock(gb *types.Block) {
-	s.chainManager.ResetWithGenesisBlock(gb)
+	s.blockchain.ResetWithGenesisBlock(gb)
 }
 
 func (s *Ethereum) StartMining(threads int) error {
@@ -518,7 +518,7 @@ func (s *Ethereum) Miner() *miner.Miner { return s.miner }
 // func (s *Ethereum) Logger() logger.LogSystem             { return s.logger }
 func (s *Ethereum) Name() string                         { return s.net.Name }
 func (s *Ethereum) AccountManager() *accounts.Manager    { return s.accountManager }
-func (s *Ethereum) ChainManager() *core.ChainManager     { return s.chainManager }
+func (s *Ethereum) BlockChain() *core.BlockChain         { return s.blockchain }
 func (s *Ethereum) BlockProcessor() *core.BlockProcessor { return s.blockProcessor }
 func (s *Ethereum) TxPool() *core.TxPool                 { return s.txPool }
 func (s *Ethereum) Whisper() *whisper.Whisper            { return s.whisper }
@@ -581,7 +581,7 @@ func (self *Ethereum) AddPeer(nodeURL string) error {
 
 func (s *Ethereum) Stop() {
 	s.net.Stop()
-	s.chainManager.Stop()
+	s.blockchain.Stop()
 	s.protocolManager.Stop()
 	s.txPool.Stop()
 	s.eventMux.Stop()
@@ -622,7 +622,7 @@ func (self *Ethereum) StartAutoDAG() {
 			select {
 			case <-timer:
 				glog.V(logger.Info).Infof("checking DAG (ethash dir: %s)", ethash.DefaultDir)
-				currentBlock := self.ChainManager().CurrentBlock().NumberU64()
+				currentBlock := self.BlockChain().CurrentBlock().NumberU64()
 				thisEpoch := currentBlock / epochLength
 				if nextEpoch <= thisEpoch {
 					if currentBlock%epochLength > autoDAGepochHeight {
diff --git a/eth/filters/filter.go b/eth/filters/filter.go
index 0b49116295..2bcf20d0ca 100644
--- a/eth/filters/filter.go
+++ b/eth/filters/filter.go
@@ -1,4 +1,4 @@
-// Copyright 2014 The go-ethereum Authors
+// Copyright 2015 The go-ethereum Authors
 // This file is part of the go-ethereum library.
 //
 // The go-ethereum library is free software: you can redistribute it and/or modify
@@ -23,6 +23,7 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/ethdb"
 )
 
 type AccountChange struct {
@@ -31,7 +32,7 @@ type AccountChange struct {
 
 // Filtering interface
 type Filter struct {
-	db       common.Database
+	db       ethdb.Database
 	earliest int64
 	latest   int64
 	skip     int
@@ -46,7 +47,7 @@ type Filter struct {
 
 // Create a new filter which uses a bloom filter on blocks to figure out whether a particular block
 // is interesting or not.
-func New(db common.Database) *Filter {
+func New(db ethdb.Database) *Filter {
 	return &Filter{db: db}
 }
 
@@ -79,7 +80,7 @@ func (self *Filter) SetSkip(skip int) {
 
 // Run filters logs with the current parameters set
 func (self *Filter) Find() vm.Logs {
-	earliestBlock := core.GetCurrentBlock(self.db)
+	earliestBlock := core.GetBlock(self.db, core.GetHeadBlockHash(self.db))
 	var earliestBlockNo uint64 = uint64(self.earliest)
 	if self.earliest == -1 {
 		earliestBlockNo = earliestBlock.NumberU64()
@@ -91,8 +92,12 @@ func (self *Filter) Find() vm.Logs {
 
 	var (
 		logs  vm.Logs
-		block = core.GetBlockByNumber(self.db, latestBlockNo)
+		block *types.Block
 	)
+	hash := core.GetCanonicalHash(self.db, latestBlockNo)
+	if hash != (common.Hash{}) {
+		block = core.GetBlock(self.db, hash)
+	}
 
 done:
 	for i := 0; block != nil; i++ {
@@ -120,7 +125,7 @@ done:
 			logs = append(logs, self.FilterLogs(unfiltered)...)
 		}
 
-		block = core.GetBlockByHash(self.db, block.ParentHash())
+		block = core.GetBlock(self.db, block.ParentHash())
 	}
 
 	skip := int(math.Min(float64(len(logs)), float64(self.skip)))
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go
index 1c27c7be45..4972dcd599 100644
--- a/eth/filters/filter_system.go
+++ b/eth/filters/filter_system.go
@@ -28,7 +28,7 @@ import (
 
 // FilterSystem manages filters that filter specific events such as
 // block, transaction and log events. The Filtering system can be used to listen
-// for specific LOG events fires by the EVM (Ethereum Virtual Machine).
+// for specific LOG events fired by the EVM (Ethereum Virtual Machine).
 type FilterSystem struct {
 	eventMux *event.TypeMux
 
diff --git a/eth/gasprice.go b/eth/gasprice.go
index 3caad73c6c..c08b961293 100644
--- a/eth/gasprice.go
+++ b/eth/gasprice.go
@@ -36,7 +36,7 @@ type blockPriceInfo struct {
 
 type GasPriceOracle struct {
 	eth                           *Ethereum
-	chain                         *core.ChainManager
+	chain                         *core.BlockChain
 	events                        event.Subscription
 	blocks                        map[uint64]*blockPriceInfo
 	firstProcessed, lastProcessed uint64
@@ -48,7 +48,7 @@ func NewGasPriceOracle(eth *Ethereum) (self *GasPriceOracle) {
 	self = &GasPriceOracle{}
 	self.blocks = make(map[uint64]*blockPriceInfo)
 	self.eth = eth
-	self.chain = eth.chainManager
+	self.chain = eth.blockchain
 	self.events = eth.EventMux().Subscribe(
 		core.ChainEvent{},
 		core.ChainSplitEvent{},
diff --git a/eth/handler.go b/eth/handler.go
index 52c9c4151b..fc92338b4f 100644
--- a/eth/handler.go
+++ b/eth/handler.go
@@ -60,9 +60,9 @@ func (ep extProt) GetHashes(hash common.Hash) error    { return ep.getHashes(has
 func (ep extProt) GetBlock(hashes []common.Hash) error { return ep.getBlocks(hashes) }
 
 type ProtocolManager struct {
-	txpool   txPool
-	chainman *core.ChainManager
-	chaindb  ethdb.Database
+	txpool     txPool
+	blockchain *core.BlockChain
+	chaindb    ethdb.Database
 
 	downloader *downloader.Downloader
 	fetcher    *fetcher.Fetcher
@@ -87,17 +87,17 @@ type ProtocolManager struct {
 
 // NewProtocolManager returns a new ethereum sub protocol manager. The Ethereum sub protocol manages peers capable
 // with the ethereum network.
-func NewProtocolManager(networkId int, mux *event.TypeMux, txpool txPool, pow pow.PoW, chainman *core.ChainManager, chaindb ethdb.Database) *ProtocolManager {
+func NewProtocolManager(networkId int, mux *event.TypeMux, txpool txPool, pow pow.PoW, blockchain *core.BlockChain, chaindb ethdb.Database) *ProtocolManager {
 	// Create the protocol manager with the base fields
 	manager := &ProtocolManager{
-		eventMux:  mux,
-		txpool:    txpool,
-		chainman:  chainman,
-		chaindb:   chaindb,
-		peers:     newPeerSet(),
-		newPeerCh: make(chan *peer, 1),
-		txsyncCh:  make(chan *txsync),
-		quitSync:  make(chan struct{}),
+		eventMux:   mux,
+		txpool:     txpool,
+		blockchain: blockchain,
+		chaindb:    chaindb,
+		peers:      newPeerSet(),
+		newPeerCh:  make(chan *peer, 1),
+		txsyncCh:   make(chan *txsync),
+		quitSync:   make(chan struct{}),
 	}
 	// Initiate a sub-protocol for every implemented version we can handle
 	manager.SubProtocols = make([]p2p.Protocol, len(ProtocolVersions))
@@ -116,15 +116,15 @@ func NewProtocolManager(networkId int, mux *event.TypeMux, txpool txPool, pow po
 		}
 	}
 	// Construct the different synchronisation mechanisms
-	manager.downloader = downloader.New(manager.eventMux, manager.chainman.HasBlock, manager.chainman.GetBlock, manager.chainman.CurrentBlock, manager.chainman.GetTd, manager.chainman.InsertChain, manager.removePeer)
+	manager.downloader = downloader.New(manager.eventMux, manager.blockchain.HasBlock, manager.blockchain.GetBlock, manager.blockchain.CurrentBlock, manager.blockchain.GetTd, manager.blockchain.InsertChain, manager.removePeer)
 
 	validator := func(block *types.Block, parent *types.Block) error {
 		return core.ValidateHeader(pow, block.Header(), parent.Header(), true, false)
 	}
 	heighter := func() uint64 {
-		return manager.chainman.CurrentBlock().NumberU64()
+		return manager.blockchain.CurrentBlock().NumberU64()
 	}
-	manager.fetcher = fetcher.New(manager.chainman.GetBlock, validator, manager.BroadcastBlock, heighter, manager.chainman.InsertChain, manager.removePeer)
+	manager.fetcher = fetcher.New(manager.blockchain.GetBlock, validator, manager.BroadcastBlock, heighter, manager.blockchain.InsertChain, manager.removePeer)
 
 	return manager
 }
@@ -187,7 +187,7 @@ func (pm *ProtocolManager) handle(p *peer) error {
 	glog.V(logger.Debug).Infof("%v: peer connected [%s]", p, p.Name())
 
 	// Execute the Ethereum handshake
-	td, head, genesis := pm.chainman.Status()
+	td, head, genesis := pm.blockchain.Status()
 	if err := p.Handshake(td, head, genesis); err != nil {
 		glog.V(logger.Debug).Infof("%v: handshake failed: %v", p, err)
 		return err
@@ -252,7 +252,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 			request.Amount = uint64(downloader.MaxHashFetch)
 		}
 		// Retrieve the hashes from the block chain and return them
-		hashes := pm.chainman.GetBlockHashesFromHash(request.Hash, request.Amount)
+		hashes := pm.blockchain.GetBlockHashesFromHash(request.Hash, request.Amount)
 		if len(hashes) == 0 {
 			glog.V(logger.Debug).Infof("invalid block hash %x", request.Hash.Bytes()[:4])
 		}
@@ -268,9 +268,9 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 			request.Amount = uint64(downloader.MaxHashFetch)
 		}
 		// Calculate the last block that should be retrieved, and short circuit if unavailable
-		last := pm.chainman.GetBlockByNumber(request.Number + request.Amount - 1)
+		last := pm.blockchain.GetBlockByNumber(request.Number + request.Amount - 1)
 		if last == nil {
-			last = pm.chainman.CurrentBlock()
+			last = pm.blockchain.CurrentBlock()
 			request.Amount = last.NumberU64() - request.Number + 1
 		}
 		if last.NumberU64() < request.Number {
@@ -278,7 +278,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 		}
 		// Retrieve the hashes from the last block backwards, reverse and return
 		hashes := []common.Hash{last.Hash()}
-		hashes = append(hashes, pm.chainman.GetBlockHashesFromHash(last.Hash(), request.Amount-1)...)
+		hashes = append(hashes, pm.blockchain.GetBlockHashesFromHash(last.Hash(), request.Amount-1)...)
 
 		for i := 0; i < len(hashes)/2; i++ {
 			hashes[i], hashes[len(hashes)-1-i] = hashes[len(hashes)-1-i], hashes[i]
@@ -318,7 +318,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 				return errResp(ErrDecode, "msg %v: %v", msg, err)
 			}
 			// Retrieve the requested block, stopping if enough was found
-			if block := pm.chainman.GetBlock(hash); block != nil {
+			if block := pm.blockchain.GetBlock(hash); block != nil {
 				blocks = append(blocks, block)
 				bytes += block.Size()
 			}
@@ -358,9 +358,9 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 			// Retrieve the next header satisfying the query
 			var origin *types.Header
 			if query.Origin.Hash != (common.Hash{}) {
-				origin = pm.chainman.GetHeader(query.Origin.Hash)
+				origin = pm.blockchain.GetHeader(query.Origin.Hash)
 			} else {
-				origin = pm.chainman.GetHeaderByNumber(query.Origin.Number)
+				origin = pm.blockchain.GetHeaderByNumber(query.Origin.Number)
 			}
 			if origin == nil {
 				break
@@ -373,7 +373,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 			case query.Origin.Hash != (common.Hash{}) && query.Reverse:
 				// Hash based traversal towards the genesis block
 				for i := 0; i < int(query.Skip)+1; i++ {
-					if header := pm.chainman.GetHeader(query.Origin.Hash); header != nil {
+					if header := pm.blockchain.GetHeader(query.Origin.Hash); header != nil {
 						query.Origin.Hash = header.ParentHash
 					} else {
 						unknown = true
@@ -382,8 +382,8 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 				}
 			case query.Origin.Hash != (common.Hash{}) && !query.Reverse:
 				// Hash based traversal towards the leaf block
-				if header := pm.chainman.GetHeaderByNumber(origin.Number.Uint64() + query.Skip + 1); header != nil {
-					if pm.chainman.GetBlockHashesFromHash(header.Hash(), query.Skip+1)[query.Skip] == query.Origin.Hash {
+				if header := pm.blockchain.GetHeaderByNumber(origin.Number.Uint64() + query.Skip + 1); header != nil {
+					if pm.blockchain.GetBlockHashesFromHash(header.Hash(), query.Skip+1)[query.Skip] == query.Origin.Hash {
 						query.Origin.Hash = header.Hash()
 					} else {
 						unknown = true
@@ -466,7 +466,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 				return errResp(ErrDecode, "msg %v: %v", msg, err)
 			}
 			// Retrieve the requested block body, stopping if enough was found
-			if data := pm.chainman.GetBodyRLP(hash); len(data) != 0 {
+			if data := pm.blockchain.GetBodyRLP(hash); len(data) != 0 {
 				bodies = append(bodies, data)
 				bytes += len(data)
 			}
@@ -562,7 +562,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 		// Schedule all the unknown hashes for retrieval
 		unknown := make([]announce, 0, len(announces))
 		for _, block := range announces {
-			if !pm.chainman.HasBlock(block.Hash) {
+			if !pm.blockchain.HasBlock(block.Hash) {
 				unknown = append(unknown, block)
 			}
 		}
@@ -586,7 +586,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 		request.Block.ReceivedAt = msg.ReceivedAt
 
 		// Mark the block's arrival for whatever reason
-		_, chainHead, _ := pm.chainman.Status()
+		_, chainHead, _ := pm.blockchain.Status()
 		jsonlogger.LogJson(&logger.EthChainReceivedNewBlock{
 			BlockHash:     request.Block.Hash().Hex(),
 			BlockNumber:   request.Block.Number(),
@@ -603,7 +603,7 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 		// Update the peers total difficulty if needed, schedule a download if gapped
 		if request.TD.Cmp(p.Td()) > 0 {
 			p.SetTd(request.TD)
-			if request.TD.Cmp(new(big.Int).Add(pm.chainman.Td(), request.Block.Difficulty())) > 0 {
+			if request.TD.Cmp(new(big.Int).Add(pm.blockchain.Td(), request.Block.Difficulty())) > 0 {
 				go pm.synchronise(p)
 			}
 		}
@@ -645,8 +645,8 @@ func (pm *ProtocolManager) BroadcastBlock(block *types.Block, propagate bool) {
 	if propagate {
 		// Calculate the TD of the block (it's not imported yet, so block.Td is not valid)
 		var td *big.Int
-		if parent := pm.chainman.GetBlock(block.ParentHash()); parent != nil {
-			td = new(big.Int).Add(block.Difficulty(), pm.chainman.GetTd(block.ParentHash()))
+		if parent := pm.blockchain.GetBlock(block.ParentHash()); parent != nil {
+			td = new(big.Int).Add(block.Difficulty(), pm.blockchain.GetTd(block.ParentHash()))
 		} else {
 			glog.V(logger.Error).Infof("propagating dangling block #%d [%x]", block.NumberU64(), hash[:4])
 			return
@@ -659,7 +659,7 @@ func (pm *ProtocolManager) BroadcastBlock(block *types.Block, propagate bool) {
 		glog.V(logger.Detail).Infof("propagated block %x to %d peers in %v", hash[:4], len(transfer), time.Since(block.ReceivedAt))
 	}
 	// Otherwise if the block is indeed in out own chain, announce it
-	if pm.chainman.HasBlock(hash) {
+	if pm.blockchain.HasBlock(hash) {
 		for _, peer := range peers {
 			if peer.version < eth62 {
 				peer.SendNewBlockHashes61([]common.Hash{hash})
diff --git a/eth/handler_test.go b/eth/handler_test.go
index 6400d4e789..2b8c6168a8 100644
--- a/eth/handler_test.go
+++ b/eth/handler_test.go
@@ -33,23 +33,23 @@ func testGetBlockHashes(t *testing.T, protocol int) {
 		number int
 		result int
 	}{
-		{common.Hash{}, 1, 0},                                 // Make sure non existent hashes don't return results
-		{pm.chainman.Genesis().Hash(), 1, 0},                  // There are no hashes to retrieve up from the genesis
-		{pm.chainman.GetBlockByNumber(5).Hash(), 5, 5},        // All the hashes including the genesis requested
-		{pm.chainman.GetBlockByNumber(5).Hash(), 10, 5},       // More hashes than available till the genesis requested
-		{pm.chainman.GetBlockByNumber(100).Hash(), 10, 10},    // All hashes available from the middle of the chain
-		{pm.chainman.CurrentBlock().Hash(), 10, 10},           // All hashes available from the head of the chain
-		{pm.chainman.CurrentBlock().Hash(), limit, limit},     // Request the maximum allowed hash count
-		{pm.chainman.CurrentBlock().Hash(), limit + 1, limit}, // Request more than the maximum allowed hash count
+		{common.Hash{}, 1, 0},                                   // Make sure non existent hashes don't return results
+		{pm.blockchain.Genesis().Hash(), 1, 0},                  // There are no hashes to retrieve up from the genesis
+		{pm.blockchain.GetBlockByNumber(5).Hash(), 5, 5},        // All the hashes including the genesis requested
+		{pm.blockchain.GetBlockByNumber(5).Hash(), 10, 5},       // More hashes than available till the genesis requested
+		{pm.blockchain.GetBlockByNumber(100).Hash(), 10, 10},    // All hashes available from the middle of the chain
+		{pm.blockchain.CurrentBlock().Hash(), 10, 10},           // All hashes available from the head of the chain
+		{pm.blockchain.CurrentBlock().Hash(), limit, limit},     // Request the maximum allowed hash count
+		{pm.blockchain.CurrentBlock().Hash(), limit + 1, limit}, // Request more than the maximum allowed hash count
 	}
 	// Run each of the tests and verify the results against the chain
 	for i, tt := range tests {
 		// Assemble the hash response we would like to receive
 		resp := make([]common.Hash, tt.result)
 		if len(resp) > 0 {
-			from := pm.chainman.GetBlock(tt.origin).NumberU64() - 1
+			from := pm.blockchain.GetBlock(tt.origin).NumberU64() - 1
 			for j := 0; j < len(resp); j++ {
-				resp[j] = pm.chainman.GetBlockByNumber(uint64(int(from) - j)).Hash()
+				resp[j] = pm.blockchain.GetBlockByNumber(uint64(int(from) - j)).Hash()
 			}
 		}
 		// Send the hash request and verify the response
@@ -76,11 +76,11 @@ func testGetBlockHashesFromNumber(t *testing.T, protocol int) {
 		number int
 		result int
 	}{
-		{pm.chainman.CurrentBlock().NumberU64() + 1, 1, 0},     // Out of bounds requests should return empty
-		{pm.chainman.CurrentBlock().NumberU64(), 1, 1},         // Make sure the head hash can be retrieved
-		{pm.chainman.CurrentBlock().NumberU64() - 4, 5, 5},     // All hashes, including the head hash requested
-		{pm.chainman.CurrentBlock().NumberU64() - 4, 10, 5},    // More hashes requested than available till the head
-		{pm.chainman.CurrentBlock().NumberU64() - 100, 10, 10}, // All hashes available from the middle of the chain
+		{pm.blockchain.CurrentBlock().NumberU64() + 1, 1, 0},     // Out of bounds requests should return empty
+		{pm.blockchain.CurrentBlock().NumberU64(), 1, 1},         // Make sure the head hash can be retrieved
+		{pm.blockchain.CurrentBlock().NumberU64() - 4, 5, 5},     // All hashes, including the head hash requested
+		{pm.blockchain.CurrentBlock().NumberU64() - 4, 10, 5},    // More hashes requested than available till the head
+		{pm.blockchain.CurrentBlock().NumberU64() - 100, 10, 10}, // All hashes available from the middle of the chain
 		{0, 10, 10},           // All hashes available from the root of the chain
 		{0, limit, limit},     // Request the maximum allowed hash count
 		{0, limit + 1, limit}, // Request more than the maximum allowed hash count
@@ -91,7 +91,7 @@ func testGetBlockHashesFromNumber(t *testing.T, protocol int) {
 		// Assemble the hash response we would like to receive
 		resp := make([]common.Hash, tt.result)
 		for j := 0; j < len(resp); j++ {
-			resp[j] = pm.chainman.GetBlockByNumber(tt.origin + uint64(j)).Hash()
+			resp[j] = pm.blockchain.GetBlockByNumber(tt.origin + uint64(j)).Hash()
 		}
 		// Send the hash request and verify the response
 		p2p.Send(peer.app, 0x08, getBlockHashesFromNumberData{tt.origin, uint64(tt.number)})
@@ -117,22 +117,22 @@ func testGetBlocks(t *testing.T, protocol int) {
 		available []bool        // Availability of explicitly requested blocks
 		expected  int           // Total number of existing blocks to expect
 	}{
-		{1, nil, nil, 1},                                                       // A single random block should be retrievable
-		{10, nil, nil, 10},                                                     // Multiple random blocks should be retrievable
-		{limit, nil, nil, limit},                                               // The maximum possible blocks should be retrievable
-		{limit + 1, nil, nil, limit},                                           // No more that the possible block count should be returned
-		{0, []common.Hash{pm.chainman.Genesis().Hash()}, []bool{true}, 1},      // The genesis block should be retrievable
-		{0, []common.Hash{pm.chainman.CurrentBlock().Hash()}, []bool{true}, 1}, // The chains head block should be retrievable
-		{0, []common.Hash{common.Hash{}}, []bool{false}, 0},                    // A non existent block should not be returned
+		{1, nil, nil, 1},                                                         // A single random block should be retrievable
+		{10, nil, nil, 10},                                                       // Multiple random blocks should be retrievable
+		{limit, nil, nil, limit},                                                 // The maximum possible blocks should be retrievable
+		{limit + 1, nil, nil, limit},                                             // No more than the possible block count should be returned
+		{0, []common.Hash{pm.blockchain.Genesis().Hash()}, []bool{true}, 1},      // The genesis block should be retrievable
+		{0, []common.Hash{pm.blockchain.CurrentBlock().Hash()}, []bool{true}, 1}, // The chains head block should be retrievable
+		{0, []common.Hash{common.Hash{}}, []bool{false}, 0},                      // A non existent block should not be returned
 
 		// Existing and non-existing blocks interleaved should not cause problems
 		{0, []common.Hash{
 			common.Hash{},
-			pm.chainman.GetBlockByNumber(1).Hash(),
+			pm.blockchain.GetBlockByNumber(1).Hash(),
 			common.Hash{},
-			pm.chainman.GetBlockByNumber(10).Hash(),
+			pm.blockchain.GetBlockByNumber(10).Hash(),
 			common.Hash{},
-			pm.chainman.GetBlockByNumber(100).Hash(),
+			pm.blockchain.GetBlockByNumber(100).Hash(),
 			common.Hash{},
 		}, []bool{false, true, false, true, false, true, false}, 3},
 	}
@@ -144,11 +144,11 @@ func testGetBlocks(t *testing.T, protocol int) {
 
 		for j := 0; j < tt.random; j++ {
 			for {
-				num := rand.Int63n(int64(pm.chainman.CurrentBlock().NumberU64()))
+				num := rand.Int63n(int64(pm.blockchain.CurrentBlock().NumberU64()))
 				if !seen[num] {
 					seen[num] = true
 
-					block := pm.chainman.GetBlockByNumber(uint64(num))
+					block := pm.blockchain.GetBlockByNumber(uint64(num))
 					hashes = append(hashes, block.Hash())
 					if len(blocks) < tt.expected {
 						blocks = append(blocks, block)
@@ -160,7 +160,7 @@ func testGetBlocks(t *testing.T, protocol int) {
 		for j, hash := range tt.explicit {
 			hashes = append(hashes, hash)
 			if tt.available[j] && len(blocks) < tt.expected {
-				blocks = append(blocks, pm.chainman.GetBlock(hash))
+				blocks = append(blocks, pm.blockchain.GetBlock(hash))
 			}
 		}
 		// Send the hash request and verify the response
@@ -194,83 +194,83 @@ func testGetBlockHeaders(t *testing.T, protocol int) {
 	}{
 		// A single random block should be retrievable by hash and number too
 		{
-			&getBlockHeadersData{Origin: hashOrNumber{Hash: pm.chainman.GetBlockByNumber(limit / 2).Hash()}, Amount: 1},
-			[]common.Hash{pm.chainman.GetBlockByNumber(limit / 2).Hash()},
+			&getBlockHeadersData{Origin: hashOrNumber{Hash: pm.blockchain.GetBlockByNumber(limit / 2).Hash()}, Amount: 1},
+			[]common.Hash{pm.blockchain.GetBlockByNumber(limit / 2).Hash()},
 		}, {
 			&getBlockHeadersData{Origin: hashOrNumber{Number: limit / 2}, Amount: 1},
-			[]common.Hash{pm.chainman.GetBlockByNumber(limit / 2).Hash()},
+			[]common.Hash{pm.blockchain.GetBlockByNumber(limit / 2).Hash()},
 		},
 		// Multiple headers should be retrievable in both directions
 		{
 			&getBlockHeadersData{Origin: hashOrNumber{Number: limit / 2}, Amount: 3},
 			[]common.Hash{
-				pm.chainman.GetBlockByNumber(limit / 2).Hash(),
-				pm.chainman.GetBlockByNumber(limit/2 + 1).Hash(),
-				pm.chainman.GetBlockByNumber(limit/2 + 2).Hash(),
+				pm.blockchain.GetBlockByNumber(limit / 2).Hash(),
+				pm.blockchain.GetBlockByNumber(limit/2 + 1).Hash(),
+				pm.blockchain.GetBlockByNumber(limit/2 + 2).Hash(),
 			},
 		}, {
 			&getBlockHeadersData{Origin: hashOrNumber{Number: limit / 2}, Amount: 3, Reverse: true},
 			[]common.Hash{
-				pm.chainman.GetBlockByNumber(limit / 2).Hash(),
-				pm.chainman.GetBlockByNumber(limit/2 - 1).Hash(),
-				pm.chainman.GetBlockByNumber(limit/2 - 2).Hash(),
+				pm.blockchain.GetBlockByNumber(limit / 2).Hash(),
+				pm.blockchain.GetBlockByNumber(limit/2 - 1).Hash(),
+				pm.blockchain.GetBlockByNumber(limit/2 - 2).Hash(),
 			},
 		},
 		// Multiple headers with skip lists should be retrievable
 		{
 			&getBlockHeadersData{Origin: hashOrNumber{Number: limit / 2}, Skip: 3, Amount: 3},
 			[]common.Hash{
-				pm.chainman.GetBlockByNumber(limit / 2).Hash(),
-				pm.chainman.GetBlockByNumber(limit/2 + 4).Hash(),
-				pm.chainman.GetBlockByNumber(limit/2 + 8).Hash(),
+				pm.blockchain.GetBlockByNumber(limit / 2).Hash(),
+				pm.blockchain.GetBlockByNumber(limit/2 + 4).Hash(),
+				pm.blockchain.GetBlockByNumber(limit/2 + 8).Hash(),
 			},
 		}, {
 			&getBlockHeadersData{Origin: hashOrNumber{Number: limit / 2}, Skip: 3, Amount: 3, Reverse: true},
 			[]common.Hash{
-				pm.chainman.GetBlockByNumber(limit / 2).Hash(),
-				pm.chainman.GetBlockByNumber(limit/2 - 4).Hash(),
-				pm.chainman.GetBlockByNumber(limit/2 - 8).Hash(),
+				pm.blockchain.GetBlockByNumber(limit / 2).Hash(),
+				pm.blockchain.GetBlockByNumber(limit/2 - 4).Hash(),
+				pm.blockchain.GetBlockByNumber(limit/2 - 8).Hash(),
 			},
 		},
 		// The chain endpoints should be retrievable
 		{
 			&getBlockHeadersData{Origin: hashOrNumber{Number: 0}, Amount: 1},
-			[]common.Hash{pm.chainman.GetBlockByNumber(0).Hash()},
+			[]common.Hash{pm.blockchain.GetBlockByNumber(0).Hash()},
 		}, {
-			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.chainman.CurrentBlock().NumberU64()}, Amount: 1},
-			[]common.Hash{pm.chainman.CurrentBlock().Hash()},
+			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.blockchain.CurrentBlock().NumberU64()}, Amount: 1},
+			[]common.Hash{pm.blockchain.CurrentBlock().Hash()},
 		},
 		// Ensure protocol limits are honored
 		{
-			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.chainman.CurrentBlock().NumberU64() - 1}, Amount: limit + 10, Reverse: true},
-			pm.chainman.GetBlockHashesFromHash(pm.chainman.CurrentBlock().Hash(), limit),
+			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.blockchain.CurrentBlock().NumberU64() - 1}, Amount: limit + 10, Reverse: true},
+			pm.blockchain.GetBlockHashesFromHash(pm.blockchain.CurrentBlock().Hash(), limit),
 		},
 		// Check that requesting more than available is handled gracefully
 		{
-			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.chainman.CurrentBlock().NumberU64() - 4}, Skip: 3, Amount: 3},
+			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.blockchain.CurrentBlock().NumberU64() - 4}, Skip: 3, Amount: 3},
 			[]common.Hash{
-				pm.chainman.GetBlockByNumber(pm.chainman.CurrentBlock().NumberU64() - 4).Hash(),
-				pm.chainman.GetBlockByNumber(pm.chainman.CurrentBlock().NumberU64()).Hash(),
+				pm.blockchain.GetBlockByNumber(pm.blockchain.CurrentBlock().NumberU64() - 4).Hash(),
+				pm.blockchain.GetBlockByNumber(pm.blockchain.CurrentBlock().NumberU64()).Hash(),
 			},
 		}, {
 			&getBlockHeadersData{Origin: hashOrNumber{Number: 4}, Skip: 3, Amount: 3, Reverse: true},
 			[]common.Hash{
-				pm.chainman.GetBlockByNumber(4).Hash(),
-				pm.chainman.GetBlockByNumber(0).Hash(),
+				pm.blockchain.GetBlockByNumber(4).Hash(),
+				pm.blockchain.GetBlockByNumber(0).Hash(),
 			},
 		},
 		// Check that requesting more than available is handled gracefully, even if mid skip
 		{
-			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.chainman.CurrentBlock().NumberU64() - 4}, Skip: 2, Amount: 3},
+			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.blockchain.CurrentBlock().NumberU64() - 4}, Skip: 2, Amount: 3},
 			[]common.Hash{
-				pm.chainman.GetBlockByNumber(pm.chainman.CurrentBlock().NumberU64() - 4).Hash(),
-				pm.chainman.GetBlockByNumber(pm.chainman.CurrentBlock().NumberU64() - 1).Hash(),
+				pm.blockchain.GetBlockByNumber(pm.blockchain.CurrentBlock().NumberU64() - 4).Hash(),
+				pm.blockchain.GetBlockByNumber(pm.blockchain.CurrentBlock().NumberU64() - 1).Hash(),
 			},
 		}, {
 			&getBlockHeadersData{Origin: hashOrNumber{Number: 4}, Skip: 2, Amount: 3, Reverse: true},
 			[]common.Hash{
-				pm.chainman.GetBlockByNumber(4).Hash(),
-				pm.chainman.GetBlockByNumber(1).Hash(),
+				pm.blockchain.GetBlockByNumber(4).Hash(),
+				pm.blockchain.GetBlockByNumber(1).Hash(),
 			},
 		},
 		// Check that non existing headers aren't returned
@@ -278,7 +278,7 @@ func testGetBlockHeaders(t *testing.T, protocol int) {
 			&getBlockHeadersData{Origin: hashOrNumber{Hash: unknown}, Amount: 1},
 			[]common.Hash{},
 		}, {
-			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.chainman.CurrentBlock().NumberU64() + 1}, Amount: 1},
+			&getBlockHeadersData{Origin: hashOrNumber{Number: pm.blockchain.CurrentBlock().NumberU64() + 1}, Amount: 1},
 			[]common.Hash{},
 		},
 	}
@@ -287,7 +287,7 @@ func testGetBlockHeaders(t *testing.T, protocol int) {
 		// Collect the headers to expect in the response
 		headers := []*types.Header{}
 		for _, hash := range tt.expect {
-			headers = append(headers, pm.chainman.GetBlock(hash).Header())
+			headers = append(headers, pm.blockchain.GetBlock(hash).Header())
 		}
 		// Send the hash request and verify the response
 		p2p.Send(peer.app, 0x03, tt.query)
@@ -315,22 +315,22 @@ func testGetBlockBodies(t *testing.T, protocol int) {
 		available []bool        // Availability of explicitly requested blocks
 		expected  int           // Total number of existing blocks to expect
 	}{
-		{1, nil, nil, 1},                                                       // A single random block should be retrievable
-		{10, nil, nil, 10},                                                     // Multiple random blocks should be retrievable
-		{limit, nil, nil, limit},                                               // The maximum possible blocks should be retrievable
-		{limit + 1, nil, nil, limit},                                           // No more that the possible block count should be returned
-		{0, []common.Hash{pm.chainman.Genesis().Hash()}, []bool{true}, 1},      // The genesis block should be retrievable
-		{0, []common.Hash{pm.chainman.CurrentBlock().Hash()}, []bool{true}, 1}, // The chains head block should be retrievable
-		{0, []common.Hash{common.Hash{}}, []bool{false}, 0},                    // A non existent block should not be returned
+		{1, nil, nil, 1},                                                         // A single random block should be retrievable
+		{10, nil, nil, 10},                                                       // Multiple random blocks should be retrievable
+		{limit, nil, nil, limit},                                                 // The maximum possible blocks should be retrievable
+		{limit + 1, nil, nil, limit},                                             // No more than the possible block count should be returned
+		{0, []common.Hash{pm.blockchain.Genesis().Hash()}, []bool{true}, 1},      // The genesis block should be retrievable
+		{0, []common.Hash{pm.blockchain.CurrentBlock().Hash()}, []bool{true}, 1}, // The chains head block should be retrievable
+		{0, []common.Hash{common.Hash{}}, []bool{false}, 0},                      // A non existent block should not be returned
 
 		// Existing and non-existing blocks interleaved should not cause problems
 		{0, []common.Hash{
 			common.Hash{},
-			pm.chainman.GetBlockByNumber(1).Hash(),
+			pm.blockchain.GetBlockByNumber(1).Hash(),
 			common.Hash{},
-			pm.chainman.GetBlockByNumber(10).Hash(),
+			pm.blockchain.GetBlockByNumber(10).Hash(),
 			common.Hash{},
-			pm.chainman.GetBlockByNumber(100).Hash(),
+			pm.blockchain.GetBlockByNumber(100).Hash(),
 			common.Hash{},
 		}, []bool{false, true, false, true, false, true, false}, 3},
 	}
@@ -342,11 +342,11 @@ func testGetBlockBodies(t *testing.T, protocol int) {
 
 		for j := 0; j < tt.random; j++ {
 			for {
-				num := rand.Int63n(int64(pm.chainman.CurrentBlock().NumberU64()))
+				num := rand.Int63n(int64(pm.blockchain.CurrentBlock().NumberU64()))
 				if !seen[num] {
 					seen[num] = true
 
-					block := pm.chainman.GetBlockByNumber(uint64(num))
+					block := pm.blockchain.GetBlockByNumber(uint64(num))
 					hashes = append(hashes, block.Hash())
 					if len(bodies) < tt.expected {
 						bodies = append(bodies, &blockBody{Transactions: block.Transactions(), Uncles: block.Uncles()})
@@ -358,7 +358,7 @@ func testGetBlockBodies(t *testing.T, protocol int) {
 		for j, hash := range tt.explicit {
 			hashes = append(hashes, hash)
 			if tt.available[j] && len(bodies) < tt.expected {
-				block := pm.chainman.GetBlock(hash)
+				block := pm.blockchain.GetBlock(hash)
 				bodies = append(bodies, &blockBody{Transactions: block.Transactions(), Uncles: block.Uncles()})
 			}
 		}
@@ -442,11 +442,11 @@ func testGetNodeData(t *testing.T, protocol int) {
 		statedb.Put(hashes[i].Bytes(), data[i])
 	}
 	accounts := []common.Address{testBankAddress, acc1Addr, acc2Addr}
-	for i := uint64(0); i <= pm.chainman.CurrentBlock().NumberU64(); i++ {
-		trie := state.New(pm.chainman.GetBlockByNumber(i).Root(), statedb)
+	for i := uint64(0); i <= pm.blockchain.CurrentBlock().NumberU64(); i++ {
+		trie := state.New(pm.blockchain.GetBlockByNumber(i).Root(), statedb)
 
 		for j, acc := range accounts {
-			bw := pm.chainman.State().GetBalance(acc)
+			bw := pm.blockchain.State().GetBalance(acc)
 			bh := trie.GetBalance(acc)
 
 			if (bw != nil && bh == nil) || (bw == nil && bh != nil) {
@@ -505,8 +505,8 @@ func testGetReceipt(t *testing.T, protocol int) {
 
 	// Collect the hashes to request, and the response to expect
 	hashes := []common.Hash{}
-	for i := uint64(0); i <= pm.chainman.CurrentBlock().NumberU64(); i++ {
-		for _, tx := range pm.chainman.GetBlockByNumber(i).Transactions() {
+	for i := uint64(0); i <= pm.blockchain.CurrentBlock().NumberU64(); i++ {
+		for _, tx := range pm.blockchain.GetBlockByNumber(i).Transactions() {
 			hashes = append(hashes, tx.Hash())
 		}
 	}
diff --git a/eth/helper_test.go b/eth/helper_test.go
index 034751f7f9..e42fa1f82b 100644
--- a/eth/helper_test.go
+++ b/eth/helper_test.go
@@ -30,18 +30,18 @@ var (
 // channels for different events.
 func newTestProtocolManager(blocks int, generator func(int, *core.BlockGen), newtx chan<- []*types.Transaction) *ProtocolManager {
 	var (
-		evmux       = new(event.TypeMux)
-		pow         = new(core.FakePow)
-		db, _       = ethdb.NewMemDatabase()
-		genesis     = core.WriteGenesisBlockForTesting(db, core.GenesisAccount{testBankAddress, testBankFunds})
-		chainman, _ = core.NewChainManager(db, pow, evmux)
-		blockproc   = core.NewBlockProcessor(db, pow, chainman, evmux)
+		evmux         = new(event.TypeMux)
+		pow           = new(core.FakePow)
+		db, _         = ethdb.NewMemDatabase()
+		genesis       = core.WriteGenesisBlockForTesting(db, core.GenesisAccount{testBankAddress, testBankFunds})
+		blockchain, _ = core.NewBlockChain(db, pow, evmux)
+		blockproc     = core.NewBlockProcessor(db, pow, blockchain, evmux)
 	)
-	chainman.SetProcessor(blockproc)
-	if _, err := chainman.InsertChain(core.GenerateChain(genesis, db, blocks, generator)); err != nil {
+	blockchain.SetProcessor(blockproc)
+	if _, err := blockchain.InsertChain(core.GenerateChain(genesis, db, blocks, generator)); err != nil {
 		panic(err)
 	}
-	pm := NewProtocolManager(NetworkId, evmux, &testTxPool{added: newtx}, pow, chainman, db)
+	pm := NewProtocolManager(NetworkId, evmux, &testTxPool{added: newtx}, pow, blockchain, db)
 	pm.Start()
 	return pm
 }
@@ -116,7 +116,7 @@ func newTestPeer(name string, version int, pm *ProtocolManager, shake bool) (*te
 	}
 	// Execute any implicitly requested handshakes and return
 	if shake {
-		td, head, genesis := pm.chainman.Status()
+		td, head, genesis := pm.blockchain.Status()
 		tp.handshake(nil, td, head, genesis)
 	}
 	return tp, errc
diff --git a/eth/protocol_test.go b/eth/protocol_test.go
index bc3b5acfc3..523e6c1eb8 100644
--- a/eth/protocol_test.go
+++ b/eth/protocol_test.go
@@ -45,7 +45,7 @@ func TestStatusMsgErrors64(t *testing.T) { testStatusMsgErrors(t, 64) }
 
 func testStatusMsgErrors(t *testing.T, protocol int) {
 	pm := newTestProtocolManager(0, nil, nil)
-	td, currentBlock, genesis := pm.chainman.Status()
+	td, currentBlock, genesis := pm.blockchain.Status()
 	defer pm.Stop()
 
 	tests := []struct {
diff --git a/eth/sync.go b/eth/sync.go
index b4dea4b0ff..5a2031c68f 100644
--- a/eth/sync.go
+++ b/eth/sync.go
@@ -160,7 +160,7 @@ func (pm *ProtocolManager) synchronise(peer *peer) {
 		return
 	}
 	// Make sure the peer's TD is higher than our own. If not drop.
-	if peer.Td().Cmp(pm.chainman.Td()) <= 0 {
+	if peer.Td().Cmp(pm.blockchain.Td()) <= 0 {
 		return
 	}
 	// Otherwise try to sync with the downloader
diff --git a/miner/worker.go b/miner/worker.go
index 470f1f6763..8be2db93e4 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -100,7 +100,7 @@ type worker struct {
 	pow    pow.PoW
 
 	eth     core.Backend
-	chain   *core.ChainManager
+	chain   *core.BlockChain
 	proc    *core.BlockProcessor
 	chainDb ethdb.Database
 
@@ -131,7 +131,7 @@ func newWorker(coinbase common.Address, eth core.Backend) *worker {
 		chainDb:        eth.ChainDb(),
 		recv:           make(chan *Result, resultQueueSize),
 		gasPrice:       new(big.Int),
-		chain:          eth.ChainManager(),
+		chain:          eth.BlockChain(),
 		proc:           eth.BlockProcessor(),
 		possibleUncles: make(map[common.Hash]*types.Block),
 		coinbase:       coinbase,
diff --git a/rpc/api/admin.go b/rpc/api/admin.go
index 8af69b189d..6aa04e6675 100644
--- a/rpc/api/admin.go
+++ b/rpc/api/admin.go
@@ -151,7 +151,7 @@ func (self *adminApi) DataDir(req *shared.Request) (interface{}, error) {
 	return self.ethereum.DataDir, nil
 }
 
-func hasAllBlocks(chain *core.ChainManager, bs []*types.Block) bool {
+func hasAllBlocks(chain *core.BlockChain, bs []*types.Block) bool {
 	for _, b := range bs {
 		if !chain.HasBlock(b.Hash()) {
 			return false
@@ -193,10 +193,10 @@ func (self *adminApi) ImportChain(req *shared.Request) (interface{}, error) {
 			break
 		}
 		// Import the batch.
-		if hasAllBlocks(self.ethereum.ChainManager(), blocks[:i]) {
+		if hasAllBlocks(self.ethereum.BlockChain(), blocks[:i]) {
 			continue
 		}
-		if _, err := self.ethereum.ChainManager().InsertChain(blocks[:i]); err != nil {
+		if _, err := self.ethereum.BlockChain().InsertChain(blocks[:i]); err != nil {
 			return false, fmt.Errorf("invalid block %d: %v", n, err)
 		}
 	}
@@ -214,7 +214,7 @@ func (self *adminApi) ExportChain(req *shared.Request) (interface{}, error) {
 		return false, err
 	}
 	defer fh.Close()
-	if err := self.ethereum.ChainManager().Export(fh); err != nil {
+	if err := self.ethereum.BlockChain().Export(fh); err != nil {
 		return false, err
 	}
 
diff --git a/rpc/api/debug.go b/rpc/api/debug.go
index d325b17209..e193f7ad2d 100644
--- a/rpc/api/debug.go
+++ b/rpc/api/debug.go
@@ -152,7 +152,7 @@ func (self *debugApi) SetHead(req *shared.Request) (interface{}, error) {
 		return nil, fmt.Errorf("block #%d not found", args.BlockNumber)
 	}
 
-	self.ethereum.ChainManager().SetHead(block)
+	self.ethereum.BlockChain().SetHead(block)
 
 	return nil, nil
 }
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index 4cd5f26950..6db006a466 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -168,7 +168,7 @@ func (self *ethApi) IsMining(req *shared.Request) (interface{}, error) {
 }
 
 func (self *ethApi) IsSyncing(req *shared.Request) (interface{}, error) {
-	current := self.ethereum.ChainManager().CurrentBlock().NumberU64()
+	current := self.ethereum.BlockChain().CurrentBlock().NumberU64()
 	origin, height := self.ethereum.Downloader().Boundaries()
 
 	if current < height {
diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index 33577cf550..fb9ca16e68 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -181,7 +181,7 @@ func runBlockTest(test *BlockTest) error {
 		return fmt.Errorf("InsertPreState: %v", err)
 	}
 
-	cm := ethereum.ChainManager()
+	cm := ethereum.BlockChain()
 	validBlocks, err := test.TryBlocksInsert(cm)
 	if err != nil {
 		return err
@@ -276,7 +276,7 @@ func (t *BlockTest) InsertPreState(ethereum *eth.Ethereum) (*state.StateDB, erro
    expected we are expected to ignore it and continue processing and then validate the
    post state.
 */
-func (t *BlockTest) TryBlocksInsert(chainManager *core.ChainManager) ([]btBlock, error) {
+func (t *BlockTest) TryBlocksInsert(blockchain *core.BlockChain) ([]btBlock, error) {
 	validBlocks := make([]btBlock, 0)
 	// insert the test blocks, which will execute all transactions
 	for _, b := range t.Json.Blocks {
@@ -289,7 +289,7 @@ func (t *BlockTest) TryBlocksInsert(chainManager *core.ChainManager) ([]btBlock,
 			}
 		}
 		// RLP decoding worked, try to insert into chain:
-		_, err = chainManager.InsertChain(types.Blocks{cb})
+		_, err = blockchain.InsertChain(types.Blocks{cb})
 		if err != nil {
 			if b.BlockHeader == nil {
 				continue // OK - block is supposed to be invalid, continue with next block
@@ -426,7 +426,7 @@ func (t *BlockTest) ValidatePostState(statedb *state.StateDB) error {
 	return nil
 }
 
-func (test *BlockTest) ValidateImportedHeaders(cm *core.ChainManager, validBlocks []btBlock) error {
+func (test *BlockTest) ValidateImportedHeaders(cm *core.BlockChain, validBlocks []btBlock) error {
 	// to get constant lookup when verifying block headers by hash (some tests have many blocks)
 	bmap := make(map[string]btBlock, len(test.Json.Blocks))
 	for _, b := range validBlocks {
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 9d366d2150..da712a9848 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -126,7 +126,7 @@ func New(ethereum *eth.Ethereum, frontend Frontend) *XEth {
 	if frontend == nil {
 		xeth.frontend = dummyFrontend{}
 	}
-	xeth.state = NewState(xeth, xeth.backend.ChainManager().State())
+	xeth.state = NewState(xeth, xeth.backend.BlockChain().State())
 
 	go xeth.start()
 
@@ -214,7 +214,7 @@ func (self *XEth) AtStateNum(num int64) *XEth {
 		if block := self.getBlockByHeight(num); block != nil {
 			st = state.New(block.Root(), self.backend.ChainDb())
 		} else {
-			st = state.New(self.backend.ChainManager().GetBlockByNumber(0).Root(), self.backend.ChainDb())
+			st = state.New(self.backend.BlockChain().GetBlockByNumber(0).Root(), self.backend.ChainDb())
 		}
 	}
 
@@ -290,19 +290,19 @@ func (self *XEth) getBlockByHeight(height int64) *types.Block {
 		num = uint64(height)
 	}
 
-	return self.backend.ChainManager().GetBlockByNumber(num)
+	return self.backend.BlockChain().GetBlockByNumber(num)
 }
 
 func (self *XEth) BlockByHash(strHash string) *Block {
 	hash := common.HexToHash(strHash)
-	block := self.backend.ChainManager().GetBlock(hash)
+	block := self.backend.BlockChain().GetBlock(hash)
 
 	return NewBlock(block)
 }
 
 func (self *XEth) EthBlockByHash(strHash string) *types.Block {
 	hash := common.HexToHash(strHash)
-	block := self.backend.ChainManager().GetBlock(hash)
+	block := self.backend.BlockChain().GetBlock(hash)
 
 	return block
 }
@@ -356,11 +356,11 @@ func (self *XEth) EthBlockByNumber(num int64) *types.Block {
 }
 
 func (self *XEth) Td(hash common.Hash) *big.Int {
-	return self.backend.ChainManager().GetTd(hash)
+	return self.backend.BlockChain().GetTd(hash)
 }
 
 func (self *XEth) CurrentBlock() *types.Block {
-	return self.backend.ChainManager().CurrentBlock()
+	return self.backend.BlockChain().CurrentBlock()
 }
 
 func (self *XEth) GetBlockReceipts(bhash common.Hash) types.Receipts {
@@ -372,7 +372,7 @@ func (self *XEth) GetTxReceipt(txhash common.Hash) *types.Receipt {
 }
 
 func (self *XEth) GasLimit() *big.Int {
-	return self.backend.ChainManager().GasLimit()
+	return self.backend.BlockChain().GasLimit()
 }
 
 func (self *XEth) Block(v interface{}) *Block {
@@ -855,7 +855,7 @@ func (self *XEth) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, dataStr st
 	}
 
 	header := self.CurrentBlock().Header()
-	vmenv := core.NewEnv(statedb, self.backend.ChainManager(), msg, header)
+	vmenv := core.NewEnv(statedb, self.backend.BlockChain(), msg, header)
 
 	res, gas, err := core.ApplyMessage(vmenv, msg, from)
 	return common.ToHex(res), gas.String(), err