diff --git a/.gitignore b/.gitignore
index 3226ea5a2..47546d0ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@
 
 # Build artifacts
 out/
+
+.vscode
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1fdabd12..5ce186600 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,6 @@
 stages:
+  - test
+  - js-build
   - build
 variables:
   GIT_DEPTH: "3"
@@ -6,17 +8,18 @@ variables:
   RUST_BACKTRACE: "1"
   RUSTFLAGS: ""
   CARGOFLAGS: ""
+  NIGHTLY: "nigtly"
 cache:
-  key: "$CI_BUILD_NAME/$CI_BUILD_REF_NAME"
+  key: "$CI_BUILD_STAGE/$CI_BUILD_REF_NAME"
   untracked: true
 linux-stable:
   stage: build
   image: ethcore/rust:stable
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - cargo build --release $CARGOFLAGS
     - strip target/release/parity
@@ -43,10 +46,10 @@ linux-stable-14.04:
   stage: build
   image: ethcore/rust-14.04:latest
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - cargo build --release $CARGOFLAGS
     - strip target/release/parity
@@ -73,10 +76,10 @@ linux-beta:
   stage: build
   image: ethcore/rust:beta
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - cargo build --release $CARGOFLAGS
     - strip target/release/parity
@@ -92,10 +95,10 @@ linux-nightly:
   stage: build
   image: ethcore/rust:nightly
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - cargo build --release $CARGOFLAGS
     - strip target/release/parity
@@ -111,10 +114,10 @@ linux-centos:
   stage: build
   image: ethcore/rust-centos:latest
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - export CXX="g++"
     - export CC="gcc"
@@ -132,14 +135,47 @@ linux-centos:
     paths:
     - target/release/parity
     name: "x86_64-unknown-centos-gnu_parity"
+linux-i686:   
+  stage: build   
+  image: ethcore/rust-i686:latest   
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - export HOST_CC=gcc
+    - export HOST_CXX=g++
+    - cargo build --target i686-unknown-linux-gnu --release $CARGOFLAGS
+    - strip target/i686-unknown-linux-gnu/release/parity
+    - md5sum target/i686-unknown-linux-gnu/release/parity >> parity.md5
+    - sh scripts/deb-build.sh i386
+    - cp target/i686-unknown-linux-gnu/release/parity deb/usr/bin/parity
+    - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
+    - dpkg-deb -b deb "parity_"$VER"_i386.deb"
+    - md5sum "parity_"$VER"_i386.deb" >> "parity_"$VER"_i386.deb.md5"
+    - aws configure set aws_access_key_id $s3_key
+    - aws configure set aws_secret_access_key $s3_secret
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity --body target/i686-unknown-linux-gnu/release/parity
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/parity.md5 --body parity.md5
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/"parity_"$VER"_i386.deb" --body "parity_"$VER"_i386.deb"
+    - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/i686-unknown-linux-gnu/"parity_"$VER"_i386.deb.md5" --body "parity_"$VER"_i386.deb.md5"
+  tags:
+    - rust
+    - rust-i686
+  artifacts:
+    paths:
+      - target/i686-unknown-linux-gnu/release/parity
+    name: "i686-unknown-linux-gnu"
+  allow_failure: true
 linux-armv7:
   stage: build
   image: ethcore/rust-armv7:latest
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - export CC=arm-linux-gnueabihf-gcc
     - export CXX=arm-linux-gnueabihf-g++
@@ -176,10 +212,10 @@ linux-arm:
   stage: build
   image: ethcore/rust-arm:latest
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - export CC=arm-linux-gnueabihf-gcc
     - export CXX=arm-linux-gnueabihf-g++
@@ -219,6 +255,7 @@ linux-armv6:
     - beta
     - tags
     - stable
+    - triggers
   script:
     - export CC=arm-linux-gnueabi-gcc
     - export CXX=arm-linux-gnueabi-g++
@@ -248,10 +285,10 @@ linux-aarch64:
   stage: build
   image: ethcore/rust-aarch64:latest
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - export CC=aarch64-linux-gnu-gcc
     - export CXX=aarch64-linux-gnu-g++
@@ -287,10 +324,10 @@ linux-aarch64:
 darwin:
   stage: build
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - cargo build --release $CARGOFLAGS
     - rm -rf parity.md5
@@ -306,12 +343,15 @@ darwin:
     - target/release/parity
     name: "x86_64-apple-darwin_parity"
 windows:
+  cache:
+    key: "%CI_BUILD_STAGE%/%CI_BUILD_REF_NAME%"
+    untracked: true
   stage: build
   only:
-    - master
     - beta
     - tags
     - stable
+    - triggers
   script:
     - set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt
     - set LIB=C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64
@@ -322,6 +362,8 @@ windows:
     - curl -sL --url "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll
     - curl -sL --url "https://github.com/ethcore/win-build/raw/master/vc_redist.x64.exe" -o nsis\vc_redist.x64.exe
     - signtool sign /f %keyfile% /p %certpass% target\release\parity.exe
+    - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
+    - signtool sign /f %keyfile% /p %certpass% windows\ptray\x64\release\ptray.exe
     - cd nsis
     - makensis.exe installer.nsi
     - copy installer.exe InstallParity.exe
@@ -353,39 +395,100 @@ windows:
     - target/release/parity.pdb
     - nsis/InstallParity.exe
     name: "x86_64-pc-windows-msvc_parity"
-#test-darwin:
-#  stage: build
-#  before_script:
-#    - git submodule update --init --recursive
-#  script:
-#    - export RUST_BACKTRACE=1
-#    - ./test.sh $CARGOFLAGS --no-release
-#  tags:
-#    - osx
-#test-windows:
-#  stage: build
-#  before_script:
-#    - git submodule update --init --recursive
-#  script:
-#    - set RUST_BACKTRACE=1
-#    - cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
-#  tags:
-#    - rust-windows
-#  allow_failure: true
-test-linux:
-  stage: build
+test-darwin:
+  stage: test
+  only:
+    - triggers
   before_script:
     - git submodule update --init --recursive
   script:
     - export RUST_BACKTRACE=1
     - ./test.sh $CARGOFLAGS --no-release
   tags:
-    - rust-test
+    - osx
+  allow_failure: true
+test-windows:
+  stage: test
+  only:
+    - triggers
+  before_script:
+    - git submodule update --init --recursive
+  script:
+    - set RUST_BACKTRACE=1
+    - cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
+  tags:
+    - rust-windows
+  allow_failure: true
+test-rust-stable:
+  stage: test
+  image: ethcore/rust:stable
+  before_script:
+    - git submodule update --init --recursive
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only CI_BUILD_REF CI_BUILD_REF@{1} | grep \.js | wc -l)
+    - echo $JS_FILES_MODIFIED
+    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
+  script:
+    - export RUST_BACKTRACE=1
+    - echo $JS_FILES_MODIFIED
+    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; else ./test.sh $CARGOFLAGS --no-release; fi
+  tags:
+    - rust
+    - rust-stable
+test-rust-beta:
+  stage: test
+  only:
+    - triggers
+  image: ethcore/rust:beta
+  before_script:
+    - git submodule update --init --recursive
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only CI_BUILD_REF CI_BUILD_REF@{1} | grep \.js | wc -l)
+    - echo $JS_FILES_MODIFIED
+    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
+  script:
+    - export RUST_BACKTRACE=1
+    - echo $JS_FILES_MODIFIED
+    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; else ./test.sh $CARGOFLAGS --no-release; fi
+  tags:
+    - rust
+    - rust-beta
+  allow_failure: true
+test-rust-nightly:
+  stage: test
+  only:
+    - triggers
+  image: ethcore/rust:nightly
+  before_script:
+    - git submodule update --init --recursive
+    - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only CI_BUILD_REF CI_BUILD_REF@{1} | grep \.js | wc -l)
+    - echo $JS_FILES_MODIFIED
+    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; fi
+  script:
+    - export RUST_BACKTRACE=1
+    - echo $JS_FILES_MODIFIED
+    - if [ -z $JS_FILES_MODIFIED ]; then echo "skip js test"; else ./test.sh $CARGOFLAGS --no-release; fi
+  tags:
+    - rust
+    - rust-nightly
+  allow_failure: true
+js-tests:
+  stage: test
+  image: ethcore/rust:stable
+  before_script:
+    - ./js/scripts/install-deps.sh
+  script:
+    - ./js/scripts/lint.sh
+    - ./js/scripts/test.sh
+    - ./js/scripts/build.sh
+  tags:
+    - javascript-test
 js-release:
-  stage: build
-  image: ethcore/javascript:latest
+  stage: js-build
   only:
     - master
+    - beta
+    - stable
+    - tags
+  image: ethcore/rust:stable
   before_script:
     - ./js/scripts/install-deps.sh
   script:
@@ -393,30 +496,3 @@ js-release:
     - ./js/scripts/release.sh
   tags:
     - javascript
-js-lint:
-  stage: build
-  image: ethcore/javascript:latest
-  before_script:
-    - ./js/scripts/install-deps.sh
-  script:
-    - ./js/scripts/lint.sh
-  tags:
-    - javascript-test
-js-test:
-  stage: build
-  image: ethcore/javascript:latest
-  before_script:
-    - ./js/scripts/install-deps.sh
-  script:
-    - ./js/scripts/test.sh
-  tags:
-    - javascript-test
-js-pack:
-  stage: build
-  image: ethcore/javascript:latest
-  before_script:
-    - ./js/scripts/install-deps.sh
-  script:
-    - ./js/scripts/build.sh
-  tags:
-    - javascript-test
diff --git a/Cargo.lock b/Cargo.lock
index b5e47dde2..b69b439c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 [root]
 name = "parity"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -8,21 +8,21 @@ dependencies = [
  "daemonize 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.4.0",
- "ethcore-dapps 1.4.0",
+ "ethcore 1.5.0",
+ "ethcore-dapps 1.5.0",
  "ethcore-devtools 1.4.0",
- "ethcore-io 1.4.0",
+ "ethcore-io 1.5.0",
  "ethcore-ipc 1.4.0",
  "ethcore-ipc-codegen 1.4.0",
  "ethcore-ipc-hypervisor 1.2.0",
  "ethcore-ipc-nano 1.4.0",
  "ethcore-ipc-tests 0.1.0",
- "ethcore-logger 1.4.0",
- "ethcore-rpc 1.4.0",
- "ethcore-signer 1.4.0",
+ "ethcore-logger 1.5.0",
+ "ethcore-rpc 1.5.0",
+ "ethcore-signer 1.5.0",
  "ethcore-stratum 1.4.0",
- "ethcore-util 1.4.0",
- "ethsync 1.4.0",
+ "ethcore-util 1.5.0",
+ "ethsync 1.5.0",
  "fdlimit 0.1.0",
  "hyper 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -185,7 +185,7 @@ version = "1.1.1"
 source = "git+https://github.com/ethcore/rust-ctrlc.git#f4927770f89eca80ec250911eea3adcbf579ac48"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -194,7 +194,7 @@ name = "daemonize"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -244,7 +244,7 @@ source = "git+https://github.com/ethcore/rust-secp256k1#a9a0b1be1f39560ca86e8fc8
 dependencies = [
  "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "gcc 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -274,7 +274,7 @@ dependencies = [
 
 [[package]]
 name = "ethcore"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bloomchain 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -285,11 +285,11 @@ dependencies = [
  "ethash 1.4.0",
  "ethcore-bloom-journal 0.1.0",
  "ethcore-devtools 1.4.0",
- "ethcore-io 1.4.0",
+ "ethcore-io 1.5.0",
  "ethcore-ipc 1.4.0",
  "ethcore-ipc-codegen 1.4.0",
  "ethcore-ipc-nano 1.4.0",
- "ethcore-util 1.4.0",
+ "ethcore-util 1.5.0",
  "ethjson 0.1.0",
  "ethkey 0.2.0",
  "ethstore 0.1.0",
@@ -312,7 +312,7 @@ dependencies = [
 
 [[package]]
 name = "ethcore-bigint"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -329,14 +329,14 @@ dependencies = [
 
 [[package]]
 name = "ethcore-dapps"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethabi 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.4.0",
- "ethcore-rpc 1.4.0",
- "ethcore-util 1.4.0",
+ "ethcore-rpc 1.5.0",
+ "ethcore-util 1.5.0",
  "fetch 0.1.0",
  "hyper 0.9.4 (git+https://github.com/ethcore/hyper)",
  "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -352,6 +352,7 @@ dependencies = [
  "serde 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_codegen 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "zip 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -366,11 +367,11 @@ dependencies = [
 
 [[package]]
 name = "ethcore-io"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.0 (git+https://github.com/carllerche/mio)",
+ "mio 0.6.1 (git+https://github.com/carllerche/mio)",
  "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -380,7 +381,7 @@ name = "ethcore-ipc"
 version = "1.4.0"
 dependencies = [
  "ethcore-devtools 1.4.0",
- "ethcore-util 1.4.0",
+ "ethcore-util 1.5.0",
  "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)",
  "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -427,7 +428,7 @@ dependencies = [
  "ethcore-ipc 1.4.0",
  "ethcore-ipc-codegen 1.4.0",
  "ethcore-ipc-nano 1.4.0",
- "ethcore-util 1.4.0",
+ "ethcore-util 1.5.0",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)",
  "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -435,10 +436,10 @@ dependencies = [
 
 [[package]]
 name = "ethcore-logger"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.4.0",
+ "ethcore-util 1.5.0",
  "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -448,19 +449,19 @@ dependencies = [
 
 [[package]]
 name = "ethcore-network"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.4.0",
- "ethcore-io 1.4.0",
- "ethcore-util 1.4.0",
+ "ethcore-io 1.5.0",
+ "ethcore-util 1.5.0",
  "ethcrypto 0.1.0",
  "ethkey 0.2.0",
  "igd 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.0 (git+https://github.com/carllerche/mio)",
+ "mio 0.6.1 (git+https://github.com/carllerche/mio)",
  "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.1.0",
@@ -473,20 +474,20 @@ dependencies = [
 
 [[package]]
 name = "ethcore-rpc"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethash 1.4.0",
- "ethcore 1.4.0",
+ "ethcore 1.5.0",
  "ethcore-devtools 1.4.0",
- "ethcore-io 1.4.0",
+ "ethcore-io 1.5.0",
  "ethcore-ipc 1.4.0",
- "ethcore-util 1.4.0",
+ "ethcore-util 1.5.0",
  "ethcrypto 0.1.0",
  "ethjson 0.1.0",
  "ethkey 0.2.0",
  "ethstore 0.1.0",
- "ethsync 1.4.0",
+ "ethsync 1.5.0",
  "fetch 0.1.0",
  "json-ipc-server 0.2.4 (git+https://github.com/ethcore/json-ipc-server.git)",
  "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -503,14 +504,14 @@ dependencies = [
 
 [[package]]
 name = "ethcore-signer"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.4.0",
- "ethcore-io 1.4.0",
- "ethcore-rpc 1.4.0",
- "ethcore-util 1.4.0",
+ "ethcore-io 1.5.0",
+ "ethcore-rpc 1.5.0",
+ "ethcore-util 1.5.0",
  "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -529,7 +530,7 @@ dependencies = [
  "ethcore-ipc 1.4.0",
  "ethcore-ipc-codegen 1.4.0",
  "ethcore-ipc-nano 1.4.0",
- "ethcore-util 1.4.0",
+ "ethcore-util 1.5.0",
  "json-tcp-server 0.1.0 (git+https://github.com/ethcore/json-tcp-server)",
  "jsonrpc-core 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -540,7 +541,7 @@ dependencies = [
 
 [[package]]
 name = "ethcore-util"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -548,13 +549,13 @@ dependencies = [
  "elastic-array 0.6.0 (git+https://github.com/ethcore/elastic-array)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "eth-secp256k1 0.5.4 (git+https://github.com/ethcore/rust-secp256k1)",
- "ethcore-bigint 0.1.1",
+ "ethcore-bigint 0.1.2",
  "ethcore-bloom-journal 0.1.0",
  "ethcore-devtools 1.4.0",
  "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -579,7 +580,7 @@ name = "ethcrypto"
 version = "0.1.0"
 dependencies = [
  "eth-secp256k1 0.5.4 (git+https://github.com/ethcore/rust-secp256k1)",
- "ethcore-bigint 0.1.1",
+ "ethcore-bigint 0.1.2",
  "ethkey 0.2.0",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -589,7 +590,7 @@ dependencies = [
 name = "ethjson"
 version = "0.1.0"
 dependencies = [
- "ethcore-util 1.4.0",
+ "ethcore-util 1.5.0",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_codegen 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -602,7 +603,7 @@ version = "0.2.0"
 dependencies = [
  "docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
  "eth-secp256k1 0.5.4 (git+https://github.com/ethcore/rust-secp256k1)",
- "ethcore-bigint 0.1.1",
+ "ethcore-bigint 0.1.2",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -618,7 +619,7 @@ dependencies = [
  "ethkey 0.2.0",
  "itertools 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -632,17 +633,17 @@ dependencies = [
 
 [[package]]
 name = "ethsync"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
  "clippy 0.0.96 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore 1.4.0",
- "ethcore-io 1.4.0",
+ "ethcore 1.5.0",
+ "ethcore-io 1.5.0",
  "ethcore-ipc 1.4.0",
  "ethcore-ipc-codegen 1.4.0",
  "ethcore-ipc-nano 1.4.0",
- "ethcore-network 1.4.0",
- "ethcore-util 1.4.0",
+ "ethcore-network 1.5.0",
+ "ethcore-util 1.5.0",
  "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -663,7 +664,7 @@ dependencies = [
 name = "fdlimit"
 version = "0.1.0"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -681,7 +682,7 @@ name = "flate2"
 version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -802,7 +803,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -894,7 +895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -930,7 +931,7 @@ name = "memchr"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -958,7 +959,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -967,7 +968,7 @@ version = "0.5.1"
 source = "git+https://github.com/ethcore/mio?branch=v0.5.x#3842d3b250ffd7bd9b16f9586b875ddcbac2b0dd"
 dependencies = [
  "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -983,7 +984,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -999,7 +1000,7 @@ version = "0.6.0-dev"
 source = "git+https://github.com/ethcore/mio?branch=timer-fix#31eccc40ece3d47abaefaf23bb2114033175b972"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1010,16 +1011,16 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.6.0"
-source = "git+https://github.com/carllerche/mio#9f17b70d6fecbf912168267ea74cf536f2cba705"
+version = "0.6.1"
+source = "git+https://github.com/carllerche/mio#56f8663510196fdca04bdf7c5f4d60b24297826f"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1050,7 +1051,7 @@ name = "nanomsg"
 version = "0.5.1"
 source = "git+https://github.com/ethcore/nanomsg.rs.git#c40fe442c9afaea5b38009a3d992ca044dcceb00"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "nanomsg-sys 0.5.0 (git+https://github.com/ethcore/nanomsg.rs.git)",
 ]
 
@@ -1060,7 +1061,7 @@ version = "0.5.0"
 source = "git+https://github.com/ethcore/nanomsg.rs.git#c40fe442c9afaea5b38009a3d992ca044dcceb00"
 dependencies = [
  "gcc 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1070,7 +1071,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1081,7 +1082,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1091,7 +1092,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "nix"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1181,7 +1195,7 @@ name = "num_cpus"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1235,7 +1249,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#8e8432d2986c29e9ff4c338cb4d2a11bc9c3c557"
+source = "git+https://github.com/ethcore/js-precompiled.git#4c885041fd0bbb0ef012a97679abad3d04802713"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1246,7 +1260,7 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1266,7 +1280,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1405,7 +1419,7 @@ name = "rand"
 version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1449,7 +1463,7 @@ name = "rlp"
 version = "0.1.0"
 dependencies = [
  "elastic-array 0.6.0 (git+https://github.com/ethcore/elastic-array)",
- "ethcore-bigint 0.1.1",
+ "ethcore-bigint 0.1.2",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1459,7 +1473,7 @@ name = "rocksdb"
 version = "0.4.5"
 source = "git+https://github.com/ethcore/rust-rocksdb#64c63ccbe1f62c2e2b39262486f9ba813793af58"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocksdb-sys 0.3.0 (git+https://github.com/ethcore/rust-rocksdb)",
 ]
 
@@ -1469,7 +1483,7 @@ version = "0.3.0"
 source = "git+https://github.com/ethcore/rust-rocksdb#64c63ccbe1f62c2e2b39262486f9ba813793af58"
 dependencies = [
  "gcc 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1489,7 +1503,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1500,7 +1514,7 @@ version = "0.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1671,7 +1685,7 @@ name = "syntex_errors"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_pos 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1693,7 +1707,7 @@ version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1706,7 +1720,7 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntex_errors 0.42.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1747,7 +1761,7 @@ name = "termios"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1756,7 +1770,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1773,7 +1787,7 @@ version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2012,7 +2026,7 @@ dependencies = [
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49247ec2a285bb3dcb23cbd9c35193c025e7251bfce77c1d5da97e6362dffe7f"
 "checksum lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce12306c4739d86ee97c23139f3a34ddf0387bbf181bc7929d287025a8c3ef6b"
-"checksum libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "23e3757828fa702a20072c37ff47938e9dd331b92fac6e223d26d4b7a55f7ee2"
+"checksum libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "408014cace30ee0f767b1c4517980646a573ec61a57957aeeabcac8ac0a02e8d"
 "checksum linked-hash-map 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bda158e0dabeb97ee8a401f4d17e479d6b891a14de0bba79d5cc2d4d325b5e48"
 "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
 "checksum log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ab83497bf8bf4ed2a74259c1c802351fcd67a65baa86394b6ba73c36f4838054"
@@ -2024,8 +2038,8 @@ dependencies = [
 "checksum miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d1f4d337a01c32e1f2122510fed46393d53ca35a7f429cb0450abaedfa3ed54"
 "checksum mio 0.5.1 (git+https://github.com/ethcore/mio?branch=v0.5.x)" = "<none>"
 "checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e"
-"checksum mio 0.6.0 (git+https://github.com/carllerche/mio)" = "<none>"
 "checksum mio 0.6.0-dev (git+https://github.com/ethcore/mio?branch=timer-fix)" = "<none>"
+"checksum mio 0.6.1 (git+https://github.com/carllerche/mio)" = "<none>"
 "checksum miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a"
 "checksum msdos_time 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c04b68cc63a8480fb2550343695f7be72effdec953a9d4508161c3e69041c7d8"
 "checksum nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)" = "<none>"
@@ -2033,6 +2047,7 @@ dependencies = [
 "checksum net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)" = "6a816012ca11cb47009693c1e0c6130e26d39e4d97ee2a13c50e868ec83e3204"
 "checksum nix 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f05c2fc965fc1cd6b73fa57fa7b89f288178737f2f3ce9e63e4a6a141189000e"
 "checksum nix 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a7bb1da2be7da3cbffda73fc681d509ffd9e665af478d2bee1907cee0bc64b2"
+"checksum nix 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a0d95c5fa8b641c10ad0b8887454ebaafa3c92b5cd5350f8fc693adafd178e7b"
 "checksum nodrop 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4d9a22dbcebdeef7bf275cbf444d6521d4e7a2fee187b72d80dba0817120dd8f"
 "checksum nom 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6caab12c5f97aa316cb249725aa32115118e1522b445e26c257dd77cad5ffd4e"
 "checksum num 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "c04bd954dbf96f76bab6e5bd6cef6f1ce1262d15268ce4f926d2b5b778fa7af2"
diff --git a/Cargo.toml b/Cargo.toml
index dc802a0fd..fe72d67ec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "1.4.0"
+version = "1.5.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
diff --git a/README.md b/README.md
index 08c04c097..fc5cd9762 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,12 @@
 # [Parity](https://ethcore.io/parity.html)
 ### Fast, light, and robust Ethereum implementation
 
-[![Join the chat at https://gitter.im/ethcore/parity.js](https://badges.gitter.im/ethcore/parity.js.svg)](https://gitter.im/ethcore/parity.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status][travis-image]][travis-url] [![build status](https://gitlab.ethcore.io/Mirrors/ethcore-parity/badges/master/build.svg)](https://gitlab.ethcore.io/Mirrors/ethcore-parity/commits/master) [![Coverage Status][coveralls-image]][coveralls-url]  [![GPLv3][license-image]][license-url]
 
-[![Build Status][travis-image]][travis-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Join the chat at https://gitter.im/ethcore/parity][gitter-image]][gitter-url] [![GPLv3][license-image]][license-url]
+### Join the chat!
+
+Parity [![Join the chat at https://gitter.im/ethcore/parity][gitter-image]][gitter-url] and
+parity.js [![Join the chat at https://gitter.im/ethcore/parity.js](https://badges.gitter.im/ethcore/parity.js.svg)](https://gitter.im/ethcore/parity.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [Internal Documentation][doc-url]
 
@@ -21,7 +24,7 @@ Be sure to check out [our wiki][wiki-url] for more information.
 [doc-url]: https://ethcore.github.io/parity/ethcore/index.html
 [wiki-url]: https://github.com/ethcore/parity/wiki
 
-**Requires Rust version 1.12.0 to build**
+**Parity requires Rust version 1.12.0 to build**
 
 ----
 
@@ -31,12 +34,15 @@ Be sure to check out [our wiki][wiki-url] for more information.
 Parity's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity using the sophisticated and
 cutting-edge Rust programming language. Parity is licensed under the GPLv3, and can be used for all your Ethereum needs.
 
-By default, Parity will run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number
-of RPC APIs.
+Parity comes with a built-in wallet. To access [Parity Wallet](http://127.0.0.1:8080/) this simply go to http://127.0.0.1:8080/. It
+includes various functionality allowing you to:
+- create and manage your Ethereum accounts;
+- manage your Ether and any Ethereum tokens;
+- create and register your own tokens;
+- and much more.    
 
-Parity also runs a server for running decentralized apps, or "Dapps", on `http://127.0.0.1:8080`.
-This includes a few useful Dapps, including Ethereum Wallet, Maker OTC, and a node status page.
-In a near-future release, it will be easy to install Dapps and use them through this web interface.
+By default, Parity will also run a JSONRPC server on `127.0.0.1:8545`. This is fully configurable and supports a number
+of RPC APIs.
 
 If you run into an issue while using parity, feel free to file one in this repository
 or hop on our [gitter chat room][gitter-url] to ask a question. We are glad to help!
@@ -56,7 +62,14 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do
 	```bash
 	$ curl https://sh.rustup.rs -sSf | sh
 	```
+	
+	Parity also requires `gcc`, `g++` and `make` packages to be installed.
+- OSX:
+	```bash
+	$ curl https://sh.rustup.rs -sSf | sh
+	```
 
+	`clang` and `make` are required. These come with Xcode command line tools or can be installed with homebrew.
 - Windows
 
     Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
diff --git a/appveyor.yml b/appveyor.yml
index 75a2da7cb..ad6b2b2a3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,6 +38,8 @@ after_test:
   - cargo build --verbose --release
   - ps: if($env:cert) { Start-FileDownload $env:cert -FileName $env:keyfile }
   - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass target\release\parity.exe }
+  - msbuild windows\ptray\ptray.vcxproj /p:Platform=x64 /p:Configuration=Release
+  - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass windows\ptray\x64\release\ptray.exe }
   - makensis.exe nsis\installer.nsi
   - ps: if($env:cert) { signtool sign /f $env:keyfile /p $env:certpass nsis\installer.exe }
 
diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml
index ddc23c87c..f6e9d102d 100644
--- a/dapps/Cargo.toml
+++ b/dapps/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Parity Dapps crate"
 name = "ethcore-dapps"
-version = "1.4.0"
+version = "1.5.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 build = "build.rs"
@@ -24,6 +24,7 @@ ethabi = "0.2.2"
 linked-hash-map = "0.3"
 parity-dapps-glue = "1.4"
 mime = "0.2"
+time = "0.1.35"
 serde_macros = { version = "0.8", optional = true }
 zip = { version = "0.1", default-features = false }
 ethcore-devtools = { path = "../devtools" }
diff --git a/dapps/src/apps/fetcher.rs b/dapps/src/apps/fetcher.rs
index e4ee63fea..041064121 100644
--- a/dapps/src/apps/fetcher.rs
+++ b/dapps/src/apps/fetcher.rs
@@ -32,14 +32,15 @@ use random_filename;
 use SyncStatus;
 use util::{Mutex, H256};
 use util::sha3::sha3;
-use page::LocalPageEndpoint;
+use page::{LocalPageEndpoint, PageCache};
 use handlers::{ContentHandler, ContentFetcherHandler, ContentValidator};
 use endpoint::{Endpoint, EndpointPath, Handler};
 use apps::cache::{ContentCache, ContentStatus};
 use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest, serialize_manifest, Manifest};
 use apps::urlhint::{URLHintContract, URLHint, URLHintResult};
 
-const MAX_CACHED_DAPPS: usize = 10;
+/// Limit of cached dapps/content
+const MAX_CACHED_DAPPS: usize = 20;
 
 pub struct ContentFetcher<R: URLHint = URLHintContract> {
 	dapps_path: PathBuf,
@@ -71,12 +72,13 @@ impl<R: URLHint> ContentFetcher<R> {
 		}
 	}
 
-	fn still_syncing() -> Box<Handler> {
+	fn still_syncing(port: Option<u16>) -> Box<Handler> {
 		Box::new(ContentHandler::error(
 			StatusCode::ServiceUnavailable,
 			"Sync In Progress",
 			"Your node is still syncing. We cannot resolve any content before it's fully synced.",
-			Some("<a href=\"javascript:window.location.reload()\">Refresh</a>")
+			Some("<a href=\"javascript:window.location.reload()\">Refresh</a>"),
+			port,
 		))
 	}
 
@@ -143,19 +145,19 @@ impl<R: URLHint> ContentFetcher<R> {
 					match content {
 						// Don't serve dapps if we are still syncing (but serve content)
 						Some(URLHintResult::Dapp(_)) if self.sync.is_major_importing() => {
-							(None, Self::still_syncing())
+							(None, Self::still_syncing(self.embeddable_at))
 						},
 						Some(URLHintResult::Dapp(dapp)) => {
 							let (handler, fetch_control) = ContentFetcherHandler::new(
 								dapp.url(),
 								control,
-								path.using_dapps_domains,
 								DappInstaller {
 									id: content_id.clone(),
 									dapps_path: self.dapps_path.clone(),
 									on_done: Box::new(on_done),
 									embeddable_at: self.embeddable_at,
-								}
+								},
+								self.embeddable_at,
 							);
 
 							(Some(ContentStatus::Fetching(fetch_control)), Box::new(handler) as Box<Handler>)
@@ -164,19 +166,19 @@ impl<R: URLHint> ContentFetcher<R> {
 							let (handler, fetch_control) = ContentFetcherHandler::new(
 								content.url,
 								control,
-								path.using_dapps_domains,
 								ContentInstaller {
 									id: content_id.clone(),
 									mime: content.mime,
 									content_path: self.dapps_path.clone(),
 									on_done: Box::new(on_done),
-								}
+								},
+								self.embeddable_at,
 							);
 
 							(Some(ContentStatus::Fetching(fetch_control)), Box::new(handler) as Box<Handler>)
 						},
 						None if self.sync.is_major_importing() => {
-							(None, Self::still_syncing())
+							(None, Self::still_syncing(self.embeddable_at))
 						},
 						None => {
 							// This may happen when sync status changes in between
@@ -185,7 +187,8 @@ impl<R: URLHint> ContentFetcher<R> {
 								StatusCode::NotFound,
 								"Resource Not Found",
 								"Requested resource was not found.",
-								None
+								None,
+								self.embeddable_at,
 							)) as Box<Handler>)
 						},
 					}
@@ -255,6 +258,17 @@ impl ContentValidator for ContentInstaller {
 		// Create dir
 		try!(fs::create_dir_all(&self.content_path));
 
+		// Validate hash
+		let mut file_reader = io::BufReader::new(try!(fs::File::open(&path)));
+		let hash = try!(sha3(&mut file_reader));
+		let id = try!(self.id.as_str().parse().map_err(|_| ValidationError::InvalidContentId));
+		if id != hash {
+			return Err(ValidationError::HashMismatch {
+				expected: id,
+				got: hash,
+			});
+		}
+
 		// And prepare path for a file
 		let filename = path.file_name().expect("We always fetch a file.");
 		let mut content_path = self.content_path.clone();
@@ -266,7 +280,7 @@ impl ContentValidator for ContentInstaller {
 
 		try!(fs::copy(&path, &content_path));
 
-		Ok((self.id.clone(), LocalPageEndpoint::single_file(content_path, self.mime.clone())))
+		Ok((self.id.clone(), LocalPageEndpoint::single_file(content_path, self.mime.clone(), PageCache::Enabled)))
 	}
 
 	fn done(&self, endpoint: Option<LocalPageEndpoint>) {
@@ -372,7 +386,7 @@ impl ContentValidator for DappInstaller {
 		try!(manifest_file.write_all(manifest_str.as_bytes()));
 
 		// Create endpoint
-		let app = LocalPageEndpoint::new(target, manifest.clone().into(), self.embeddable_at);
+		let app = LocalPageEndpoint::new(target, manifest.clone().into(), PageCache::Enabled, self.embeddable_at);
 
 		// Return modified app manifest
 		Ok((manifest.id.clone(), app))
@@ -412,7 +426,7 @@ mod tests {
 			version: "".into(),
 			author: "".into(),
 			icon_url: "".into(),
-		}, None);
+		}, Default::default(), None);
 
 		// when
 		fetcher.set_status("test", ContentStatus::Ready(handler));
diff --git a/dapps/src/apps/fs.rs b/dapps/src/apps/fs.rs
index e7a11fc8e..104b33035 100644
--- a/dapps/src/apps/fs.rs
+++ b/dapps/src/apps/fs.rs
@@ -18,7 +18,7 @@ use std::io;
 use std::io::Read;
 use std::fs;
 use std::path::PathBuf;
-use page::LocalPageEndpoint;
+use page::{LocalPageEndpoint, PageCache};
 use endpoint::{Endpoints, EndpointInfo};
 use apps::manifest::{MANIFEST_FILENAME, deserialize_manifest};
 
@@ -102,7 +102,7 @@ pub fn local_endpoints(dapps_path: String, signer_port: Option<u16>) -> Endpoint
 	for dapp in local_dapps(dapps_path) {
 		pages.insert(
 			dapp.id,
-			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info, signer_port))
+			Box::new(LocalPageEndpoint::new(dapp.path, dapp.info, PageCache::Disabled, signer_port))
 		);
 	}
 	pages
diff --git a/dapps/src/apps/mod.rs b/dapps/src/apps/mod.rs
index a7b97d37c..11919d6d2 100644
--- a/dapps/src/apps/mod.rs
+++ b/dapps/src/apps/mod.rs
@@ -33,14 +33,6 @@ pub const RPC_PATH : &'static str =  "rpc";
 pub const API_PATH : &'static str =  "api";
 pub const UTILS_PATH : &'static str =  "parity-utils";
 
-pub fn redirection_address(using_dapps_domains: bool, app_id: &str) -> String {
-	if using_dapps_domains {
-		format!("http://{}{}/", app_id, DAPPS_DOMAIN)
-	} else {
-		format!("/{}/", app_id)
-	}
-}
-
 pub fn utils() -> Box<Endpoint> {
 	Box::new(PageEndpoint::with_prefix(parity_ui::App::default(), UTILS_PATH.to_owned()))
 }
diff --git a/dapps/src/handlers/content.rs b/dapps/src/handlers/content.rs
index 6bde9cf84..a67fbcd0b 100644
--- a/dapps/src/handlers/content.rs
+++ b/dapps/src/handlers/content.rs
@@ -48,11 +48,7 @@ impl ContentHandler {
 		Self::new_embeddable(code, content, mime!(Text/Html), embeddable_at)
 	}
 
-	pub fn error(code: StatusCode, title: &str, message: &str, details: Option<&str>) -> Self {
-		Self::error_embeddable(code, title, message, details, None)
-	}
-
-	pub fn error_embeddable(code: StatusCode, title: &str, message: &str, details: Option<&str>, embeddable_at: Option<u16>) -> Self {
+	pub fn error(code: StatusCode, title: &str, message: &str, details: Option<&str>, embeddable_at: Option<u16>) -> Self {
 		Self::html(code, format!(
 			include_str!("../error_tpl.html"),
 			title=title,
diff --git a/dapps/src/handlers/fetch.rs b/dapps/src/handlers/fetch.rs
index 639fc7497..1a0221bff 100644
--- a/dapps/src/handlers/fetch.rs
+++ b/dapps/src/handlers/fetch.rs
@@ -22,14 +22,14 @@ use std::sync::{mpsc, Arc};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::{Instant, Duration};
 use util::Mutex;
+use url::Url;
 use fetch::{Client, Fetch, FetchResult};
 
 use hyper::{server, Decoder, Encoder, Next, Method, Control};
 use hyper::net::HttpStream;
 use hyper::status::StatusCode;
 
-use handlers::{ContentHandler, Redirection};
-use apps::redirection_address;
+use handlers::{ContentHandler, Redirection, extract_url};
 use page::LocalPageEndpoint;
 
 const FETCH_TIMEOUT: u64 = 30;
@@ -136,8 +136,9 @@ pub struct ContentFetcherHandler<H: ContentValidator> {
 	control: Option<Control>,
 	status: FetchState,
 	client: Option<Client>,
-	using_dapps_domains: bool,
 	installer: H,
+	request_url: Option<Url>,
+	embeddable_at: Option<u16>,
 }
 
 impl<H: ContentValidator> Drop for ContentFetcherHandler<H> {
@@ -155,8 +156,9 @@ impl<H: ContentValidator> ContentFetcherHandler<H> {
 	pub fn new(
 		url: String,
 		control: Control,
-		using_dapps_domains: bool,
-		handler: H) -> (Self, Arc<FetchControl>) {
+		handler: H,
+		embeddable_at: Option<u16>,
+	) -> (Self, Arc<FetchControl>) {
 
 		let fetch_control = Arc::new(FetchControl::default());
 		let client = Client::default();
@@ -165,8 +167,9 @@ impl<H: ContentValidator> ContentFetcherHandler<H> {
 			control: Some(control),
 			client: Some(client),
 			status: FetchState::NotStarted(url),
-			using_dapps_domains: using_dapps_domains,
 			installer: handler,
+			request_url: None,
+			embeddable_at: embeddable_at,
 		};
 
 		(handler, fetch_control)
@@ -189,6 +192,7 @@ impl<H: ContentValidator> ContentFetcherHandler<H> {
 
 impl<H: ContentValidator> server::Handler<HttpStream> for ContentFetcherHandler<H> {
 	fn on_request(&mut self, request: server::Request<HttpStream>) -> Next {
+		self.request_url = extract_url(&request);
 		let status = if let FetchState::NotStarted(ref url) = self.status {
 			Some(match *request.method() {
 				// Start fetching content
@@ -204,6 +208,7 @@ impl<H: ContentValidator> server::Handler<HttpStream> for ContentFetcherHandler<
 							"Unable To Start Dapp Download",
 							"Could not initialize download of the dapp. It might be a problem with the remote server.",
 							Some(&format!("{}", e)),
+							self.embeddable_at,
 						)),
 					}
 				},
@@ -213,6 +218,7 @@ impl<H: ContentValidator> server::Handler<HttpStream> for ContentFetcherHandler<
 					"Method Not Allowed",
 					"Only <code>GET</code> requests are allowed.",
 					None,
+					self.embeddable_at,
 				)),
 			})
 		} else { None };
@@ -234,7 +240,8 @@ impl<H: ContentValidator> server::Handler<HttpStream> for ContentFetcherHandler<
 					StatusCode::GatewayTimeout,
 					"Download Timeout",
 					&format!("Could not fetch content within {} seconds.", FETCH_TIMEOUT),
-					None
+					None,
+					self.embeddable_at,
 				);
 				Self::close_client(&mut self.client);
 				(Some(FetchState::Error(timeout)), Next::write())
@@ -255,12 +262,15 @@ impl<H: ContentValidator> server::Handler<HttpStream> for ContentFetcherHandler<
 									StatusCode::BadGateway,
 									"Invalid Dapp",
 									"Downloaded bundle does not contain a valid content.",
-									Some(&format!("{:?}", e))
+									Some(&format!("{:?}", e)),
+									self.embeddable_at,
 								))
 							},
 							Ok((id, result)) => {
-								let address = redirection_address(self.using_dapps_domains, &id);
-								FetchState::Done(id, result, Redirection::new(&address))
+								let url: String = self.request_url.take()
+									.map(|url| url.raw.into_string())
+									.expect("Request URL always read in on_request; qed");
+								FetchState::Done(id, result, Redirection::new(&url))
 							},
 						};
 						// Remove temporary zip file
@@ -274,6 +284,7 @@ impl<H: ContentValidator> server::Handler<HttpStream> for ContentFetcherHandler<
 							"Download Error",
 							"There was an error when fetching the content.",
 							Some(&format!("{:?}", e)),
+							self.embeddable_at,
 						);
 						(Some(FetchState::Error(error)), Next::write())
 					},
diff --git a/dapps/src/lib.rs b/dapps/src/lib.rs
index 0041dbedf..4394d1183 100644
--- a/dapps/src/lib.rs
+++ b/dapps/src/lib.rs
@@ -44,6 +44,7 @@
 #![cfg_attr(feature="nightly", plugin(clippy))]
 
 extern crate hyper;
+extern crate time;
 extern crate url as url_lib;
 extern crate unicase;
 extern crate serde;
diff --git a/dapps/src/page/builtin.rs b/dapps/src/page/builtin.rs
index c4f56556e..bf5bf088f 100644
--- a/dapps/src/page/builtin.rs
+++ b/dapps/src/page/builtin.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use page::handler;
+use page::{handler, PageCache};
 use std::sync::Arc;
 use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
 use parity_dapps::{WebApp, File, Info};
@@ -80,6 +80,7 @@ impl<T: WebApp> Endpoint for PageEndpoint<T> {
 			prefix: self.prefix.clone(),
 			path: path,
 			file: handler::ServedFile::new(self.safe_to_embed_at_port.clone()),
+			cache: PageCache::Disabled,
 			safe_to_embed_at_port: self.safe_to_embed_at_port.clone(),
 		})
 	}
diff --git a/dapps/src/page/handler.rs b/dapps/src/page/handler.rs
index 0962f22c7..f908a69c5 100644
--- a/dapps/src/page/handler.rs
+++ b/dapps/src/page/handler.rs
@@ -15,6 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::io::Write;
+use time::{self, Duration};
+
 use hyper::header;
 use hyper::server;
 use hyper::uri::RequestUri;
@@ -59,7 +61,7 @@ pub enum ServedFile<T: Dapp> {
 
 impl<T: Dapp> ServedFile<T> {
 	pub fn new(embeddable_at: Option<u16>) -> Self {
-		ServedFile::Error(ContentHandler::error_embeddable(
+		ServedFile::Error(ContentHandler::error(
 			StatusCode::NotFound,
 			"404 Not Found",
 			"Requested dapp resource was not found.",
@@ -69,6 +71,19 @@ impl<T: Dapp> ServedFile<T> {
 	}
 }
 
+/// Defines what cache headers should be appended to returned resources.
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum PageCache {
+	Enabled,
+	Disabled,
+}
+
+impl Default for PageCache {
+	fn default() -> Self {
+		PageCache::Disabled
+	}
+}
+
 /// A handler for a single webapp.
 /// Resolves correct paths and serves as a plumbing code between
 /// hyper server and dapp.
@@ -83,6 +98,8 @@ pub struct PageHandler<T: Dapp> {
 	pub path: EndpointPath,
 	/// Flag indicating if the file can be safely embeded (put in iframe).
 	pub safe_to_embed_at_port: Option<u16>,
+	/// Cache settings for this page.
+	pub cache: PageCache,
 }
 
 impl<T: Dapp> PageHandler<T> {
@@ -129,9 +146,19 @@ impl<T: Dapp> server::Handler<HttpStream> for PageHandler<T> {
 			ServedFile::File(ref f) => {
 				res.set_status(StatusCode::Ok);
 
+				if let PageCache::Enabled = self.cache {
+					let mut headers = res.headers_mut();
+					let validity = Duration::days(365);
+					headers.set(header::CacheControl(vec![
+						header::CacheDirective::Public,
+						header::CacheDirective::MaxAge(validity.num_seconds() as u32),
+					]));
+					headers.set(header::Expires(header::HttpDate(time::now() + validity)));
+				}
+
 				match f.content_type().parse() {
 					Ok(mime) => res.headers_mut().set(header::ContentType(mime)),
-					Err(()) => debug!(target: "page_handler", "invalid MIME type: {}", f.content_type()),
+					Err(()) => debug!(target: "dapps", "invalid MIME type: {}", f.content_type()),
 				}
 
 				// Security headers:
@@ -218,6 +245,7 @@ fn should_extract_path_with_appid() {
 			using_dapps_domains: true,
 		},
 		file: ServedFile::new(None),
+		cache: Default::default(),
 		safe_to_embed_at_port: None,
 	};
 
diff --git a/dapps/src/page/local.rs b/dapps/src/page/local.rs
index 5390f5aac..aa98a68cd 100644
--- a/dapps/src/page/local.rs
+++ b/dapps/src/page/local.rs
@@ -18,7 +18,7 @@ use mime_guess;
 use std::io::{Seek, Read, SeekFrom};
 use std::fs;
 use std::path::{Path, PathBuf};
-use page::handler;
+use page::handler::{self, PageCache};
 use endpoint::{Endpoint, EndpointInfo, EndpointPath, Handler};
 
 #[derive(Debug, Clone)]
@@ -26,24 +26,27 @@ pub struct LocalPageEndpoint {
 	path: PathBuf,
 	mime: Option<String>,
 	info: Option<EndpointInfo>,
+	cache: PageCache,
 	embeddable_at: Option<u16>,
 }
 
 impl LocalPageEndpoint {
-	pub fn new(path: PathBuf, info: EndpointInfo, embeddable_at: Option<u16>) -> Self {
+	pub fn new(path: PathBuf, info: EndpointInfo, cache: PageCache, embeddable_at: Option<u16>) -> Self {
 		LocalPageEndpoint {
 			path: path,
 			mime: None,
 			info: Some(info),
+			cache: cache,
 			embeddable_at: embeddable_at,
 		}
 	}
 
-	pub fn single_file(path: PathBuf, mime: String) -> Self {
+	pub fn single_file(path: PathBuf, mime: String, cache: PageCache) -> Self {
 		LocalPageEndpoint {
 			path: path,
 			mime: Some(mime),
 			info: None,
+			cache: cache,
 			embeddable_at: None,
 		}
 	}
@@ -66,6 +69,7 @@ impl Endpoint for LocalPageEndpoint {
 				path: path,
 				file: handler::ServedFile::new(None),
 				safe_to_embed_at_port: self.embeddable_at,
+				cache: self.cache,
 			})
 		} else {
 			Box::new(handler::PageHandler {
@@ -74,6 +78,7 @@ impl Endpoint for LocalPageEndpoint {
 				path: path,
 				file: handler::ServedFile::new(None),
 				safe_to_embed_at_port: self.embeddable_at,
+				cache: self.cache,
 			})
 		}
 	}
diff --git a/dapps/src/page/mod.rs b/dapps/src/page/mod.rs
index 349c979c7..92c066df3 100644
--- a/dapps/src/page/mod.rs
+++ b/dapps/src/page/mod.rs
@@ -21,4 +21,5 @@ mod handler;
 
 pub use self::local::LocalPageEndpoint;
 pub use self::builtin::PageEndpoint;
+pub use self::handler::PageCache;
 
diff --git a/dapps/src/router/auth.rs b/dapps/src/router/auth.rs
index ff05420bc..a220e2ab0 100644
--- a/dapps/src/router/auth.rs
+++ b/dapps/src/router/auth.rs
@@ -59,7 +59,8 @@ impl Authorization for HttpBasicAuth {
 					status::StatusCode::Unauthorized,
 					"Unauthorized",
 					"You need to provide valid credentials to access this page.",
-					None
+					None,
+					None,
 				)))
 			},
 			Access::AuthRequired => {
diff --git a/dapps/src/router/host_validation.rs b/dapps/src/router/host_validation.rs
index 2b7e6c9e4..802466efd 100644
--- a/dapps/src/router/host_validation.rs
+++ b/dapps/src/router/host_validation.rs
@@ -41,6 +41,7 @@ pub fn host_invalid_response() -> Box<server::Handler<HttpStream> + Send> {
 	Box::new(ContentHandler::error(StatusCode::Forbidden,
 		"Current Host Is Disallowed",
 		"You are trying to access your node using incorrect address.",
-		Some("Use allowed URL or specify different <code>hosts</code> CLI options.")
+		Some("Use allowed URL or specify different <code>hosts</code> CLI options."),
+		None,
 	))
 }
diff --git a/dapps/src/router/mod.rs b/dapps/src/router/mod.rs
index 6ca453d6d..fe8061ef0 100644
--- a/dapps/src/router/mod.rs
+++ b/dapps/src/router/mod.rs
@@ -117,6 +117,7 @@ impl<A: Authorization + 'static> server::Handler<HttpStream> for Router<A> {
 					"404 Not Found",
 					"Requested content was not found.",
 					None,
+					self.signer_port,
 				))
 			},
 			// Redirect any other GET request to signer.
@@ -131,6 +132,7 @@ impl<A: Authorization + 'static> server::Handler<HttpStream> for Router<A> {
 						"404 Not Found",
 						"Your homepage is not available when Trusted Signer is disabled.",
 						Some("You can still access dapps by writing a correct address, though. Re-enabled Signer to get your homepage back."),
+						self.signer_port,
 					))
 				}
 			},
diff --git a/dapps/src/tests/fetch.rs b/dapps/src/tests/fetch.rs
index 1cabca5cb..d50b2bdde 100644
--- a/dapps/src/tests/fetch.rs
+++ b/dapps/src/tests/fetch.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use tests::helpers::{serve_with_registrar, serve_with_registrar_and_sync, request, assert_security_headers};
+use tests::helpers::{serve_with_registrar, serve_with_registrar_and_sync, request, assert_security_headers_for_embed};
 
 #[test]
 fn should_resolve_dapp() {
@@ -34,7 +34,7 @@ fn should_resolve_dapp() {
 	// then
 	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
 	assert_eq!(registrar.calls.lock().len(), 2);
-	assert_security_headers(&response.headers);
+	assert_security_headers_for_embed(&response.headers);
 }
 
 #[test]
@@ -63,5 +63,5 @@ fn should_return_503_when_syncing_but_should_make_the_calls() {
 	// then
 	assert_eq!(response.status, "HTTP/1.1 503 Service Unavailable".to_owned());
 	assert_eq!(registrar.calls.lock().len(), 4);
-	assert_security_headers(&response.headers);
+	assert_security_headers_for_embed(&response.headers);
 }
diff --git a/dapps/src/tests/redirection.rs b/dapps/src/tests/redirection.rs
index 398d08774..b0a5ca9a2 100644
--- a/dapps/src/tests/redirection.rs
+++ b/dapps/src/tests/redirection.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use tests::helpers::{serve, request, assert_security_headers};
+use tests::helpers::{serve, request, assert_security_headers, assert_security_headers_for_embed};
 
 #[test]
 fn should_redirect_to_home() {
@@ -93,7 +93,7 @@ fn should_display_404_on_invalid_dapp() {
 
 	// then
 	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
-	assert_security_headers(&response.headers);
+	assert_security_headers_for_embed(&response.headers);
 }
 
 #[test]
@@ -113,7 +113,7 @@ fn should_display_404_on_invalid_dapp_with_domain() {
 
 	// then
 	assert_eq!(response.status, "HTTP/1.1 404 Not Found".to_owned());
-	assert_security_headers(&response.headers);
+	assert_security_headers_for_embed(&response.headers);
 }
 
 #[test]
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index 1f8413339..667b40ace 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 
diff --git a/ethcore/res/ethereum/classic.json b/ethcore/res/ethereum/classic.json
index 5be7b1caf..7c1e9454e 100644
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
@@ -11,7 +11,13 @@
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 				"homesteadTransition": "0x118c30",
-				"eip150Transition": "0x2625a0"
+				"eip150Transition": "0x2625a0",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x7fffffffffffffff",
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff",
+				"ecip1010PauseTransition": "0x2dc6c0",
+				"ecip1010ContinueTransition": "0x4c4b40"
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/eip150_test.json b/ethcore/res/ethereum/eip150_test.json
index 39d4b3fe8..34ef478dc 100644
--- a/ethcore/res/ethereum/eip150_test.json
+++ b/ethcore/res/ethereum/eip150_test.json
@@ -10,7 +10,11 @@
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 				"homesteadTransition": "0x0",
-				"eip150Transition": "0x0"
+				"eip150Transition": "0x0",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x7fffffffffffffff",
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/eip161_test.json b/ethcore/res/ethereum/eip161_test.json
new file mode 100644
index 000000000..884053d2a
--- /dev/null
+++ b/ethcore/res/ethereum/eip161_test.json
@@ -0,0 +1,47 @@
+{
+	"name": "Homestead (Test)",
+	"engine": {
+		"Ethash": {
+			"params": {
+				"gasLimitBoundDivisor": "0x0400",
+				"minimumDifficulty": "0x020000",
+				"difficultyBoundDivisor": "0x0800",
+				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
+				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
+				"homesteadTransition": "0x0",
+				"eip150Transition": "0x0",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x0",
+				"eip161abcTransition": "0x0",
+				"eip161dTransition": "0x0"
+			}
+		}
+	},
+	"params": {
+		"accountStartNonce": "0x00",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x1"
+	},
+	"genesis": {
+		"seal": {
+			"ethereum": {
+				"nonce": "0x0000000000000042",
+				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"difficulty": "0x400000000",
+		"author": "0x0000000000000000000000000000000000000000",
+		"timestamp": "0x00",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+		"gasLimit": "0x1388"
+	},
+	"accounts": {
+		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } }
+	}
+}
diff --git a/ethcore/res/ethereum/expanse.json b/ethcore/res/ethereum/expanse.json
index d2d036487..8d580b6f5 100644
--- a/ethcore/res/ethereum/expanse.json
+++ b/ethcore/res/ethereum/expanse.json
@@ -15,7 +15,11 @@
 				"difficultyHardforkTransition": "0x59d9",
 				"difficultyHardforkBoundDivisor": "0x0200",
 				"bombDefuseTransition": "0x30d40",
-				"eip150Transition": "0x7fffffffffffffff"				
+				"eip150Transition": "0x7fffffffffffffff",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x7fffffffffffffff",
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/frontier.json b/ethcore/res/ethereum/frontier.json
index 111dff30e..ecaefa4c3 100644
--- a/ethcore/res/ethereum/frontier.json
+++ b/ethcore/res/ethereum/frontier.json
@@ -130,7 +130,11 @@
 					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
 					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
 				],
-				"eip150Transition": "0x259518"
+				"eip150Transition": "0x259518",
+				"eip155Transition": 2642462,
+				"eip160Transition": 2642462,
+				"eip161abcTransition": 2642462,
+				"eip161dTransition": 2642462
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/frontier_like_test.json b/ethcore/res/ethereum/frontier_like_test.json
index 99a7ad712..8f41c61c8 100644
--- a/ethcore/res/ethereum/frontier_like_test.json
+++ b/ethcore/res/ethereum/frontier_like_test.json
@@ -130,7 +130,11 @@
 					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
 					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
 				],
-				"eip150Transition": "0x7fffffffffffffff"
+				"eip150Transition": "0x7fffffffffffffff",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x7fffffffffffffff",
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/frontier_test.json b/ethcore/res/ethereum/frontier_test.json
index 1cb3d8cfc..0fad8f37e 100644
--- a/ethcore/res/ethereum/frontier_test.json
+++ b/ethcore/res/ethereum/frontier_test.json
@@ -10,7 +10,11 @@
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 				"homesteadTransition": "0x7fffffffffffffff",
-				"eip150Transition": "0x7fffffffffffffff"
+				"eip150Transition": "0x7fffffffffffffff",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x7fffffffffffffff",
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/homestead_test.json b/ethcore/res/ethereum/homestead_test.json
index ad64ce2d5..a757a7bc6 100644
--- a/ethcore/res/ethereum/homestead_test.json
+++ b/ethcore/res/ethereum/homestead_test.json
@@ -10,7 +10,11 @@
 				"blockReward": "0x4563918244F40000",
 				"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 				"homesteadTransition": "0x0",
-				"eip150Transition": "0x7fffffffffffffff"
+				"eip150Transition": "0x7fffffffffffffff",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x7fffffffffffffff",
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json
index 67d9ce044..9d54169c3 100644
--- a/ethcore/res/ethereum/morden.json
+++ b/ethcore/res/ethereum/morden.json
@@ -10,7 +10,11 @@
 				"blockReward": "0x4563918244F40000",
 				"registrar": "0x52dff57a8a1532e6afb3dc07e2af58bb9eb05b3d",
 				"homesteadTransition": "0x789b0",
-				"eip150Transition": "0x1b34d8"
+				"eip150Transition": "0x1b34d8",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x7fffffffffffffff",
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/olympic.json b/ethcore/res/ethereum/olympic.json
index ebc7abd4e..655410ee1 100644
--- a/ethcore/res/ethereum/olympic.json
+++ b/ethcore/res/ethereum/olympic.json
@@ -10,7 +10,11 @@
 				"blockReward": "0x14D1120D7B160000",
 				"registrar": "5e70c0bbcd5636e0f9f9316e9f8633feb64d4050",
 				"homesteadTransition": "0x7fffffffffffffff",
-				"eip150Transition": "0x7fffffffffffffff"
+				"eip150Transition": "0x7fffffffffffffff",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x7fffffffffffffff",
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
diff --git a/ethcore/res/ethereum/tests b/ethcore/res/ethereum/tests
index 97066e40c..853333e7d 160000
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
@@ -1 +1 @@
-Subproject commit 97066e40ccd061f727deb5cd860e4d9135aa2551
+Subproject commit 853333e7da312775fb8f32f2c2771b8578cd0d79
diff --git a/ethcore/res/ethereum/transition_test.json b/ethcore/res/ethereum/transition_test.json
index c004bc2ba..aebea2b4f 100644
--- a/ethcore/res/ethereum/transition_test.json
+++ b/ethcore/res/ethereum/transition_test.json
@@ -130,7 +130,11 @@
 					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
 					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
 				],
-				"eip150Transition": "0xa"
+				"eip150Transition": "0xa",
+				"eip155Transition": "0x7fffffffffffffff",
+				"eip160Transition": "0x7fffffffffffffff",
+				"eip161abcTransition": "0x7fffffffffffffff",
+				"eip161dTransition": "0x7fffffffffffffff"
 			}
 		}
 	},
diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs
index d95c199ed..5910d0309 100644
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -1468,7 +1468,7 @@ mod tests {
 			action: Action::Create,
 			value: 100.into(),
 			data: "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap(),
-		}.sign(&"".sha3());
+		}.sign(&"".sha3(), None);
 
 
 		let b1a = canon_chain
@@ -1532,7 +1532,7 @@ mod tests {
 			action: Action::Create,
 			value: 100.into(),
 			data: "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap(),
-		}.sign(&"".sha3());
+		}.sign(&"".sha3(), None);
 
 		let t2 = Transaction {
 			nonce: 1.into(),
@@ -1541,7 +1541,7 @@ mod tests {
 			action: Action::Create,
 			value: 100.into(),
 			data: "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap(),
-		}.sign(&"".sha3());
+		}.sign(&"".sha3(), None);
 
 		let t3 = Transaction {
 			nonce: 2.into(),
@@ -1550,7 +1550,7 @@ mod tests {
 			action: Action::Create,
 			value: 100.into(),
 			data: "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap(),
-		}.sign(&"".sha3());
+		}.sign(&"".sha3(), None);
 
 		let b1a = canon_chain
 			.with_transaction(t1.clone())
@@ -1856,7 +1856,7 @@ mod tests {
 			action: Action::Create,
 			value: 101.into(),
 			data: "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap(),
-		}.sign(&"".sha3());
+		}.sign(&"".sha3(), None);
 		let t2 = Transaction {
 			nonce: 0.into(),
 			gas_price: 0.into(),
@@ -1864,7 +1864,7 @@ mod tests {
 			action: Action::Create,
 			value: 102.into(),
 			data: "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap(),
-		}.sign(&"".sha3());
+		}.sign(&"".sha3(), None);
 		let t3 = Transaction {
 			nonce: 0.into(),
 			gas_price: 0.into(),
@@ -1872,7 +1872,7 @@ mod tests {
 			action: Action::Create,
 			value: 103.into(),
 			data: "601080600c6000396000f3006000355415600957005b60203560003555".from_hex().unwrap(),
-		}.sign(&"".sha3());
+		}.sign(&"".sha3(), None);
 		let tx_hash1 = t1.hash();
 		let tx_hash2 = t2.hash();
 		let tx_hash3 = t3.hash();
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index bf612852e..b1a70454d 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -33,7 +33,7 @@ use io::*;
 use views::{HeaderView, BodyView, BlockView};
 use error::{ImportError, ExecutionError, CallError, BlockError, ImportResult, Error as EthcoreError};
 use header::BlockNumber;
-use state::State;
+use state::{State, CleanupMode};
 use spec::Spec;
 use basic_types::Seal;
 use engines::Engine;
@@ -65,7 +65,7 @@ use evm::{Factory as EvmFactory, Schedule};
 use miner::{Miner, MinerService};
 use snapshot::{self, io as snapshot_io};
 use factory::Factories;
-use rlp::{View, UntrustedRlp};
+use rlp::{decode, View, UntrustedRlp};
 use state_db::StateDB;
 use rand::OsRng;
 
@@ -147,6 +147,7 @@ pub struct Client {
 	factories: Factories,
 	history: u64,
 	rng: Mutex<OsRng>,
+	on_mode_change: Mutex<Option<Box<FnMut(&Mode) + 'static + Send>>>,
 }
 
 impl Client {
@@ -211,7 +212,7 @@ impl Client {
 		let panic_handler = PanicHandler::new_in_arc();
 		panic_handler.forward_from(&block_queue);
 
-		let awake = match config.mode { Mode::Dark(..) => false, _ => true };
+		let awake = match config.mode { Mode::Dark(..) | Mode::Off => false, _ => true };
 
 		let factories = Factories {
 			vm: EvmFactory::new(config.vm_type.clone(), config.jump_table_size),
@@ -243,6 +244,7 @@ impl Client {
 			factories: factories,
 			history: history,
 			rng: Mutex::new(try!(OsRng::new().map_err(::util::UtilError::StdIo))),
+			on_mode_change: Mutex::new(None),
 		};
 		Ok(Arc::new(client))
 	}
@@ -260,6 +262,11 @@ impl Client {
 		}
 	}
 
+	/// Register an action to be done if a mode change happens. 
+	pub fn on_mode_change<F>(&self, f: F) where F: 'static + FnMut(&Mode) + Send {
+		*self.on_mode_change.lock() = Some(Box::new(f));
+	}
+
 	/// Flush the block import queue.
 	pub fn flush_queue(&self) {
 		self.block_queue.flush();
@@ -268,6 +275,22 @@ impl Client {
 		}
 	}
 
+	/// The env info as of the best block.
+	fn latest_env_info(&self) -> EnvInfo {
+		let header_data = self.best_block_header();
+		let view = HeaderView::new(&header_data);
+
+		EnvInfo {
+			number: view.number(),
+			author: view.author(),
+			timestamp: view.timestamp(),
+			difficulty: view.difficulty(),
+			last_hashes: self.build_last_hashes(view.hash()),
+			gas_used: U256::default(),
+			gas_limit: view.gas_limit(),
+		}
+	}
+
 	fn build_last_hashes(&self, parent_hash: H256) -> Arc<LastHashes> {
 		{
 			let hashes = self.last_hashes.read();
@@ -790,7 +813,7 @@ impl BlockChainClient for Client {
 		let needed_balance = t.value + t.gas * t.gas_price;
 		if balance < needed_balance {
 			// give the sender a sufficient balance
-			state.add_balance(&sender, &(needed_balance - balance));
+			state.add_balance(&sender, &(needed_balance - balance), CleanupMode::NoEmpty);
 		}
 		let options = TransactOptions { tracing: analytics.transaction_tracing, vm_tracing: analytics.vm_tracing, check_nonce: false };
 		let mut ret = try!(Executive::new(&mut state, &env_info, &*self.engine, &self.factories.vm).transact(t, options));
@@ -840,18 +863,37 @@ impl BlockChainClient for Client {
 	}
 
 	fn keep_alive(&self) {
-		let mode = self.mode.lock().clone();
-		if mode != Mode::Active {
+		let should_wake = match &*self.mode.lock() {
+			&Mode::Dark(..) | &Mode::Passive(..) => true,
+			_ => false,
+		};
+		if should_wake {
 			self.wake_up();
 			(*self.sleep_state.lock()).last_activity = Some(Instant::now());
 		}
 	}
 
-	fn mode(&self) -> IpcMode { self.mode.lock().clone().into() }
+	fn mode(&self) -> IpcMode {
+		let r = self.mode.lock().clone().into();
+		trace!(target: "mode", "Asked for mode = {:?}. returning {:?}", &*self.mode.lock(), r);
+		r
+	}
 
-	fn set_mode(&self, mode: IpcMode) {
-		*self.mode.lock() = mode.clone().into();
-		match mode {
+	fn set_mode(&self, new_mode: IpcMode) {
+		trace!(target: "mode", "Client::set_mode({:?})", new_mode);
+		{
+			let mut mode = self.mode.lock();
+			*mode = new_mode.clone().into();
+			trace!(target: "mode", "Mode now {:?}", &*mode);
+			match *self.on_mode_change.lock() {
+				Some(ref mut f) => {
+					trace!(target: "mode", "Making callback...");
+					f(&*mode)
+				},
+				_ => {} 
+			}
+		}
+		match new_mode {
 			IpcMode::Active => self.wake_up(),
 			IpcMode::Off => self.sleep(),
 			_ => {(*self.sleep_state.lock()).last_activity = Some(Instant::now()); }
@@ -1008,7 +1050,9 @@ impl BlockChainClient for Client {
 							transaction_hash: transaction_hash.clone(),
 							transaction_index: transaction_index,
 							log_index: i
-						}).collect()
+						}).collect(),
+						log_bloom: receipt.log_bloom,
+						state_root: receipt.state_root,
 					})
 				},
 				_ => None
@@ -1167,24 +1211,28 @@ impl BlockChainClient for Client {
 	fn pending_transactions(&self) -> Vec<SignedTransaction> {
 		self.miner.pending_transactions(self.chain.read().best_block_number())
 	}
+
+	fn signing_network_id(&self) -> Option<u8> {
+		self.engine.signing_network_id(&self.latest_env_info())
+	}
+
+	fn block_extra_info(&self, id: BlockID) -> Option<BTreeMap<String, String>> {
+		self.block_header(id)
+			.map(|block| decode(&block))
+			.map(|header| self.engine.extra_info(&header))
+	}
+
+	fn uncle_extra_info(&self, id: UncleID) -> Option<BTreeMap<String, String>> {
+		self.uncle(id)
+			.map(|block| BlockView::new(&block).header())
+			.map(|header| self.engine.extra_info(&header))
+	}
 }
 
 impl MiningBlockChainClient for Client {
 
 	fn latest_schedule(&self) -> Schedule {
-		let header_data = self.best_block_header();
-		let view = HeaderView::new(&header_data);
-
-		let env_info = EnvInfo {
-			number: view.number(),
-			author: view.author(),
-			timestamp: view.timestamp(),
-			difficulty: view.difficulty(),
-			last_hashes: self.build_last_hashes(view.hash()),
-			gas_used: U256::default(),
-			gas_limit: view.gas_limit(),
-		};
-		self.engine.schedule(&env_info)
+		self.engine.schedule(&self.latest_env_info())
 	}
 
 	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
diff --git a/ethcore/src/client/config.rs b/ethcore/src/client/config.rs
index c4aeba8a4..045b8ee05 100644
--- a/ethcore/src/client/config.rs
+++ b/ethcore/src/client/config.rs
@@ -16,6 +16,7 @@
 
 use std::str::FromStr;
 use std::path::Path;
+use std::fmt::{Display, Formatter, Error as FmtError};
 pub use std::time::Duration;
 pub use blockchain::Config as BlockChainConfig;
 pub use trace::Config as TraceConfig;
@@ -86,6 +87,17 @@ impl Default for Mode {
 	}
 }
 
+impl Display for Mode {
+	fn fmt(&self, f: &mut Formatter) -> Result<(), FmtError> {
+		match *self {
+			Mode::Active => write!(f, "active"),
+			Mode::Passive(..) => write!(f, "passive"),
+			Mode::Dark(..) => write!(f, "dark"),
+			Mode::Off => write!(f, "offline"),
+		}
+	}
+}
+
 /// Client configuration. Includes configs for all sub-systems.
 #[derive(Debug, PartialEq, Default)]
 pub struct ClientConfig {
diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index a12d94ae4..434edd3e8 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -38,6 +38,7 @@ use evm::{Factory as EvmFactory, VMType, Schedule};
 use miner::{Miner, MinerService, TransactionImportResult};
 use spec::Spec;
 use types::mode::Mode;
+use views::BlockView;
 
 use verification::queue::QueueInfo;
 use block::{OpenBlock, SealedBlock};
@@ -227,7 +228,7 @@ impl TestBlockChainClient {
 						gas_price: U256::one(),
 						nonce: U256::zero()
 					};
-					let signed_tx = tx.sign(keypair.secret());
+					let signed_tx = tx.sign(keypair.secret(), None);
 					txs.append(&signed_tx);
 					txs.out()
 				},
@@ -293,7 +294,7 @@ impl TestBlockChainClient {
 			gas_price: U256::one(),
 			nonce: U256::zero()
 		};
-		let signed_tx = tx.sign(keypair.secret());
+		let signed_tx = tx.sign(keypair.secret(), None);
 		self.set_balance(signed_tx.sender().unwrap(), 10_000_000.into());
 		let res = self.miner.import_external_transactions(self, vec![signed_tx]);
 		let res = res.into_iter().next().unwrap().expect("Successful import");
@@ -314,7 +315,7 @@ pub fn get_temp_state_db() -> GuardedTempResult<StateDB> {
 
 impl MiningBlockChainClient for TestBlockChainClient {
 	fn latest_schedule(&self) -> Schedule {
-		Schedule::new_homestead_gas_fix()
+		Schedule::new_post_eip150(true, true, true)
 	}
 
 	fn prepare_open_block(&self, author: Address, gas_range_target: (U256, U256), extra_data: Bytes) -> OpenBlock {
@@ -417,6 +418,10 @@ impl BlockChainClient for TestBlockChainClient {
 		None	// Simple default.
 	}
 
+	fn uncle_extra_info(&self, _id: UncleID) -> Option<BTreeMap<String, String>> {
+		None
+	}
+
 	fn transaction_receipt(&self, id: TransactionID) -> Option<LocalizedReceipt> {
 		self.receipts.read().get(&id).cloned()
 	}
@@ -459,6 +464,13 @@ impl BlockChainClient for TestBlockChainClient {
 		self.block_hash(id).and_then(|hash| self.blocks.read().get(&hash).cloned())
 	}
 
+	fn block_extra_info(&self, id: BlockID) -> Option<BTreeMap<String, String>> {
+		self.block(id)
+			.map(|block| BlockView::new(&block).header())
+			.map(|header| self.spec.engine.extra_info(&header))
+	}
+
+
 	fn block_status(&self, id: BlockID) -> BlockStatus {
 		match id {
 			BlockID::Number(number) if (number as usize) < self.blocks.read().len() => BlockStatus::InChain,
@@ -633,6 +645,8 @@ impl BlockChainClient for TestBlockChainClient {
 		self.miner.pending_transactions(self.chain_info().best_block_number)
 	}
 
+	fn signing_network_id(&self) -> Option<u8> { None }
+
 	fn mode(&self) -> Mode { Mode::Active }
 
 	fn set_mode(&self, _: Mode) { unimplemented!(); }
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index d7844ba3d..67092e986 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -29,13 +29,13 @@ use error::{ImportResult, CallError};
 use receipt::LocalizedReceipt;
 use trace::LocalizedTrace;
 use evm::{Factory as EvmFactory, Schedule};
-use types::ids::*;
-use types::trace_filter::Filter as TraceFilter;
 use executive::Executed;
 use env_info::LastHashes;
-use types::call_analytics::CallAnalytics;
 use block_import_error::BlockImportError;
 use ipc::IpcConfig;
+use types::ids::*;
+use types::trace_filter::Filter as TraceFilter;
+use types::call_analytics::CallAnalytics;
 use types::blockchain_info::BlockChainInfo;
 use types::block_status::BlockStatus;
 use types::mode::Mode;
@@ -215,7 +215,7 @@ pub trait BlockChainClient : Sync + Send {
 	/// Calculate median gas price from recent blocks if they have any transactions.
 	fn gas_price_median(&self, sample_size: usize) -> Option<U256> {
 		let corpus = self.gas_price_corpus(sample_size);
-		corpus.get(corpus.len()/2).cloned()
+		corpus.get(corpus.len() / 2).cloned()
 	}
 
 	/// Get the gas price distribution based on recent blocks if they have any transactions.
@@ -223,13 +223,24 @@ pub trait BlockChainClient : Sync + Send {
 		let raw_corpus = self.gas_price_corpus(sample_size);
 		let raw_len = raw_corpus.len();
 		// Throw out outliers.
-		let (corpus, _) = raw_corpus.split_at(raw_len-raw_len/40);
+		let (corpus, _) = raw_corpus.split_at(raw_len - raw_len / 40);
 		Histogram::new(corpus, bucket_number)
 	}
 
+	/// Get the preferred network ID to sign on
+	fn signing_network_id(&self) -> Option<u8>;
+
+	/// Get the mode.
 	fn mode(&self) -> Mode;
 
+	/// Set the mode.
 	fn set_mode(&self, mode: Mode);
+
+	/// Returns engine-related extra info for `BlockID`.
+	fn block_extra_info(&self, id: BlockID) -> Option<BTreeMap<String, String>>;
+
+	/// Returns engine-related extra info for `UncleID`.
+	fn uncle_extra_info(&self, id: UncleID) -> Option<BTreeMap<String, String>>;
 }
 
 /// Extended client interface used for mining
diff --git a/ethcore/src/engines/basic_authority.rs b/ethcore/src/engines/basic_authority.rs
index 815d2b43a..5a55c6210 100644
--- a/ethcore/src/engines/basic_authority.rs
+++ b/ethcore/src/engines/basic_authority.rs
@@ -81,7 +81,7 @@ impl Engine for BasicAuthority {
 	fn builtins(&self) -> &BTreeMap<Address, Builtin> { &self.builtins }
 
 	/// Additional engine-specific information for the user/developer concerning `header`.
-	fn extra_info(&self, _header: &Header) -> HashMap<String, String> { hash_map!["signature".to_owned() => "TODO".to_owned()] }
+	fn extra_info(&self, _header: &Header) -> BTreeMap<String, String> { map!["signature".to_owned() => "TODO".to_owned()] }
 
 	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
 		Schedule::new_homestead()
diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs
index 250529dad..52812f45e 100644
--- a/ethcore/src/engines/mod.rs
+++ b/ethcore/src/engines/mod.rs
@@ -47,7 +47,7 @@ pub trait Engine : Sync + Send {
 	fn seal_fields(&self) -> usize { 0 }
 
 	/// Additional engine-specific information for the user/developer concerning `header`.
-	fn extra_info(&self, _header: &Header) -> HashMap<String, String> { HashMap::new() }
+	fn extra_info(&self, _header: &Header) -> BTreeMap<String, String> { BTreeMap::new() }
 
 	/// Additional information.
 	fn additional_params(&self) -> HashMap<String, String> { HashMap::new() }
@@ -108,6 +108,9 @@ pub trait Engine : Sync + Send {
 	/// Verify a particular transaction is valid.
 	fn verify_transaction(&self, _t: &SignedTransaction, _header: &Header) -> Result<(), Error> { Ok(()) }
 
+	/// The network ID that transactions should be signed with.
+	fn signing_network_id(&self, _env_info: &EnvInfo) -> Option<u8> { None }
+
 	/// Verify the seal of a block. This is an auxilliary method that actually just calls other `verify_` methods
 	/// to get the job done. By default it must pass `verify_basic` and `verify_block_unordered`. If more or fewer
 	/// methods are needed for an Engine, this may be overridden.
diff --git a/ethcore/src/error.rs b/ethcore/src/error.rs
index 04a0920fa..ae68aefa1 100644
--- a/ethcore/src/error.rs
+++ b/ethcore/src/error.rs
@@ -76,6 +76,8 @@ pub enum TransactionError {
 	RecipientBanned,
 	/// Contract creation code is banned.
 	CodeBanned,
+	/// Invalid network ID given.
+	InvalidNetworkId,
 }
 
 impl fmt::Display for TransactionError {
@@ -99,6 +101,7 @@ impl fmt::Display for TransactionError {
 			SenderBanned => "Sender is temporarily banned.".into(),
 			RecipientBanned => "Recipient is temporarily banned.".into(),
 			CodeBanned => "Contract code is temporarily banned.".into(),
+			InvalidNetworkId => "Transaction of this network ID is not allowed on this chain.".into(),
 		};
 
 		f.write_fmt(format_args!("Transaction error ({})", msg))
diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs
index 060a20aa2..6436e3531 100644
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -14,13 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use ethash::{quick_get_difficulty, slow_get_seedhash, EthashManager, H256 as EH256};
+use ethash::{quick_get_difficulty, slow_get_seedhash, EthashManager};
 use util::*;
 use block::*;
 use builtin::Builtin;
 use env_info::EnvInfo;
-use error::{BlockError, Error};
+use error::{BlockError, TransactionError, Error};
 use header::Header;
+use state::CleanupMode;
 use spec::CommonParams;
 use transaction::SignedTransaction;
 use engines::Engine;
@@ -59,8 +60,20 @@ pub struct EthashParams {
 	pub difficulty_hardfork_bound_divisor: U256,
 	/// Block on which there is no additional difficulty from the exponential bomb.
 	pub bomb_defuse_transition: u64,
-	/// Bad gas transition block number.
+	/// Number of first block where EIP-150 rules begin.
 	pub eip150_transition: u64,
+	/// Number of first block where EIP-155 rules begin.
+	pub eip155_transition: u64,
+	/// Number of first block where EIP-160 rules begin.
+	pub eip160_transition: u64,
+	/// Number of first block where EIP-161.abc begin.
+	pub eip161abc_transition: u64,
+	/// Number of first block where EIP-161.d begins.
+	pub eip161d_transition: u64,
+	/// Number of first block where ECIP-1010 begins.
+	pub ecip1010_pause_transition: u64,
+	/// Number of first block where ECIP-1010 ends.
+	pub ecip1010_continue_transition: u64
 }
 
 impl From<ethjson::spec::EthashParams> for EthashParams {
@@ -81,6 +94,12 @@ impl From<ethjson::spec::EthashParams> for EthashParams {
 			difficulty_hardfork_bound_divisor: p.difficulty_hardfork_bound_divisor.map_or(p.difficulty_bound_divisor.into(), Into::into),
 			bomb_defuse_transition: p.bomb_defuse_transition.map_or(0x7fffffffffffffff, Into::into),
 			eip150_transition: p.eip150_transition.map_or(0, Into::into),
+			eip155_transition: p.eip155_transition.map_or(0, Into::into),
+			eip160_transition: p.eip160_transition.map_or(0, Into::into),
+			eip161abc_transition: p.eip161abc_transition.map_or(0, Into::into),
+			eip161d_transition: p.eip161d_transition.map_or(0x7fffffffffffffff, Into::into),
+			ecip1010_pause_transition: p.ecip1010_pause_transition.map_or(0x7fffffffffffffff, Into::into),
+			ecip1010_continue_transition: p.ecip1010_continue_transition.map_or(0x7fffffffffffffff, Into::into),
 		}
 	}
 }
@@ -120,8 +139,8 @@ impl Engine for Ethash {
 	}
 
 	/// Additional engine-specific information for the user/developer concerning `header`.
-	fn extra_info(&self, header: &Header) -> HashMap<String, String> {
-		hash_map!["nonce".to_owned() => format!("0x{}", header.nonce().hex()), "mixHash".to_owned() => format!("0x{}", header.mix_hash().hex())]
+	fn extra_info(&self, header: &Header) -> BTreeMap<String, String> {
+		map!["nonce".to_owned() => format!("0x{}", header.nonce().hex()), "mixHash".to_owned() => format!("0x{}", header.mix_hash().hex())]
 	}
 
 	fn schedule(&self, env_info: &EnvInfo) -> Schedule {
@@ -132,7 +151,19 @@ impl Engine for Ethash {
 		} else if env_info.number < self.ethash_params.eip150_transition {
 			Schedule::new_homestead()
 		} else {
-			Schedule::new_homestead_gas_fix()
+			Schedule::new_post_eip150(
+				env_info.number >= self.ethash_params.eip160_transition,
+				env_info.number >= self.ethash_params.eip161abc_transition,
+				env_info.number >= self.ethash_params.eip161d_transition
+			)
+		}
+	}
+
+	fn signing_network_id(&self, env_info: &EnvInfo) -> Option<u8> {
+		if env_info.number >= self.ethash_params.eip155_transition && self.params().network_id < 127 {
+			Some(self.params().network_id as u8)
+		} else {
+			None
 		}
 	}
 
@@ -169,7 +200,7 @@ impl Engine for Ethash {
 				let mut state = block.fields_mut().state;
 				for child in &self.ethash_params.dao_hardfork_accounts {
 					let b = state.balance(child);
-					state.transfer_balance(child, &self.ethash_params.dao_hardfork_beneficiary, &b);
+					state.transfer_balance(child, &self.ethash_params.dao_hardfork_beneficiary, &b, CleanupMode::NoEmpty);
 				}
 //			}
 		}
@@ -182,12 +213,12 @@ impl Engine for Ethash {
 		let fields = block.fields_mut();
 
 		// Bestow block reward
-		fields.state.add_balance(fields.header.author(), &(reward + reward / U256::from(32) * U256::from(fields.uncles.len())));
+		fields.state.add_balance(fields.header.author(), &(reward + reward / U256::from(32) * U256::from(fields.uncles.len())), CleanupMode::NoEmpty);
 
 		// Bestow uncle rewards
 		let current_number = fields.header.number();
 		for u in fields.uncles.iter() {
-			fields.state.add_balance(u.author(), &(reward * U256::from(8 + u.number() - current_number) / U256::from(8)));
+			fields.state.add_balance(u.author(), &(reward * U256::from(8 + u.number() - current_number) / U256::from(8)), CleanupMode::NoEmpty);
 		}
 
 		// Commit state so that we can actually figure out the state root.
@@ -212,10 +243,10 @@ impl Engine for Ethash {
 			return Err(From::from(BlockError::DifficultyOutOfBounds(OutOfBounds { min: Some(min_difficulty), max: None, found: header.difficulty().clone() })))
 		}
 
-		let difficulty = Ethash::boundary_to_difficulty(&Ethash::from_ethash(quick_get_difficulty(
-			&Ethash::to_ethash(header.bare_hash()),
+		let difficulty = Ethash::boundary_to_difficulty(&H256(quick_get_difficulty(
+			&header.bare_hash().0,
 			header.nonce().low_u64(),
-			&Ethash::to_ethash(header.mix_hash())
+			&header.mix_hash().0
 		)));
 		if &difficulty < header.difficulty() {
 			return Err(From::from(BlockError::InvalidProofOfWork(OutOfBounds { min: Some(header.difficulty().clone()), max: None, found: difficulty })));
@@ -240,10 +271,10 @@ impl Engine for Ethash {
 				Mismatch { expected: self.seal_fields(), found: header.seal().len() }
 			)));
 		}
-		let result = self.pow.compute_light(header.number() as u64, &Ethash::to_ethash(header.bare_hash()), header.nonce().low_u64());
-		let mix = Ethash::from_ethash(result.mix_hash);
-		let difficulty = Ethash::boundary_to_difficulty(&Ethash::from_ethash(result.value));
-		trace!(target: "miner", "num: {}, seed: {}, h: {}, non: {}, mix: {}, res: {}" , header.number() as u64, Ethash::from_ethash(slow_get_seedhash(header.number() as u64)), header.bare_hash(), header.nonce().low_u64(), Ethash::from_ethash(result.mix_hash), Ethash::from_ethash(result.value));
+		let result = self.pow.compute_light(header.number() as u64, &header.bare_hash().0, header.nonce().low_u64());
+		let mix = H256(result.mix_hash);
+		let difficulty = Ethash::boundary_to_difficulty(&H256(result.value));
+		trace!(target: "miner", "num: {}, seed: {}, h: {}, non: {}, mix: {}, res: {}" , header.number() as u64, H256(slow_get_seedhash(header.number() as u64)), header.bare_hash(), header.nonce().low_u64(), H256(result.mix_hash), H256(result.value));
 		if mix != header.mix_hash() {
 			return Err(From::from(BlockError::MismatchedH256SealElement(Mismatch { expected: mix, found: header.mix_hash() })));
 		}
@@ -277,6 +308,13 @@ impl Engine for Ethash {
 		if header.number() >= self.ethash_params.homestead_transition {
 			try!(t.check_low_s());
 		}
+
+		if let Some(n) = t.network_id() {
+			if header.number() < self.ethash_params.eip155_transition || n as usize != self.params().network_id {
+				return Err(TransactionError::InvalidNetworkId.into())
+			}
+		}
+
 		Ok(())
 	}
 
@@ -285,7 +323,7 @@ impl Engine for Ethash {
 	}
 }
 
-#[cfg_attr(feature="dev", allow(wrong_self_convention))] // to_ethash should take self
+#[cfg_attr(feature="dev", allow(wrong_self_convention))]
 impl Ethash {
 	fn calculate_difficulty(&self, header: &Header, parent: &Header) -> U256 {
 		const EXP_DIFF_PERIOD: u64 = 100000;
@@ -321,9 +359,20 @@ impl Ethash {
 		};
 		target = max(min_difficulty, target);
 		if header.number() < self.ethash_params.bomb_defuse_transition {
-			let period = ((parent.number() + 1) / EXP_DIFF_PERIOD) as usize;
-			if period > 1 {
-				target = max(min_difficulty, target + (U256::from(1) << (period - 2)));
+			if header.number() < self.ethash_params.ecip1010_pause_transition {
+				let period = ((parent.number() + 1) / EXP_DIFF_PERIOD) as usize;
+				if period > 1 {
+					target = max(min_difficulty, target + (U256::from(1) << (period - 2)));
+				}
+			}
+			else if header.number() < self.ethash_params.ecip1010_continue_transition {
+				let fixed_difficulty = ((self.ethash_params.ecip1010_pause_transition / EXP_DIFF_PERIOD) - 2) as usize;
+				target = max(min_difficulty, target + (U256::from(1) << fixed_difficulty));
+			}
+			else {
+				let period = ((parent.number() + 1) / EXP_DIFF_PERIOD) as usize;
+				let delay = ((self.ethash_params.ecip1010_continue_transition - self.ethash_params.ecip1010_pause_transition) / EXP_DIFF_PERIOD) as usize;
+				target = max(min_difficulty, target + (U256::from(1) << (period - delay - 2)));
 			}
 		}
 		target
@@ -347,14 +396,6 @@ impl Ethash {
 			(((U256::one() << 255) / *difficulty) << 1).into()
 		}
 	}
-
-	fn to_ethash(hash: H256) -> EH256 {
-		unsafe { mem::transmute(hash) }
-	}
-
-	fn from_ethash(hash: EH256) -> H256 {
-		unsafe { mem::transmute(hash) }
-	}
 }
 
 impl Header {
@@ -382,8 +423,8 @@ mod tests {
 	use env_info::EnvInfo;
 	use error::{BlockError, Error};
 	use header::Header;
-	use super::super::new_morden;
-	use super::Ethash;
+	use super::super::{new_morden, new_homestead_test};
+	use super::{Ethash, EthashParams};
 	use rlp;
 
 	#[test]
@@ -605,5 +646,122 @@ mod tests {
 		assert_eq!(Ethash::difficulty_to_boundary(&U256::from(32)), H256::from_str("0800000000000000000000000000000000000000000000000000000000000000").unwrap());
 	}
 
-	// TODO: difficulty test
+	#[test]
+	fn difficulty_frontier() {
+		let spec = new_homestead_test();
+		let ethparams = get_default_ethash_params();
+		let ethash = Ethash::new(spec.params, ethparams, BTreeMap::new());
+
+		let mut parent_header = Header::default();
+		parent_header.set_number(1000000);
+		parent_header.set_difficulty(U256::from_str("b69de81a22b").unwrap());
+		parent_header.set_timestamp(1455404053);
+		let mut header = Header::default();
+		header.set_number(parent_header.number() + 1);
+		header.set_timestamp(1455404058);
+
+		let difficulty = ethash.calculate_difficulty(&header, &parent_header);
+		assert_eq!(U256::from_str("b6b4bbd735f").unwrap(), difficulty);
+	}
+
+	#[test]
+	fn difficulty_homestead() {
+		let spec = new_homestead_test();
+		let ethparams = get_default_ethash_params();
+		let ethash = Ethash::new(spec.params, ethparams, BTreeMap::new());
+
+		let mut parent_header = Header::default();
+		parent_header.set_number(1500000);
+		parent_header.set_difficulty(U256::from_str("1fd0fd70792b").unwrap());
+		parent_header.set_timestamp(1463003133);
+		let mut header = Header::default();
+		header.set_number(parent_header.number() + 1);
+		header.set_timestamp(1463003177);
+
+		let difficulty = ethash.calculate_difficulty(&header, &parent_header);
+		assert_eq!(U256::from_str("1fc50f118efe").unwrap(), difficulty);
+	}
+
+	#[test]
+	fn difficulty_classic_bomb_delay() {
+		let spec = new_homestead_test();
+		let ethparams = EthashParams {
+			ecip1010_pause_transition: 3000000,
+			..get_default_ethash_params()
+		};
+		let ethash = Ethash::new(spec.params, ethparams, BTreeMap::new());
+
+		let mut parent_header = Header::default();
+		parent_header.set_number(3500000);
+		parent_header.set_difficulty(U256::from_str("6F62EAF8D3C").unwrap());
+		parent_header.set_timestamp(1452838500);
+		let mut header = Header::default();
+		header.set_number(parent_header.number() + 1);
+
+		header.set_timestamp(parent_header.timestamp() + 20);
+		assert_eq!(
+			U256::from_str("6F55FE9B74B").unwrap(),
+			ethash.calculate_difficulty(&header, &parent_header)
+		);
+		header.set_timestamp(parent_header.timestamp() + 5);
+		assert_eq!(
+			U256::from_str("6F71D75632D").unwrap(),
+			ethash.calculate_difficulty(&header, &parent_header)
+		);
+		header.set_timestamp(parent_header.timestamp() + 80);
+		assert_eq!(
+			U256::from_str("6F02746B3A5").unwrap(),
+			ethash.calculate_difficulty(&header, &parent_header)
+		);
+	}
+
+	#[test]
+	fn test_difficulty_bomb_continue() {
+		let spec = new_homestead_test();
+		let ethparams = EthashParams {
+			ecip1010_pause_transition: 3000000,
+			ecip1010_continue_transition: 5000000,
+			..get_default_ethash_params()
+		};
+		let ethash = Ethash::new(spec.params, ethparams, BTreeMap::new());
+
+		let mut parent_header = Header::default();
+		parent_header.set_number(5000102);
+		parent_header.set_difficulty(U256::from_str("14944397EE8B").unwrap());
+		parent_header.set_timestamp(1513175023);
+		let mut header = Header::default();
+		header.set_number(parent_header.number() + 1);
+		header.set_timestamp(parent_header.timestamp() + 6);
+		assert_eq!(
+			U256::from_str("1496E6206188").unwrap(),
+			ethash.calculate_difficulty(&header, &parent_header)
+		);
+		parent_header.set_number(5100123);
+		parent_header.set_difficulty(U256::from_str("14D24B39C7CF").unwrap());
+		parent_header.set_timestamp(1514609324);
+		header.set_number(parent_header.number() + 1);
+		header.set_timestamp(parent_header.timestamp() + 41);
+		assert_eq!(
+			U256::from_str("14CA9C5D9227").unwrap(),
+			ethash.calculate_difficulty(&header, &parent_header)
+		);
+		parent_header.set_number(6150001);
+		parent_header.set_difficulty(U256::from_str("305367B57227").unwrap());
+		parent_header.set_timestamp(1529664575);
+		header.set_number(parent_header.number() + 1);
+		header.set_timestamp(parent_header.timestamp() + 105);
+		assert_eq!(
+			U256::from_str("309D09E0C609").unwrap(),
+			ethash.calculate_difficulty(&header, &parent_header)
+		);
+		parent_header.set_number(8000000);
+		parent_header.set_difficulty(U256::from_str("1180B36D4CE5B6A").unwrap());
+		parent_header.set_timestamp(1535431724);
+		header.set_number(parent_header.number() + 1);
+		header.set_timestamp(parent_header.timestamp() + 420);
+		assert_eq!(
+			U256::from_str("5126FFD5BCBB9E7").unwrap(),
+			ethash.calculate_difficulty(&header, &parent_header)
+		);
+	}
 }
diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs
index d8299324d..253a12372 100644
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -54,6 +54,9 @@ pub fn new_homestead_test() -> Spec { load(include_bytes!("../../res/ethereum/ho
 /// Create a new Homestead-EIP150 chain spec as though it never changed from Homestead/Frontier.
 pub fn new_eip150_test() -> Spec { load(include_bytes!("../../res/ethereum/eip150_test.json")) }
 
+/// Create a new Homestead-EIP150 chain spec as though it never changed from Homestead/Frontier.
+pub fn new_eip161_test() -> Spec { load(include_bytes!("../../res/ethereum/eip161_test.json")) }
+
 /// Create a new Frontier/Homestead/DAO chain spec with transition points at #5 and #8.
 pub fn new_transition_test() -> Spec { load(include_bytes!("../../res/ethereum/transition_test.json")) }
 
diff --git a/ethcore/src/evm/ext.rs b/ethcore/src/evm/ext.rs
index 6397f067e..1c340b5b1 100644
--- a/ethcore/src/evm/ext.rs
+++ b/ethcore/src/evm/ext.rs
@@ -52,6 +52,12 @@ pub trait Ext {
 	/// Determine whether an account exists.
 	fn exists(&self, address: &Address) -> bool;
 
+	/// Determine whether an account exists and is not null (zero balance/nonce, no code).
+	fn exists_and_not_null(&self, address: &Address) -> bool;
+
+	/// Balance of the origin account.
+	fn origin_balance(&self) -> U256;
+
 	/// Returns address balance.
 	fn balance(&self, address: &Address) -> U256;
 
diff --git a/ethcore/src/evm/interpreter/gasometer.rs b/ethcore/src/evm/interpreter/gasometer.rs
index a2b940655..beaaadac5 100644
--- a/ethcore/src/evm/interpreter/gasometer.rs
+++ b/ethcore/src/evm/interpreter/gasometer.rs
@@ -146,8 +146,13 @@ impl<Gas: CostType> Gasometer<Gas> {
 			instructions::SUICIDE => {
 				let mut gas = Gas::from(schedule.suicide_gas);
 
+				let is_value_transfer = !ext.origin_balance().is_zero();
 				let address = u256_to_address(stack.peek(0));
-				if !ext.exists(&address) {
+				if (
+					!schedule.no_empty && !ext.exists(&address)
+				) || (
+					schedule.no_empty && is_value_transfer && !ext.exists_and_not_null(&address)
+				) {
 					gas = overflowing!(gas.overflow_add(schedule.suicide_to_new_account_cost.into()));
 				}
 
@@ -190,12 +195,19 @@ impl<Gas: CostType> Gasometer<Gas> {
 				);
 
 				let address = u256_to_address(stack.peek(1));
+				let is_value_transfer = !stack.peek(2).is_zero();
 
-				if instruction == instructions::CALL && !ext.exists(&address) {
-					gas = overflowing!(gas.overflow_add(schedule.call_new_account_gas.into()));
+				if instruction == instructions::CALL {
+					if (
+						!schedule.no_empty && !ext.exists(&address)
+					) || (
+						schedule.no_empty && is_value_transfer && !ext.exists_and_not_null(&address)
+					) {
+						gas = overflowing!(gas.overflow_add(schedule.call_new_account_gas.into()));
+					}
 				};
 
-				if !stack.peek(2).is_zero() {
+				if is_value_transfer {
 					gas = overflowing!(gas.overflow_add(schedule.call_value_transfer_gas.into()));
 				};
 
diff --git a/ethcore/src/evm/schedule.rs b/ethcore/src/evm/schedule.rs
index b8de785b3..b68f6acb5 100644
--- a/ethcore/src/evm/schedule.rs
+++ b/ethcore/src/evm/schedule.rs
@@ -93,6 +93,10 @@ pub struct Schedule {
 	/// If Some(x): let limit = GAS * (x - 1) / x; let CALL's gas = min(requested, limit). let CREATE's gas = limit.
 	/// If None: let CALL's gas = (requested > GAS ? [OOG] : GAS). let CREATE's gas = GAS
 	pub sub_gas_cap_divisor: Option<usize>,
+	/// Don't ever make empty accounts; contracts start with nonce=1. Also, don't charge 25k when sending/suicide zero-value.
+	pub no_empty: bool,
+	/// Kill empty accounts if touched.
+	pub kill_empty: bool,
 }
 
 impl Schedule {
@@ -106,16 +110,16 @@ impl Schedule {
 		Self::new(true, true, 53000)
 	}
 
-	/// Schedule for the Homestead-era of the Ethereum main net.
-	pub fn new_homestead_gas_fix() -> Schedule {
-		Schedule{
+	/// Schedule for the post-EIP-150-era of the Ethereum main net.
+	pub fn new_post_eip150(fix_exp: bool, no_empty: bool, kill_empty: bool) -> Schedule {
+		Schedule {
 			exceptional_failed_code_deposit: true,
 			have_delegate_call: true,
 			stack_limit: 1024,
 			max_depth: 1024,
 			tier_step_gas: [0, 2, 3, 5, 8, 10, 20, 0],
 			exp_gas: 10,
-			exp_byte_gas: 10,
+			exp_byte_gas: if fix_exp {50} else {10},
 			sha3_gas: 30,
 			sha3_word_gas: 6,
 			sload_gas: 200,
@@ -146,11 +150,13 @@ impl Schedule {
 			suicide_gas: 5000,
 			suicide_to_new_account_cost: 25000,
 			sub_gas_cap_divisor: Some(64),
+			no_empty: no_empty,
+			kill_empty: kill_empty,
 		}
 	}
 
 	fn new(efcd: bool, hdc: bool, tcg: usize) -> Schedule {
-		Schedule{
+		Schedule {
 			exceptional_failed_code_deposit: efcd,
 			have_delegate_call: hdc,
 			stack_limit: 1024,
@@ -188,6 +194,8 @@ impl Schedule {
 			suicide_gas: 0,
 			suicide_to_new_account_cost: 0,
 			sub_gas_cap_divisor: None,
+			no_empty: false,
+			kill_empty: false,
 		}
 	}
 }
diff --git a/ethcore/src/evm/tests.rs b/ethcore/src/evm/tests.rs
index ba002d649..7e69c0771 100644
--- a/ethcore/src/evm/tests.rs
+++ b/ethcore/src/evm/tests.rs
@@ -94,6 +94,14 @@ impl Ext for FakeExt {
 		self.balances.contains_key(address)
 	}
 
+	fn exists_and_not_null(&self, address: &Address) -> bool {
+		self.balances.get(address).map_or(false, |b| !b.is_zero()) 
+	}
+
+	fn origin_balance(&self) -> U256 {
+		unimplemented!()
+	}
+
 	fn balance(&self, address: &Address) -> U256 {
 		*self.balances.get(address).unwrap()
 	}
diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
index f05cc4fd8..5da105e2f 100644
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -17,7 +17,7 @@
 //! Transaction Execution environment.
 use util::*;
 use action_params::{ActionParams, ActionValue};
-use state::{State, Substate};
+use state::{State, Substate, CleanupMode};
 use engines::Engine;
 use types::executed::CallType;
 use env_info::EnvInfo;
@@ -256,9 +256,11 @@ impl<'a> Executive<'a> {
 		// backup used in case of running out of gas
 		self.state.checkpoint();
 
+		let schedule = self.engine.schedule(self.info);
+
 		// at first, transfer value to destination
 		if let ActionValue::Transfer(val) = params.value {
-			self.state.transfer_balance(&params.sender, &params.address, &val);
+			self.state.transfer_balance(&params.sender, &params.address, &val, substate.to_cleanup_mode(&schedule));
 		}
 		trace!("Executive::call(params={:?}) self.env_info={:?}", params, self.info);
 
@@ -364,12 +366,14 @@ impl<'a> Executive<'a> {
 		let mut unconfirmed_substate = Substate::new();
 
 		// create contract and transfer value to it if necessary
+		let schedule = self.engine.schedule(self.info);
+		let nonce_offset = if schedule.no_empty {1} else {0}.into();
 		let prev_bal = self.state.balance(&params.address);
 		if let ActionValue::Transfer(val) = params.value {
 			self.state.sub_balance(&params.sender, &val);
-			self.state.new_contract(&params.address, val + prev_bal);
+			self.state.new_contract(&params.address, val + prev_bal, nonce_offset);
 		} else {
-			self.state.new_contract(&params.address, prev_bal);
+			self.state.new_contract(&params.address, prev_bal, nonce_offset);
 		}
 
 		let trace_info = tracer.prepare_trace_create(&params);
@@ -405,7 +409,7 @@ impl<'a> Executive<'a> {
 	fn finalize(
 		&mut self,
 		t: &SignedTransaction,
-		substate: Substate,
+		mut substate: Substate,
 		result: evm::Result<U256>,
 		output: Bytes,
 		trace: Vec<FlatTrace>,
@@ -440,15 +444,23 @@ impl<'a> Executive<'a> {
 		};
 
 		trace!("exec::finalize: Refunding refund_value={}, sender={}\n", refund_value, sender);
-		self.state.add_balance(&sender, &refund_value);
+		// Below: NoEmpty is safe since the sender must already be non-null to have sent this transaction
+		self.state.add_balance(&sender, &refund_value, CleanupMode::NoEmpty);  
 		trace!("exec::finalize: Compensating author: fees_value={}, author={}\n", fees_value, &self.info.author);
-		self.state.add_balance(&self.info.author, &fees_value);
+		self.state.add_balance(&self.info.author, &fees_value, substate.to_cleanup_mode(&schedule));
 
 		// perform suicides
 		for address in &substate.suicides {
 			self.state.kill_account(address);
 		}
 
+		// perform garbage-collection
+		for address in &substate.garbage {
+			if self.state.exists(address) && !self.state.exists_and_not_null(address) {
+				self.state.kill_account(address);
+			}
+		}
+
 		match result {
 			Err(evm::Error::Internal) => Err(ExecutionError::Internal),
 			Err(_) => {
@@ -509,7 +521,7 @@ mod tests {
 	use env_info::EnvInfo;
 	use evm::{Factory, VMType};
 	use error::ExecutionError;
-	use state::Substate;
+	use state::{Substate, CleanupMode};
 	use tests::helpers::*;
 	use trace::trace;
 	use trace::{FlatTrace, Tracer, NoopTracer, ExecutiveTracer};
@@ -538,7 +550,7 @@ mod tests {
 		params.value = ActionValue::Transfer(U256::from(0x7));
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(0x100u64));
+		state.add_balance(&sender, &U256::from(0x100u64), CleanupMode::NoEmpty);
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
 		let mut substate = Substate::new();
@@ -597,7 +609,7 @@ mod tests {
 		params.value = ActionValue::Transfer(U256::from(100));
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(100));
+		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty);
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
 		let mut substate = Substate::new();
@@ -656,7 +668,7 @@ mod tests {
 		params.call_type = CallType::Call;
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(100));
+		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty);
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(5);
 		let mut substate = Substate::new();
@@ -767,7 +779,7 @@ mod tests {
 		params.value = ActionValue::Transfer(100.into());
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(100));
+		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty);
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(5);
 		let mut substate = Substate::new();
@@ -855,7 +867,7 @@ mod tests {
 		params.value = ActionValue::Transfer(U256::from(100));
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(100));
+		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty);
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
 		let mut substate = Substate::new();
@@ -907,7 +919,7 @@ mod tests {
 		params.value = ActionValue::Transfer(U256::from(100));
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(100));
+		state.add_balance(&sender, &U256::from(100), CleanupMode::NoEmpty);
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(1024);
 		let mut substate = Substate::new();
@@ -967,7 +979,7 @@ mod tests {
 		let mut state = state_result.reference_mut();
 		state.init_code(&address_a, code_a.clone());
 		state.init_code(&address_b, code_b.clone());
-		state.add_balance(&sender, &U256::from(100_000));
+		state.add_balance(&sender, &U256::from(100_000), CleanupMode::NoEmpty);
 
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
@@ -1040,13 +1052,13 @@ mod tests {
 			gas: U256::from(100_000),
 			gas_price: U256::zero(),
 			nonce: U256::zero()
-		}.sign(keypair.secret());
+		}.sign(keypair.secret(), None);
 		let sender = t.sender().unwrap();
 		let contract = contract_address(&sender, &U256::zero());
 
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(18));
+		state.add_balance(&sender, &U256::from(18), CleanupMode::NoEmpty);
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
 		let engine = TestEngine::new(0);
@@ -1107,12 +1119,12 @@ mod tests {
 			gas: U256::from(100_000),
 			gas_price: U256::zero(),
 			nonce: U256::one()
-		}.sign(keypair.secret());
+		}.sign(keypair.secret(), None);
 		let sender = t.sender().unwrap();
 
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(17));
+		state.add_balance(&sender, &U256::from(17), CleanupMode::NoEmpty);
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
 		let engine = TestEngine::new(0);
@@ -1140,12 +1152,12 @@ mod tests {
 			gas: U256::from(80_001),
 			gas_price: U256::zero(),
 			nonce: U256::zero()
-		}.sign(keypair.secret());
+		}.sign(keypair.secret(), None);
 		let sender = t.sender().unwrap();
 
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(17));
+		state.add_balance(&sender, &U256::from(17), CleanupMode::NoEmpty);
 		let mut info = EnvInfo::default();
 		info.gas_used = U256::from(20_000);
 		info.gas_limit = U256::from(100_000);
@@ -1175,12 +1187,12 @@ mod tests {
 			gas: U256::from(100_000),
 			gas_price: U256::one(),
 			nonce: U256::zero()
-		}.sign(keypair.secret());
+		}.sign(keypair.secret(), None);
 		let sender = t.sender().unwrap();
 
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from(100_017));
+		state.add_balance(&sender, &U256::from(100_017), CleanupMode::NoEmpty);
 		let mut info = EnvInfo::default();
 		info.gas_limit = U256::from(100_000);
 		let engine = TestEngine::new(0);
@@ -1215,7 +1227,7 @@ mod tests {
 		params.value = ActionValue::Transfer(U256::from_str("0de0b6b3a7640000").unwrap());
 		let mut state_result = get_temp_state();
 		let mut state = state_result.reference_mut();
-		state.add_balance(&sender, &U256::from_str("152d02c7e14af6800000").unwrap());
+		state.add_balance(&sender, &U256::from_str("152d02c7e14af6800000").unwrap(), CleanupMode::NoEmpty);
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0);
 		let mut substate = Substate::new();
diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs
index bbe81a511..df1b64e67 100644
--- a/ethcore/src/externalities.rs
+++ b/ethcore/src/externalities.rs
@@ -114,6 +114,12 @@ impl<'a, T, V> Ext for Externalities<'a, T, V> where T: 'a + Tracer, V: 'a + VMT
 		self.state.exists(address)
 	}
 
+	fn exists_and_not_null(&self, address: &Address) -> bool {
+		self.state.exists_and_not_null(address)
+	}
+
+	fn origin_balance(&self) -> U256 { self.balance(&self.origin_info.address) }
+
 	fn balance(&self, address: &Address) -> U256 {
 		self.state.balance(address)
 	}
@@ -269,11 +275,11 @@ impl<'a, T, V> Ext for Externalities<'a, T, V> where T: 'a + Tracer, V: 'a + VMT
 		let address = self.origin_info.address.clone();
 		let balance = self.balance(&address);
 		if &address == refund_address {
-			// TODO [todr] To be consisted with CPP client we set balance to 0 in that case.
+			// TODO [todr] To be consistent with CPP client we set balance to 0 in that case.
 			self.state.sub_balance(&address, &balance);
 		} else {
-			trace!("Suiciding {} -> {} (xfer: {})", address, refund_address, balance);
-			self.state.transfer_balance(&address, refund_address, &balance);
+			trace!(target: "ext", "Suiciding {} -> {} (xfer: {})", address, refund_address, balance);
+			self.state.transfer_balance(&address, refund_address, &balance, self.substate.to_cleanup_mode(&self.schedule));
 		}
 
 		self.tracer.trace_suicide(address, balance, refund_address.clone());
diff --git a/ethcore/src/json_tests/chain.rs b/ethcore/src/json_tests/chain.rs
index bf32db133..b50241199 100644
--- a/ethcore/src/json_tests/chain.rs
+++ b/ethcore/src/json_tests/chain.rs
@@ -49,6 +49,7 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
 					ChainEra::Frontier => ethereum::new_frontier_test(),
 					ChainEra::Homestead => ethereum::new_homestead_test(),
 					ChainEra::Eip150 => ethereum::new_eip150_test(),
+					ChainEra::Eip161 => ethereum::new_eip161_test(),
 					ChainEra::TransitionTest => ethereum::new_transition_test(),
 				};
 				spec.set_genesis_state(state);
diff --git a/ethcore/src/json_tests/eip161_state.rs b/ethcore/src/json_tests/eip161_state.rs
new file mode 100644
index 000000000..da7997fa1
--- /dev/null
+++ b/ethcore/src/json_tests/eip161_state.rs
@@ -0,0 +1,51 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use super::test_common::*;
+use tests::helpers::*;
+use super::state::json_chain_test;
+
+fn do_json_test(json_data: &[u8]) -> Vec<String> {
+	json_chain_test(json_data, ChainEra::Eip161)
+}
+
+declare_test!{StateTests_EIP158_stEIP158SpecificTest, "StateTests/EIP158/stEIP158SpecificTest"}
+declare_test!{StateTests_EIP158_stNonZeroCallsTest, "StateTests/EIP158/stNonZeroCallsTest"}
+declare_test!{StateTests_EIP158_stZeroCallsTest, "StateTests/EIP158/stZeroCallsTest"}
+
+declare_test!{StateTests_EIP158_EIP150_stMemExpandingEIPCalls, "StateTests/EIP158/EIP150/stMemExpandingEIPCalls"}
+declare_test!{StateTests_EIP158_EIP150_stEIPSpecificTest, "StateTests/EIP158/EIP150/stEIPSpecificTest"}
+declare_test!{StateTests_EIP158_EIP150_stEIPsingleCodeGasPrices, "StateTests/EIP158/EIP150/stEIPsingleCodeGasPrices"}
+declare_test!{StateTests_EIP158_EIP150_stChangedTests, "StateTests/EIP158/EIP150/stChangedTests"}
+
+declare_test!{StateTests_EIP158_Homestead_stBoundsTest, "StateTests/EIP158/Homestead/stBoundsTest"}
+declare_test!{StateTests_EIP158_Homestead_stCallCodes, "StateTests/EIP158/Homestead/stCallCodes"}
+declare_test!{StateTests_EIP158_Homestead_stCallCreateCallCodeTest, "StateTests/EIP158/Homestead/stCallCreateCallCodeTest"}
+declare_test!{StateTests_EIP158_Homestead_stCallDelegateCodes, "StateTests/EIP158/Homestead/stCallDelegateCodes"}
+declare_test!{StateTests_EIP158_Homestead_stCallDelegateCodesCallCode, "StateTests/EIP158/Homestead/stCallDelegateCodesCallCode"}
+declare_test!{StateTests_EIP158_Homestead_stDelegatecallTest, "StateTests/EIP158/Homestead/stDelegatecallTest"}
+declare_test!{StateTests_EIP158_Homestead_stHomeSteadSpecific, "StateTests/EIP158/Homestead/stHomeSteadSpecific"}
+declare_test!{StateTests_EIP158_Homestead_stInitCodeTest, "StateTests/EIP158/Homestead/stInitCodeTest"}
+declare_test!{StateTests_EIP158_Homestead_stLogTests, "StateTests/EIP158/Homestead/stLogTests"}
+declare_test!{heavy => StateTests_EIP158_Homestead_stMemoryTest, "StateTests/EIP158/Homestead/stMemoryTest"}
+declare_test!{StateTests_EIP158_Homestead_stPreCompiledContracts, "StateTests/EIP158/Homestead/stPreCompiledContracts"}
+declare_test!{heavy => StateTests_EIP158_Homestead_stQuadraticComplexityTest, "StateTests/EIP158/Homestead/stQuadraticComplexityTest"}
+declare_test!{StateTests_EIP158_Homestead_stRecursiveCreate, "StateTests/EIP158/Homestead/stRecursiveCreate"}
+declare_test!{StateTests_EIP158_Homestead_stRefundTest, "StateTests/EIP158/Homestead/stRefundTest"}
+declare_test!{StateTests_EIP158_Homestead_stSpecialTest, "StateTests/EIP158/Homestead/stSpecialTest"}
+declare_test!{StateTests_EIP158_Homestead_stSystemOperationsTest, "StateTests/EIP158/Homestead/stSystemOperationsTest"}
+declare_test!{StateTests_EIP158_Homestead_stTransactionTest, "StateTests/EIP158/Homestead/stTransactionTest"}
+declare_test!{StateTests_EIP158_Homestead_stWalletTest, "StateTests/EIP158/Homestead/stWalletTest"}
\ No newline at end of file
diff --git a/ethcore/src/json_tests/executive.rs b/ethcore/src/json_tests/executive.rs
index 1d4faec62..60321f971 100644
--- a/ethcore/src/json_tests/executive.rs
+++ b/ethcore/src/json_tests/executive.rs
@@ -92,10 +92,18 @@ impl<'a, T, V> Ext for TestExt<'a, T, V> where T: Tracer, V: VMTracer {
 		self.ext.exists(address)
 	}
 
+	fn exists_and_not_null(&self, address: &Address) -> bool {
+		self.ext.exists_and_not_null(address)
+	}
+
 	fn balance(&self, address: &Address) -> U256 {
 		self.ext.balance(address)
 	}
 
+	fn origin_balance(&self) -> U256 {
+		self.ext.origin_balance()
+	}
+
 	fn blockhash(&self, number: &U256) -> H256 {
 		self.ext.blockhash(number)
 	}
diff --git a/ethcore/src/json_tests/mod.rs b/ethcore/src/json_tests/mod.rs
index 7a5dd30d2..13d3fb5bb 100644
--- a/ethcore/src/json_tests/mod.rs
+++ b/ethcore/src/json_tests/mod.rs
@@ -24,4 +24,5 @@ mod chain;
 mod homestead_state;
 mod homestead_chain;
 mod eip150_state;
+mod eip161_state;
 mod trie;
diff --git a/ethcore/src/json_tests/state.rs b/ethcore/src/json_tests/state.rs
index c3e74af5d..bf84d50ee 100644
--- a/ethcore/src/json_tests/state.rs
+++ b/ethcore/src/json_tests/state.rs
@@ -29,6 +29,7 @@ pub fn json_chain_test(json_data: &[u8], era: ChainEra) -> Vec<String> {
 		ChainEra::Frontier => ethereum::new_mainnet_like().engine,
 		ChainEra::Homestead => ethereum::new_homestead_test().engine,
 		ChainEra::Eip150 => ethereum::new_eip150_test().engine,
+		ChainEra::Eip161 => ethereum::new_eip161_test().engine,
 		ChainEra::TransitionTest => ethereum::new_transition_test().engine,
 	};
 
diff --git a/ethcore/src/json_tests/transaction.rs b/ethcore/src/json_tests/transaction.rs
index 50061cbfd..dd5a4ef14 100644
--- a/ethcore/src/json_tests/transaction.rs
+++ b/ethcore/src/json_tests/transaction.rs
@@ -35,17 +35,24 @@ fn do_json_test(json_data: &[u8]) -> Vec<String> {
 			Some(x) if x < 1_150_000 => &old_schedule,
 			Some(_) => &new_schedule
 		};
+		let allow_network_id_of_one = number.map_or(false, |n| n > 2600000); 
 
 		let rlp: Vec<u8> = test.rlp.into();
 		let res = UntrustedRlp::new(&rlp)
 			.as_val()
 			.map_err(From::from)
-			.and_then(|t: SignedTransaction| t.validate(schedule, schedule.have_delegate_call));
+			.and_then(|t: SignedTransaction| t.validate(schedule, schedule.have_delegate_call, allow_network_id_of_one));
 
 		fail_unless(test.transaction.is_none() == res.is_err());
 		if let (Some(tx), Some(sender)) = (test.transaction, test.sender) {
 			let t = res.unwrap();
 			fail_unless(t.sender().unwrap() == sender.into());
+			let is_acceptable_network_id = match t.network_id() {
+				None => true,
+				Some(1) if allow_network_id_of_one => true,
+				_ => false,
+			};
+			fail_unless(is_acceptable_network_id);
 			let data: Vec<u8> = tx.data.into();
 			fail_unless(t.data == data);
 			fail_unless(t.gas_price == tx.gas_price.into());
diff --git a/ethcore/src/miner/banning_queue.rs b/ethcore/src/miner/banning_queue.rs
index f127dc7e8..0fdea2ac3 100644
--- a/ethcore/src/miner/banning_queue.rs
+++ b/ethcore/src/miner/banning_queue.rs
@@ -245,7 +245,7 @@ mod tests {
 			gas: U256::from(100_000),
 			gas_price: U256::from(10),
 			nonce: U256::from(0),
-		}.sign(keypair.secret())
+		}.sign(keypair.secret(), None)
 	}
 
 	fn unwrap_err(res: Result<TransactionImportResult, Error>) -> TransactionError {
diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
index d36869a74..19a2b9a10 100644
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -21,7 +21,7 @@ use util::*;
 use util::using_queue::{UsingQueue, GetAction};
 use account_provider::AccountProvider;
 use views::{BlockView, HeaderView};
-use state::State;
+use state::{State, CleanupMode};
 use client::{MiningBlockChainClient, Executive, Executed, EnvInfo, TransactOptions, BlockID, CallAnalytics};
 use executive::contract_address;
 use block::{ClosedBlock, SealedBlock, IsBlock, Block};
@@ -650,7 +650,7 @@ impl MinerService for Miner {
 				let needed_balance = t.value + t.gas * t.gas_price;
 				if balance < needed_balance {
 					// give the sender a sufficient balance
-					state.add_balance(&sender, &(needed_balance - balance));
+					state.add_balance(&sender, &(needed_balance - balance), CleanupMode::NoEmpty);
 				}
 				let options = TransactOptions { tracing: analytics.transaction_tracing, vm_tracing: analytics.vm_tracing, check_nonce: false };
 				let mut ret = try!(Executive::new(&mut state, &env_info, &*self.engine, chain.vm_factory()).transact(t, options));
@@ -935,6 +935,8 @@ impl MinerService for Miner {
 								}
 							},
 							logs: receipt.logs.clone(),
+							log_bloom: receipt.log_bloom,
+							state_root: receipt.state_root,
 						}
 					})
 			}
@@ -1173,7 +1175,7 @@ mod tests {
 			gas: U256::from(100_000),
 			gas_price: U256::zero(),
 			nonce: U256::zero(),
-		}.sign(keypair.secret())
+		}.sign(keypair.secret(), None)
 	}
 
 	#[test]
diff --git a/ethcore/src/miner/transaction_queue.rs b/ethcore/src/miner/transaction_queue.rs
index 51c1863f6..cc10bbe98 100644
--- a/ethcore/src/miner/transaction_queue.rs
+++ b/ethcore/src/miner/transaction_queue.rs
@@ -42,8 +42,8 @@
 //!		let t2 = Transaction { action: Action::Create, value: U256::from(100), data: "3331600055".from_hex().unwrap(),
 //!			gas: U256::from(100_000), gas_price: U256::one(), nonce: U256::from(11) };
 //!
-//!		let st1 = t1.sign(&key.secret());
-//!		let st2 = t2.sign(&key.secret());
+//!		let st1 = t1.sign(&key.secret(), None);
+//!		let st2 = t2.sign(&key.secret(), None);
 //!		let default_account_details = |_a: &Address| AccountDetails {
 //!			nonce: U256::from(10),
 //!			balance: U256::from(1_000_000),
@@ -1104,12 +1104,12 @@ mod test {
 
 	fn new_tx(nonce: U256, gas_price: U256) -> SignedTransaction {
 		let keypair = Random.generate().unwrap();
-		new_unsigned_tx(nonce, default_gas_val(), gas_price).sign(keypair.secret())
+		new_unsigned_tx(nonce, default_gas_val(), gas_price).sign(keypair.secret(), None)
 	}
 
 	fn new_tx_with_gas(gas: U256, gas_price: U256) -> SignedTransaction {
 		let keypair = Random.generate().unwrap();
-		new_unsigned_tx(default_nonce(), gas, gas_price).sign(keypair.secret())
+		new_unsigned_tx(default_nonce(), gas, gas_price).sign(keypair.secret(), None)
 	}
 
 	fn new_tx_default() -> SignedTransaction {
@@ -1133,7 +1133,7 @@ mod test {
 
 		let keypair = Random.generate().unwrap();
 		let secret = &keypair.secret();
-		(tx1.sign(secret), tx2.sign(secret))
+		(tx1.sign(secret, None), tx2.sign(secret, None))
 	}
 
 	/// Returns two consecutive transactions, both with increased gas price
@@ -1144,7 +1144,7 @@ mod test {
 
 		let keypair = Random.generate().unwrap();
 		let secret = &keypair.secret();
-		(tx1.sign(secret), tx2.sign(secret))
+		(tx1.sign(secret, None), tx2.sign(secret, None))
 	}
 
 	fn new_tx_pair_default(nonce_increment: U256, gas_price_increment: U256) -> (SignedTransaction, SignedTransaction) {
@@ -1798,9 +1798,9 @@ mod test {
 		let mut txq = TransactionQueue::default();
 		let kp = Random.generate().unwrap();
 		let secret = kp.secret();
-		let tx = new_unsigned_tx(123.into(), default_gas_val(), 1.into()).sign(secret);
-		let tx1 = new_unsigned_tx(124.into(), default_gas_val(), 1.into()).sign(secret);
-		let tx2 = new_unsigned_tx(125.into(), default_gas_val(), 1.into()).sign(secret);
+		let tx = new_unsigned_tx(123.into(), default_gas_val(), 1.into()).sign(secret, None);
+		let tx1 = new_unsigned_tx(124.into(), default_gas_val(), 1.into()).sign(secret, None);
+		let tx2 = new_unsigned_tx(125.into(), default_gas_val(), 1.into()).sign(secret, None);
 
 		txq.add(tx, TransactionOrigin::External, &default_account_details, &gas_estimator).unwrap();
 		assert_eq!(txq.status().pending, 1);
@@ -2038,11 +2038,11 @@ mod test {
 		// given
 		let mut txq = TransactionQueue::default();
 		let keypair = Random.generate().unwrap();
-		let tx = new_unsigned_tx(123.into(), default_gas_val(), 1.into()).sign(keypair.secret());
+		let tx = new_unsigned_tx(123.into(), default_gas_val(), 1.into()).sign(keypair.secret(), None);
 		let tx2 = {
 			let mut tx2 = (*tx).clone();
 			tx2.gas_price = U256::from(200);
-			tx2.sign(keypair.secret())
+			tx2.sign(keypair.secret(), None)
 		};
 
 		// when
@@ -2061,16 +2061,16 @@ mod test {
 		// given
 		let mut txq = TransactionQueue::default();
 		let keypair = Random.generate().unwrap();
-		let tx0 = new_unsigned_tx(123.into(), default_gas_val(), 1.into()).sign(keypair.secret());
+		let tx0 = new_unsigned_tx(123.into(), default_gas_val(), 1.into()).sign(keypair.secret(), None);
 		let tx1 = {
 			let mut tx1 = (*tx0).clone();
 			tx1.nonce = U256::from(124);
-			tx1.sign(keypair.secret())
+			tx1.sign(keypair.secret(), None)
 		};
 		let tx2 = {
 			let mut tx2 = (*tx1).clone();
 			tx2.gas_price = U256::from(200);
-			tx2.sign(keypair.secret())
+			tx2.sign(keypair.secret(), None)
 		};
 
 		// when
@@ -2223,7 +2223,7 @@ mod test {
 			let tx3 = new_unsigned_tx(nonce + 2.into(), gas, 1.into());
 
 
-			(tx.sign(secret), tx2.sign(secret), tx2_2.sign(secret), tx3.sign(secret))
+			(tx.sign(secret, None), tx2.sign(secret, None), tx2_2.sign(secret, None), tx3.sign(secret, None))
 		};
 		let sender = tx1.sender().unwrap();
 		txq.add(tx1, TransactionOrigin::Local, &default_account_details, &gas_estimator).unwrap();
diff --git a/ethcore/src/spec/spec.rs b/ethcore/src/spec/spec.rs
index 46e99c12e..2babfb708 100644
--- a/ethcore/src/spec/spec.rs
+++ b/ethcore/src/spec/spec.rs
@@ -38,7 +38,7 @@ pub struct CommonParams {
 	/// Maximum size of extra data.
 	pub maximum_extra_data_size: usize,
 	/// Network id.
-	pub network_id: U256,
+	pub network_id: usize,
 	/// Main subprotocol name.
 	pub subprotocol_name: String,
 	/// Minimum gas limit.
@@ -160,7 +160,7 @@ impl Spec {
 	pub fn nodes(&self) -> &[String] { &self.nodes }
 
 	/// Get the configured Network ID.
-	pub fn network_id(&self) -> U256 { self.params.network_id }
+	pub fn network_id(&self) -> usize { self.params.network_id }
 
 	/// Get the configured Network ID.
 	pub fn subprotocol_name(&self) -> String { self.params.subprotocol_name.clone() }
@@ -250,7 +250,7 @@ impl Spec {
 			}
 			trace!(target: "spec", "ensure_db_good: Populated sec trie; root is {}", root);
 			for (address, account) in self.genesis_state.get().iter() {
-				db.note_account_bloom(address);
+				db.note_non_null_account(address);
 				account.insert_additional(&mut AccountDBMut::new(db.as_hashdb_mut(), address));
 			}
 			assert!(db.as_hashdb().contains(&self.state_root()));
diff --git a/ethcore/src/state/account.rs b/ethcore/src/state/account.rs
index d8d281b17..76061f6a0 100644
--- a/ethcore/src/state/account.rs
+++ b/ethcore/src/state/account.rs
@@ -300,11 +300,17 @@ impl Account {
 	pub fn storage_is_clean(&self) -> bool { self.storage_changes.is_empty() }
 
 	/// Check if account has zero nonce, balance, no code and no storage.
+	///
+	/// NOTE: Will panic if `!self.storage_is_clean()`
 	pub fn is_empty(&self) -> bool {
-		self.storage_changes.is_empty() &&
+		assert!(self.storage_is_clean(), "Account::is_empty() may only legally be called when storage is clean.");
+		self.is_null() && self.storage_root == SHA3_NULL_RLP
+	}
+
+	/// Check if account has zero nonce, balance, no code.
+	pub fn is_null(&self) -> bool {
 		self.balance.is_zero() &&
 		self.nonce.is_zero() &&
-		self.storage_root == SHA3_NULL_RLP &&
 		self.code_hash == SHA3_EMPTY
 	}
 
diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs
index 7c0f43d97..01a7e3b15 100644
--- a/ethcore/src/state/mod.rs
+++ b/ethcore/src/state/mod.rs
@@ -199,6 +199,13 @@ enum RequireCache {
 	Code,
 }
 
+#[derive(PartialEq)]
+pub enum CleanupMode<'a> {
+	ForceCreate,
+	NoEmpty,
+	KillEmpty(&'a mut HashSet<Address>),
+}
+
 const SEC_TRIE_DB_UNWRAP_STR: &'static str = "A state can only be created with valid root. Creating a SecTrieDB with a valid root will not fail. \
 			 Therefore creating a SecTrieDB with this state's root will not fail.";
 
@@ -329,8 +336,8 @@ impl State {
 
 	/// Create a new contract at address `contract`. If there is already an account at the address
 	/// it will have its code reset, ready for `init_code()`.
-	pub fn new_contract(&mut self, contract: &Address, balance: U256) {
-		self.insert_cache(contract, AccountEntry::new_dirty(Some(Account::new_contract(balance, self.account_start_nonce))));
+	pub fn new_contract(&mut self, contract: &Address, balance: U256, nonce_offset: U256) {
+		self.insert_cache(contract, AccountEntry::new_dirty(Some(Account::new_contract(balance, self.account_start_nonce + nonce_offset))));
 	}
 
 	/// Remove an existing account.
@@ -341,10 +348,15 @@ impl State {
 	/// Determine whether an account exists.
 	pub fn exists(&self, a: &Address) -> bool {
 		// Bloom filter does not contain empty accounts, so it is important here to
-		// check if account exists in the database directly before EIP-158 is in effect.
+		// check if account exists in the database directly before EIP-161 is in effect.
 		self.ensure_cached(a, RequireCache::None, false, |a| a.is_some())
 	}
 
+	/// Determine whether an account exists and if not empty.
+	pub fn exists_and_not_null(&self, a: &Address) -> bool {
+		self.ensure_cached(a, RequireCache::None, false, |a| a.map_or(false, |a| !a.is_null()))
+	}
+
 	/// Get the balance of account `a`.
 	pub fn balance(&self, a: &Address) -> U256 {
 		self.ensure_cached(a, RequireCache::None, true,
@@ -399,7 +411,7 @@ impl State {
 		}
 
 		// check bloom before any requests to trie
-		if !self.db.check_account_bloom(address) { return H256::zero() }
+		if !self.db.check_non_null_bloom(address) { return H256::zero() }
 
 		// account is not found in the global cache, get from the DB and insert into local
 		let db = self.factories.trie.readonly(self.db.as_hashdb(), &self.root).expect(SEC_TRIE_DB_UNWRAP_STR);
@@ -433,10 +445,18 @@ impl State {
 	}
 
 	/// Add `incr` to the balance of account `a`.
-	pub fn add_balance(&mut self, a: &Address, incr: &U256) {
+	pub fn add_balance(&mut self, a: &Address, incr: &U256, cleanup_mode: CleanupMode) {
 		trace!(target: "state", "add_balance({}, {}): {}", a, incr, self.balance(a));
-		if !incr.is_zero() || !self.exists(a) {
+		let is_value_transfer = !incr.is_zero();
+		if is_value_transfer || (cleanup_mode == CleanupMode::ForceCreate && !self.exists(a)) {
 			self.require(a, false).add_balance(incr);
+		} else {
+			match cleanup_mode {
+				CleanupMode::KillEmpty(set) => if !is_value_transfer && self.exists(a) && !self.exists_and_not_null(a) {
+					set.insert(a.clone());
+				},
+				_ => {}
+			}
 		}
 	}
 
@@ -449,9 +469,9 @@ impl State {
 	}
 
 	/// Subtracts `by` from the balance of `from` and adds it to that of `to`.
-	pub fn transfer_balance(&mut self, from: &Address, to: &Address, by: &U256) {
+	pub fn transfer_balance(&mut self, from: &Address, to: &Address, by: &U256, cleanup_mode: CleanupMode) {
 		self.sub_balance(from, by);
-		self.add_balance(to, by);
+		self.add_balance(to, by, cleanup_mode);
 	}
 
 	/// Increment the nonce of account `a` by 1.
@@ -507,13 +527,15 @@ impl State {
 		// first, commit the sub trees.
 		for (address, ref mut a) in accounts.iter_mut().filter(|&(_, ref a)| a.is_dirty()) {
 			if let Some(ref mut account) = a.account {
-				if !account.is_empty() {
-					db.note_account_bloom(address);
-				}
 				let addr_hash = account.address_hash(address);
-				let mut account_db = factories.accountdb.create(db.as_hashdb_mut(), addr_hash);
-				account.commit_storage(&factories.trie, account_db.as_hashdb_mut());
-				account.commit_code(account_db.as_hashdb_mut());
+				{
+					let mut account_db = factories.accountdb.create(db.as_hashdb_mut(), addr_hash);
+					account.commit_storage(&factories.trie, account_db.as_hashdb_mut());
+					account.commit_code(account_db.as_hashdb_mut());
+				}
+				if !account.is_empty() {
+					db.note_non_null_account(address);
+				}
 			}
 		}
 
@@ -653,7 +675,7 @@ impl State {
 			Some(r) => r,
 			None => {
 				// first check bloom if it is not in database for sure
-				if check_bloom && !self.db.check_account_bloom(a) { return f(None); }
+				if check_bloom && !self.db.check_non_null_bloom(a) { return f(None); }
 
 				// not found in the global cache, get from the DB and insert into local
 				let db = self.factories.trie.readonly(self.db.as_hashdb(), &self.root).expect(SEC_TRIE_DB_UNWRAP_STR);
@@ -687,7 +709,7 @@ impl State {
 			match self.db.get_cached_account(a) {
 				Some(acc) => self.insert_cache(a, AccountEntry::new_clean_cached(acc)),
 				None => {
-					let maybe_acc = if self.db.check_account_bloom(a) {
+					let maybe_acc = if self.db.check_non_null_bloom(a) {
 						let db = self.factories.trie.readonly(self.db.as_hashdb(), &self.root).expect(SEC_TRIE_DB_UNWRAP_STR);
 						match db.get(a) {
 							Ok(Some(acc)) => AccountEntry::new_clean(Some(Account::from_rlp(&acc))),
@@ -793,9 +815,9 @@ fn should_apply_create_transaction() {
 		action: Action::Create,
 		value: 100.into(),
 		data: FromHex::from_hex("601080600c6000396000f3006000355415600957005b60203560003555").unwrap(),
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -853,9 +875,9 @@ fn should_trace_failed_create_transaction() {
 		action: Action::Create,
 		value: 100.into(),
 		data: FromHex::from_hex("5b600056").unwrap(),
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -890,10 +912,10 @@ fn should_trace_call_transaction() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("6000").unwrap());
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -933,9 +955,9 @@ fn should_trace_basic_call_transaction() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -975,7 +997,7 @@ fn should_trace_call_transaction_to_builtin() {
 		action: Action::Call(0x1.into()),
 		value: 0.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	let result = state.apply(&info, engine, &t, true).unwrap();
 
@@ -1017,7 +1039,7 @@ fn should_not_trace_subcall_transaction_to_builtin() {
 		action: Action::Call(0xa.into()),
 		value: 0.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("600060006000600060006001610be0f1").unwrap());
 	let result = state.apply(&info, engine, &t, true).unwrap();
@@ -1060,7 +1082,7 @@ fn should_not_trace_callcode() {
 		action: Action::Call(0xa.into()),
 		value: 0.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006000600b611000f2").unwrap());
 	state.init_code(&0xb.into(), FromHex::from_hex("6000").unwrap());
@@ -1122,7 +1144,7 @@ fn should_not_trace_delegatecall() {
 		action: Action::Call(0xa.into()),
 		value: 0.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("6000600060006000600b618000f4").unwrap());
 	state.init_code(&0xb.into(), FromHex::from_hex("6000").unwrap());
@@ -1181,10 +1203,10 @@ fn should_trace_failed_call_transaction() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("5b600056").unwrap());
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -1221,11 +1243,11 @@ fn should_trace_call_with_subcall_transaction() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006000600b602b5a03f1").unwrap());
 	state.init_code(&0xb.into(), FromHex::from_hex("6000").unwrap());
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 
 	let expected_trace = vec![FlatTrace {
@@ -1281,10 +1303,10 @@ fn should_trace_call_with_basic_subcall_transaction() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006045600b6000f1").unwrap());
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -1336,10 +1358,10 @@ fn should_not_trace_call_with_invalid_basic_subcall_transaction() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("600060006000600060ff600b6000f1").unwrap());	// not enough funds.
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -1379,11 +1401,11 @@ fn should_trace_failed_subcall_transaction() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],//600480600b6000396000f35b600056
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006000600b602b5a03f1").unwrap());
 	state.init_code(&0xb.into(), FromHex::from_hex("5b600056").unwrap());
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -1435,12 +1457,12 @@ fn should_trace_call_with_subcall_with_subcall_transaction() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006000600b602b5a03f1").unwrap());
 	state.init_code(&0xb.into(), FromHex::from_hex("60006000600060006000600c602b5a03f1").unwrap());
 	state.init_code(&0xc.into(), FromHex::from_hex("6000").unwrap());
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -1510,12 +1532,12 @@ fn should_trace_failed_subcall_with_subcall_transaction() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],//600480600b6000396000f35b600056
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("60006000600060006000600b602b5a03f1").unwrap());
 	state.init_code(&0xb.into(), FromHex::from_hex("60006000600060006000600c602b5a03f1505b601256").unwrap());
 	state.init_code(&0xc.into(), FromHex::from_hex("6000").unwrap());
-	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()));
+	state.add_balance(t.sender().as_ref().unwrap(), &(100.into()), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 
 	let expected_trace = vec![FlatTrace {
@@ -1583,11 +1605,11 @@ fn should_trace_suicide() {
 		action: Action::Call(0xa.into()),
 		value: 100.into(),
 		data: vec![],
-	}.sign(&"".sha3());
+	}.sign(&"".sha3(), None);
 
 	state.init_code(&0xa.into(), FromHex::from_hex("73000000000000000000000000000000000000000bff").unwrap());
-	state.add_balance(&0xa.into(), &50.into());
-	state.add_balance(t.sender().as_ref().unwrap(), &100.into());
+	state.add_balance(&0xa.into(), &50.into(), CleanupMode::NoEmpty);
+	state.add_balance(t.sender().as_ref().unwrap(), &100.into(), CleanupMode::NoEmpty);
 	let result = state.apply(&info, &engine, &t, true).unwrap();
 	let expected_trace = vec![FlatTrace {
 		trace_address: Default::default(),
@@ -1658,7 +1680,7 @@ fn get_from_database() {
 	let (root, db) = {
 		let mut state = get_temp_state_in(temp.as_path());
 		state.inc_nonce(&a);
-		state.add_balance(&a, &U256::from(69u64));
+		state.add_balance(&a, &U256::from(69u64), CleanupMode::NoEmpty);
 		state.commit().unwrap();
 		assert_eq!(state.balance(&a), U256::from(69u64));
 		state.drop()
@@ -1675,27 +1697,47 @@ fn remove() {
 	let mut state_result = get_temp_state();
 	let mut state = state_result.reference_mut();
 	assert_eq!(state.exists(&a), false);
+	assert_eq!(state.exists_and_not_null(&a), false);
 	state.inc_nonce(&a);
 	assert_eq!(state.exists(&a), true);
+	assert_eq!(state.exists_and_not_null(&a), true);
 	assert_eq!(state.nonce(&a), U256::from(1u64));
 	state.kill_account(&a);
 	assert_eq!(state.exists(&a), false);
+	assert_eq!(state.exists_and_not_null(&a), false);
 	assert_eq!(state.nonce(&a), U256::from(0u64));
 }
 
 #[test]
-fn empty_account_exists() {
+fn empty_account_is_not_created() {
 	let a = Address::zero();
 	let path = RandomTempPath::new();
 	let db = get_temp_state_db_in(path.as_path());
 	let (root, db) = {
 		let mut state = State::new(db, U256::from(0), Default::default());
-		state.add_balance(&a, &U256::default()); // create an empty account
+		state.add_balance(&a, &U256::default(), CleanupMode::NoEmpty); // create an empty account
+		state.commit().unwrap();
+		state.drop()
+	};
+	let state = State::from_existing(db, root, U256::from(0u8), Default::default()).unwrap();
+	assert!(!state.exists(&a));
+	assert!(!state.exists_and_not_null(&a));
+}
+
+#[test]
+fn empty_account_exists_when_creation_forced() {
+	let a = Address::zero();
+	let path = RandomTempPath::new();
+	let db = get_temp_state_db_in(path.as_path());
+	let (root, db) = {
+		let mut state = State::new(db, U256::from(0), Default::default());
+		state.add_balance(&a, &U256::default(), CleanupMode::ForceCreate); // create an empty account
 		state.commit().unwrap();
 		state.drop()
 	};
 	let state = State::from_existing(db, root, U256::from(0u8), Default::default()).unwrap();
 	assert!(state.exists(&a));
+	assert!(!state.exists_and_not_null(&a));
 }
 
 #[test]
@@ -1733,7 +1775,7 @@ fn alter_balance() {
 	let mut state = state_result.reference_mut();
 	let a = Address::zero();
 	let b = 1u64.into();
-	state.add_balance(&a, &U256::from(69u64));
+	state.add_balance(&a, &U256::from(69u64), CleanupMode::NoEmpty);
 	assert_eq!(state.balance(&a), U256::from(69u64));
 	state.commit().unwrap();
 	assert_eq!(state.balance(&a), U256::from(69u64));
@@ -1741,7 +1783,7 @@ fn alter_balance() {
 	assert_eq!(state.balance(&a), U256::from(27u64));
 	state.commit().unwrap();
 	assert_eq!(state.balance(&a), U256::from(27u64));
-	state.transfer_balance(&a, &b, &U256::from(18u64));
+	state.transfer_balance(&a, &b, &U256::from(18u64), CleanupMode::NoEmpty);
 	assert_eq!(state.balance(&a), U256::from(9u64));
 	assert_eq!(state.balance(&b), U256::from(18u64));
 	state.commit().unwrap();
@@ -1794,12 +1836,12 @@ fn checkpoint_basic() {
 	let mut state = state_result.reference_mut();
 	let a = Address::zero();
 	state.checkpoint();
-	state.add_balance(&a, &U256::from(69u64));
+	state.add_balance(&a, &U256::from(69u64), CleanupMode::NoEmpty);
 	assert_eq!(state.balance(&a), U256::from(69u64));
 	state.discard_checkpoint();
 	assert_eq!(state.balance(&a), U256::from(69u64));
 	state.checkpoint();
-	state.add_balance(&a, &U256::from(1u64));
+	state.add_balance(&a, &U256::from(1u64), CleanupMode::NoEmpty);
 	assert_eq!(state.balance(&a), U256::from(70u64));
 	state.revert_to_checkpoint();
 	assert_eq!(state.balance(&a), U256::from(69u64));
@@ -1812,7 +1854,7 @@ fn checkpoint_nested() {
 	let a = Address::zero();
 	state.checkpoint();
 	state.checkpoint();
-	state.add_balance(&a, &U256::from(69u64));
+	state.add_balance(&a, &U256::from(69u64), CleanupMode::NoEmpty);
 	assert_eq!(state.balance(&a), U256::from(69u64));
 	state.discard_checkpoint();
 	assert_eq!(state.balance(&a), U256::from(69u64));
@@ -1835,7 +1877,7 @@ fn should_not_panic_on_state_diff_with_storage() {
 
 	let a: Address = 0xa.into();
 	state.init_code(&a, b"abcdefg".to_vec());
-	state.add_balance(&a, &256.into());
+	state.add_balance(&a, &256.into(), CleanupMode::NoEmpty);
 	state.set_storage(&a, 0xb.into(), 0xc.into());
 
 	let mut new_state = state.clone();
diff --git a/ethcore/src/state/substate.rs b/ethcore/src/state/substate.rs
index de703f369..853b0e422 100644
--- a/ethcore/src/state/substate.rs
+++ b/ethcore/src/state/substate.rs
@@ -18,6 +18,8 @@
 use std::collections::HashSet;
 use util::{Address, U256};
 use log_entry::LogEntry;
+use evm::Schedule;
+use super::CleanupMode;
 
 /// State changes which should be applied in finalize,
 /// after transaction is fully executed.
@@ -26,6 +28,9 @@ pub struct Substate {
 	/// Any accounts that have suicided.
 	pub suicides: HashSet<Address>,
 
+	/// Any accounts that are tagged for garbage collection.
+	pub garbage: HashSet<Address>,
+
 	/// Any logs.
 	pub logs: Vec<LogEntry>,
 
@@ -45,10 +50,20 @@ impl Substate {
 	/// Merge secondary substate `s` into self, accruing each element correspondingly.
 	pub fn accrue(&mut self, s: Substate) {
 		self.suicides.extend(s.suicides.into_iter());
+		self.garbage.extend(s.garbage.into_iter());
 		self.logs.extend(s.logs.into_iter());
 		self.sstore_clears_count = self.sstore_clears_count + s.sstore_clears_count;
 		self.contracts_created.extend(s.contracts_created.into_iter());
 	}
+
+	/// Get the cleanup mode object from this.
+	pub fn to_cleanup_mode(&mut self, schedule: &Schedule) -> CleanupMode {
+		match (schedule.no_empty, schedule.kill_empty) {
+			(false, _) => CleanupMode::ForceCreate,
+			(true, false) => CleanupMode::NoEmpty,
+			(true, true) => CleanupMode::KillEmpty(&mut self.garbage),
+		}
+	}
 }
 
 #[cfg(test)]
diff --git a/ethcore/src/state_db.rs b/ethcore/src/state_db.rs
index 3506b8951..3a3595a35 100644
--- a/ethcore/src/state_db.rs
+++ b/ethcore/src/state_db.rs
@@ -165,13 +165,13 @@ impl StateDB {
 		bloom
 	}
 
-	pub fn check_account_bloom(&self, address: &Address) -> bool {
+	pub fn check_non_null_bloom(&self, address: &Address) -> bool {
 		trace!(target: "account_bloom", "Check account bloom: {:?}", address);
 		let bloom = self.account_bloom.lock();
 		bloom.check(&*address.sha3())
 	}
 
-	pub fn note_account_bloom(&self, address: &Address) {
+	pub fn note_non_null_account(&self, address: &Address) {
 		trace!(target: "account_bloom", "Note account bloom: {:?}", address);
 		let mut bloom = self.account_bloom.lock();
 		bloom.set(&*address.sha3());
diff --git a/ethcore/src/tests/client.rs b/ethcore/src/tests/client.rs
index 3a24ccf21..99b251d66 100644
--- a/ethcore/src/tests/client.rs
+++ b/ethcore/src/tests/client.rs
@@ -16,6 +16,7 @@
 
 use io::IoChannel;
 use client::{BlockChainClient, MiningBlockChainClient, Client, ClientConfig, BlockID};
+use state::CleanupMode;
 use ethereum;
 use block::IsBlock;
 use tests::helpers::*;
@@ -217,7 +218,7 @@ fn can_generate_gas_price_histogram() {
 	let client = client_result.reference();
 
 	let hist = client.gas_price_histogram(20, 5).unwrap();
-	let correct_hist = Histogram { bucket_bounds: vec_into![643,2293,3943,5593,7243,8893], counts: vec![4,2,4,6,3] };
+	let correct_hist = Histogram { bucket_bounds: vec_into![643, 2294, 3945, 5596, 7247, 8898], counts: vec![4,2,4,6,4] };
 	assert_eq!(hist, correct_hist);
 }
 
@@ -272,7 +273,7 @@ fn change_history_size() {
 		let client = Client::new(ClientConfig::default(), &test_spec, dir.as_path(), Arc::new(Miner::with_spec(&test_spec)), IoChannel::disconnected(), &db_config).unwrap();
 		for _ in 0..20 {
 			let mut b = client.prepare_open_block(Address::default(), (3141562.into(), 31415620.into()), vec![]);
-			b.block_mut().fields_mut().state.add_balance(&address, &5.into());
+			b.block_mut().fields_mut().state.add_balance(&address, &5.into(), CleanupMode::NoEmpty);
 			b.block_mut().fields_mut().state.commit().unwrap();
 			let b = b.close_and_lock().seal(&*test_spec.engine, vec![]).unwrap();
 			client.import_sealed_block(b).unwrap(); // account change is in the journal overlay
diff --git a/ethcore/src/tests/helpers.rs b/ethcore/src/tests/helpers.rs
index 7b952b30c..96d5f8366 100644
--- a/ethcore/src/tests/helpers.rs
+++ b/ethcore/src/tests/helpers.rs
@@ -28,6 +28,7 @@ use evm::Schedule;
 use engines::Engine;
 use env_info::EnvInfo;
 use ethereum;
+use ethereum::ethash::EthashParams;
 use devtools::*;
 use miner::Miner;
 use header::Header;
@@ -40,6 +41,7 @@ pub enum ChainEra {
 	Frontier,
 	Homestead,
 	Eip150,
+	Eip161,
 	TransitionTest,
 }
 
@@ -194,7 +196,7 @@ pub fn generate_dummy_client_with_spec_and_data<F>(get_test_spec: F, block_numbe
 				action: Action::Create,
 				data: vec![],
 				value: U256::zero(),
-			}.sign(kp.secret()), None).unwrap();
+			}.sign(kp.secret(), None), None).unwrap();
 			n += 1;
 		}
 
@@ -420,3 +422,29 @@ pub fn get_bad_state_dummy_block() -> Bytes {
 
 	create_test_block(&block_header)
 }
+
+pub fn get_default_ethash_params() -> EthashParams{
+	EthashParams {
+		gas_limit_bound_divisor: U256::from(1024),
+		minimum_difficulty: U256::from(131072),
+		difficulty_bound_divisor: U256::from(2048),
+		difficulty_increment_divisor: 10,
+		duration_limit: 13,
+		block_reward: U256::from(0),
+		registrar: "0000000000000000000000000000000000000001".into(),
+		homestead_transition: 1150000,
+		dao_hardfork_transition: 0x7fffffffffffffff,
+		dao_hardfork_beneficiary: "0000000000000000000000000000000000000001".into(),
+		dao_hardfork_accounts: vec![],
+		difficulty_hardfork_transition: 0x7fffffffffffffff,
+		difficulty_hardfork_bound_divisor: U256::from(0),
+		bomb_defuse_transition: 0x7fffffffffffffff,
+		eip150_transition: 0x7fffffffffffffff,
+		eip155_transition: 0x7fffffffffffffff,
+		eip160_transition: 0x7fffffffffffffff,
+		eip161abc_transition: 0x7fffffffffffffff,
+		eip161d_transition: 0x7fffffffffffffff,
+		ecip1010_pause_transition: 0x7fffffffffffffff,
+		ecip1010_continue_transition: 0x7fffffffffffffff
+	}
+}
diff --git a/ethcore/src/types/ids.rs b/ethcore/src/types/ids.rs
index d248a45bc..1fe81f392 100644
--- a/ethcore/src/types/ids.rs
+++ b/ethcore/src/types/ids.rs
@@ -55,7 +55,7 @@ pub struct TraceId {
 }
 
 /// Uniquely identifies Uncle.
-#[derive(Debug, Binary)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone, Binary)]
 pub struct UncleID {
 	/// Block id.
 	pub block: BlockID,
diff --git a/ethcore/src/types/mode.rs b/ethcore/src/types/mode.rs
index b48a92a89..58f652c6c 100644
--- a/ethcore/src/types/mode.rs
+++ b/ethcore/src/types/mode.rs
@@ -20,7 +20,7 @@ pub use std::time::Duration;
 use client::Mode as ClientMode;
 
 /// IPC-capable shadow-type for client::config::Mode
-#[derive(Clone, Binary)]
+#[derive(Clone, Binary, Debug)]
 pub enum Mode {
 	/// Same as ClientMode::Off.
 	Off,
diff --git a/ethcore/src/types/receipt.rs b/ethcore/src/types/receipt.rs
index 52e6747e8..deefeb383 100644
--- a/ethcore/src/types/receipt.rs
+++ b/ethcore/src/types/receipt.rs
@@ -93,6 +93,10 @@ pub struct RichReceipt {
 	pub contract_address: Option<Address>,
 	/// Logs
 	pub logs: Vec<LogEntry>,
+	/// Logs bloom
+	pub log_bloom: LogBloom,
+	/// State root
+	pub state_root: H256,
 }
 
 /// Receipt with additional info.
@@ -114,6 +118,10 @@ pub struct LocalizedReceipt {
 	pub contract_address: Option<Address>,
 	/// Logs
 	pub logs: Vec<LocalizedLogEntry>,
+	/// Logs bloom
+	pub log_bloom: LogBloom,
+	/// State root
+	pub state_root: H256,
 }
 
 #[test]
diff --git a/ethcore/src/types/transaction.rs b/ethcore/src/types/transaction.rs
index 247a1b301..8289c5864 100644
--- a/ethcore/src/types/transaction.rs
+++ b/ethcore/src/types/transaction.rs
@@ -72,8 +72,8 @@ pub struct Transaction {
 
 impl Transaction {
 	/// Append object with a without signature into RLP stream
-	pub fn rlp_append_unsigned_transaction(&self, s: &mut RlpStream) {
-		s.begin_list(6);
+	pub fn rlp_append_unsigned_transaction(&self, s: &mut RlpStream, network_id: Option<u8>) {
+		s.begin_list(if let None = network_id { 6 } else { 9 });
 		s.append(&self.nonce);
 		s.append(&self.gas_price);
 		s.append(&self.gas);
@@ -83,6 +83,11 @@ impl Transaction {
 		};
 		s.append(&self.value);
 		s.append(&self.data);
+		if let Some(n) = network_id {
+			s.append(&n);
+			s.append(&0u8);
+			s.append(&0u8);
+		}
 	}
 }
 
@@ -105,7 +110,7 @@ impl From<ethjson::state::Transaction> for SignedTransaction {
 			},
 			value: t.value.into(),
 			data: t.data.into(),
-		}.sign(&t.secret.into())
+		}.sign(&t.secret.into(), None)
 	}
 }
 
@@ -135,26 +140,26 @@ impl From<ethjson::transaction::Transaction> for SignedTransaction {
 
 impl Transaction {
 	/// The message hash of the transaction.
-	pub fn hash(&self) -> H256 {
+	pub fn hash(&self, network_id: Option<u8>) -> H256 {
 		let mut stream = RlpStream::new();
-		self.rlp_append_unsigned_transaction(&mut stream);
+		self.rlp_append_unsigned_transaction(&mut stream, network_id);
 		stream.out().sha3()
 	}
 
 	/// Signs the transaction as coming from `sender`.
-	pub fn sign(self, secret: &Secret) -> SignedTransaction {
-		let sig = ::ethkey::sign(secret, &self.hash())
+	pub fn sign(self, secret: &Secret, network_id: Option<u8>) -> SignedTransaction {
+		let sig = ::ethkey::sign(secret, &self.hash(network_id))
 			.expect("data is valid and context has signing capabilities; qed");
-		self.with_signature(sig)
+		self.with_signature(sig, network_id)
 	}
 
 	/// Signs the transaction with signature.
-	pub fn with_signature(self, sig: Signature) -> SignedTransaction {
+	pub fn with_signature(self, sig: Signature, network_id: Option<u8>) -> SignedTransaction {
 		SignedTransaction {
 			unsigned: self,
 			r: sig.r().into(),
 			s: sig.s().into(),
-			v: sig.v() + 27,
+			v: sig.v() + if let Some(n) = network_id { 35 + n * 2 } else { 27 },
 			hash: Cell::new(None),
 			sender: Cell::new(None),
 		}
@@ -204,7 +209,8 @@ impl Transaction {
 pub struct SignedTransaction {
 	/// Plain Transaction.
 	unsigned: Transaction,
-	/// The V field of the signature, either 27 or 28; helps describe the point on the curve.
+	/// The V field of the signature; the LS bit described which half of the curve our point falls
+	/// in. The MS bits describe which network this transaction is for. If 27/28, its for all networks.  
 	v: u8,
 	/// The R field of the signature; helps describe the point on the curve.
 	r: U256,
@@ -266,7 +272,7 @@ impl HeapSizeOf for SignedTransaction {
 
 impl SignedTransaction {
 	/// Append object with a signature into RLP stream
-	pub fn rlp_append_sealed_transaction(&self, s: &mut RlpStream) {
+	fn rlp_append_sealed_transaction(&self, s: &mut RlpStream) {
 		s.begin_list(9);
 		s.append(&self.nonce);
 		s.append(&self.gas_price);
@@ -295,8 +301,16 @@ impl SignedTransaction {
 		}
 	}
 
-	/// 0 is `v` is 27, 1 if 28, and 4 otherwise.
-	pub fn standard_v(&self) -> u8 { match self.v { 27 => 0, 28 => 1, _ => 4 } }
+	/// 0 if `v` would have been 27 under "Electrum" notation, 1 if 28 or 4 if invalid.
+	pub fn standard_v(&self) -> u8 { match self.v { v if v == 27 || v == 28 || v > 36 => (v - 1) % 2, _ => 4 } }
+
+	/// The network ID, or `None` if this is a global transaction. 
+	pub fn network_id(&self) -> Option<u8> {
+		match self.v {
+			v if v > 36 => Some((v - 35) / 2),
+			_ => None,
+		}
+	}
 
 	/// Construct a signature object from the sig.
 	pub fn signature(&self) -> Signature {
@@ -327,20 +341,25 @@ impl SignedTransaction {
 
 	/// Returns the public key of the sender.
 	pub fn public_key(&self) -> Result<Public, Error> {
-		Ok(try!(recover(&self.signature(), &self.unsigned.hash())))
+		Ok(try!(recover(&self.signature(), &self.unsigned.hash(self.network_id()))))
 	}
 
 	/// Do basic validation, checking for valid signature and minimum gas,
 	// TODO: consider use in block validation.
 	#[cfg(test)]
 	#[cfg(feature = "json-tests")]
-	pub fn validate(self, schedule: &Schedule, require_low: bool) -> Result<SignedTransaction, Error> {
+	pub fn validate(self, schedule: &Schedule, require_low: bool, allow_network_id_of_one: bool) -> Result<SignedTransaction, Error> {
 		if require_low && !self.signature().is_low_s() {
 			return Err(EthkeyError::InvalidSignature.into())
 		}
+		match self.network_id() {
+			None => {},
+			Some(1) if allow_network_id_of_one => {},
+			_ => return Err(TransactionError::InvalidNetworkId.into()),
+		}
 		try!(self.sender());
 		if self.gas < U256::from(self.gas_required(&schedule)) {
-			Err(From::from(TransactionError::InvalidGasLimit(::util::OutOfBounds{min: Some(U256::from(self.gas_required(&schedule))), max: None, found: self.gas})))
+			Err(TransactionError::InvalidGasLimit(::util::OutOfBounds{min: Some(U256::from(self.gas_required(&schedule))), max: None, found: self.gas}).into())
 		} else {
 			Ok(self)
 		}
@@ -380,6 +399,7 @@ fn sender_test() {
 	} else { panic!(); }
 	assert_eq!(t.value, U256::from(0x0au64));
 	assert_eq!(t.sender().unwrap(), "0f65fe9276bc9a24ae7083ae28e2660ef72df99e".into());
+	assert_eq!(t.network_id(), None);
 }
 
 #[test]
@@ -394,8 +414,9 @@ fn signing() {
 		gas: U256::from(50_000),
 		value: U256::from(1),
 		data: b"Hello!".to_vec()
-	}.sign(&key.secret());
+	}.sign(&key.secret(), None);
 	assert_eq!(Address::from(key.public().sha3()), t.sender().unwrap());
+	assert_eq!(t.network_id(), None);
 }
 
 #[test]
@@ -409,7 +430,48 @@ fn fake_signing() {
 		data: b"Hello!".to_vec()
 	}.fake_sign(Address::from(0x69));
 	assert_eq!(Address::from(0x69), t.sender().unwrap());
+	assert_eq!(t.network_id(), None);
 
 	let t = t.clone();
 	assert_eq!(Address::from(0x69), t.sender().unwrap());
+	assert_eq!(t.network_id(), None);
 }
+
+#[test]
+fn should_recover_from_network_specific_signing() {
+	use ethkey::{Random, Generator};
+	let key = Random.generate().unwrap();
+	let t = Transaction {
+		action: Action::Create,
+		nonce: U256::from(42),
+		gas_price: U256::from(3000),
+		gas: U256::from(50_000),
+		value: U256::from(1),
+		data: b"Hello!".to_vec()
+	}.sign(&key.secret(), Some(69));
+	assert_eq!(Address::from(key.public().sha3()), t.sender().unwrap());
+	assert_eq!(t.network_id(), Some(69));
+}
+
+#[test]
+fn should_agree_with_vitalik() {
+	use rustc_serialize::hex::FromHex;
+
+	let test_vector = |tx_data: &str, address: &'static str| {
+		let signed: SignedTransaction = decode(&FromHex::from_hex(tx_data).unwrap());
+		signed.check_low_s().unwrap();
+		assert_eq!(signed.sender().unwrap(), address.into());
+		flushln!("networkid: {:?}", signed.network_id()); 
+	};
+
+	test_vector("f864808504a817c800825208943535353535353535353535353535353535353535808025a0044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116da0044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", "0xf0f6f18bca1b28cd68e4357452947e021241e9ce")
+	test_vector("f864018504a817c80182a410943535353535353535353535353535353535353535018025a0489efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bcaa0489efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc6", "0x23ef145a395ea3fa3deb533b8a9e1b4c6c25d112")
+	test_vector("f864028504a817c80282f618943535353535353535353535353535353535353535088025a02d7c5bef027816a800da1736444fb58a807ef4c9603b7848673f7e3a68eb14a5a02d7c5bef027816a800da1736444fb58a807ef4c9603b7848673f7e3a68eb14a5", "0x2e485e0c23b4c3c542628a5f672eeab0ad4888be")
+	test_vector("f865038504a817c803830148209435353535353535353535353535353535353535351b8025a02a80e1ef1d7842f27f2e6be0972bb708b9a135c38860dbe73c27c3486c34f4e0a02a80e1ef1d7842f27f2e6be0972bb708b9a135c38860dbe73c27c3486c34f4de", "0x82a88539669a3fd524d669e858935de5e5410cf0")
+	test_vector("f865048504a817c80483019a28943535353535353535353535353535353535353535408025a013600b294191fc92924bb3ce4b969c1e7e2bab8f4c93c3fc6d0a51733df3c063a013600b294191fc92924bb3ce4b969c1e7e2bab8f4c93c3fc6d0a51733df3c060", "0xf9358f2538fd5ccfeb848b64a96b743fcc930554")
+	test_vector("f865058504a817c8058301ec309435353535353535353535353535353535353535357d8025a04eebf77a833b30520287ddd9478ff51abbdffa30aa90a8d655dba0e8a79ce0c1a04eebf77a833b30520287ddd9478ff51abbdffa30aa90a8d655dba0e8a79ce0c1", "0xa8f7aba377317440bc5b26198a363ad22af1f3a4")
+	test_vector("f866068504a817c80683023e3894353535353535353535353535353535353535353581d88025a06455bf8ea6e7463a1046a0b52804526e119b4bf5136279614e0b1e8e296a4e2fa06455bf8ea6e7463a1046a0b52804526e119b4bf5136279614e0b1e8e296a4e2d", "0xf1f571dc362a0e5b2696b8e775f8491d3e50de35")
+	test_vector("f867078504a817c807830290409435353535353535353535353535353535353535358201578025a052f1a9b320cab38e5da8a8f97989383aab0a49165fc91c737310e4f7e9821021a052f1a9b320cab38e5da8a8f97989383aab0a49165fc91c737310e4f7e9821021", "0xd37922162ab7cea97c97a87551ed02c9a38b7332")
+	test_vector("f867088504a817c8088302e2489435353535353535353535353535353535353535358202008025a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c12a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10", "0x9bddad43f934d313c2b79ca28a432dd2b7281029")
+	test_vector("f867098504a817c809830334509435353535353535353535353535353535353535358202d98025a052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afba052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb", "0x3c24d7329e92f84f08556ceb6df1cdb0104ca49f")
+}
\ No newline at end of file
diff --git a/ethcore/src/verification/verification.rs b/ethcore/src/verification/verification.rs
index 4ebd8aebd..47b2e16de 100644
--- a/ethcore/src/verification/verification.rs
+++ b/ethcore/src/verification/verification.rs
@@ -395,7 +395,7 @@ mod tests {
 			gas: U256::from(30_000),
 			gas_price: U256::from(40_000),
 			nonce: U256::one()
-		}.sign(keypair.secret());
+		}.sign(keypair.secret(), None);
 
 		let tr2 = Transaction {
 			action: Action::Create,
@@ -404,7 +404,7 @@ mod tests {
 			gas: U256::from(30_000),
 			gas_price: U256::from(40_000),
 			nonce: U256::from(2)
-		}.sign(keypair.secret());
+		}.sign(keypair.secret(), None);
 
 		let good_transactions = [ tr1.clone(), tr2.clone() ];
 
diff --git a/evmbin/src/ext.rs b/evmbin/src/ext.rs
index 11fb3a876..cac89d76c 100644
--- a/evmbin/src/ext.rs
+++ b/evmbin/src/ext.rs
@@ -51,6 +51,14 @@ impl Ext for FakeExt {
 		unimplemented!();
 	}
 
+	fn exists_and_not_null(&self, address: &Address) -> bool {
+		unimplemented!(); 
+	}
+
+	fn origin_balance(&self) -> U256 {
+		unimplemented!();
+	}
+
 	fn balance(&self, _address: &Address) -> U256 {
 		unimplemented!();
 	}
diff --git a/js/assets/images/dapps/coins-64x64.jpg b/js/assets/images/dapps/coins-64x64.jpg
deleted file mode 100644
index 987d7400e..000000000
Binary files a/js/assets/images/dapps/coins-64x64.jpg and /dev/null differ
diff --git a/js/assets/images/dapps/coins.jpg b/js/assets/images/dapps/coins.jpg
deleted file mode 100644
index 8fba5e65c..000000000
Binary files a/js/assets/images/dapps/coins.jpg and /dev/null differ
diff --git a/js/assets/images/dapps/hex-64x64.jpg b/js/assets/images/dapps/hex-64x64.jpg
deleted file mode 100644
index 8c6a1d5cc..000000000
Binary files a/js/assets/images/dapps/hex-64x64.jpg and /dev/null differ
diff --git a/js/assets/images/dapps/hex.jpg b/js/assets/images/dapps/hex.jpg
deleted file mode 100644
index 8e09f49aa..000000000
Binary files a/js/assets/images/dapps/hex.jpg and /dev/null differ
diff --git a/js/assets/images/dapps/interlock-64x64.png b/js/assets/images/dapps/interlock-64x64.png
deleted file mode 100644
index f4b342489..000000000
Binary files a/js/assets/images/dapps/interlock-64x64.png and /dev/null differ
diff --git a/js/assets/images/dapps/interlock.png b/js/assets/images/dapps/interlock.png
deleted file mode 100644
index e8aeb275d..000000000
Binary files a/js/assets/images/dapps/interlock.png and /dev/null differ
diff --git a/js/assets/images/dapps/link-64x64.jpg b/js/assets/images/dapps/link-64x64.jpg
deleted file mode 100644
index 14f9c1190..000000000
Binary files a/js/assets/images/dapps/link-64x64.jpg and /dev/null differ
diff --git a/js/assets/images/dapps/link.jpg b/js/assets/images/dapps/link.jpg
deleted file mode 100644
index 546c67e20..000000000
Binary files a/js/assets/images/dapps/link.jpg and /dev/null differ
diff --git a/js/assets/images/dapps/register-64x64.jpg b/js/assets/images/dapps/register-64x64.jpg
deleted file mode 100644
index ff8fc6c2f..000000000
Binary files a/js/assets/images/dapps/register-64x64.jpg and /dev/null differ
diff --git a/js/assets/images/dapps/register.jpg b/js/assets/images/dapps/register.jpg
deleted file mode 100644
index cd47bd81e..000000000
Binary files a/js/assets/images/dapps/register.jpg and /dev/null differ
diff --git a/js/build-server.js b/js/build-server.js
index 9153f5ed2..f8c0eb828 100644
--- a/js/build-server.js
+++ b/js/build-server.js
@@ -13,6 +13,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+// test only
 
 /**
  * Run `PARITY_URL="127.0.0.1:8180" NODE_ENV="production" npm run build`
diff --git a/js/package.json b/js/package.json
index 0ff75b720..f2a004140 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,11 +1,13 @@
 {
   "name": "parity.js",
-  "version": "0.1.35",
+  "version": "0.2.19",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",
   "maintainers": [
-    "Jaco Greeff"
+    "Jaco Greeff",
+    "Nicolas Gotchac",
+    "Jannis Redmann"
   ],
   "contributors": [],
   "license": "GPL-3.0",
@@ -23,16 +25,16 @@
     "Promise"
   ],
   "scripts": {
-    "build": "npm run build:dll && npm run build:app && npm run build:lib",
+    "build": "npm run build:lib && npm run build:dll && npm run build:app",
     "build:app": "webpack --progress",
     "build:lib": "webpack --config webpack.libraries --progress",
     "build:dll": "webpack --config webpack.vendor --progress",
-    "ci:build": "npm run ci:build:dll && npm run ci:build:app && npm run ci:build:lib",
+    "ci:build": "npm run ci:build:lib && npm run ci:build:dll && npm run ci:build:app",
     "ci:build:app": "NODE_ENV=production webpack",
     "ci:build:lib": "NODE_ENV=production webpack --config webpack.libraries",
     "ci:build:dll": "NODE_ENV=production webpack --config webpack.vendor",
     "ci:build:npm": "NODE_ENV=production webpack --config webpack.npm",
-    "start": "npm install && npm run build:dll && npm run start:app",
+    "start": "npm install && npm run build:lib && npm run build:dll && npm run start:app",
     "start:app": "webpack-dev-server -d --history-api-fallback --open --hot --inline --progress --colors --port 3000",
     "clean": "rm -rf ./build ./coverage",
     "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
@@ -44,7 +46,7 @@
   "devDependencies": {
     "babel-cli": "^6.10.1",
     "babel-core": "^6.10.4",
-    "babel-eslint": "^6.1.2",
+    "babel-eslint": "^7.1.0",
     "babel-loader": "^6.2.3",
     "babel-plugin-lodash": "^3.2.2",
     "babel-plugin-transform-class-properties": "^6.11.5",
@@ -126,6 +128,9 @@
     "marked": "^0.3.6",
     "material-ui": "^0.16.1",
     "material-ui-chip-input": "^0.8.0",
+    "mobx": "^2.6.1",
+    "mobx-react": "^3.5.8",
+    "mobx-react-devtools": "^4.2.9",
     "moment": "^2.14.1",
     "qs": "^6.3.0",
     "react": "^15.2.1",
diff --git a/js/scripts/release.sh b/js/scripts/release.sh
index 22fd91ab6..fd95e00b8 100755
--- a/js/scripts/release.sh
+++ b/js/scripts/release.sh
@@ -50,32 +50,32 @@ setup_git_user
 git remote set-url origin $GIT_PARITY
 git reset --hard origin/$BRANCH 2>$GITLOG
 
-echo "*** Bumping package.json patch version"
-cd js
-npm --no-git-tag-version version
-npm version patch
-cd ..
+if [ "$BRANCH" == "master" ]; then
+  cd js
+  echo "*** Bumping package.json patch version"
+  npm --no-git-tag-version version
+  npm version patch
+
+  echo "*** Building packages for npmjs"
+  # echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login
+  echo "$NPM_TOKEN" >> ~/.npmrc
+  npm run ci:build:npm
+
+  echo "*** Publishing $PACKAGE to npmjs"
+  cd .npmjs
+  npm publish --access public
+  cd ../..
+fi
 
 echo "*** Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH"
 cargo update -p parity-ui-precompiled
 # --precise "$PRECOMPILED_HASH"
 
 echo "*** Committing updated files"
-git add Cargo.lock js/package.json
+git add .
 git commit -m "[ci skip] js-precompiled $UTCDATE"
 git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
 
-echo "*** Building packages for npmjs"
-cd js
-# echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login
-echo "$NPM_TOKEN" >> ~/.npmrc
-npm run ci:build:npm
-
-echo "*** Publishing $PACKAGE to npmjs"
-cd .npmjs
-npm publish --access public
-cd ..
-
 # back to root
 echo "*** Release completed"
 popd
diff --git a/js/src/api/README.md b/js/src/api/README.md
index 691a24cca..e28c6c2a1 100644
--- a/js/src/api/README.md
+++ b/js/src/api/README.md
@@ -135,10 +135,11 @@ APIs implement the calls as exposed in the [Ethcore JSON Ethereum RPC](https://g
 
 - [ethapi.db](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#db)
 - [ethapi.eth](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#eth)
-- [ethapi.ethcore](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#ethcore)
+- [ethapi.parity](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#parity)
 - [ethapi.net](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#net)
 - [ethapi.personal](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#personal)
 - [ethapi.shh](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#shh)
+- [ethapi.signer](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#signer)
 - [ethapi.trace](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#trace)
 - [ethapi.web3](https://github.com/ethcore/ethereum-rpc-json/blob/master/interfaces.md#web3)
 
diff --git a/js/src/api/api.js b/js/src/api/api.js
index 9768b9acb..75d4392d0 100644
--- a/js/src/api/api.js
+++ b/js/src/api/api.js
@@ -17,7 +17,7 @@
 import { Http, Ws } from './transport';
 import Contract from './contract';
 
-import { Db, Eth, Ethcore, Net, Personal, Shh, Trace, Web3 } from './rpc';
+import { Db, Eth, Parity, Net, Personal, Shh, Signer, Trace, Web3 } from './rpc';
 import Subscriptions from './subscriptions';
 import util from './util';
 import { isFunction } from './util/types';
@@ -32,10 +32,11 @@ export default class Api {
 
     this._db = new Db(transport);
     this._eth = new Eth(transport);
-    this._ethcore = new Ethcore(transport);
     this._net = new Net(transport);
+    this._parity = new Parity(transport);
     this._personal = new Personal(transport);
     this._shh = new Shh(transport);
+    this._signer = new Signer(transport);
     this._trace = new Trace(transport);
     this._web3 = new Web3(transport);
 
@@ -50,8 +51,8 @@ export default class Api {
     return this._eth;
   }
 
-  get ethcore () {
-    return this._ethcore;
+  get parity () {
+    return this._parity;
   }
 
   get net () {
@@ -66,6 +67,10 @@ export default class Api {
     return this._shh;
   }
 
+  get signer () {
+    return this._signer;
+  }
+
   get trace () {
     return this._trace;
   }
diff --git a/js/src/api/contract/contract.js b/js/src/api/contract/contract.js
index cef75eda7..bb6c15d8d 100644
--- a/js/src/api/contract/contract.js
+++ b/js/src/api/contract/contract.js
@@ -102,7 +102,7 @@ export default class Contract {
         options.gas = gas.toFixed(0);
 
         setState({ state: 'postTransaction', gas });
-        return this._api.eth.postTransaction(this._encodeOptions(this.constructors[0], options, values));
+        return this._api.parity.postTransaction(this._encodeOptions(this.constructors[0], options, values));
       })
       .then((requestId) => {
         setState({ state: 'checkRequest', requestId });
@@ -166,7 +166,7 @@ export default class Contract {
   }
 
   _pollCheckRequest = (requestId) => {
-    return this._api.pollMethod('eth_checkRequest', requestId);
+    return this._api.pollMethod('parity_checkRequest', requestId);
   }
 
   _pollTransactionReceipt = (txhash, gas) => {
@@ -208,7 +208,7 @@ export default class Contract {
 
     if (!func.constant) {
       func.postTransaction = (options, values = []) => {
-        return this._api.eth
+        return this._api.parity
           .postTransaction(this._encodeOptions(func, this._addOptionsTo(options), values));
       };
 
diff --git a/js/src/api/contract/contract.spec.js b/js/src/api/contract/contract.spec.js
index 0d6169e26..9065b4fad 100644
--- a/js/src/api/contract/contract.spec.js
+++ b/js/src/api/contract/contract.spec.js
@@ -249,9 +249,9 @@ describe('api/contract/Contract', () => {
       before(() => {
         scope = mockHttp([
           { method: 'eth_estimateGas', reply: { result: 1000 } },
-          { method: 'eth_postTransaction', reply: { result: '0x678' } },
-          { method: 'eth_checkRequest', reply: { result: null } },
-          { method: 'eth_checkRequest', reply: { result: '0x890' } },
+          { method: 'parity_postTransaction', reply: { result: '0x678' } },
+          { method: 'parity_checkRequest', reply: { result: null } },
+          { method: 'parity_checkRequest', reply: { result: '0x890' } },
           { method: 'eth_getTransactionReceipt', reply: { result: null } },
           { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT_PEND } },
           { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT_DONE } },
@@ -266,7 +266,7 @@ describe('api/contract/Contract', () => {
       });
 
       it('passes the options through to postTransaction (incl. gas calculation)', () => {
-        expect(scope.body.eth_postTransaction.params).to.deep.equal([
+        expect(scope.body.parity_postTransaction.params).to.deep.equal([
           { data: '0x123', gas: '0x4b0' }
         ]);
       });
@@ -280,8 +280,8 @@ describe('api/contract/Contract', () => {
       it('fails when gasUsed == gas', () => {
         mockHttp([
           { method: 'eth_estimateGas', reply: { result: 1000 } },
-          { method: 'eth_postTransaction', reply: { result: '0x678' } },
-          { method: 'eth_checkRequest', reply: { result: '0x789' } },
+          { method: 'parity_postTransaction', reply: { result: '0x678' } },
+          { method: 'parity_checkRequest', reply: { result: '0x789' } },
           { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT_EXCP } }
         ]);
 
@@ -295,8 +295,8 @@ describe('api/contract/Contract', () => {
       it('fails when no code was deployed', () => {
         mockHttp([
           { method: 'eth_estimateGas', reply: { result: 1000 } },
-          { method: 'eth_postTransaction', reply: { result: '0x678' } },
-          { method: 'eth_checkRequest', reply: { result: '0x789' } },
+          { method: 'parity_postTransaction', reply: { result: '0x678' } },
+          { method: 'parity_checkRequest', reply: { result: '0x789' } },
           { method: 'eth_getTransactionReceipt', reply: { result: RECEIPT_DONE } },
           { method: 'eth_getCode', reply: { result: '0x' } }
         ]);
@@ -360,15 +360,15 @@ describe('api/contract/Contract', () => {
 
     describe('postTransaction', () => {
       beforeEach(() => {
-        scope = mockHttp([{ method: 'eth_postTransaction', reply: { result: ['hashId'] } }]);
+        scope = mockHttp([{ method: 'parity_postTransaction', reply: { result: ['hashId'] } }]);
       });
 
-      it('encodes options and mades an eth_postTransaction call', () => {
+      it('encodes options and mades an parity_postTransaction call', () => {
         return func
           .postTransaction({ someExtras: 'foo' }, VALUES)
           .then(() => {
             expect(scope.isDone()).to.be.true;
-            expect(scope.body.eth_postTransaction.params[0]).to.deep.equal({
+            expect(scope.body.parity_postTransaction.params[0]).to.deep.equal({
               someExtras: 'foo',
               to: ADDR,
               data: ENCODED
diff --git a/js/src/api/rpc/eth/eth.js b/js/src/api/rpc/eth/eth.js
index 703f3ed11..43f8025e1 100644
--- a/js/src/api/rpc/eth/eth.js
+++ b/js/src/api/rpc/eth/eth.js
@@ -39,11 +39,6 @@ export default class Eth {
       .execute('eth_call', inOptions(options), inBlockNumber(blockNumber));
   }
 
-  checkRequest (requestId) {
-    return this._transport
-      .execute('eth_checkRequest', inNumber16(requestId));
-  }
-
   coinbase () {
     return this._transport
       .execute('eth_coinbase')
@@ -267,11 +262,6 @@ export default class Eth {
       .execute('eth_pendingTransactions');
   }
 
-  postTransaction (options) {
-    return this._transport
-      .execute('eth_postTransaction', inOptions(options));
-  }
-
   protocolVersion () {
     return this._transport
       .execute('eth_protocolVersion');
diff --git a/js/src/api/rpc/ethcore/ethcore.js b/js/src/api/rpc/ethcore/ethcore.js
deleted file mode 100644
index 663143f0d..000000000
--- a/js/src/api/rpc/ethcore/ethcore.js
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity 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 General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-import { inAddress, inData, inNumber16 } from '../../format/input';
-import { outAddress, outHistogram, outNumber, outPeers } from '../../format/output';
-
-export default class Ethcore {
-  constructor (transport) {
-    this._transport = transport;
-  }
-
-  acceptNonReservedPeers () {
-    return this._transport
-      .execute('ethcore_acceptNonReservedPeers');
-  }
-
-  addReservedPeer (encode) {
-    return this._transport
-      .execute('ethcore_addReservedPeer', encode);
-  }
-
-  dappsPort () {
-    return this._transport
-      .execute('ethcore_dappsPort')
-      .then(outNumber);
-  }
-
-  defaultExtraData () {
-    return this._transport
-      .execute('ethcore_defaultExtraData');
-  }
-
-  devLogs () {
-    return this._transport
-      .execute('ethcore_devLogs');
-  }
-
-  devLogsLevels () {
-    return this._transport
-      .execute('ethcore_devLogsLevels');
-  }
-
-  dropNonReservedPeers () {
-    return this._transport
-      .execute('ethcore_dropNonReservedPeers');
-  }
-
-  extraData () {
-    return this._transport
-      .execute('ethcore_extraData');
-  }
-
-  gasFloorTarget () {
-    return this._transport
-      .execute('ethcore_gasFloorTarget')
-      .then(outNumber);
-  }
-
-  gasPriceHistogram () {
-    return this._transport
-      .execute('ethcore_gasPriceHistogram')
-      .then(outHistogram);
-  }
-
-  generateSecretPhrase () {
-    return this._transport
-      .execute('ethcore_generateSecretPhrase');
-  }
-
-  hashContent (url) {
-    return this._transport
-      .execute('ethcore_hashContent', url);
-  }
-
-  minGasPrice () {
-    return this._transport
-      .execute('ethcore_minGasPrice')
-      .then(outNumber);
-  }
-
-  mode () {
-    return this._transport
-      .execute('ethcore_mode');
-  }
-
-  netChain () {
-    return this._transport
-      .execute('ethcore_netChain');
-  }
-
-  netPeers () {
-    return this._transport
-      .execute('ethcore_netPeers')
-      .then(outPeers);
-  }
-
-  netMaxPeers () {
-    return this._transport
-      .execute('ethcore_netMaxPeers')
-      .then(outNumber);
-  }
-
-  netPort () {
-    return this._transport
-      .execute('ethcore_netPort')
-      .then(outNumber);
-  }
-
-  nodeName () {
-    return this._transport
-      .execute('ethcore_nodeName');
-  }
-
-  phraseToAddress (phrase) {
-    return this._transport
-      .execute('ethcore_phraseToAddress', phrase)
-      .then(outAddress);
-  }
-
-  registryAddress () {
-    return this._transport
-      .execute('ethcore_registryAddress')
-      .then(outAddress);
-  }
-
-  removeReservedPeer (encode) {
-    return this._transport
-      .execute('ethcore_removeReservedPeer', encode);
-  }
-
-  rpcSettings () {
-    return this._transport
-      .execute('ethcore_rpcSettings');
-  }
-
-  setAuthor (address) {
-    return this._transport
-      .execute('ethcore_setAuthor', inAddress(address));
-  }
-
-  setExtraData (data) {
-    return this._transport
-      .execute('ethcore_setExtraData', inData(data));
-  }
-
-  setGasFloorTarget (quantity) {
-    return this._transport
-      .execute('ethcore_setGasFloorTarget', inNumber16(quantity));
-  }
-
-  setMinGasPrice (quantity) {
-    return this._transport
-      .execute('ethcore_setMinGasPrice', inNumber16(quantity));
-  }
-
-  setMode (mode) {
-    return this._transport
-      .execute('ethcore_setMode', mode);
-  }
-
-  setTransactionsLimit (quantity) {
-    return this._transport
-      .execute('ethcore_setTransactionsLimit', inNumber16(quantity));
-  }
-
-  signerPort () {
-    return this._transport
-      .execute('ethcore_signerPort')
-      .then(outNumber);
-  }
-
-  transactionsLimit () {
-    return this._transport
-      .execute('ethcore_transactionsLimit')
-      .then(outNumber);
-  }
-
-  unsignedTransactionsCount () {
-    return this._transport
-      .execute('ethcore_unsignedTransactionsCount')
-      .then(outNumber);
-  }
-}
diff --git a/js/src/api/rpc/index.js b/js/src/api/rpc/index.js
index e7e94b9ed..7961da81c 100644
--- a/js/src/api/rpc/index.js
+++ b/js/src/api/rpc/index.js
@@ -16,9 +16,10 @@
 
 export Db from './db';
 export Eth from './eth';
-export Ethcore from './ethcore';
+export Parity from './parity';
 export Net from './net';
 export Personal from './personal';
 export Shh from './shh';
+export Signer from './signer';
 export Trace from './trace';
 export Web3 from './web3';
diff --git a/js/src/api/rpc/ethcore/index.js b/js/src/api/rpc/parity/index.js
similarity index 95%
rename from js/src/api/rpc/ethcore/index.js
rename to js/src/api/rpc/parity/index.js
index 2372a2171..38f08f725 100644
--- a/js/src/api/rpc/ethcore/index.js
+++ b/js/src/api/rpc/parity/index.js
@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-export default from './ethcore';
+export default from './parity';
diff --git a/js/src/api/rpc/ethcore/ethcore.e2e.js b/js/src/api/rpc/parity/parity.e2e.js
similarity index 82%
rename from js/src/api/rpc/ethcore/ethcore.e2e.js
rename to js/src/api/rpc/parity/parity.e2e.js
index aae7108e7..91e01ab6a 100644
--- a/js/src/api/rpc/ethcore/ethcore.e2e.js
+++ b/js/src/api/rpc/parity/parity.e2e.js
@@ -16,12 +16,12 @@
 
 import { createHttpApi } from '../../../../test/e2e/ethapi';
 
-describe('ethapi.ethcore', () => {
+describe('ethapi.parity', () => {
   const ethapi = createHttpApi();
 
   describe('gasFloorTarget', () => {
     it('returns and translates the target', () => {
-      return ethapi.ethcore.gasFloorTarget().then((value) => {
+      return ethapi.parity.gasFloorTarget().then((value) => {
         expect(value.gt(0)).to.be.true;
       });
     });
@@ -29,7 +29,7 @@ describe('ethapi.ethcore', () => {
 
   describe('gasPriceHistogram', () => {
     it('returns and translates the target', () => {
-      return ethapi.ethcore.gasPriceHistogram().then((result) => {
+      return ethapi.parity.gasPriceHistogram().then((result) => {
         expect(Object.keys(result)).to.deep.equal(['bucketBounds', 'counts']);
         expect(result.bucketBounds.length > 0).to.be.true;
         expect(result.counts.length > 0).to.be.true;
@@ -39,7 +39,7 @@ describe('ethapi.ethcore', () => {
 
   describe('netChain', () => {
     it('returns and the chain', () => {
-      return ethapi.ethcore.netChain().then((value) => {
+      return ethapi.parity.netChain().then((value) => {
         expect(value).to.equal('morden');
       });
     });
@@ -47,7 +47,7 @@ describe('ethapi.ethcore', () => {
 
   describe('netPort', () => {
     it('returns and translates the port', () => {
-      return ethapi.ethcore.netPort().then((value) => {
+      return ethapi.parity.netPort().then((value) => {
         expect(value.gt(0)).to.be.true;
       });
     });
@@ -55,7 +55,7 @@ describe('ethapi.ethcore', () => {
 
   describe('transactionsLimit', () => {
     it('returns and translates the limit', () => {
-      return ethapi.ethcore.transactionsLimit().then((value) => {
+      return ethapi.parity.transactionsLimit().then((value) => {
         expect(value.gt(0)).to.be.true;
       });
     });
@@ -63,7 +63,7 @@ describe('ethapi.ethcore', () => {
 
   describe('rpcSettings', () => {
     it('returns and translates the settings', () => {
-      return ethapi.ethcore.rpcSettings().then((value) => {
+      return ethapi.parity.rpcSettings().then((value) => {
         expect(value).to.be.ok;
       });
     });
diff --git a/js/src/api/rpc/parity/parity.js b/js/src/api/rpc/parity/parity.js
new file mode 100644
index 000000000..f1739f848
--- /dev/null
+++ b/js/src/api/rpc/parity/parity.js
@@ -0,0 +1,273 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { inAddress, inData, inHex, inNumber16, inOptions } from '../../format/input';
+import { outAccountInfo, outAddress, outHistogram, outNumber, outPeers } from '../../format/output';
+
+export default class Parity {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  acceptNonReservedPeers () {
+    return this._transport
+      .execute('parity_acceptNonReservedPeers');
+  }
+
+  accounts () {
+    return this._transport
+      .execute('parity_accounts')
+      .then(outAccountInfo);
+  }
+
+  accountsInfo () {
+    return this._transport
+      .execute('parity_accountsInfo')
+      .then(outAccountInfo);
+  }
+
+  addReservedPeer (encode) {
+    return this._transport
+      .execute('parity_addReservedPeer', encode);
+  }
+
+  changePassword (account, password, newPassword) {
+    return this._transport
+      .execute('parity_changePassword', inAddress(account), password, newPassword);
+  }
+
+  checkRequest (requestId) {
+    return this._transport
+      .execute('parity_checkRequest', inNumber16(requestId));
+  }
+
+  dappsPort () {
+    return this._transport
+      .execute('parity_dappsPort')
+      .then(outNumber);
+  }
+
+  defaultExtraData () {
+    return this._transport
+      .execute('parity_defaultExtraData');
+  }
+
+  devLogs () {
+    return this._transport
+      .execute('parity_devLogs');
+  }
+
+  devLogsLevels () {
+    return this._transport
+      .execute('parity_devLogsLevels');
+  }
+
+  dropNonReservedPeers () {
+    return this._transport
+      .execute('parity_dropNonReservedPeers');
+  }
+
+  enode () {
+    return this._transport
+      .execute('parity_enode');
+  }
+
+  extraData () {
+    return this._transport
+      .execute('parity_extraData');
+  }
+
+  gasFloorTarget () {
+    return this._transport
+      .execute('parity_gasFloorTarget')
+      .then(outNumber);
+  }
+
+  gasPriceHistogram () {
+    return this._transport
+      .execute('parity_gasPriceHistogram')
+      .then(outHistogram);
+  }
+
+  generateSecretPhrase () {
+    return this._transport
+      .execute('parity_generateSecretPhrase');
+  }
+
+  hashContent (url) {
+    return this._transport
+      .execute('parity_hashContent', url);
+  }
+
+  listGethAccounts () {
+    return this._transport
+      .execute('parity_listGethAccounts')
+      .then((accounts) => (accounts || []).map(outAddress));
+  }
+
+  importGethAccounts (accounts) {
+    return this._transport
+      .execute('parity_importGethAccounts', (accounts || []).map(inAddress))
+      .then((accounts) => (accounts || []).map(outAddress));
+  }
+
+  minGasPrice () {
+    return this._transport
+      .execute('parity_minGasPrice')
+      .then(outNumber);
+  }
+
+  mode () {
+    return this._transport
+      .execute('parity_mode');
+  }
+
+  netChain () {
+    return this._transport
+      .execute('parity_netChain');
+  }
+
+  netPeers () {
+    return this._transport
+      .execute('parity_netPeers')
+      .then(outPeers);
+  }
+
+  netMaxPeers () {
+    return this._transport
+      .execute('parity_netMaxPeers')
+      .then(outNumber);
+  }
+
+  netPort () {
+    return this._transport
+      .execute('parity_netPort')
+      .then(outNumber);
+  }
+
+  newAccountFromPhrase (phrase, password) {
+    return this._transport
+      .execute('parity_newAccountFromPhrase', phrase, password)
+      .then(outAddress);
+  }
+
+  newAccountFromSecret (secret, password) {
+    return this._transport
+      .execute('parity_newAccountFromSecret', inHex(secret), password)
+      .then(outAddress);
+  }
+
+  newAccountFromWallet (json, password) {
+    return this._transport
+      .execute('parity_newAccountFromWallet', json, password)
+      .then(outAddress);
+  }
+
+  nodeName () {
+    return this._transport
+      .execute('parity_nodeName');
+  }
+
+  phraseToAddress (phrase) {
+    return this._transport
+      .execute('parity_phraseToAddress', phrase)
+      .then(outAddress);
+  }
+
+  postTransaction (options) {
+    return this._transport
+      .execute('parity_postTransaction', inOptions(options));
+  }
+
+  registryAddress () {
+    return this._transport
+      .execute('parity_registryAddress')
+      .then(outAddress);
+  }
+
+  removeReservedPeer (encode) {
+    return this._transport
+      .execute('parity_removeReservedPeer', encode);
+  }
+
+  rpcSettings () {
+    return this._transport
+      .execute('parity_rpcSettings');
+  }
+
+  setAccountName (address, name) {
+    return this._transport
+      .execute('parity_setAccountName', inAddress(address), name);
+  }
+
+  setAccountMeta (address, meta) {
+    return this._transport
+      .execute('parity_setAccountMeta', inAddress(address), JSON.stringify(meta));
+  }
+
+  setAuthor (address) {
+    return this._transport
+      .execute('parity_setAuthor', inAddress(address));
+  }
+
+  setExtraData (data) {
+    return this._transport
+      .execute('parity_setExtraData', inData(data));
+  }
+
+  setGasFloorTarget (quantity) {
+    return this._transport
+      .execute('parity_setGasFloorTarget', inNumber16(quantity));
+  }
+
+  setMinGasPrice (quantity) {
+    return this._transport
+      .execute('parity_setMinGasPrice', inNumber16(quantity));
+  }
+
+  setMode (mode) {
+    return this._transport
+      .execute('parity_setMode', mode);
+  }
+
+  setTransactionsLimit (quantity) {
+    return this._transport
+      .execute('parity_setTransactionsLimit', inNumber16(quantity));
+  }
+
+  signerPort () {
+    return this._transport
+      .execute('parity_signerPort')
+      .then(outNumber);
+  }
+
+  testPassword (account, password) {
+    return this._transport
+      .execute('parity_testPassword', inAddress(account), password);
+  }
+
+  transactionsLimit () {
+    return this._transport
+      .execute('parity_transactionsLimit')
+      .then(outNumber);
+  }
+
+  unsignedTransactionsCount () {
+    return this._transport
+      .execute('parity_unsignedTransactionsCount')
+      .then(outNumber);
+  }
+}
diff --git a/js/src/api/rpc/ethcore/ethcore.spec.js b/js/src/api/rpc/parity/parity.spec.js
similarity index 66%
rename from js/src/api/rpc/ethcore/ethcore.spec.js
rename to js/src/api/rpc/parity/parity.spec.js
index fd34550a7..ea0dd8d8c 100644
--- a/js/src/api/rpc/ethcore/ethcore.spec.js
+++ b/js/src/api/rpc/parity/parity.spec.js
@@ -18,14 +18,36 @@ import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
 import { isBigNumber } from '../../../../test/types';
 
 import Http from '../../transport/http';
-import Ethcore from './ethcore';
+import Parity from './parity';
 
-const instance = new Ethcore(new Http(TEST_HTTP_URL));
+const instance = new Parity(new Http(TEST_HTTP_URL));
+
+describe('api/rpc/parity', () => {
+  describe('accountsInfo', () => {
+    it('retrieves the available account info', () => {
+      mockHttp([{ method: 'parity_accountsInfo', reply: {
+        result: {
+          '0x63cf90d3f0410092fc0fca41846f596223979195': {
+            name: 'name', uuid: 'uuid', meta: '{"data":"data"}'
+          }
+        }
+      } }]);
+
+      return instance.accountsInfo().then((result) => {
+        expect(result).to.deep.equal({
+          '0x63Cf90D3f0410092FC0fca41846f596223979195': {
+            name: 'name', uuid: 'uuid', meta: {
+              data: 'data'
+            }
+          }
+        });
+      });
+    });
+  });
 
-describe('api/rpc/Ethcore', () => {
   describe('gasFloorTarget', () => {
     it('returns the gasfloor, formatted', () => {
-      mockHttp([{ method: 'ethcore_gasFloorTarget', reply: { result: '0x123456' } }]);
+      mockHttp([{ method: 'parity_gasFloorTarget', reply: { result: '0x123456' } }]);
 
       return instance.gasFloorTarget().then((count) => {
         expect(isBigNumber(count)).to.be.true;
@@ -36,7 +58,7 @@ describe('api/rpc/Ethcore', () => {
 
   describe('minGasPrice', () => {
     it('returns the min gasprice, formatted', () => {
-      mockHttp([{ method: 'ethcore_minGasPrice', reply: { result: '0x123456' } }]);
+      mockHttp([{ method: 'parity_minGasPrice', reply: { result: '0x123456' } }]);
 
       return instance.minGasPrice().then((count) => {
         expect(isBigNumber(count)).to.be.true;
@@ -47,7 +69,7 @@ describe('api/rpc/Ethcore', () => {
 
   describe('netMaxPeers', () => {
     it('returns the max peers, formatted', () => {
-      mockHttp([{ method: 'ethcore_netMaxPeers', reply: { result: 25 } }]);
+      mockHttp([{ method: 'parity_netMaxPeers', reply: { result: 25 } }]);
 
       return instance.netMaxPeers().then((count) => {
         expect(isBigNumber(count)).to.be.true;
@@ -58,7 +80,7 @@ describe('api/rpc/Ethcore', () => {
 
   describe('newPeers', () => {
     it('returns the peer structure, formatted', () => {
-      mockHttp([{ method: 'ethcore_netPeers', reply: { result: { active: 123, connected: 456, max: 789 } } }]);
+      mockHttp([{ method: 'parity_netPeers', reply: { result: { active: 123, connected: 456, max: 789 } } }]);
 
       return instance.netPeers().then((peers) => {
         expect(peers.active.eq(123)).to.be.true;
@@ -70,7 +92,7 @@ describe('api/rpc/Ethcore', () => {
 
   describe('netPort', () => {
     it('returns the connected port, formatted', () => {
-      mockHttp([{ method: 'ethcore_netPort', reply: { result: 33030 } }]);
+      mockHttp([{ method: 'parity_netPort', reply: { result: 33030 } }]);
 
       return instance.netPort().then((count) => {
         expect(isBigNumber(count)).to.be.true;
@@ -81,7 +103,7 @@ describe('api/rpc/Ethcore', () => {
 
   describe('transactionsLimit', () => {
     it('returns the tx limit, formatted', () => {
-      mockHttp([{ method: 'ethcore_transactionsLimit', reply: { result: 1024 } }]);
+      mockHttp([{ method: 'parity_transactionsLimit', reply: { result: 1024 } }]);
 
       return instance.transactionsLimit().then((count) => {
         expect(isBigNumber(count)).to.be.true;
diff --git a/js/src/api/rpc/personal/personal.js b/js/src/api/rpc/personal/personal.js
index ca7dbce9b..db9a71d23 100644
--- a/js/src/api/rpc/personal/personal.js
+++ b/js/src/api/rpc/personal/personal.js
@@ -14,113 +14,31 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { inAddress, inHex, inNumber10, inNumber16, inOptions } from '../../format/input';
-import { outAccountInfo, outAddress, outSignerRequest } from '../../format/output';
+import { inAddress, inNumber10, inOptions } from '../../format/input';
+import { outAddress } from '../../format/output';
 
 export default class Personal {
   constructor (transport) {
     this._transport = transport;
   }
 
-  accountsInfo () {
-    return this._transport
-      .execute('personal_accountsInfo')
-      .then(outAccountInfo);
-  }
-
-  confirmRequest (requestId, options, password) {
-    return this._transport
-      .execute('personal_confirmRequest', inNumber16(requestId), options, password);
-  }
-
-  changePassword (account, password, newPassword) {
-    return this._transport
-      .execute('personal_changePassword', inAddress(account), password, newPassword);
-  }
-
-  generateAuthorizationToken () {
-    return this._transport
-      .execute('personal_generateAuthorizationToken');
-  }
-
   listAccounts () {
     return this._transport
       .execute('personal_listAccounts')
       .then((accounts) => (accounts || []).map(outAddress));
   }
 
-  listGethAccounts () {
-    return this._transport
-      .execute('personal_listGethAccounts')
-      .then((accounts) => (accounts || []).map(outAddress));
-  }
-
-  importGethAccounts (accounts) {
-    return this._transport
-      .execute('personal_importGethAccounts', (accounts || []).map(inAddress))
-      .then((accounts) => (accounts || []).map(outAddress));
-  }
-
   newAccount (password) {
     return this._transport
       .execute('personal_newAccount', password)
       .then(outAddress);
   }
 
-  newAccountFromPhrase (phrase, password) {
-    return this._transport
-      .execute('personal_newAccountFromPhrase', phrase, password)
-      .then(outAddress);
-  }
-
-  newAccountFromSecret (secret, password) {
-    return this._transport
-      .execute('personal_newAccountFromSecret', inHex(secret), password)
-      .then(outAddress);
-  }
-
-  newAccountFromWallet (json, password) {
-    return this._transport
-      .execute('personal_newAccountFromWallet', json, password)
-      .then(outAddress);
-  }
-
-  rejectRequest (requestId) {
-    return this._transport
-      .execute('personal_rejectRequest', inNumber16(requestId));
-  }
-
-  requestsToConfirm () {
-    return this._transport
-      .execute('personal_requestsToConfirm')
-      .then((requests) => (requests || []).map(outSignerRequest));
-  }
-
-  setAccountName (address, name) {
-    return this._transport
-      .execute('personal_setAccountName', inAddress(address), name);
-  }
-
-  setAccountMeta (address, meta) {
-    return this._transport
-      .execute('personal_setAccountMeta', inAddress(address), JSON.stringify(meta));
-  }
-
   signAndSendTransaction (options, password) {
     return this._transport
       .execute('personal_signAndSendTransaction', inOptions(options), password);
   }
 
-  signerEnabled () {
-    return this._transport
-      .execute('personal_signerEnabled');
-  }
-
-  testPassword (account, password) {
-    return this._transport
-      .execute('personal_testPassword', inAddress(account), password);
-  }
-
   unlockAccount (account, password, duration = 1) {
     return this._transport
       .execute('personal_unlockAccount', inAddress(account), password, inNumber10(duration));
diff --git a/js/src/api/rpc/personal/personal.spec.js b/js/src/api/rpc/personal/personal.spec.js
index 70734c7ee..a9bf4f644 100644
--- a/js/src/api/rpc/personal/personal.spec.js
+++ b/js/src/api/rpc/personal/personal.spec.js
@@ -26,28 +26,6 @@ describe('rpc/Personal', () => {
   const checksum = '0x63Cf90D3f0410092FC0fca41846f596223979195';
   let scope;
 
-  describe('accountsInfo', () => {
-    it('retrieves the available account info', () => {
-      scope = mockHttp([{ method: 'personal_accountsInfo', reply: {
-        result: {
-          '0x63cf90d3f0410092fc0fca41846f596223979195': {
-            name: 'name', uuid: 'uuid', meta: '{"data":"data"}'
-          }
-        }
-      } }]);
-
-      return instance.accountsInfo().then((result) => {
-        expect(result).to.deep.equal({
-          '0x63Cf90D3f0410092FC0fca41846f596223979195': {
-            name: 'name', uuid: 'uuid', meta: {
-              data: 'data'
-            }
-          }
-        });
-      });
-    });
-  });
-
   describe('listAccounts', () => {
     it('retrieves a list of available accounts', () => {
       scope = mockHttp([{ method: 'personal_listAccounts', reply: { result: [account] } }]);
diff --git a/js/src/views/Dapps/hidden.js b/js/src/api/rpc/signer/index.js
similarity index 58%
rename from js/src/views/Dapps/hidden.js
rename to js/src/api/rpc/signer/index.js
index fa5458bac..6426bdc06 100644
--- a/js/src/views/Dapps/hidden.js
+++ b/js/src/api/rpc/signer/index.js
@@ -12,24 +12,6 @@
 // GNU General Public License for more details.
 
 // You should have received a copy of the GNU General Public License
-// along with Parity. If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-const defaultHidden = [];
-
-export function readHiddenApps () {
-  const stored = localStorage.getItem('hiddenApps');
-
-  if (stored) {
-    try {
-      return JSON.parse(stored);
-    } catch (error) {
-      console.warn('readHiddenApps', error);
-    }
-  }
-
-  return defaultHidden;
-}
-
-export function writeHiddenApps (hidden) {
-  localStorage.setItem('hiddenApps', JSON.stringify(hidden));
-}
+export default from './signer';
diff --git a/js/src/api/rpc/signer/signer.js b/js/src/api/rpc/signer/signer.js
new file mode 100644
index 000000000..7f905cf50
--- /dev/null
+++ b/js/src/api/rpc/signer/signer.js
@@ -0,0 +1,50 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { inNumber16 } from '../../format/input';
+import { outSignerRequest } from '../../format/output';
+
+export default class Signer {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  confirmRequest (requestId, options, password) {
+    return this._transport
+      .execute('signer_confirmRequest', inNumber16(requestId), options, password);
+  }
+
+  generateAuthorizationToken () {
+    return this._transport
+      .execute('signer_generateAuthorizationToken');
+  }
+
+  rejectRequest (requestId) {
+    return this._transport
+      .execute('signer_rejectRequest', inNumber16(requestId));
+  }
+
+  requestsToConfirm () {
+    return this._transport
+      .execute('signer_requestsToConfirm')
+      .then((requests) => (requests || []).map(outSignerRequest));
+  }
+
+  signerEnabled () {
+    return this._transport
+      .execute('signer_signerEnabled');
+  }
+}
diff --git a/js/src/api/subscriptions/manager.js b/js/src/api/subscriptions/manager.js
index 61e06499e..08f1a9e53 100644
--- a/js/src/api/subscriptions/manager.js
+++ b/js/src/api/subscriptions/manager.js
@@ -24,9 +24,9 @@ import Signer from './signer';
 const events = {
   'logging': { module: 'logging' },
   'eth_blockNumber': { module: 'eth' },
-  'personal_accountsInfo': { module: 'personal' },
-  'personal_listAccounts': { module: 'personal' },
-  'personal_requestsToConfirm': { module: 'signer' }
+  'parity_accountsInfo': { module: 'personal' },
+  'eth_accounts': { module: 'personal' },
+  'signer_requestsToConfirm': { module: 'signer' }
 };
 
 export default class Manager {
diff --git a/js/src/api/subscriptions/personal.js b/js/src/api/subscriptions/personal.js
index d65419962..58428895b 100644
--- a/js/src/api/subscriptions/personal.js
+++ b/js/src/api/subscriptions/personal.js
@@ -37,18 +37,18 @@ export default class Personal {
   }
 
   _listAccounts = () => {
-    return this._api.personal
-      .listAccounts()
+    return this._api.eth
+      .accounts()
       .then((accounts) => {
-        this._updateSubscriptions('personal_listAccounts', null, accounts);
+        this._updateSubscriptions('eth_accounts', null, accounts);
       });
   }
 
   _accountsInfo = () => {
-    return this._api.personal
+    return this._api.parity
       .accountsInfo()
       .then((info) => {
-        this._updateSubscriptions('personal_accountsInfo', null, info);
+        this._updateSubscriptions('parity_accountsInfo', null, info);
       });
   }
 
@@ -59,16 +59,16 @@ export default class Personal {
       }
 
       switch (data.method) {
-        case 'personal_importGethAccounts':
+        case 'parity_importGethAccounts':
         case 'personal_newAccount':
-        case 'personal_newAccountFromPhrase':
-        case 'personal_newAccountFromWallet':
+        case 'parity_newAccountFromPhrase':
+        case 'parity_newAccountFromWallet':
           this._listAccounts();
           this._accountsInfo();
           return;
 
-        case 'personal_setAccountName':
-        case 'personal_setAccountMeta':
+        case 'parity_setAccountName':
+        case 'parity_setAccountMeta':
           this._accountsInfo();
           return;
       }
diff --git a/js/src/api/subscriptions/personal.spec.js b/js/src/api/subscriptions/personal.spec.js
index 1a77b5f61..d6fd2b203 100644
--- a/js/src/api/subscriptions/personal.spec.js
+++ b/js/src/api/subscriptions/personal.spec.js
@@ -34,14 +34,15 @@ function stubApi (accounts, info) {
 
   return {
     _calls,
-    personal: {
+    parity: {
       accountsInfo: () => {
         const stub = sinon.stub().resolves(info || TEST_INFO)();
         _calls.accountsInfo.push(stub);
         return stub;
-      },
-
-      listAccounts: () => {
+      }
+    },
+    eth: {
+      accounts: () => {
         const stub = sinon.stub().resolves(accounts || TEST_LIST)();
         _calls.listAccounts.push(stub);
         return stub;
@@ -85,17 +86,17 @@ describe('api/subscriptions/personal', () => {
         expect(personal.isStarted).to.be.true;
       });
 
-      it('calls personal_accountsInfo', () => {
+      it('calls parity_accountsInfo', () => {
         expect(api._calls.accountsInfo.length).to.be.ok;
       });
 
-      it('calls personal_listAccounts', () => {
+      it('calls eth_accounts', () => {
         expect(api._calls.listAccounts.length).to.be.ok;
       });
 
       it('updates subscribers', () => {
-        expect(cb.firstCall).to.have.been.calledWith('personal_listAccounts', null, TEST_LIST);
-        expect(cb.secondCall).to.have.been.calledWith('personal_accountsInfo', null, TEST_INFO);
+        expect(cb.firstCall).to.have.been.calledWith('eth_accounts', null, TEST_LIST);
+        expect(cb.secondCall).to.have.been.calledWith('parity_accountsInfo', null, TEST_INFO);
       });
     });
 
diff --git a/js/src/api/subscriptions/signer.js b/js/src/api/subscriptions/signer.js
index af745261b..4413fe432 100644
--- a/js/src/api/subscriptions/signer.js
+++ b/js/src/api/subscriptions/signer.js
@@ -49,10 +49,10 @@ export default class Signer {
       return;
     }
 
-    return this._api.personal
+    return this._api.signer
       .requestsToConfirm()
       .then((requests) => {
-        this._updateSubscriptions('personal_requestsToConfirm', null, requests);
+        this._updateSubscriptions('signer_requestsToConfirm', null, requests);
         nextTimeout();
       })
       .catch(nextTimeout);
@@ -65,7 +65,7 @@ export default class Signer {
       }
 
       switch (data.method) {
-        case 'eth_postTransaction':
+        case 'parity_postTransaction':
         case 'eth_sendTranasction':
         case 'eth_sendRawTransaction':
           this._listRequests(false);
diff --git a/js/src/api/transport/http/http.js b/js/src/api/transport/http/http.js
index 65ba089cc..08d9422f8 100644
--- a/js/src/api/transport/http/http.js
+++ b/js/src/api/transport/http/http.js
@@ -56,6 +56,8 @@ export default class Http extends JsonRpcBase {
         if (response.status !== 200) {
           this._connected = false;
           this.error(JSON.stringify({ status: response.status, statusText: response.statusText }));
+          console.error(`${method}(${JSON.stringify(params)}): ${response.status}: ${response.statusText}`);
+
           throw new Error(`${response.status}: ${response.statusText}`);
         }
 
@@ -66,7 +68,9 @@ export default class Http extends JsonRpcBase {
 
         if (response.error) {
           this.error(JSON.stringify(response));
-          throw new Error(`${response.error.code}: ${response.error.message}`);
+          console.error(`${method}(${JSON.stringify(params)}): ${response.error.code}: ${response.error.message}`);
+
+          throw new Error(`${method}: ${response.error.code}: ${response.error.message}`);
         }
 
         this.log(JSON.stringify(response));
diff --git a/js/src/api/transport/ws/ws.js b/js/src/api/transport/ws/ws.js
index 119f4ba76..d608426b0 100644
--- a/js/src/api/transport/ws/ws.js
+++ b/js/src/api/transport/ws/ws.js
@@ -107,7 +107,9 @@ export default class Ws extends JsonRpcBase {
       if (result.error) {
         this.error(event.data);
 
-        reject(new Error(`${result.error.code}: ${result.error.message}`));
+        console.error(`${method}(${JSON.stringify(params)}): ${result.error.code}: ${result.error.message}`);
+
+        reject(new Error(`${method}: ${result.error.code}: ${result.error.message}`));
         delete this._messages[result.id];
         return;
       }
diff --git a/js/src/contracts/dappreg.js b/js/src/contracts/dappreg.js
index 5272f6561..ae982af56 100644
--- a/js/src/contracts/dappreg.js
+++ b/js/src/contracts/dappreg.js
@@ -57,4 +57,8 @@ export default class DappReg {
   getContent (id) {
     return this.meta(id, 'CONTENT');
   }
+
+  getManifest (id) {
+    return this.meta(id, 'MANIFEST');
+  }
 }
diff --git a/js/src/contracts/registry.js b/js/src/contracts/registry.js
index 85b9d6bb5..9853c0df9 100644
--- a/js/src/contracts/registry.js
+++ b/js/src/contracts/registry.js
@@ -32,7 +32,7 @@ export default class Registry {
         return;
       }
 
-      this._api.ethcore
+      this._api.parity
         .registryAddress()
         .then((address) => {
           this._instance = this._api.newContract(abis.registry, address).instance;
diff --git a/js/src/dapps/basiccoin/Application/application.js b/js/src/dapps/basiccoin/Application/application.js
index 4ab97ab6c..abe0c90c5 100644
--- a/js/src/dapps/basiccoin/Application/application.js
+++ b/js/src/dapps/basiccoin/Application/application.js
@@ -83,7 +83,7 @@ export default class Application extends Component {
     Promise
       .all([
         attachInstances(),
-        api.personal.accountsInfo()
+        api.parity.accounts()
       ])
       .then(([{ managerInstance, registryInstance, tokenregInstance }, accountsInfo]) => {
         accountsInfo = accountsInfo || {};
diff --git a/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js b/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js
index f9232789b..0fa7dc863 100644
--- a/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js
+++ b/js/src/dapps/basiccoin/Deploy/Deployment/deployment.js
@@ -296,7 +296,7 @@ export default class Deployment extends Component {
       .then((signerRequestId) => {
         this.setState({ signerRequestId, deployState: 'Transaction posted, Waiting for transaction authorization' });
 
-        return api.pollMethod('eth_checkRequest', signerRequestId);
+        return api.pollMethod('parity_checkRequest', signerRequestId);
       })
       .then((txHash) => {
         this.setState({ txHash, deployState: 'Transaction authorized, Waiting for network confirmations' });
diff --git a/js/src/dapps/basiccoin/Transfer/Send/send.js b/js/src/dapps/basiccoin/Transfer/Send/send.js
index aee860fe2..a9c05a228 100644
--- a/js/src/dapps/basiccoin/Transfer/Send/send.js
+++ b/js/src/dapps/basiccoin/Transfer/Send/send.js
@@ -279,7 +279,7 @@ export default class Send extends Component {
       .then((signerRequestId) => {
         this.setState({ signerRequestId, sendState: 'Transaction posted, Waiting for transaction authorization' });
 
-        return api.pollMethod('eth_checkRequest', signerRequestId);
+        return api.pollMethod('parity_checkRequest', signerRequestId);
       })
       .then((txHash) => {
         this.setState({ txHash, sendState: 'Transaction authorized, Waiting for network confirmations' });
diff --git a/js/src/dapps/basiccoin/services.js b/js/src/dapps/basiccoin/services.js
index 28cc662a7..4aed4199f 100644
--- a/js/src/dapps/basiccoin/services.js
+++ b/js/src/dapps/basiccoin/services.js
@@ -100,8 +100,8 @@ export function attachInstances () {
 
   return Promise
     .all([
-      api.ethcore.registryAddress(),
-      api.ethcore.netChain()
+      api.parity.registryAddress(),
+      api.parity.netChain()
     ])
     .then(([registryAddress, netChain]) => {
       const registry = api.newContract(abis.registry, registryAddress).instance;
diff --git a/js/src/dapps/githubhint.html b/js/src/dapps/githubhint.html
index 631182fcb..746c7f466 100644
--- a/js/src/dapps/githubhint.html
+++ b/js/src/dapps/githubhint.html
@@ -11,7 +11,6 @@
     <div id="container"></div>
     <script src="vendor.js"></script>
     <script src="commons.js"></script>
-    <script src="/parity-utils/parity.js"></script>
     <script src="githubhint.js"></script>
   </body>
 </html>
diff --git a/js/src/dapps/githubhint/Application/application.css b/js/src/dapps/githubhint/Application/application.css
index d149d883d..be04ecf34 100644
--- a/js/src/dapps/githubhint/Application/application.css
+++ b/js/src/dapps/githubhint/Application/application.css
@@ -82,6 +82,10 @@
 .capture {
 }
 
+.capture+.capture {
+  margin-top: 0.5em;
+}
+
 .capture * {
   display: inline-block;
   padding: 0.75em;
@@ -124,3 +128,20 @@
 .hashOk {
   opacity: 0.5;
 }
+
+.typeButtons {
+  text-align: center;
+  padding: 0 0 1em 0;
+}
+
+.typeButtons>div {
+  border-radius: 0 !important;
+
+  &:first-child {
+    border-radius: 5px 0 0 5px !important;
+  }
+
+  &:last-child {
+    border-radius: 0 5px 5px 0 !important;
+  }
+}
diff --git a/js/src/dapps/githubhint/Application/application.js b/js/src/dapps/githubhint/Application/application.js
index 3c4ecfda8..5a7494928 100644
--- a/js/src/dapps/githubhint/Application/application.js
+++ b/js/src/dapps/githubhint/Application/application.js
@@ -33,12 +33,17 @@ export default class Application extends Component {
     loading: true,
     url: '',
     urlError: null,
+    commit: '',
+    commitError: null,
     contentHash: '',
     contentHashError: null,
     contentHashOwner: null,
     registerBusy: false,
     registerError: null,
-    registerState: ''
+    registerState: '',
+    registerType: 'file',
+    repo: '',
+    repoError: null
   }
 
   componentDidMount () {
@@ -65,7 +70,7 @@ export default class Application extends Component {
   }
 
   renderPage () {
-    const { fromAddress, registerBusy, url, urlError, contentHash, contentHashError, contentHashOwner } = this.state;
+    const { fromAddress, registerBusy, url, urlError, contentHash, contentHashError, contentHashOwner, commit, commitError, registerType, repo, repoError } = this.state;
 
     let hashClass = null;
     if (contentHashError) {
@@ -74,22 +79,60 @@ export default class Application extends Component {
       hashClass = styles.hashOk;
     }
 
+    let valueInputs = null;
+    if (registerType === 'content') {
+      valueInputs = [
+        <div className={ styles.capture } key='repo'>
+          <input
+            type='text'
+            placeholder='owner/repo'
+            disabled={ registerBusy }
+            value={ repo }
+            className={ repoError ? styles.error : null }
+            onChange={ this.onChangeRepo } />
+        </div>,
+        <div className={ styles.capture } key='hash'>
+          <input
+            type='text'
+            placeholder='commit hash sha3'
+            disabled={ registerBusy }
+            value={ commit }
+            className={ commitError ? styles.error : null }
+            onChange={ this.onChangeCommit } />
+        </div>
+      ];
+    } else {
+      valueInputs = (
+        <div className={ styles.capture } key='url'>
+          <input
+            type='text'
+            placeholder='http://domain/filename'
+            disabled={ registerBusy }
+            value={ url }
+            className={ urlError ? styles.error : null }
+            onChange={ this.onChangeUrl } />
+        </div>
+      );
+    }
+
     return (
       <div className={ styles.container }>
         <div className={ styles.form }>
+          <div className={ styles.typeButtons }>
+            <Button
+              disabled={ registerBusy }
+              invert={ registerType !== 'file' }
+              onClick={ this.onClickTypeNormal }>File Link</Button>
+            <Button
+              disabled={ registerBusy }
+              invert={ registerType !== 'content' }
+              onClick={ this.onClickTypeContent }>Content Bundle</Button>
+          </div>
           <div className={ styles.box }>
             <div className={ styles.description }>
               Provide a valid URL to register. The content information can be used in other contracts that allows for reverse lookups, e.g. image registries, dapp registries, etc.
             </div>
-            <div className={ styles.capture }>
-              <input
-                type='text'
-                placeholder='http://domain/filename'
-                disabled={ registerBusy }
-                value={ url }
-                className={ urlError ? styles.error : null }
-                onChange={ this.onChangeUrl } />
-            </div>
+            { valueInputs }
             <div className={ hashClass }>
               { contentHashError || contentHash }
             </div>
@@ -101,7 +144,7 @@ export default class Application extends Component {
   }
 
   renderButtons () {
-    const { accounts, fromAddress, url, urlError, contentHashError, contentHashOwner } = this.state;
+    const { accounts, fromAddress, urlError, repoError, commitError, contentHashError, contentHashOwner } = this.state;
     const account = accounts[fromAddress];
 
     return (
@@ -114,7 +157,7 @@ export default class Application extends Component {
         </div>
         <Button
           onClick={ this.onClickRegister }
-          disabled={ (!!contentHashError && contentHashOwner !== fromAddress) || !!urlError || url.length === 0 }>register url</Button>
+          disabled={ (contentHashError && contentHashOwner !== fromAddress) || urlError || repoError || commitError }>register url</Button>
       </div>
     );
   }
@@ -147,57 +190,107 @@ export default class Application extends Component {
     );
   }
 
-  onClickContentHash = () => {
-    this.setState({ fileHash: false, commit: '' });
+  onClickTypeNormal = () => {
+    const { url } = this.state;
+
+    this.setState({ registerType: 'file', commitError: null, repoError: null }, () => {
+      this.onChangeUrl({ target: { value: url } });
+    });
   }
 
-  onClickFileHash = () => {
-    this.setState({ fileHash: true, commit: 0 });
+  onClickTypeContent = () => {
+    const { repo, commit } = this.state;
+
+    this.setState({ registerType: 'content', urlError: null }, () => {
+      this.onChangeRepo({ target: { value: repo } });
+      this.onChangeCommit({ target: { value: commit } });
+    });
+  }
+
+  onChangeCommit = (event) => {
+    let commit = event.target.value;
+    const commitError = null;
+    let hasContent = false;
+
+    this.setState({ commit, commitError, contentHashError: null }, () => {
+      const { repo } = this.state || '';
+      const parts = repo.split('/');
+
+      hasContent = commit.length !== 0 && parts.length === 2 && parts[0].length !== 0 && parts[1].length !== 0;
+      if (!commitError && hasContent) {
+        this.setState({ contentHashError: 'hash lookup in progress' });
+        this.lookupHash(`https://codeload.github.com/${repo}/zip/${commit}`);
+      }
+    });
+  }
+
+  onChangeRepo = (event) => {
+    let repo = event.target.value;
+    const repoError = null;
+    let hasContent = false;
+
+    // TODO: field validation
+    if (!repoError) {
+      repo = repo.replace('https://github.com/', '');
+    }
+
+    this.setState({ repo, repoError, contentHashError: null }, () => {
+      const { commit } = this.state || '';
+      const parts = repo.split('/');
+
+      hasContent = commit.length !== 0 && parts.length === 2 && parts[0].length !== 0 && parts[1].length !== 0;
+      if (!repoError && hasContent) {
+        this.setState({ contentHashError: 'hash lookup in progress' });
+        this.lookupHash(`https://codeload.github.com/${repo}/zip/${commit}`);
+      }
+    });
   }
 
   onChangeUrl = (event) => {
-    const url = event.target.value;
-    let urlError = null;
+    let url = event.target.value;
+    const urlError = null;
+    let hasContent = false;
 
-    if (url && url.length) {
-      const re = /^https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}/g; // eslint-disable-line
-      urlError = re.test(url)
-        ? null
-        : 'not matching rexex';
+    // TODO: field validation
+    if (!urlError) {
+      const parts = url.split('/');
+      hasContent = parts.length !== 0;
+
+      if (parts[2] === 'github.com' || parts[2] === 'raw.githubusercontent.com') {
+        url = `https://raw.githubusercontent.com/${parts.slice(3).join('/')}`.replace('/blob/', '/');
+      }
     }
 
-    this.setState({ url, urlError, contentHashError: 'hash lookup in progress' }, () => {
-      this.lookupHash();
+    this.setState({ url, urlError, contentHashError: null }, () => {
+      if (!urlError && hasContent) {
+        this.setState({ contentHashError: 'hash lookup in progress' });
+        this.lookupHash(url);
+      }
     });
   }
 
   onClickRegister = () => {
-    const { url, urlError, contentHash, contentHashError, contentHashOwner, fromAddress, instance } = this.state;
+    const { commit, commitError, contentHashError, contentHashOwner, fromAddress, url, urlError, registerType, repo, repoError } = this.state;
 
-    if ((!!contentHashError && contentHashOwner !== fromAddress) || !!urlError || url.length === 0) {
+    // TODO: No errors are currently set, validation to be expanded and added for each
+    // field (query is fast to pick up the issues, so not burning atm)
+    if ((contentHashError && contentHashOwner !== fromAddress) || repoError || urlError || commitError) {
       return;
     }
 
-    this.setState({ registerBusy: true, registerState: 'Estimating gas for the transaction' });
+    if (registerType === 'file') {
+      this.registerUrl(url);
+    } else {
+      this.registerContent(repo, commit);
+    }
+  }
 
-    const values = [contentHash, url];
-    const options = { from: fromAddress };
-
-    instance
-      .hintURL.estimateGas(options, values)
-      .then((gas) => {
-        this.setState({ registerState: 'Gas estimated, Posting transaction to the network' });
-
-        const gasPassed = gas.mul(1.2);
-        options.gas = gasPassed.toFixed(0);
-        console.log(`gas estimated at ${gas.toFormat(0)}, passing ${gasPassed.toFormat(0)}`);
-
-        return instance.hintURL.postTransaction(options, values);
-      })
+  trackRequest (promise) {
+    return promise
       .then((signerRequestId) => {
         this.setState({ signerRequestId, registerState: 'Transaction posted, Waiting for transaction authorization' });
 
-        return api.pollMethod('eth_checkRequest', signerRequestId);
+        return api.pollMethod('parity_checkRequest', signerRequestId);
       })
       .then((txHash) => {
         this.setState({ txHash, registerState: 'Transaction authorized, Waiting for network confirmations' });
@@ -211,7 +304,7 @@ export default class Application extends Component {
         });
       })
       .then((txReceipt) => {
-        this.setState({ txReceipt, registerBusy: false, registerState: 'Network confirmed, Received transaction receipt', url: '', contentHash: '' });
+        this.setState({ txReceipt, registerBusy: false, registerState: 'Network confirmed, Received transaction receipt', url: '', commit: '', repo: '', commitError: null, contentHash: '', contentHashOwner: null, contentHashError: null });
       })
       .catch((error) => {
         console.error('onSend', error);
@@ -219,6 +312,52 @@ export default class Application extends Component {
       });
   }
 
+  registerContent (repo, commit) {
+    const { contentHash, fromAddress, instance } = this.state;
+
+    this.setState({ registerBusy: true, registerState: 'Estimating gas for the transaction' });
+
+    const values = [contentHash, repo, commit.substr(0, 2) === '0x' ? commit : `0x${commit}`];
+    const options = { from: fromAddress };
+
+    this.trackRequest(
+      instance
+        .hint.estimateGas(options, values)
+        .then((gas) => {
+          this.setState({ registerState: 'Gas estimated, Posting transaction to the network' });
+
+          const gasPassed = gas.mul(1.2);
+          options.gas = gasPassed.toFixed(0);
+          console.log(`gas estimated at ${gas.toFormat(0)}, passing ${gasPassed.toFormat(0)}`);
+
+          return instance.hint.postTransaction(options, values);
+        })
+    );
+  }
+
+  registerUrl (url) {
+    const { contentHash, fromAddress, instance } = this.state;
+
+    this.setState({ registerBusy: true, registerState: 'Estimating gas for the transaction' });
+
+    const values = [contentHash, url];
+    const options = { from: fromAddress };
+
+    this.trackRequest(
+      instance
+        .hintURL.estimateGas(options, values)
+        .then((gas) => {
+          this.setState({ registerState: 'Gas estimated, Posting transaction to the network' });
+
+          const gasPassed = gas.mul(1.2);
+          options.gas = gasPassed.toFixed(0);
+          console.log(`gas estimated at ${gas.toFormat(0)}, passing ${gasPassed.toFormat(0)}`);
+
+          return instance.hintURL.postTransaction(options, values);
+        })
+    );
+  }
+
   onSelectFromAddress = () => {
     const { accounts, fromAddress } = this.state;
     const addresses = Object.keys(accounts);
@@ -238,10 +377,16 @@ export default class Application extends Component {
     this.setState({ fromAddress: addresses[index] });
   }
 
-  lookupHash () {
-    const { url, instance } = this.state;
+  lookupHash (url) {
+    const { instance } = this.state;
 
-    api.ethcore
+    if (!url || !url.length) {
+      return;
+    }
+
+    console.log(`lookupHash ${url}`);
+
+    api.parity
       .hashContent(url)
       .then((contentHash) => {
         console.log('lookupHash', contentHash);
diff --git a/js/src/dapps/githubhint/parity.js b/js/src/dapps/githubhint/parity.js
index f6d59f44d..acee4dee0 100644
--- a/js/src/dapps/githubhint/parity.js
+++ b/js/src/dapps/githubhint/parity.js
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-const { api } = window.parity;
+const api = window.parent.secureApi;
 
 export {
   api
diff --git a/js/src/dapps/githubhint/services.js b/js/src/dapps/githubhint/services.js
index b7676d5f5..c9d260b73 100644
--- a/js/src/dapps/githubhint/services.js
+++ b/js/src/dapps/githubhint/services.js
@@ -18,7 +18,7 @@ import * as abis from '../../contracts/abi';
 import { api } from './parity';
 
 export function attachInterface () {
-  return api.ethcore
+  return api.parity
     .registryAddress()
     .then((registryAddress) => {
       console.log(`the registry was found at ${registryAddress}`);
@@ -29,7 +29,7 @@ export function attachInterface () {
         .all([
           registry.getAddress.call({}, [api.util.sha3('githubhint'), 'A']),
           api.eth.accounts(),
-          api.personal.accountsInfo()
+          api.parity.accounts()
         ]);
     })
     .then(([address, addresses, accountsInfo]) => {
diff --git a/js/src/dapps/registry/actions.js b/js/src/dapps/registry/actions.js
index 882af0360..b1390926b 100644
--- a/js/src/dapps/registry/actions.js
+++ b/js/src/dapps/registry/actions.js
@@ -29,7 +29,7 @@ export { addresses, accounts, lookup, events, names, records };
 export const setContract = (contract) => ({ type: 'set contract', contract });
 
 export const fetchContract = () => (dispatch) =>
-  api.ethcore.registryAddress()
+  api.parity.registryAddress()
   .then((address) => {
     const contract = api.newContract(registryAbi, address);
     dispatch(setContract(contract));
diff --git a/js/src/dapps/registry/addresses/actions.js b/js/src/dapps/registry/addresses/actions.js
index 17975f9e6..2341d716c 100644
--- a/js/src/dapps/registry/addresses/actions.js
+++ b/js/src/dapps/registry/addresses/actions.js
@@ -22,7 +22,7 @@ export const fetch = () => (dispatch) => {
   return Promise
     .all([
       api.eth.accounts(),
-      api.personal.accountsInfo()
+      api.parity.accounts()
     ])
     .then(([ accounts, data ]) => {
       data = data || {};
diff --git a/js/src/dapps/signaturereg/services.js b/js/src/dapps/signaturereg/services.js
index cab324f7e..54394c4b8 100644
--- a/js/src/dapps/signaturereg/services.js
+++ b/js/src/dapps/signaturereg/services.js
@@ -39,7 +39,7 @@ const logToEvent = (log) => {
 };
 
 export function attachInterface (callback) {
-  return api.ethcore
+  return api.parity
     .registryAddress()
     .then((registryAddress) => {
       console.log(`the registry was found at ${registryAddress}`);
@@ -50,7 +50,7 @@ export function attachInterface (callback) {
         .all([
           registry.getAddress.call({}, [api.util.sha3('signaturereg'), 'A']),
           api.eth.accounts(),
-          api.personal.accountsInfo()
+          api.parity.accounts()
         ]);
     })
     .then(([address, addresses, accountsInfo]) => {
diff --git a/js/src/dapps/tokenreg/Accounts/actions.js b/js/src/dapps/tokenreg/Accounts/actions.js
index f501399c2..58a74dfd8 100644
--- a/js/src/dapps/tokenreg/Accounts/actions.js
+++ b/js/src/dapps/tokenreg/Accounts/actions.js
@@ -38,7 +38,7 @@ export const loadAccounts = () => (dispatch) => {
   Promise
     .all([
       api.eth.accounts(),
-      api.personal.accountsInfo()
+      api.parity.accounts()
     ])
     .then(([ accounts, accountsInfo ]) => {
       accountsInfo = accountsInfo || {};
diff --git a/js/src/dapps/tokenreg/Actions/Register/register.js b/js/src/dapps/tokenreg/Actions/Register/register.js
index 78d823326..5eb2d9e1b 100644
--- a/js/src/dapps/tokenreg/Actions/Register/register.js
+++ b/js/src/dapps/tokenreg/Actions/Register/register.js
@@ -80,7 +80,9 @@ export default class RegisterAction extends Component {
         modal={ sending || complete }
         className={ styles.dialog }
         onRequestClose={ this.onClose }
-        actions={ this.renderActions() } >
+        actions={ this.renderActions() }
+        autoScrollBodyContent
+      >
         { this.renderContent() }
       </Dialog>
     );
diff --git a/js/src/dapps/tokenreg/Status/actions.js b/js/src/dapps/tokenreg/Status/actions.js
index b7de9c108..e9e217d6a 100644
--- a/js/src/dapps/tokenreg/Status/actions.js
+++ b/js/src/dapps/tokenreg/Status/actions.js
@@ -34,7 +34,7 @@ export const FIND_CONTRACT = 'FIND_CONTRACT';
 export const loadContract = () => (dispatch) => {
   dispatch(setLoading(true));
 
-  api.ethcore
+  api.parity
     .registryAddress()
     .then((registryAddress) => {
       console.log(`registry found at ${registryAddress}`);
diff --git a/js/src/dev.parity.html b/js/src/dev.parity.html
index 9cfe5ac18..504dfbb70 100644
--- a/js/src/dev.parity.html
+++ b/js/src/dev.parity.html
@@ -6,8 +6,31 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
     <title>dev::Parity.js</title>
+    <script src="/parity-utils/parity.js"></script>
+    <style>
+      .box {
+        font-size: 1.5em;
+        text-align: center;
+        border-radius: 0.5em;
+        background: #eee;
+        padding: 1em;
+        margin: 1em;
+      }
+    </style>
   </head>
   <body>
-    <script src="/parity-utils/parity.js"></script>
+    <div class="box">
+      best block #<span id="blockNumber">unknown</span>
+    </div>
+    <script>
+      window.parity.api.subscribe('eth_blockNumber', function (error, blockNumber) {
+        if (error) {
+          console.log('error', error);
+          return;
+        }
+
+        document.getElementById('blockNumber').innerHTML = blockNumber.toFormat(0);
+      });
+    </script>
   </body>
 </html>
diff --git a/js/src/dev.web3.html b/js/src/dev.web3.html
index 93faba8e5..f4006160a 100644
--- a/js/src/dev.web3.html
+++ b/js/src/dev.web3.html
@@ -6,8 +6,33 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
     <title>dev::Web3</title>
+    <script src="/parity-utils/web3.js"></script>
+    <style>
+      .box {
+        font-size: 1.5em;
+        text-align: center;
+        border-radius: 0.5em;
+        background: #eee;
+        padding: 1em;
+        margin: 1em;
+      }
+    </style>
   </head>
   <body>
-    <script src="/parity-utils/web3.js"></script>
+    <div class="box">
+      best block #<span id="blockNumber">unknown</span>
+    </div>
+    <script>
+      window.setInterval(function () {
+        window.web3.eth.getBlockNumber(function (error, blockNumber) {
+          if (error) {
+            console.error('error', error);
+            return;
+          }
+
+          document.getElementById('blockNumber').innerHTML = blockNumber;
+        });
+      }, 1000);
+    </script>
   </body>
 </html>
diff --git a/js/src/index.js b/js/src/index.js
index 2321b5cf6..966e2708e 100644
--- a/js/src/index.js
+++ b/js/src/index.js
@@ -31,7 +31,7 @@ import ContractInstances from './contracts';
 
 import { initStore } from './redux';
 import { ContextProvider, muiTheme } from './ui';
-import { Accounts, Account, Addresses, Address, Application, Contract, Contracts, Dapp, Dapps, Settings, SettingsBackground, SettingsProxy, SettingsViews, Signer, Status } from './views';
+import { Accounts, Account, Addresses, Address, Application, Contract, Contracts, Dapp, Dapps, Settings, SettingsBackground, SettingsParity, SettingsProxy, SettingsViews, Signer, Status } from './views';
 
 import { setApi } from './redux/providers/apiActions';
 
@@ -59,6 +59,8 @@ const store = initStore(api);
 store.dispatch({ type: 'initAll', api });
 store.dispatch(setApi(api));
 
+window.secureApi = api;
+
 const routerHistory = useRouterHistory(createHashHistory)({});
 
 ReactDOM.render(
@@ -72,13 +74,14 @@ ReactDOM.render(
         <Route path='addresses' component={ Addresses } />
         <Route path='address/:address' component={ Address } />
         <Route path='apps' component={ Dapps } />
-        <Route path='app/:type/:name' component={ Dapp } />
+        <Route path='app/:id' component={ Dapp } />
         <Route path='contracts' component={ Contracts } />
         <Route path='contract/:address' component={ Contract } />
         <Route path='settings' component={ Settings }>
           <Route path='background' component={ SettingsBackground } />
           <Route path='proxy' component={ SettingsProxy } />
           <Route path='views' component={ SettingsViews } />
+          <Route path='parity' component={ SettingsParity } />
         </Route>
         <Route path='signer' component={ Signer } />
         <Route path='status' component={ Status } />
diff --git a/js/src/jsonrpc/index.js b/js/src/jsonrpc/index.js
index 18bd4302d..9e9692279 100644
--- a/js/src/jsonrpc/index.js
+++ b/js/src/jsonrpc/index.js
@@ -16,20 +16,22 @@
 
 import db from './interfaces/db';
 import eth from './interfaces/eth';
-import ethcore from './interfaces/ethcore';
 import net from './interfaces/net';
+import parity from './interfaces/parity';
 import personal from './interfaces/personal';
 import shh from './interfaces/shh';
+import signer from './interfaces/signer';
 import trace from './interfaces/trace';
 import web3 from './interfaces/web3';
 
 export default {
-  db: db,
-  eth: eth,
-  ethcore: ethcore,
-  net: net,
-  personal: personal,
-  shh: shh,
-  trace: trace,
-  web3: web3
+  db,
+  eth,
+  parity,
+  net,
+  personal,
+  shh,
+  signer,
+  trace,
+  web3
 };
diff --git a/js/src/jsonrpc/interfaces/eth.js b/js/src/jsonrpc/interfaces/eth.js
index f1c8fb86f..d5ff471fb 100644
--- a/js/src/jsonrpc/interfaces/eth.js
+++ b/js/src/jsonrpc/interfaces/eth.js
@@ -86,20 +86,6 @@ export default {
     }
   },
 
-  checkRequest: {
-    desc: 'Returns the transactionhash of the requestId (received from eth_postTransaction) if the request was confirmed',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The requestId to check for'
-      }
-    ],
-    returns: {
-      type: Hash,
-      desc: '32 Bytes - the transaction hash, or the zero hash if the transaction is not yet available'
-    }
-  },
-
   coinbase: {
     desc: 'Returns the client coinbase address.',
     params: [],
@@ -823,22 +809,6 @@ export default {
     }
   },
 
-  postTransaction: {
-    desc: 'Posts a transaction to the Signer.',
-    params: [
-      {
-        type: Object,
-        desc: 'see [eth_sendTransaction](#eth_sendTransaction)',
-        format: 'inputCallFormatter'
-      }
-    ],
-    returns: {
-      type: Quantity,
-      desc: 'The id of the actual transaction',
-      format: 'utils.toDecimal'
-    }
-  },
-
   protocolVersion: {
     desc: 'Returns the current ethereum protocol version.',
     params: [],
diff --git a/js/src/jsonrpc/interfaces/ethcore.js b/js/src/jsonrpc/interfaces/parity.js
similarity index 64%
rename from js/src/jsonrpc/interfaces/ethcore.js
rename to js/src/jsonrpc/interfaces/parity.js
index c81a82f76..66a8ea962 100644
--- a/js/src/jsonrpc/interfaces/ethcore.js
+++ b/js/src/jsonrpc/interfaces/parity.js
@@ -26,6 +26,52 @@ export default {
     }
   },
 
+  accounts: {
+    desc: 'returns a map of accounts as an object',
+    params: [],
+    returns: {
+      type: Array,
+      desc: 'Account metadata',
+      details: {
+        name: {
+          type: String,
+          desc: 'Account name'
+        },
+        meta: {
+          type: String,
+          desc: 'Encoded JSON string the defines additional account metadata'
+        },
+        uuid: {
+          type: String,
+          desc: 'The account UUID, or null if not available/unknown/not applicable.'
+        }
+      }
+    }
+  },
+
+  accountsInfo: {
+    desc: 'returns a map of accounts as an object',
+    params: [],
+    returns: {
+      type: Array,
+      desc: 'Account metadata',
+      details: {
+        name: {
+          type: String,
+          desc: 'Account name'
+        },
+        meta: {
+          type: String,
+          desc: 'Encoded JSON string the defines additional account metadata'
+        },
+        uuid: {
+          type: String,
+          desc: 'The account UUID, or null if not available/unknown/not applicable.'
+        }
+      }
+    }
+  },
+
   addReservedPeer: {
     desc: '?',
     params: [
@@ -40,6 +86,20 @@ export default {
     }
   },
 
+  checkRequest: {
+    desc: 'Returns the transactionhash of the requestId (received from parity_postTransaction) if the request was confirmed',
+    params: [
+      {
+        type: Quantity,
+        desc: 'The requestId to check for'
+      }
+    ],
+    returns: {
+      type: Hash,
+      desc: '32 Bytes - the transaction hash, or the zero hash if the transaction is not yet available'
+    }
+  },
+
   dappsPort: {
     desc: 'Returns the port the dapps are running on, error if not enabled',
     params: [],
@@ -85,6 +145,15 @@ export default {
     }
   },
 
+  enode: {
+    desc: 'Returns the node enode URI',
+    params: [],
+    returns: {
+      type: String,
+      desc: 'Enode URI'
+    }
+  },
+
   extraData: {
     desc: 'Returns currently set extra data',
     params: [],
@@ -146,6 +215,29 @@ export default {
     }
   },
 
+  listGethAccounts: {
+    desc: 'Returns a list of the accounts available from Geth',
+    params: [],
+    returns: {
+      type: Array,
+      desc: '20 Bytes addresses owned by the client.'
+    }
+  },
+
+  importGethAccounts: {
+    desc: 'Imports a list of accounts from geth',
+    params: [
+      {
+        type: Array,
+        desc: 'List of the geth addresses to import'
+      }
+    ],
+    returns: {
+      type: Array,
+      desc: 'Array of the imported addresses'
+    }
+  },
+
   minGasPrice: {
     desc: 'Returns currently set minimal gas price',
     params: [],
@@ -157,7 +249,7 @@ export default {
   },
 
   mode: {
-    desc: 'Get the mode. Results one of: "active", "passive", "dark", "off".',
+    desc: 'Get the mode. Results one of: "active", "passive", "dark", "offline".',
     params: [],
     returns: {
       type: String,
@@ -201,6 +293,60 @@ export default {
     }
   },
 
+  newAccountFromPhrase: {
+    desc: 'Creates a new account from a recovery passphrase',
+    params: [
+      {
+        type: String,
+        desc: 'Phrase'
+      },
+      {
+        type: String,
+        desc: 'Password'
+      }
+    ],
+    returns: {
+      type: Address,
+      desc: 'The created address'
+    }
+  },
+
+  newAccountFromSecret: {
+    desc: 'Creates a new account from a private ethstore secret key',
+    params: [
+      {
+        type: Data,
+        desc: 'Secret, 32-byte hex'
+      },
+      {
+        type: String,
+        desc: 'Password'
+      }
+    ],
+    returns: {
+      type: Address,
+      desc: 'The created address'
+    }
+  },
+
+  newAccountFromWallet: {
+    desc: 'Creates a new account from a JSON import',
+    params: [
+      {
+        type: String,
+        desc: 'JSON'
+      },
+      {
+        type: String,
+        desc: 'Password'
+      }
+    ],
+    returns: {
+      type: Address,
+      desc: 'The created address'
+    }
+  },
+
   nodeName: {
     desc: 'Returns node name (identity)',
     params: [],
@@ -224,6 +370,22 @@ export default {
     }
   },
 
+  postTransaction: {
+    desc: 'Posts a transaction to the Signer.',
+    params: [
+      {
+        type: Object,
+        desc: 'see [eth_sendTransaction](#eth_sendTransaction)',
+        format: 'inputCallFormatter'
+      }
+    ],
+    returns: {
+      type: Quantity,
+      desc: 'The id of the actual transaction',
+      format: 'utils.toDecimal'
+    }
+  },
+
   removeReservedPeer: {
     desc: '?',
     params: [
@@ -256,6 +418,42 @@ export default {
     }
   },
 
+  setAccountName: {
+    desc: 'Sets a name for the account',
+    params: [
+      {
+        type: Address,
+        desc: 'Address'
+      },
+      {
+        type: String,
+        desc: 'Name'
+      }
+    ],
+    returns: {
+      type: Object,
+      desc: 'Returns null in all cases'
+    }
+  },
+
+  setAccountMeta: {
+    desc: 'Sets metadata for the account',
+    params: [
+      {
+        type: Address,
+        desc: 'Address'
+      },
+      {
+        type: String,
+        desc: 'Metadata (JSON encoded)'
+      }
+    ],
+    returns: {
+      type: Object,
+      desc: 'Returns null in all cases'
+    }
+  },
+
   setAuthor: {
     desc: 'Changes author (coinbase) for mined blocks.',
     params: [
@@ -321,7 +519,7 @@ export default {
     params: [
       {
         type: String,
-        desc: 'The mode to set, one of "active", "passive", "dark", "off"'
+        desc: 'The mode to set, one of "active", "passive", "dark", "offline"'
       }
     ],
     returns: {
diff --git a/js/src/jsonrpc/interfaces/personal.js b/js/src/jsonrpc/interfaces/personal.js
index 2a9ce7c19..eb7e5fc0f 100644
--- a/js/src/jsonrpc/interfaces/personal.js
+++ b/js/src/jsonrpc/interfaces/personal.js
@@ -17,83 +17,6 @@
 import { Address, Data, Quantity } from '../types';
 
 export default {
-  accountsInfo: {
-    desc: 'returns a map of accounts as an object',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'Account metadata',
-      details: {
-        name: {
-          type: String,
-          desc: 'Account name'
-        },
-        meta: {
-          type: String,
-          desc: 'Encoded JSON string the defines additional account metadata'
-        },
-        uuid: {
-          type: String,
-          desc: 'The account UUID, or null if not available/unknown/not applicable.'
-        }
-      }
-    }
-  },
-
-  generateAuthorizationToken: {
-    desc: 'Generates a new authorization token',
-    params: [],
-    returns: {
-      type: String,
-      desc: 'The new authorization token'
-    }
-  },
-
-  requestsToConfirm: {
-    desc: 'Returns a list of the transactions requiring authorization',
-    params: [],
-    returns: {
-      type: Array,
-      desc: 'A list of the outstanding transactions'
-    }
-  },
-
-  confirmRequest: {
-    desc: 'Confirm a request in the signer queue',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The request id'
-      },
-      {
-        type: Object,
-        desc: 'The request options'
-      },
-      {
-        type: String,
-        desc: 'The account password'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'The status of the confirmation'
-    }
-  },
-
-  rejectRequest: {
-    desc: 'Rejects a request in the signer queue',
-    params: [
-      {
-        type: Quantity,
-        desc: 'The request id'
-      }
-    ],
-    returns: {
-      type: Boolean,
-      desc: 'The status of the rejection'
-    }
-  },
-
   listAccounts: {
     desc: 'Returns a list of addresses owned by client.',
     params: [],
@@ -103,29 +26,6 @@ export default {
     }
   },
 
-  listGethAccounts: {
-    desc: 'Returns a list of the accounts available from Geth',
-    params: [],
-    returns: {
-      type: Array,
-      desc: '20 Bytes addresses owned by the client.'
-    }
-  },
-
-  importGethAccounts: {
-    desc: 'Imports a list of accounts from geth',
-    params: [
-      {
-        type: Array,
-        desc: 'List of the geth addresses to import'
-      }
-    ],
-    returns: {
-      type: Array,
-      desc: 'Array of the imported addresses'
-    }
-  },
-
   newAccount: {
     desc: 'Creates new account',
     params: [
@@ -140,96 +40,6 @@ export default {
     }
   },
 
-  newAccountFromPhrase: {
-    desc: 'Creates a new account from a recovery passphrase',
-    params: [
-      {
-        type: String,
-        desc: 'Phrase'
-      },
-      {
-        type: String,
-        desc: 'Password'
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: 'The created address'
-    }
-  },
-
-  newAccountFromSecret: {
-    desc: 'Creates a new account from a private ethstore secret key',
-    params: [
-      {
-        type: Data,
-        desc: 'Secret, 32-byte hex'
-      },
-      {
-        type: String,
-        desc: 'Password'
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: 'The created address'
-    }
-  },
-
-  newAccountFromWallet: {
-    desc: 'Creates a new account from a JSON import',
-    params: [
-      {
-        type: String,
-        desc: 'JSON'
-      },
-      {
-        type: String,
-        desc: 'Password'
-      }
-    ],
-    returns: {
-      type: Address,
-      desc: 'The created address'
-    }
-  },
-
-  setAccountName: {
-    desc: 'Sets a name for the account',
-    params: [
-      {
-        type: Address,
-        desc: 'Address'
-      },
-      {
-        type: String,
-        desc: 'Name'
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Returns null in all cases'
-    }
-  },
-
-  setAccountMeta: {
-    desc: 'Sets metadata for the account',
-    params: [
-      {
-        type: Address,
-        desc: 'Address'
-      },
-      {
-        type: String,
-        desc: 'Metadata (JSON encoded)'
-      }
-    ],
-    returns: {
-      type: Object,
-      desc: 'Returns null in all cases'
-    }
-  },
-
   signAndSendTransaction: {
     desc: 'Sends and signs a transaction given account passphrase. Does not require the account to be unlocked nor unlocks the account for future transactions. ',
     params: [
@@ -284,15 +94,6 @@ export default {
     }
   },
 
-  signerEnabled: {
-    desc: 'Returns whether signer is enabled/disabled.',
-    params: [],
-    returns: {
-      type: Boolean,
-      desc: 'true when enabled, false when disabled'
-    }
-  },
-
   unlockAccount: {
     desc: '?',
     params: [
diff --git a/js/src/jsonrpc/interfaces/signer.js b/js/src/jsonrpc/interfaces/signer.js
new file mode 100644
index 000000000..f394dbb61
--- /dev/null
+++ b/js/src/jsonrpc/interfaces/signer.js
@@ -0,0 +1,82 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { Quantity } from '../types';
+
+export default {
+  generateAuthorizationToken: {
+    desc: 'Generates a new authorization token',
+    params: [],
+    returns: {
+      type: String,
+      desc: 'The new authorization token'
+    }
+  },
+
+  requestsToConfirm: {
+    desc: 'Returns a list of the transactions requiring authorization',
+    params: [],
+    returns: {
+      type: Array,
+      desc: 'A list of the outstanding transactions'
+    }
+  },
+
+  confirmRequest: {
+    desc: 'Confirm a request in the signer queue',
+    params: [
+      {
+        type: Quantity,
+        desc: 'The request id'
+      },
+      {
+        type: Object,
+        desc: 'The request options'
+      },
+      {
+        type: String,
+        desc: 'The account password'
+      }
+    ],
+    returns: {
+      type: Boolean,
+      desc: 'The status of the confirmation'
+    }
+  },
+
+  rejectRequest: {
+    desc: 'Rejects a request in the signer queue',
+    params: [
+      {
+        type: Quantity,
+        desc: 'The request id'
+      }
+    ],
+    returns: {
+      type: Boolean,
+      desc: 'The status of the rejection'
+    }
+  },
+
+  signerEnabled: {
+    desc: 'Returns whether signer is enabled/disabled.',
+    params: [],
+    returns: {
+      type: Boolean,
+      desc: 'true when enabled, false when disabled'
+    }
+  }
+};
diff --git a/js/src/modals/AddAddress/addAddress.js b/js/src/modals/AddAddress/addAddress.js
index 5ab8bbe80..c8845aa13 100644
--- a/js/src/modals/AddAddress/addAddress.js
+++ b/js/src/modals/AddAddress/addAddress.js
@@ -133,9 +133,10 @@ export default class AddAddress extends Component {
     const { address, name, description } = this.state;
 
     Promise.all([
-      api.personal.setAccountName(address, name),
-      api.personal.setAccountMeta(address, {
+      api.parity.setAccountName(address, name),
+      api.parity.setAccountMeta(address, {
         description,
+        timestamp: Date.now(),
         deleted: false
       })
     ]).catch((error) => {
diff --git a/js/src/modals/AddContract/addContract.js b/js/src/modals/AddContract/addContract.js
index ebad86807..418378136 100644
--- a/js/src/modals/AddContract/addContract.js
+++ b/js/src/modals/AddContract/addContract.js
@@ -141,10 +141,11 @@ export default class AddContract extends Component {
     const { abiParsed, address, name, description } = this.state;
 
     Promise.all([
-      api.personal.setAccountName(address, name),
-      api.personal.setAccountMeta(address, {
+      api.parity.setAccountName(address, name),
+      api.parity.setAccountMeta(address, {
         contract: true,
         deleted: false,
+        timestamp: Date.now(),
         abi: abiParsed,
         description
       })
diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js b/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
index 079d3cac9..646c7c180 100644
--- a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
+++ b/js/src/modals/CreateAccount/AccountDetails/accountDetails.js
@@ -31,7 +31,8 @@ export default class AccountDetails extends Component {
     return (
       <Form>
         <Input
-          disabled
+          readOnly
+          allowCopy
           hint='a descriptive name for the account'
           label='account name'
           value={ name } />
@@ -54,7 +55,8 @@ export default class AccountDetails extends Component {
 
     return (
       <Input
-        disabled
+        readOnly
+        allowCopy
         hint='the account recovery phrase'
         label='account recovery phrase (keep safe)'
         value={ phrase } />
diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.js b/js/src/modals/CreateAccount/NewAccount/newAccount.js
index 323152213..8c476634f 100644
--- a/js/src/modals/CreateAccount/NewAccount/newAccount.js
+++ b/js/src/modals/CreateAccount/NewAccount/newAccount.js
@@ -27,7 +27,7 @@ const ERRORS = {
   noName: 'you need to specify a valid name for the account',
   noPhrase: 'you need to specify the recovery phrase',
   noKey: 'you need to provide the raw private key',
-  invalidKey: 'the raw key needs to be hex, 64 characters in length',
+  invalidKey: 'the raw key needs to be hex, 64 characters in length and contain the prefix "0x"',
   invalidPassword: 'you need to specify a password >= 8 characters',
   noMatchPassword: 'the supplied passwords does not match'
 };
@@ -84,7 +84,6 @@ export default class CreateAccount extends Component {
         <div className={ styles.passwords }>
           <div className={ styles.password }>
             <Input
-              className={ styles.password }
               label='password'
               hint='a strong, unique password'
               type='password'
@@ -94,7 +93,6 @@ export default class CreateAccount extends Component {
           </div>
           <div className={ styles.password }>
             <Input
-              className={ styles.password }
               label='password (repeat)'
               hint='verify your password'
               type='password'
@@ -175,15 +173,15 @@ export default class CreateAccount extends Component {
 
     Promise
       .all([
-        api.ethcore.generateSecretPhrase(),
-        api.ethcore.generateSecretPhrase(),
-        api.ethcore.generateSecretPhrase(),
-        api.ethcore.generateSecretPhrase(),
-        api.ethcore.generateSecretPhrase()
+        api.parity.generateSecretPhrase(),
+        api.parity.generateSecretPhrase(),
+        api.parity.generateSecretPhrase(),
+        api.parity.generateSecretPhrase(),
+        api.parity.generateSecretPhrase()
       ])
       .then((phrases) => {
         return Promise
-          .all(phrases.map((phrase) => api.ethcore.phraseToAddress(phrase)))
+          .all(phrases.map((phrase) => api.parity.phraseToAddress(phrase)))
           .then((addresses) => {
             const accounts = {};
 
diff --git a/js/src/modals/CreateAccount/NewGeth/newGeth.js b/js/src/modals/CreateAccount/NewGeth/newGeth.js
index 8853a671b..4b6cc2c96 100644
--- a/js/src/modals/CreateAccount/NewGeth/newGeth.js
+++ b/js/src/modals/CreateAccount/NewGeth/newGeth.js
@@ -102,7 +102,7 @@ export default class NewGeth extends Component {
     const { api } = this.context;
     const { accounts } = this.props;
 
-    api.personal
+    api.parity
       .listGethAccounts()
       .then((_addresses) => {
         const addresses = (addresses || []).filter((address) => !accounts[address]);
diff --git a/js/src/modals/CreateAccount/NewImport/newImport.js b/js/src/modals/CreateAccount/NewImport/newImport.js
index 793a8ab1b..60c80fd00 100644
--- a/js/src/modals/CreateAccount/NewImport/newImport.js
+++ b/js/src/modals/CreateAccount/NewImport/newImport.js
@@ -72,7 +72,6 @@ export default class NewImport extends Component {
         <div className={ styles.passwords }>
           <div className={ styles.password }>
             <Input
-              className={ styles.password }
               label='password'
               hint='the password to unlock the wallet'
               type='password'
diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.js b/js/src/modals/CreateAccount/RawKey/rawKey.js
index 6e03874d8..458925c72 100644
--- a/js/src/modals/CreateAccount/RawKey/rawKey.js
+++ b/js/src/modals/CreateAccount/RawKey/rawKey.js
@@ -75,7 +75,6 @@ export default class RawKey extends Component {
         <div className={ styles.passwords }>
           <div className={ styles.password }>
             <Input
-              className={ styles.password }
               label='password'
               hint='a strong, unique password'
               type='password'
@@ -85,7 +84,6 @@ export default class RawKey extends Component {
           </div>
           <div className={ styles.password }>
             <Input
-              className={ styles.password }
               label='password (repeat)'
               hint='verify your password'
               type='password'
diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
index 451650c69..9feaa4d2c 100644
--- a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
+++ b/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js
@@ -72,7 +72,6 @@ export default class RecoveryPhrase extends Component {
         <div className={ styles.passwords }>
           <div className={ styles.password }>
             <Input
-              className={ styles.password }
               label='password'
               hint='a strong, unique password'
               type='password'
@@ -82,7 +81,6 @@ export default class RecoveryPhrase extends Component {
           </div>
           <div className={ styles.password }>
             <Input
-              className={ styles.password }
               label='password (repeat)'
               hint='verify your password'
               type='password'
diff --git a/js/src/modals/CreateAccount/createAccount.css b/js/src/modals/CreateAccount/createAccount.css
index d7acd84df..169cb618a 100644
--- a/js/src/modals/CreateAccount/createAccount.css
+++ b/js/src/modals/CreateAccount/createAccount.css
@@ -21,6 +21,15 @@
 .password {
   flex: 0 1 50%;
   width: 50%;
+  box-sizing: border-box;
+
+  &:nth-child(odd) {
+    padding-right: 0.25rem;
+  }
+
+  &:nth-child(even) {
+    padding-left: 0.25rem;
+  }
 }
 
 .passwords {
diff --git a/js/src/modals/CreateAccount/createAccount.js b/js/src/modals/CreateAccount/createAccount.js
index e0808b47b..283e91531 100644
--- a/js/src/modals/CreateAccount/createAccount.js
+++ b/js/src/modals/CreateAccount/createAccount.js
@@ -208,13 +208,16 @@ export default class CreateAccount extends Component {
     });
 
     if (createType === 'fromNew' || createType === 'fromPhrase') {
-      return api.personal
+      return api.parity
         .newAccountFromPhrase(this.state.phrase, this.state.password)
         .then((address) => {
           this.setState({ address });
-          return api.personal
+          return api.parity
             .setAccountName(address, this.state.name)
-            .then(() => api.personal.setAccountMeta(address, { passwordHint: this.state.passwordHint }));
+            .then(() => api.parity.setAccountMeta(address, {
+              timestamp: Date.now(),
+              passwordHint: this.state.passwordHint
+            }));
         })
         .then(() => {
           this.onNext();
@@ -230,13 +233,16 @@ export default class CreateAccount extends Component {
           this.newError(error);
         });
     } else if (createType === 'fromRaw') {
-      return api.personal
+      return api.parity
         .newAccountFromSecret(this.state.rawKey, this.state.password)
         .then((address) => {
           this.setState({ address });
-          return api.personal
+          return api.parity
             .setAccountName(address, this.state.name)
-            .then(() => api.personal.setAccountMeta(address, { passwordHint: this.state.passwordHint }));
+            .then(() => api.parity.setAccountMeta(address, {
+              timestamp: Date.now(),
+              passwordHint: this.state.passwordHint
+            }));
         })
         .then(() => {
           this.onNext();
@@ -252,13 +258,13 @@ export default class CreateAccount extends Component {
           this.newError(error);
         });
     } else if (createType === 'fromGeth') {
-      return api.personal
+      return api.parity
         .importGethAccounts(this.state.gethAddresses)
         .then((result) => {
           console.log('result', result);
 
           return Promise.all(this.state.gethAddresses.map((address) => {
-            return api.personal.setAccountName(address, 'Geth Import');
+            return api.parity.setAccountName(address, 'Geth Import');
           }));
         })
         .then(() => {
@@ -276,16 +282,19 @@ export default class CreateAccount extends Component {
         });
     }
 
-    return api.personal
+    return api.parity
       .newAccountFromWallet(this.state.json, this.state.password)
       .then((address) => {
         this.setState({
           address: address
         });
 
-        return api.personal
+        return api.parity
           .setAccountName(address, this.state.name)
-          .then(() => api.personal.setAccountMeta(address, { passwordHint: this.state.passwordHint }));
+          .then(() => api.parity.setAccountMeta(address, {
+            timestamp: Date.now(),
+            passwordHint: this.state.passwordHint
+          }));
       })
       .then(() => {
         this.onNext();
diff --git a/js/src/modals/DeployContract/DetailsStep/detailsStep.js b/js/src/modals/DeployContract/DetailsStep/detailsStep.js
index 1eebe4304..e0f02bc70 100644
--- a/js/src/modals/DeployContract/DetailsStep/detailsStep.js
+++ b/js/src/modals/DeployContract/DetailsStep/detailsStep.js
@@ -15,8 +15,9 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { MenuItem } from 'material-ui';
 
-import { AddressSelect, Form, Input, InputAddressSelect } from '../../../ui';
+import { AddressSelect, Form, Input, InputAddressSelect, Select } from '../../../ui';
 import { validateAbi } from '../../../util/validation';
 
 import styles from '../deployContract.css';
@@ -98,6 +99,7 @@ export default class DetailsStep extends Component {
 
     return inputs.map((input, index) => {
       const onChange = (event, value) => this.onParamChange(index, value);
+      const onChangeBool = (event, _index, value) => this.onParamChange(index, value === 'true');
       const onSubmit = (value) => this.onParamChange(index, value);
       const label = `${input.name}: ${input.type}`;
       let inputBox = null;
@@ -115,6 +117,26 @@ export default class DetailsStep extends Component {
           );
           break;
 
+        case 'bool':
+          const boolitems = ['false', 'true'].map((bool) => {
+            return (
+              <MenuItem
+                key={ bool }
+                value={ bool }
+                label={ bool }>{ bool }</MenuItem>
+            );
+          });
+          inputBox = (
+            <Select
+              label={ label }
+              value={ params[index] ? 'true' : 'false' }
+              error={ paramsError[index] }
+              onChange={ onChangeBool }>
+              { boolitems }
+            </Select>
+          );
+          break;
+
         default:
           inputBox = (
             <Input
@@ -164,12 +186,28 @@ export default class DetailsStep extends Component {
 
       inputs.forEach((input) => {
         switch (input.type) {
+          case 'address':
+            params.push('0x');
+            break;
+
+          case 'bool':
+            params.push(false);
+            break;
+
+          case 'bytes':
+            params.push('0x');
+            break;
+
+          case 'uint':
+            params.push('0');
+            break;
+
           case 'string':
             params.push('');
             break;
 
           default:
-            params.push('0x');
+            params.push('0');
             break;
         }
       });
diff --git a/js/src/modals/DeployContract/deployContract.js b/js/src/modals/DeployContract/deployContract.js
index 3e1b10599..588d16f6a 100644
--- a/js/src/modals/DeployContract/deployContract.js
+++ b/js/src/modals/DeployContract/deployContract.js
@@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
 import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
 import ContentClear from 'material-ui/svg-icons/content/clear';
 
-import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '../../ui';
+import { BusyStep, CompletedStep, CopyToClipboard, Button, IdentityIcon, Modal, TxHash } from '../../ui';
 import { ERRORS, validateAbi, validateCode, validateName } from '../../util/validation';
 
 import DetailsStep from './DetailsStep';
@@ -155,6 +155,7 @@ export default class DeployContract extends Component {
           <CompletedStep>
             <div>Your contract has been deployed at</div>
             <div>
+              <CopyToClipboard data={ address } label='copy address to clipboard' />
               <IdentityIcon address={ address } inline center className={ styles.identityicon } />
               <div className={ styles.address }>{ address }</div>
             </div>
@@ -212,10 +213,11 @@ export default class DeployContract extends Component {
       .deploy(options, params, this.onDeploymentState)
       .then((address) => {
         return Promise.all([
-          api.personal.setAccountName(address, name),
-          api.personal.setAccountMeta(address, {
+          api.parity.setAccountName(address, name),
+          api.parity.setAccountMeta(address, {
             abi: abiParsed,
             contract: true,
+            timestamp: Date.now(),
             deleted: false,
             description
           })
diff --git a/js/src/modals/EditMeta/editMeta.js b/js/src/modals/EditMeta/editMeta.js
index b2ba89d61..7f0a061e2 100644
--- a/js/src/modals/EditMeta/editMeta.js
+++ b/js/src/modals/EditMeta/editMeta.js
@@ -99,11 +99,10 @@ export default class EditMeta extends Component {
 
   renderTags () {
     const { meta } = this.state;
-    const { tags } = meta || [];
 
     return (
       <InputChip
-        tokens={ tags }
+        tokens={ meta.tags || [] }
         onTokensChange={ this.onTagsChange }
         label='(optional) tags'
         hint='press <Enter> to add a tag'
@@ -139,8 +138,8 @@ export default class EditMeta extends Component {
 
     Promise
       .all([
-        api.personal.setAccountName(account.address, name),
-        api.personal.setAccountMeta(account.address, Object.assign({}, account.meta, meta))
+        api.parity.setAccountName(account.address, name),
+        api.parity.setAccountMeta(account.address, Object.assign({}, account.meta, meta))
       ])
       .then(() => this.props.onClose())
       .catch((error) => {
diff --git a/js/src/modals/ExecuteContract/executeContract.js b/js/src/modals/ExecuteContract/executeContract.js
index 67f350feb..b45cf6875 100644
--- a/js/src/modals/ExecuteContract/executeContract.js
+++ b/js/src/modals/ExecuteContract/executeContract.js
@@ -19,7 +19,7 @@ import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
 import ContentClear from 'material-ui/svg-icons/content/clear';
 
 import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '../../ui';
-import { validateAddress } from '../../util/validation';
+import { validateAddress, validateUint } from '../../util/validation';
 
 import DetailsStep from './DetailsStep';
 
@@ -41,6 +41,7 @@ export default class ExecuteContract extends Component {
   state = {
     amount: '0',
     amountError: null,
+    fromAddressError: null,
     func: null,
     funcError: null,
     values: [],
@@ -77,7 +78,8 @@ export default class ExecuteContract extends Component {
 
   renderDialogActions () {
     const { onClose, fromAddress } = this.props;
-    const { sending, step } = this.state;
+    const { sending, step, fromAddressError, valuesError } = this.state;
+    const hasError = fromAddressError || valuesError.find((error) => error);
     const cancelBtn = (
       <Button
         key='cancel'
@@ -92,7 +94,7 @@ export default class ExecuteContract extends Component {
         <Button
           key='postTransaction'
           label='post transaction'
-          disabled={ sending }
+          disabled={ sending || hasError }
           icon={ <IdentityIcon address={ fromAddress } button /> }
           onClick={ this.postTransaction } />
       ];
@@ -177,12 +179,16 @@ export default class ExecuteContract extends Component {
     let valueError = null;
 
     switch (input.kind.type) {
+      case 'address':
+        valueError = validateAddress(_value).addressError;
+        break;
+
       case 'bool':
         value = _value === 'true';
         break;
 
-      case 'address':
-        valueError = validateAddress(_value).addressError;
+      case 'uint':
+        valueError = validateUint(_value).valueError;
         break;
     }
 
@@ -190,8 +196,8 @@ export default class ExecuteContract extends Component {
     valuesError[index] = valueError;
 
     this.setState({
-      values,
-      valuesError
+      values: [].concat(values),
+      valuesError: [].concat(valuesError)
     });
   }
 
@@ -215,7 +221,7 @@ export default class ExecuteContract extends Component {
       })
       .then((requestId) => {
         this.setState({ busyState: 'Waiting for authorization in the Parity Signer' });
-        return api.pollMethod('eth_checkRequest', requestId);
+        return api.pollMethod('parity_checkRequest', requestId);
       })
       .then((txhash) => {
         this.setState({ sending: false, step: 2, txhash, busyState: 'Your transaction has been posted to the network' });
diff --git a/js/src/modals/FirstRun/firstRun.js b/js/src/modals/FirstRun/firstRun.js
index ea49e852e..3a676fc3b 100644
--- a/js/src/modals/FirstRun/firstRun.js
+++ b/js/src/modals/FirstRun/firstRun.js
@@ -183,9 +183,9 @@ export default class FirstRun extends Component {
       canCreate: false
     });
 
-    return api.personal
+    return api.parity
       .newAccountFromPhrase(phrase, password)
-      .then((address) => api.personal.setAccountName(address, name))
+      .then((address) => api.parity.setAccountName(address, name))
       .then(() => {
         this.onNext();
       })
diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/modals/PasswordManager/passwordManager.js
index 368664a71..aabf691ef 100644
--- a/js/src/modals/PasswordManager/passwordManager.js
+++ b/js/src/modals/PasswordManager/passwordManager.js
@@ -317,7 +317,7 @@ export default class PasswordManager extends Component {
     this.setState({ waiting: true, showMessage: false });
 
     this.context
-      .api.personal
+      .api.parity
       .testPassword(account.address, currentPass)
       .then(correct => {
         const message = correct
@@ -343,7 +343,7 @@ export default class PasswordManager extends Component {
     this.setState({ waiting: true, showMessage: false });
 
     this.context
-      .api.personal
+      .api.parity
       .testPassword(account.address, currentPass)
       .then(correct => {
         if (!correct) {
@@ -363,11 +363,11 @@ export default class PasswordManager extends Component {
 
         return Promise.all([
           this.context
-            .api.personal
+            .api.parity
             .setAccountMeta(account.address, meta),
 
           this.context
-            .api.personal
+            .api.parity
             .changePassword(account.address, currentPass, newPass)
         ])
           .then(() => {
diff --git a/js/src/modals/Transfer/Details/details.js b/js/src/modals/Transfer/Details/details.js
index f7cc70ad4..decd69c3c 100644
--- a/js/src/modals/Transfer/Details/details.js
+++ b/js/src/modals/Transfer/Details/details.js
@@ -123,7 +123,13 @@ export default class Details extends Component {
       .map((balance, index) => {
         const token = balance.token;
         const isEth = index === 0;
-        const imagesrc = token.image || images[token.address] || imageUnknown;
+        let imagesrc = token.image;
+        if (!imagesrc) {
+          imagesrc =
+            images[token.address]
+              ? `${api.dappsUrl}${images[token.address]}`
+              : imageUnknown;
+        }
         let value = 0;
 
         if (isEth) {
diff --git a/js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js b/js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js
index 0dcee8f9d..adf644c4e 100644
--- a/js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js
+++ b/js/src/modals/Transfer/GasPriceSelector/gasPriceSelector.js
@@ -539,7 +539,7 @@ export default class GasPriceSelector extends Component {
     const gasPriceBIdx = gasPriceAIdx + 1;
 
     if (gasPriceBIdx === N + 1) {
-      const gasPrice = gasPrices[gasPriceAIdx];
+      const gasPrice = gasPrices[gasPriceAIdx].round();
       this.props.onChange(event, gasPrice);
       return;
     }
@@ -548,7 +548,9 @@ export default class GasPriceSelector extends Component {
     const gasPriceB = gasPrices[gasPriceBIdx];
 
     const mult = Math.round((sliderValue % 1) * 100) / 100;
-    const gasPrice = gasPriceA.plus(gasPriceB.minus(gasPriceA).times(mult));
+    const gasPrice = gasPriceA
+      .plus(gasPriceB.minus(gasPriceA).times(mult))
+      .round();
 
     this.setSliderValue(sliderValue, gasPrice);
     this.props.onChange(event, gasPrice);
diff --git a/js/src/modals/Transfer/transfer.js b/js/src/modals/Transfer/transfer.js
index 192b2f460..506e91930 100644
--- a/js/src/modals/Transfer/transfer.js
+++ b/js/src/modals/Transfer/transfer.js
@@ -411,6 +411,7 @@ export default class Transfer extends Component {
     const { api } = this.context;
     const { account } = this.props;
     const { data, gas, gasPrice, recipient, value } = this.state;
+
     const options = {
       from: account.address,
       to: recipient,
@@ -423,7 +424,7 @@ export default class Transfer extends Component {
       options.data = data;
     }
 
-    return api.eth.postTransaction(options);
+    return api.parity.postTransaction(options);
   }
 
   _sendToken () {
@@ -454,7 +455,7 @@ export default class Transfer extends Component {
         : this._sendToken()
       ).then((requestId) => {
         this.setState({ busyState: 'Waiting for authorization in the Parity Signer' });
-        return api.pollMethod('eth_checkRequest', requestId);
+        return api.pollMethod('parity_checkRequest', requestId);
       })
       .then((txhash) => {
         this.onNext();
@@ -591,7 +592,7 @@ export default class Transfer extends Component {
 
     Promise
       .all([
-        api.ethcore.gasPriceHistogram(),
+        api.parity.gasPriceHistogram(),
         api.eth.gasPrice()
       ])
       .then(([gasPriceHistogram, gasPrice]) => {
diff --git a/js/src/redux/providers/balances.js b/js/src/redux/providers/balances.js
index fa60e4310..b80fad28f 100644
--- a/js/src/redux/providers/balances.js
+++ b/js/src/redux/providers/balances.js
@@ -42,7 +42,7 @@ export default class Balances {
 
   _subscribeAccountsInfo () {
     this._api
-      .subscribe('personal_accountsInfo', (error, accountsInfo) => {
+      .subscribe('parity_accountsInfo', (error, accountsInfo) => {
         if (error) {
           return;
         }
@@ -76,7 +76,7 @@ export default class Balances {
   }
 
   _retrieveTokens () {
-    this._api.ethcore
+    this._api.parity
       .registryAddress()
       .then((registryAddress) => {
         const registry = this._api.newContract(abis.registry, registryAddress);
diff --git a/js/src/redux/providers/imagesReducer.js b/js/src/redux/providers/imagesReducer.js
index 15745932d..396576cc8 100644
--- a/js/src/redux/providers/imagesReducer.js
+++ b/js/src/redux/providers/imagesReducer.js
@@ -17,8 +17,6 @@
 import { handleActions } from 'redux-actions';
 import { bytesToHex } from '../../api/util/format';
 
-import { parityNode } from '../../environment';
-
 const ZERO = '0x0000000000000000000000000000000000000000000000000000000000000000';
 
 const initialState = {
@@ -28,7 +26,7 @@ const initialState = {
 export function hashToImageUrl (hashArray) {
   const hash = hashArray ? bytesToHex(hashArray) : ZERO;
 
-  return hash === ZERO ? null : `${parityNode}/api/content/${hash.substr(2)}`;
+  return hash === ZERO ? null : `/api/content/${hash.substr(2)}`;
 }
 
 export default handleActions({
diff --git a/js/src/redux/providers/personal.js b/js/src/redux/providers/personal.js
index e75b4082b..fd67ab5f7 100644
--- a/js/src/redux/providers/personal.js
+++ b/js/src/redux/providers/personal.js
@@ -28,9 +28,9 @@ export default class Personal {
 
   _subscribeAccountsInfo () {
     this._api
-      .subscribe('personal_accountsInfo', (error, accountsInfo) => {
+      .subscribe('parity_accountsInfo', (error, accountsInfo) => {
         if (error) {
-          console.error('personal_accountsInfo', error);
+          console.error('parity_accountsInfo', error);
           return;
         }
 
diff --git a/js/src/redux/providers/signer.js b/js/src/redux/providers/signer.js
index 92f80d51e..5ece371c2 100644
--- a/js/src/redux/providers/signer.js
+++ b/js/src/redux/providers/signer.js
@@ -14,22 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity 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 General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
 import { signerRequestsToConfirm } from './signerActions';
 
 export default class Signer {
@@ -44,7 +28,7 @@ export default class Signer {
 
   _subscribeRequestsToConfirm () {
     this._api
-      .subscribe('personal_requestsToConfirm', (error, pending) => {
+      .subscribe('signer_requestsToConfirm', (error, pending) => {
         if (error) {
           return;
         }
diff --git a/js/src/redux/providers/signerMiddleware.js b/js/src/redux/providers/signerMiddleware.js
index 53144e454..6d09eeb4e 100644
--- a/js/src/redux/providers/signerMiddleware.js
+++ b/js/src/redux/providers/signerMiddleware.js
@@ -51,7 +51,7 @@ export default class SignerMiddleware {
   onConfirmStart = (store, action) => {
     const { id, password } = action.payload;
 
-    this._api.personal
+    this._api.signer
       .confirmRequest(id, {}, password)
       .then((txHash) => {
         console.log('confirmRequest', id, txHash);
@@ -71,7 +71,7 @@ export default class SignerMiddleware {
   onRejectStart = (store, action) => {
     const id = action.payload;
 
-    this._api.personal
+    this._api.signer
       .rejectRequest(id)
       .then(() => {
         store.dispatch(actions.successRejectRequest({ id }));
diff --git a/js/src/redux/providers/status.js b/js/src/redux/providers/status.js
index 8d5874698..0e2bf6866 100644
--- a/js/src/redux/providers/status.js
+++ b/js/src/redux/providers/status.js
@@ -16,8 +16,6 @@
 
 import { statusBlockNumber, statusCollection, statusLogs } from './statusActions';
 
-import { parityNode } from '../../environment';
-
 export default class Status {
   constructor (store, api) {
     this._api = api;
@@ -29,6 +27,20 @@ export default class Status {
     this._pollPing();
     this._pollStatus();
     this._pollLogs();
+    this._fetchEnode();
+  }
+
+  _fetchEnode () {
+    this._api.parity
+      .enode()
+      .then((enode) => {
+        this._store.dispatch(statusCollection({ enode }));
+      })
+      .catch(() => {
+        window.setTimeout(() => {
+          this._fetchEnode();
+        }, 1000);
+      });
   }
 
   _subscribeBlockNumber () {
@@ -51,7 +63,7 @@ export default class Status {
       setTimeout(this._pollPing, timeout);
     };
 
-    fetch(`${parityNode}/api/ping`, { method: 'GET' })
+    fetch('/', { method: 'HEAD' })
       .then((response) => dispatch(!!response.ok))
       .catch(() => dispatch(false));
   }
@@ -68,11 +80,18 @@ export default class Status {
 
   _pollStatus = () => {
     const { secureToken, isConnected, isConnecting, needsToken } = this._api;
+
     const nextTimeout = (timeout = 1000) => {
       setTimeout(this._pollStatus, timeout);
     };
 
+    const wasConnected = this._store.getState().nodeStatus.isConnected;
+    if (isConnected !== wasConnected) {
+      this._fetchEnode();
+    }
+
     this._store.dispatch(statusCollection({ isConnected, isConnecting, needsToken, secureToken }));
+
     if (!isConnected) {
       nextTimeout(250);
       return;
@@ -82,16 +101,16 @@ export default class Status {
       .all([
         this._api.web3.clientVersion(),
         this._api.eth.coinbase(),
-        this._api.ethcore.defaultExtraData(),
-        this._api.ethcore.extraData(),
-        this._api.ethcore.gasFloorTarget(),
+        this._api.parity.defaultExtraData(),
+        this._api.parity.extraData(),
+        this._api.parity.gasFloorTarget(),
         this._api.eth.hashrate(),
-        this._api.ethcore.minGasPrice(),
-        this._api.ethcore.netChain(),
-        this._api.ethcore.netPeers(),
-        this._api.ethcore.netPort(),
-        this._api.ethcore.nodeName(),
-        this._api.ethcore.rpcSettings(),
+        this._api.parity.minGasPrice(),
+        this._api.parity.netChain(),
+        this._api.parity.netPeers(),
+        this._api.parity.netPort(),
+        this._api.parity.nodeName(),
+        this._api.parity.rpcSettings(),
         this._api.eth.syncing(),
         this._pollTraceMode()
       ])
@@ -134,8 +153,8 @@ export default class Status {
 
     Promise
       .all([
-        this._api.ethcore.devLogs(),
-        this._api.ethcore.devLogsLevels()
+        this._api.parity.devLogs(),
+        this._api.parity.devLogsLevels()
       ])
       .then(([devLogs, devLogsLevels]) => {
         this._store.dispatch(statusLogs({
diff --git a/js/src/redux/providers/statusReducer.js b/js/src/redux/providers/statusReducer.js
index d75f62429..98bb536ae 100644
--- a/js/src/redux/providers/statusReducer.js
+++ b/js/src/redux/providers/statusReducer.js
@@ -25,6 +25,7 @@ const initialState = {
   clientVersion: '',
   coinbase: '',
   defaultExtraData: '',
+  enode: '',
   extraData: '',
   gasFloorTarget: new BigNumber(0),
   hashrate: new BigNumber(0),
diff --git a/js/src/secureApi.js b/js/src/secureApi.js
index 545cfd459..2f03d62e9 100644
--- a/js/src/secureApi.js
+++ b/js/src/secureApi.js
@@ -25,6 +25,8 @@ export default class SecureApi extends Api {
     this._isConnecting = true;
     this._connectState = 0;
     this._needsToken = false;
+    this._dappsPort = 8080;
+    this._signerPort = 8180;
 
     this._followConnection();
   }
@@ -50,7 +52,7 @@ export default class SecureApi extends Api {
       case 0:
         if (isConnected) {
           this._isConnecting = false;
-          return this.setToken();
+          return this.connectSuccess();
         } else if (lastError) {
           this.updateToken('initial', 1);
         }
@@ -60,7 +62,7 @@ export default class SecureApi extends Api {
       case 1:
         if (isConnected) {
           this._connectState = 2;
-          this.personal
+          this.parity
             .generateAuthorizationToken()
             .then((token) => {
               this.updateToken(token, 2);
@@ -79,7 +81,7 @@ export default class SecureApi extends Api {
       case 2:
         if (isConnected) {
           this._isConnecting = false;
-          return this.setToken();
+          return this.connectSuccess();
         } else if (lastError) {
           return setManual();
         }
@@ -89,12 +91,38 @@ export default class SecureApi extends Api {
     nextTick();
   }
 
+  connectSuccess () {
+    this.setToken();
+
+    Promise
+      .all([
+        this.parity.dappsPort(),
+        this.parity.signerPort()
+      ])
+      .then(([dappsPort, signerPort]) => {
+        this._dappsPort = dappsPort.toNumber();
+        this._signerPort = signerPort.toNumber();
+      });
+  }
+
   updateToken (token, connectedState = 0) {
     this._connectState = connectedState;
     this._transport.updateToken(token.replace(/[^a-zA-Z0-9]/g, ''));
     this._followConnection();
   }
 
+  get dappsPort () {
+    return this._dappsPort;
+  }
+
+  get dappsUrl () {
+    return `http://127.0.0.1:${this._dappsPort}`;
+  }
+
+  get signerPort () {
+    return this._signerPort;
+  }
+
   get isConnecting () {
     return this._isConnecting;
   }
diff --git a/js/src/ui/Actionbar/Sort/sort.js b/js/src/ui/Actionbar/Sort/sort.js
index 35c51e5a1..474ef465b 100644
--- a/js/src/ui/Actionbar/Sort/sort.js
+++ b/js/src/ui/Actionbar/Sort/sort.js
@@ -27,14 +27,23 @@ import styles from './sort.css';
 export default class ActionbarSort extends Component {
   static propTypes = {
     onChange: PropTypes.func.isRequired,
-    order: PropTypes.string
+    order: PropTypes.string,
+    showDefault: PropTypes.bool,
+    metas: PropTypes.array
   };
 
+  static defaultProps = {
+    metas: [],
+    showDefault: true
+  }
+
   state = {
     menuOpen: false
   }
 
   render () {
+    const { showDefault } = this.props;
+
     return (
       <IconMenu
         iconButtonElement={
@@ -50,14 +59,56 @@ export default class ActionbarSort extends Component {
         onItemTouchTap={ this.handleSortChange }
         targetOrigin={ { horizontal: 'right', vertical: 'top' } }
         anchorOrigin={ { horizontal: 'right', vertical: 'top' } }
-        >
-        <MenuItem value='' primaryText='Default' />
-        <MenuItem value='tags' primaryText='Sort by tags' />
-        <MenuItem value='name' primaryText='Sort by name' />
+        touchTapCloseDelay={ 0 }
+      >
+        {
+          showDefault
+          ? this.renderMenuItem('', 'Default')
+          : null
+        }
+        { this.renderMenuItem('tags', 'Sort by tags') }
+        { this.renderMenuItem('name', 'Sort by name') }
+        { this.renderMenuItem('eth', 'Sort by ETH') }
+
+        { this.renderSortByMetas() }
       </IconMenu>
     );
   }
 
+  renderSortByMetas () {
+    const { metas } = this.props;
+
+    return metas
+      .map((meta, index) => {
+        return this
+          .renderMenuItem(meta.key, `Sort by ${meta.label}`, index);
+      });
+  }
+
+  renderMenuItem (value, label, key = null) {
+    const { order } = this.props;
+
+    const props = {};
+
+    if (key !== null) {
+      props.key = key;
+    }
+
+    const checked = order === value;
+
+    return (
+      <MenuItem
+        checked={ checked }
+        value={ value }
+        primaryText={ label }
+        innerDivStyle={ {
+          paddingLeft: checked ? 50 : 16
+        } }
+        { ...props }
+      />
+    );
+  }
+
   handleSortChange = (event, child) => {
     const order = child.props.value;
     this.props.onChange(order);
diff --git a/js/src/ui/Balance/balance.js b/js/src/ui/Balance/balance.js
index b6f786648..22b9fc1ae 100644
--- a/js/src/ui/Balance/balance.js
+++ b/js/src/ui/Balance/balance.js
@@ -47,7 +47,13 @@ class Balance extends Component {
         const value = token.format
           ? new BigNumber(balance.value).div(new BigNumber(token.format)).toFormat(3)
           : api.util.fromWei(balance.value).toFormat(3);
-        const imagesrc = token.image || images[token.address] || unknownImage;
+        let imagesrc = token.image;
+        if (!imagesrc) {
+          imagesrc =
+            images[token.address]
+              ? `${api.dappsUrl}${images[token.address]}`
+              : unknownImage;
+        }
 
         return (
           <div
diff --git a/js/src/ui/Container/Title/title.css b/js/src/ui/Container/Title/title.css
index 60baacff1..e277b7b82 100644
--- a/js/src/ui/Container/Title/title.css
+++ b/js/src/ui/Container/Title/title.css
@@ -15,7 +15,6 @@
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
 .byline {
-  color: #aaa;
   overflow: hidden;
   position: relative;
   line-height: 1.2em;
@@ -24,6 +23,12 @@
   display: -webkit-box;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
+
+  color: #aaa;
+
+  * {
+    color: #aaa !important;
+  }
 }
 
 .title {
diff --git a/js/src/ui/Container/Title/title.js b/js/src/ui/Container/Title/title.js
index 03ba4be76..5be85e48e 100644
--- a/js/src/ui/Container/Title/title.js
+++ b/js/src/ui/Container/Title/title.js
@@ -24,7 +24,9 @@ export default class Title extends Component {
     title: PropTypes.oneOfType([
       PropTypes.string, PropTypes.node
     ]),
-    byline: PropTypes.string
+    byline: PropTypes.oneOfType([
+      PropTypes.string, PropTypes.node
+    ])
   }
 
   state = {
@@ -34,15 +36,21 @@ export default class Title extends Component {
   render () {
     const { className, title, byline } = this.props;
 
+    const byLine = typeof byline === 'string'
+      ? (
+      <span title={ byline }>
+        { byline }
+      </span>
+      )
+      : byline;
+
     return (
       <div className={ className }>
         <h3 className={ styles.title }>
           { title }
         </h3>
         <div className={ styles.byline }>
-          <span title={ byline }>
-            { byline }
-          </span>
+          { byLine }
         </div>
       </div>
     );
diff --git a/js/src/ui/Container/container.css b/js/src/ui/Container/container.css
index 1071125bd..d5c2ef336 100644
--- a/js/src/ui/Container/container.css
+++ b/js/src/ui/Container/container.css
@@ -18,6 +18,7 @@
   flex: 1;
   padding: 0em;
   background: rgba(0, 0, 0, 0.8);
+  height: 100%;
 }
 
 .compact,
diff --git a/js/src/ui/CopyToClipboard/copyToClipboard.js b/js/src/ui/CopyToClipboard/copyToClipboard.js
new file mode 100644
index 000000000..3351f2e40
--- /dev/null
+++ b/js/src/ui/CopyToClipboard/copyToClipboard.js
@@ -0,0 +1,75 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import { IconButton } from 'material-ui';
+import Clipboard from 'react-copy-to-clipboard';
+import CopyIcon from 'material-ui/svg-icons/content/content-copy';
+import Theme from '../Theme';
+const { textColor, disabledTextColor } = Theme.flatButton;
+
+export default class CopyToClipboard extends Component {
+  static propTypes = {
+    data: PropTypes.string.isRequired,
+    label: PropTypes.string,
+    onCopy: PropTypes.func,
+    size: PropTypes.number, // in px
+    cooldown: PropTypes.number // in ms
+  };
+
+  static defaultProps = {
+    className: '',
+    label: 'copy to clipboard',
+    onCopy: () => {},
+    size: 16,
+    cooldown: 1000
+  };
+
+  state = {
+    copied: false
+  };
+
+  render () {
+    const { data, label, size } = this.props;
+    const { copied } = this.state;
+
+    return (
+      <Clipboard onCopy={ this.onCopy } text={ data }>
+        <IconButton
+          tooltip={ copied ? 'done!' : label }
+          disableTouchRipple
+          tooltipPosition={ 'top-right' }
+          tooltipStyles={ { marginTop: `-${size / 4}px` } }
+          style={ { width: size, height: size, padding: '0' } }
+          iconStyle={ { width: size, height: size } }
+        >
+          <CopyIcon color={ copied ? disabledTextColor : textColor } />
+        </IconButton>
+      </Clipboard>
+    );
+  }
+
+  onCopy = () => {
+    const { cooldown, onCopy } = this.props;
+
+    this.setState({ copied: true });
+    setTimeout(() => {
+      this.setState({ copied: false });
+    }, cooldown);
+
+    onCopy();
+  }
+}
diff --git a/js/src/ui/CopyToClipboard/index.js b/js/src/ui/CopyToClipboard/index.js
new file mode 100644
index 000000000..6391b478b
--- /dev/null
+++ b/js/src/ui/CopyToClipboard/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './copyToClipboard';
diff --git a/js/src/ui/Form/AddressSelect/addressSelect.js b/js/src/ui/Form/AddressSelect/addressSelect.js
index 72e80f432..ac7f2da51 100644
--- a/js/src/ui/Form/AddressSelect/addressSelect.js
+++ b/js/src/ui/Form/AddressSelect/addressSelect.js
@@ -16,6 +16,7 @@
 
 import React, { Component, PropTypes } from 'react';
 import { MenuItem } from 'material-ui';
+import { isEqual } from 'lodash';
 
 import AutoComplete from '../AutoComplete';
 import IdentityIcon from '../../IdentityIcon';
@@ -24,57 +25,82 @@ import IdentityName from '../../IdentityName';
 import styles from './addressSelect.css';
 
 export default class AddressSelect extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
   static propTypes = {
     disabled: PropTypes.bool,
     accounts: PropTypes.object,
     contacts: PropTypes.object,
+    contracts: PropTypes.object,
     label: PropTypes.string,
     hint: PropTypes.string,
     error: PropTypes.string,
     value: PropTypes.string,
     tokens: PropTypes.object,
-    onChange: PropTypes.func.isRequired
+    onChange: PropTypes.func.isRequired,
+    allowInput: PropTypes.bool
   }
 
   state = {
     entries: {},
+    addresses: [],
     value: ''
   }
 
+  entriesFromProps (props = this.props) {
+    const { accounts, contacts, contracts } = props;
+    const entries = Object.assign({}, accounts || {}, contacts || {}, contracts || {});
+    return entries;
+  }
+
   componentWillMount () {
-    const { accounts, contacts, value } = this.props;
-    const entries = Object.assign({}, accounts || {}, contacts || {});
-    this.setState({ entries, value });
+    const { value } = this.props;
+    const entries = this.entriesFromProps();
+    const addresses = Object.keys(entries).sort();
+
+    this.setState({ entries, addresses, value });
   }
 
   componentWillReceiveProps (newProps) {
-    const { accounts, contacts } = newProps;
-    const entries = Object.assign({}, accounts || {}, contacts || {});
-    this.setState({ entries });
+    const entries = this.entriesFromProps();
+    const addresses = Object.keys(entries).sort();
+
+    if (!isEqual(addresses, this.state.addresses)) {
+      this.setState({ entries, addresses });
+    }
+
+    if (newProps.value !== this.props.value) {
+      this.setState({ value: newProps.value });
+    }
   }
 
   render () {
-    const { disabled, error, hint, label } = this.props;
-    const { entries } = this.state;
-    const value = this.getSearchText();
+    const { allowInput, disabled, error, hint, label } = this.props;
+    const { entries, value } = this.state;
+
+    const searchText = this.getSearchText();
+    const icon = this.renderIdentityIcon(value);
 
     return (
       <div className={ styles.container }>
         <AutoComplete
-          className={ (error || !value) ? '' : styles.paddedInput }
+          className={ !icon ? '' : styles.paddedInput }
           disabled={ disabled }
           label={ label }
           hint={ hint ? `search for ${hint}` : 'search for an address' }
           error={ error }
           onChange={ this.onChange }
-          value={ value }
+          onBlur={ this.onBlur }
+          onUpdateInput={ allowInput && this.onUpdateInput }
+          value={ searchText }
           filter={ this.handleFilter }
           entries={ entries }
           entry={ this.getEntry() || {} }
           renderItem={ this.renderItem }
         />
-
-        { this.renderIdentityIcon(value) }
+        { icon }
       </div>
     );
   }
@@ -82,7 +108,7 @@ export default class AddressSelect extends Component {
   renderIdentityIcon (inputValue) {
     const { error, value } = this.props;
 
-    if (error || !inputValue) {
+    if (error || !inputValue || value.length !== 42) {
       return null;
     }
 
@@ -96,8 +122,9 @@ export default class AddressSelect extends Component {
 
   renderItem = (entry) => {
     return {
-      text: entry.address,
-      value: this.renderSelectEntry(entry)
+      text: entry.name && entry.name.toUpperCase() || entry.address,
+      value: this.renderSelectEntry(entry),
+      address: entry.address
     };
   }
 
@@ -127,32 +154,48 @@ export default class AddressSelect extends Component {
 
   getSearchText () {
     const entry = this.getEntry();
-    if (!entry) return '';
+    const { value } = this.state;
 
-    return entry.name ? entry.name.toUpperCase() : '';
+    return entry && entry.name
+      ? entry.name.toUpperCase()
+      : value;
   }
 
   getEntry () {
-    const { value } = this.props;
-    if (!value) return '';
-
-    const { entries } = this.state;
-    return entries[value];
+    const { entries, value } = this.state;
+    return value ? entries[value] : null;
   }
 
-  handleFilter = (searchText, address) => {
+  handleFilter = (searchText, name, item) => {
+    const { address } = item;
     const entry = this.state.entries[address];
     const lowCaseSearch = searchText.toLowerCase();
 
-    return [ entry.name, entry.address ]
+    return [entry.name, entry.address]
       .some(text => text.toLowerCase().indexOf(lowCaseSearch) !== -1);
   }
 
   onChange = (entry, empty) => {
+    const { allowInput } = this.props;
+    const { value } = this.state;
+
     const address = entry && entry.address
       ? entry.address
-      : (empty ? '' : this.state.value);
+      : ((empty && !allowInput) ? '' : value);
 
     this.props.onChange(null, address);
   }
+
+  onUpdateInput = (query, choices) => {
+    const { api } = this.context;
+
+    const address = query.trim();
+
+    if (!/^0x/.test(address) && api.util.isAddressValid(`0x${address}`)) {
+      const checksumed = api.util.toChecksumAddress(`0x${address}`);
+      return this.props.onChange(null, checksumed);
+    }
+
+    this.props.onChange(null, address);
+  };
 }
diff --git a/js/src/ui/Form/AutoComplete/autocomplete.js b/js/src/ui/Form/AutoComplete/autocomplete.js
index 353b4d73c..b0958da31 100644
--- a/js/src/ui/Form/AutoComplete/autocomplete.js
+++ b/js/src/ui/Form/AutoComplete/autocomplete.js
@@ -21,6 +21,7 @@ import { PopoverAnimationVertical } from 'material-ui/Popover';
 export default class AutoComplete extends Component {
   static propTypes = {
     onChange: PropTypes.func.isRequired,
+    onUpdateInput: PropTypes.func,
     disabled: PropTypes.bool,
     label: PropTypes.string,
     hint: PropTypes.string,
@@ -43,7 +44,7 @@ export default class AutoComplete extends Component {
   }
 
   render () {
-    const { disabled, error, hint, label, value, className, filter } = this.props;
+    const { disabled, error, hint, label, value, className, filter, onUpdateInput } = this.props;
     const { open } = this.state;
 
     return (
@@ -54,11 +55,11 @@ export default class AutoComplete extends Component {
         hintText={ hint }
         errorText={ error }
         onNewRequest={ this.onChange }
+        onUpdateInput={ onUpdateInput }
         searchText={ value }
         onFocus={ this.onFocus }
         onBlur={ this.onBlur }
         animation={ PopoverAnimationVertical }
-
         filter={ filter }
         popoverProps={ { open } }
         openOnFocus
@@ -108,11 +109,17 @@ export default class AutoComplete extends Component {
   }
 
   onBlur = () => {
-    window.setTimeout(() => {
-      const { entry } = this.state;
+    const { onUpdateInput } = this.props;
 
-      this.handleOnChange(entry);
-    }, 100);
+    // TODO: Handle blur gracefully where we use onUpdateInput (currently replaces input
+    // input where text is allowed with the last selected value from the dropdown)
+    if (!onUpdateInput) {
+      window.setTimeout(() => {
+        const { entry } = this.state;
+
+        this.handleOnChange(entry);
+      }, 100);
+    }
   }
 
   onFocus = () => {
@@ -131,5 +138,4 @@ export default class AutoComplete extends Component {
       this.props.onChange(value, empty);
     }
   }
-
 }
diff --git a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.css b/js/src/ui/Form/Input/input.css
similarity index 79%
rename from js/src/ui/Form/InputAddressSelect/inputAddressSelect.css
rename to js/src/ui/Form/Input/input.css
index 0211ef568..62c2e39b2 100644
--- a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.css
+++ b/js/src/ui/Form/Input/input.css
@@ -14,18 +14,18 @@
 /* You should have received a copy of the GNU General Public License
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
-.inputselect {
+
+.container {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-end;
   position: relative;
 }
 
-.inputselect svg {
-  padding-right: 84px;
-}
+.copy {
+  margin-right: 0.5em;
 
-.toggle {
-  position: absolute !important;
-  top: 38px;
-  right: 0;
-  display: inline-block !important;
-  width: auto !important;
+  svg {
+    transition: all .5s ease-in-out;
+  }
 }
diff --git a/js/src/ui/Form/Input/input.js b/js/src/ui/Form/Input/input.js
index 0c9206d0e..24a0a8089 100644
--- a/js/src/ui/Form/Input/input.js
+++ b/js/src/ui/Form/Input/input.js
@@ -16,11 +16,22 @@
 
 import React, { Component, PropTypes } from 'react';
 
-import { TextField } from 'material-ui';
+import CopyToClipboard from 'react-copy-to-clipboard';
+import CopyIcon from 'material-ui/svg-icons/content/content-copy';
+import { TextField, IconButton } from 'material-ui';
+import { lightWhite, fullWhite } from 'material-ui/styles/colors';
+
+import styles from './input.css';
 
 // TODO: duplicated in Select
 const UNDERLINE_DISABLED = {
-  borderColor: 'rgba(255, 255, 255, 0.298039)' // 'transparent' // 'rgba(255, 255, 255, 0.298039)'
+  borderBottom: 'dotted 2px',
+  borderColor: 'rgba(255, 255, 255, 0.125)' // 'transparent' // 'rgba(255, 255, 255, 0.298039)'
+};
+
+const UNDERLINE_READONLY = {
+  ...UNDERLINE_DISABLED,
+  cursor: 'text'
 };
 
 const UNDERLINE_NORMAL = {
@@ -34,6 +45,12 @@ export default class Input extends Component {
     children: PropTypes.node,
     className: PropTypes.string,
     disabled: PropTypes.bool,
+    readOnly: PropTypes.bool,
+    allowCopy: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.bool
+    ]),
+    floatCopy: PropTypes.bool,
     error: PropTypes.string,
     hint: PropTypes.string,
     label: PropTypes.string,
@@ -45,17 +62,24 @@ export default class Input extends Component {
     rows: PropTypes.number,
     type: PropTypes.string,
     submitOnBlur: PropTypes.bool,
+    hideUnderline: PropTypes.bool,
     value: PropTypes.oneOfType([
       PropTypes.number, PropTypes.string
     ])
-  }
+  };
 
   static defaultProps = {
-    submitOnBlur: true
+    submitOnBlur: true,
+    readOnly: false,
+    allowCopy: false,
+    hideUnderline: false,
+    floatCopy: false
   }
 
   state = {
-    value: this.props.value || ''
+    value: this.props.value || '',
+    timeoutId: null,
+    copied: false
   }
 
   componentWillReceiveProps (newProps) {
@@ -64,36 +88,145 @@ export default class Input extends Component {
     }
   }
 
+  componentWillUnmount () {
+    const { timeoutId } = this.state;
+
+    if (timeoutId) {
+      window.clearTimeout(timeoutId);
+    }
+  }
+
   render () {
     const { value } = this.state;
-    const { children, className, disabled, error, label, hint, multiLine, rows, type } = this.props;
+    const { children, className, hideUnderline, disabled, error, label, hint, multiLine, rows, type } = this.props;
+
+    const readOnly = this.props.readOnly || disabled;
+
+    const inputStyle = { overflow: 'hidden' };
+    const textFieldStyle = {};
+
+    if (readOnly) {
+      inputStyle.cursor = 'text';
+    }
+
+    if (hideUnderline && !hint) {
+      textFieldStyle.height = 'initial';
+    }
 
     return (
-      <TextField
-        autoComplete='off'
-        className={ className }
-        disabled={ disabled }
-        errorText={ error }
-        floatingLabelFixed
-        floatingLabelText={ label }
-        fullWidth
-        hintText={ hint }
-        multiLine={ multiLine }
-        name={ NAME_ID }
-        id={ NAME_ID }
-        rows={ rows }
-        type={ type || 'text' }
-        underlineDisabledStyle={ UNDERLINE_DISABLED }
-        underlineStyle={ UNDERLINE_NORMAL }
-        value={ value }
-        onBlur={ this.onBlur }
-        onChange={ this.onChange }
-        onKeyDown={ this.onKeyDown }>
-        { children }
-      </TextField>
+      <div className={ styles.container }>
+        { this.renderCopyButton() }
+        <TextField
+          autoComplete='off'
+          className={ className }
+          style={ textFieldStyle }
+
+          readOnly={ readOnly }
+
+          errorText={ error }
+          floatingLabelFixed
+          floatingLabelText={ label }
+          fullWidth
+          hintText={ hint }
+          multiLine={ multiLine }
+          name={ NAME_ID }
+          id={ NAME_ID }
+          rows={ rows }
+          type={ type || 'text' }
+          underlineDisabledStyle={ UNDERLINE_DISABLED }
+          underlineStyle={ readOnly ? UNDERLINE_READONLY : UNDERLINE_NORMAL }
+          underlineFocusStyle={ readOnly ? { display: 'none' } : null }
+          underlineShow={ !hideUnderline }
+          value={ value }
+          onBlur={ this.onBlur }
+          onChange={ this.onChange }
+          onKeyDown={ this.onKeyDown }
+          inputStyle={ inputStyle }
+        >
+          { children }
+        </TextField>
+      </div>
     );
   }
 
+  renderCopyButton () {
+    const { allowCopy, hideUnderline, label, hint, floatCopy } = this.props;
+    const { copied, value } = this.state;
+
+    if (!allowCopy) {
+      return null;
+    }
+
+    const style = {
+      marginBottom: 13
+    };
+
+    const text = typeof allowCopy === 'string'
+      ? allowCopy
+      : value;
+
+    const scale = copied ? 'scale(1.15)' : 'scale(1)';
+
+    if (hideUnderline && !label) {
+      style.marginBottom = 2;
+    } else if (label && !hint) {
+      style.marginBottom = 4;
+    } else if (label && hint) {
+      style.marginBottom = 10;
+    }
+
+    if (floatCopy) {
+      style.position = 'absolute';
+      style.left = -24;
+      style.bottom = style.marginBottom;
+      style.marginBottom = 0;
+    }
+
+    return (
+      <div className={ styles.copy } style={ style }>
+        <CopyToClipboard
+          onCopy={ this.handleCopy }
+          text={ text } >
+          <IconButton
+            tooltip={ `${copied ? 'Copied' : 'Copy'} to clipboard` }
+            tooltipPosition='bottom-right'
+            style={ {
+              width: 16,
+              height: 16,
+              padding: 0
+            } }
+            iconStyle={ {
+              width: 16,
+              height: 16,
+              transform: scale
+            } }
+            tooltipStyles={ {
+              top: 16
+            } }
+          >
+            <CopyIcon
+              color={ copied ? lightWhite : fullWhite }
+            />
+          </IconButton>
+        </CopyToClipboard>
+      </div>
+    );
+  }
+
+  handleCopy = () => {
+    if (this.state.timeoutId) {
+      window.clearTimeout(this.state.timeoutId);
+    }
+
+    this.setState({ copied: true }, () => {
+      const timeoutId = window.setTimeout(() => {
+        this.setState({ copied: false });
+      }, 500);
+
+      this.setState({ timeoutId });
+    });
+  }
+
   onChange = (event, value) => {
     this.setValue(value);
 
@@ -130,8 +263,6 @@ export default class Input extends Component {
   }
 
   setValue (value) {
-    this.setState({
-      value
-    });
+    this.setState({ value });
   }
 }
diff --git a/js/src/ui/Form/InputAddress/inputAddress.css b/js/src/ui/Form/InputAddress/inputAddress.css
index 2f65476dc..ff44ba99e 100644
--- a/js/src/ui/Form/InputAddress/inputAddress.css
+++ b/js/src/ui/Form/InputAddress/inputAddress.css
@@ -26,7 +26,16 @@
   padding-left: 0 !important;
 }
 
-.icon {
+.icon,
+.iconDisabled {
   position: absolute;
   top: 35px;
 }
+
+.icon {
+  left: 0;
+}
+
+.iconDisabled {
+  left: 24px;
+}
diff --git a/js/src/ui/Form/InputAddress/inputAddress.js b/js/src/ui/Form/InputAddress/inputAddress.js
index b7ad95216..0b5562b9a 100644
--- a/js/src/ui/Form/InputAddress/inputAddress.js
+++ b/js/src/ui/Form/InputAddress/inputAddress.js
@@ -60,21 +60,23 @@ class InputAddress extends Component {
           error={ error }
           value={ text && hasAccount ? account.name : value }
           onChange={ this.handleInputChange }
-          onSubmit={ onSubmit } />
+          onSubmit={ onSubmit }
+          allowCopy={ disabled ? value : false }
+        />
         { icon }
       </div>
     );
   }
 
   renderIcon () {
-    const { value } = this.props;
+    const { value, disabled } = this.props;
 
     if (!value || !value.length || !util.isAddressValid(value)) {
       return null;
     }
 
     return (
-      <div className={ styles.icon }>
+      <div className={ disabled ? styles.iconDisabled : styles.icon }>
         <IdentityIcon
           inline center
           address={ value } />
diff --git a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js b/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
index e2c5e8a1d..e77043aed 100644
--- a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
+++ b/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
@@ -17,103 +17,46 @@
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { Toggle } from 'material-ui';
 
 import AddressSelect from '../AddressSelect';
-import InputAddress from '../InputAddress';
-
-import styles from './inputAddressSelect.css';
 
 class InputAddressSelect extends Component {
   static propTypes = {
-    accounts: PropTypes.object,
-    contacts: PropTypes.object,
-    disabled: PropTypes.bool,
-    editing: PropTypes.bool,
+    accounts: PropTypes.object.isRequired,
+    contacts: PropTypes.object.isRequired,
+    contracts: PropTypes.object.isRequired,
     error: PropTypes.string,
     label: PropTypes.string,
     hint: PropTypes.string,
     value: PropTypes.string,
-    tokens: PropTypes.object,
     onChange: PropTypes.func
   };
 
-  state = {
-    editing: this.props.editing || false,
-    entries: []
-  }
-
   render () {
-    const { editing } = this.state;
-
-    return (
-      <div className={ styles.inputselect }>
-        { editing ? this.renderInput() : this.renderSelect() }
-        <Toggle
-          className={ styles.toggle }
-          label='Edit'
-          labelPosition='right'
-          toggled={ editing }
-          onToggle={ this.onToggle } />
-      </div>
-    );
-  }
-
-  renderInput () {
-    const { disabled, error, hint, label, value, tokens } = this.props;
-
-    return (
-      <InputAddress
-        disabled={ disabled }
-        error={ error }
-        hint={ hint }
-        label={ label }
-        value={ value }
-        tokens={ tokens }
-        onChange={ this.onChangeInput } />
-    );
-  }
-
-  renderSelect () {
-    const { accounts, contacts, disabled, error, hint, label, value, tokens } = this.props;
+    const { accounts, contacts, contracts, label, hint, error, value, onChange } = this.props;
 
     return (
       <AddressSelect
+        allowInput
         accounts={ accounts }
         contacts={ contacts }
-        disabled={ disabled }
+        contracts={ contracts }
+        error={ error }
         label={ label }
         hint={ hint }
-        error={ error }
         value={ value }
-        tokens={ tokens }
-        onChange={ this.onChangeSelect } />
+        onChange={ onChange } />
     );
   }
-
-  onToggle = () => {
-    const { editing } = this.state;
-
-    this.setState({
-      editing: !editing
-    });
-  }
-
-  onChangeInput = (event, value) => {
-    this.props.onChange(event, value);
-  }
-
-  onChangeSelect = (event, value) => {
-    this.props.onChange(event, value);
-  }
 }
 
 function mapStateToProps (state) {
-  const { accounts, contacts } = state.personal;
+  const { accounts, contacts, contracts } = state.personal;
 
   return {
     accounts,
-    contacts
+    contacts,
+    contracts
   };
 }
 
diff --git a/js/src/ui/IdentityIcon/identityIcon.js b/js/src/ui/IdentityIcon/identityIcon.js
index 928a340a7..fa8d35e61 100644
--- a/js/src/ui/IdentityIcon/identityIcon.js
+++ b/js/src/ui/IdentityIcon/identityIcon.js
@@ -59,10 +59,9 @@ class IdentityIcon extends Component {
   updateIcon (_address, images) {
     const { api } = this.context;
     const { button, inline, tiny } = this.props;
-    const iconsrc = images[_address];
 
-    if (iconsrc) {
-      this.setState({ iconsrc });
+    if (images[_address]) {
+      this.setState({ iconsrc: `${api.dappsUrl}${images[_address]}` });
       return;
     }
 
diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js/src/ui/MethodDecoding/methodDecoding.js
index fab293784..648ff271b 100644
--- a/js/src/ui/MethodDecoding/methodDecoding.js
+++ b/js/src/ui/MethodDecoding/methodDecoding.js
@@ -19,12 +19,11 @@ import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
+import Contracts from '../../contracts';
 import IdentityIcon from '../IdentityIcon';
 import IdentityName from '../IdentityName';
 import { Input, InputAddress } from '../Form';
 
-import { fetchBytecode, fetchMethod } from '../../redux/providers/blockchainActions';
-
 import styles from './methodDecoding.css';
 
 const CONTRACT_CREATE = '0x60606040';
@@ -41,12 +40,7 @@ class MethodDecoding extends Component {
     address: PropTypes.string.isRequired,
     tokens: PropTypes.object,
     transaction: PropTypes.object,
-    historic: PropTypes.bool,
-
-    fetchBytecode: PropTypes.func,
-    fetchMethod: PropTypes.func,
-    bytecodes: PropTypes.object,
-    methods: PropTypes.object
+    historic: PropTypes.bool
   }
 
   state = {
@@ -63,58 +57,7 @@ class MethodDecoding extends Component {
   }
 
   componentWillMount () {
-    const { transaction } = this.props;
-    this.lookup(transaction);
-  }
-
-  componentDidMount () {
-    this.setMethod(this.props);
-  }
-
-  componentWillReceiveProps (newProps) {
-    const { transaction } = this.props;
-    this.setMethod(newProps);
-
-    if (newProps.transaction.hash !== transaction.hash) {
-      this.lookup(transaction);
-      return;
-    }
-  }
-
-  setMethod (props) {
-    const { bytecodes, methods } = props;
-    const { contractAddress, methodSignature, methodParams } = this.state;
-
-    if (contractAddress && bytecodes[contractAddress]) {
-      const bytecode = bytecodes[contractAddress];
-
-      if (bytecode && bytecode !== '0x') {
-        this.setState({ isContract: true });
-      }
-    }
-
-    if (methodSignature && methods[methodSignature]) {
-      const method = methods[methodSignature];
-      const { api } = this.context;
-
-      let methodInputs = null;
-      let methodName = null;
-
-      if (method && method.length) {
-        const abi = api.util.methodToAbi(method);
-
-        methodName = abi.name;
-        methodInputs = api.util
-          .decodeMethodInput(abi, methodParams)
-          .map((value, index) => {
-            const type = abi.inputs[index].type;
-
-            return { type, value };
-          });
-      }
-
-      this.setState({ method, methodName, methodInputs });
-    }
+    this.lookup();
   }
 
   render () {
@@ -268,7 +211,8 @@ class MethodDecoding extends Component {
         default:
           return (
             <Input
-              disabled
+              readOnly
+              allowCopy
               key={ index }
               className={ styles.input }
               value={ this.renderValue(input.value) }
@@ -320,7 +264,9 @@ class MethodDecoding extends Component {
     );
   }
 
-  lookup (transaction) {
+  lookup () {
+    const { transaction } = this.props;
+
     if (!transaction) {
       return;
     }
@@ -346,26 +292,51 @@ class MethodDecoding extends Component {
       return;
     }
 
-    const { fetchBytecode, fetchMethod } = this.props;
+    Promise
+      .all([
+        api.eth.getCode(contractAddress),
+        Contracts.get().signatureReg.lookup(signature)
+      ])
+      .then(([bytecode, method]) => {
+        let methodInputs = null;
+        let methodName = null;
 
-    fetchBytecode(contractAddress);
-    fetchMethod(signature);
+        if (method && method.length) {
+          const { methodParams } = this.state;
+          const abi = api.util.methodToAbi(method);
+
+          methodName = abi.name;
+          methodInputs = api.util
+            .decodeMethodInput(abi, methodParams)
+            .map((value, index) => {
+              const type = abi.inputs[index].type;
+
+              return { type, value };
+            });
+        }
+
+        this.setState({
+          method,
+          methodName,
+          methodInputs,
+          bytecode,
+          isContract: bytecode && bytecode !== '0x'
+        });
+      })
+      .catch((error) => {
+        console.warn('lookup', error);
+      });
   }
 }
 
 function mapStateToProps (state) {
   const { tokens } = state.balances;
-  const { bytecodes, methods } = state.blockchain;
 
-  return {
-    tokens, bytecodes, methods
-  };
+  return { tokens };
 }
 
 function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    fetchBytecode, fetchMethod
-  }, dispatch);
+  return bindActionCreators({}, dispatch);
 }
 
 export default connect(
diff --git a/js/src/ui/Tooltips/tooltips.js b/js/src/ui/Tooltips/tooltips.js
index 2261ffe5d..9a565c26d 100644
--- a/js/src/ui/Tooltips/tooltips.js
+++ b/js/src/ui/Tooltips/tooltips.js
@@ -49,7 +49,6 @@ class Tooltips extends Component {
   redirect (props = this.props) {
     const { currentId } = props;
 
-    console.log('c', { currentId });
     if (currentId !== undefined && currentId !== -1) {
       const viewLink = '/accounts/';
       this.context.router.push(viewLink);
diff --git a/js/src/ui/index.js b/js/src/ui/index.js
index 808dec64a..c2b63097a 100644
--- a/js/src/ui/index.js
+++ b/js/src/ui/index.js
@@ -25,6 +25,7 @@ import Button from './Button';
 import ConfirmDialog from './ConfirmDialog';
 import Container, { Title as ContainerTitle } from './Container';
 import ContextProvider from './ContextProvider';
+import CopyToClipboard from './CopyToClipboard';
 import Errors from './Errors';
 import Form, { AddressSelect, FormWrap, Input, InputAddress, InputAddressSelect, InputChip, InputInline, Select } from './Form';
 import IdentityIcon from './IdentityIcon';
@@ -53,6 +54,7 @@ export {
   Container,
   ContainerTitle,
   ContextProvider,
+  CopyToClipboard,
   Errors,
   Form,
   FormWrap,
diff --git a/js/src/util/validation.js b/js/src/util/validation.js
index 243217077..dd6e22911 100644
--- a/js/src/util/validation.js
+++ b/js/src/util/validation.js
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import BigNumber from 'bignumber.js';
+
 import util from '../api/util';
 
 export const ERRORS = {
@@ -22,7 +24,10 @@ export const ERRORS = {
   invalidChecksum: 'address has failed the checksum formatting',
   invalidName: 'name should not be blank and longer than 2',
   invalidAbi: 'abi should be a valid JSON array',
-  invalidCode: 'code should be the compiled hex string'
+  invalidCode: 'code should be the compiled hex string',
+  invalidNumber: 'invalid number format',
+  negativeNumber: 'input number should be positive',
+  decimalNumber: 'input number should not contain decimals'
 };
 
 export function validateAbi (abi, api) {
@@ -88,3 +93,23 @@ export function validateName (name) {
     nameError
   };
 }
+
+export function validateUint (value) {
+  let valueError = null;
+
+  try {
+    const bn = new BigNumber(value);
+    if (bn.lt(0)) {
+      valueError = ERRORS.negativeNumber;
+    } else if (bn.toString().indexOf('.') !== -1) {
+      valueError = ERRORS.decimalNumber;
+    }
+  } catch (e) {
+    valueError = ERRORS.invalidNumber;
+  }
+
+  return {
+    value,
+    valueError
+  };
+}
diff --git a/js/src/views/Account/Header/header.js b/js/src/views/Account/Header/header.js
index 2e7d5ae77..d4b01cf56 100644
--- a/js/src/views/Account/Header/header.js
+++ b/js/src/views/Account/Header/header.js
@@ -149,7 +149,7 @@ export default class Header extends Component {
     const { account } = this.props;
 
     this.setState({ name }, () => {
-      api.personal
+      api.parity
         .setAccountName(account.address, name)
         .catch((error) => {
           console.error(error);
diff --git a/js/src/views/Account/Transactions/Transaction/transaction.js b/js/src/views/Account/Transactions/Transaction/transaction.js
index 3eed8bbfb..d84917d6b 100644
--- a/js/src/views/Account/Transactions/Transaction/transaction.js
+++ b/js/src/views/Account/Transactions/Transaction/transaction.js
@@ -17,46 +17,37 @@
 import BigNumber from 'bignumber.js';
 import React, { Component, PropTypes } from 'react';
 import moment from 'moment';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-
-import { fetchBlock, fetchTransaction } from '../../../../redux/providers/blockchainActions';
 
 import { IdentityIcon, IdentityName, MethodDecoding } from '../../../../ui';
 import { txLink, addressLink } from '../../../../3rdparty/etherscan/links';
 
 import styles from '../transactions.css';
 
-class Transaction extends Component {
+export default class Transaction extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
   }
 
   static propTypes = {
-    transaction: PropTypes.object.isRequired,
     address: PropTypes.string.isRequired,
     isTest: PropTypes.bool.isRequired,
-
-    fetchBlock: PropTypes.func.isRequired,
-    fetchTransaction: PropTypes.func.isRequired,
-
-    block: PropTypes.object,
-    transactionInfo: PropTypes.object
+    transaction: PropTypes.object.isRequired
   }
 
   state = {
     isContract: false,
-    isReceived: false
+    isReceived: false,
+    transaction: null,
+    block: null
   }
 
   componentDidMount () {
-    const { address, transaction } = this.props;
-
-    this.lookup(address, transaction);
+    this.lookup();
   }
 
   render () {
-    const { block, transaction } = this.props;
+    const { block } = this.state;
+    const { transaction } = this.props;
 
     return (
       <tr>
@@ -75,9 +66,10 @@ class Transaction extends Component {
   }
 
   renderMethod () {
-    const { address, transactionInfo } = this.props;
+    const { address } = this.props;
+    const { transaction } = this.state;
 
-    if (!transactionInfo) {
+    if (!transaction) {
       return null;
     }
 
@@ -85,12 +77,13 @@ class Transaction extends Component {
       <MethodDecoding
         historic
         address={ address }
-        transaction={ transactionInfo } />
+        transaction={ transaction } />
     );
   }
 
   renderTransaction () {
-    const { transaction, isTest } = this.props;
+    const { isTest } = this.props;
+    const { transaction } = this.props;
 
     return (
       <td className={ styles.transaction }>
@@ -138,13 +131,13 @@ class Transaction extends Component {
 
   renderEtherValue () {
     const { api } = this.context;
-    const { transactionInfo } = this.props;
+    const { transaction } = this.state;
 
-    if (!transactionInfo) {
+    if (!transaction) {
       return null;
     }
 
-    const value = api.util.fromWei(transactionInfo.value);
+    const value = api.util.fromWei(transaction.value);
 
     if (value.eq(0)) {
       return <div className={ styles.value }>{ ' ' }</div>;
@@ -177,34 +170,22 @@ class Transaction extends Component {
     return moment(block.timestamp).fromNow();
   }
 
-  lookup (address, transaction) {
-    const { transactionInfo } = this.props;
-
-    if (transactionInfo) {
-      return;
-    }
+  lookup () {
+    const { api } = this.context;
+    const { transaction, address } = this.props;
 
     this.setState({ isReceived: address === transaction.to });
 
-    const { fetchBlock, fetchTransaction } = this.props;
-    const { blockNumber, hash } = transaction;
-
-    fetchBlock(blockNumber);
-    fetchTransaction(hash);
+    Promise
+      .all([
+        api.eth.getBlockByNumber(transaction.blockNumber),
+        api.eth.getTransactionByHash(transaction.hash)
+      ])
+      .then(([block, transaction]) => {
+        this.setState({ block, transaction });
+      })
+      .catch((error) => {
+        console.warn('lookup', error);
+      });
   }
 }
-
-function mapStateToProps () {
-  return {};
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    fetchBlock, fetchTransaction
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Transaction);
diff --git a/js/src/views/Account/Transactions/transactions.js b/js/src/views/Account/Transactions/transactions.js
index 77bdf60a3..fcbb2ce41 100644
--- a/js/src/views/Account/Transactions/transactions.js
+++ b/js/src/views/Account/Transactions/transactions.js
@@ -38,9 +38,7 @@ class Transactions extends Component {
     contracts: PropTypes.object,
     tokens: PropTypes.object,
     isTest: PropTypes.bool,
-    traceMode: PropTypes.bool,
-    blocks: PropTypes.object,
-    transactionsInfo: PropTypes.object
+    traceMode: PropTypes.bool
   }
 
   state = {
@@ -121,7 +119,7 @@ class Transactions extends Component {
   }
 
   renderRows () {
-    const { address, accounts, contacts, contracts, tokens, isTest, blocks, transactionsInfo } = this.props;
+    const { address, accounts, contacts, contracts, tokens, isTest } = this.props;
     const { transactions } = this.state;
 
     return (transactions || [])
@@ -130,16 +128,9 @@ class Transactions extends Component {
       })
       .slice(0, 25)
       .map((transaction, index) => {
-        const { blockNumber, hash } = transaction;
-
-        const block = blocks[blockNumber.toString()];
-        const transactionInfo = transactionsInfo[hash];
-
         return (
           <Transaction
             key={ index }
-            block={ block }
-            transactionInfo={ transactionInfo }
             transaction={ transaction }
             address={ address }
             accounts={ accounts }
@@ -165,9 +156,9 @@ class Transactions extends Component {
   }
 
   fetchTransactions = (isTest, address, traceMode) => {
-    if (traceMode) {
-      return this.fetchTraceTransactions(address);
-    }
+    // if (traceMode) {
+    //   return this.fetchTraceTransactions(address);
+    // }
 
     return this.fetchEtherscanTransactions(isTest, address);
   }
@@ -211,7 +202,6 @@ function mapStateToProps (state) {
   const { isTest, traceMode } = state.nodeStatus;
   const { accounts, contacts, contracts } = state.personal;
   const { tokens } = state.balances;
-  const { blocks, transactions } = state.blockchain;
 
   return {
     isTest,
@@ -219,9 +209,7 @@ function mapStateToProps (state) {
     accounts,
     contacts,
     contracts,
-    tokens,
-    blocks,
-    transactionsInfo: transactions
+    tokens
   };
 }
 
diff --git a/js/src/views/Accounts/List/list.js b/js/src/views/Accounts/List/list.js
index bcdf7b072..ab231a53a 100644
--- a/js/src/views/Accounts/List/list.js
+++ b/js/src/views/Accounts/List/list.js
@@ -29,6 +29,7 @@ export default class List extends Component {
     search: PropTypes.array,
     empty: PropTypes.bool,
     order: PropTypes.string,
+    orderFallback: PropTypes.string,
     handleAddSearchToken: PropTypes.func
   };
 
@@ -79,9 +80,9 @@ export default class List extends Component {
   }
 
   sortAddresses (addresses) {
-    const { order } = this.props;
+    const { order, orderFallback } = this.props;
 
-    if (!order || ['tags', 'name'].indexOf(order) === -1) {
+    if (!order) {
       return addresses;
     }
 
@@ -91,26 +92,77 @@ export default class List extends Component {
       const accountA = accounts[addressA];
       const accountB = accounts[addressB];
 
-      if (order === 'name') {
-        return accountA.name.localeCompare(accountB.name);
+      const sort = this.compareAccounts(accountA, accountB, order);
+
+      if (sort === 0 && orderFallback) {
+        return this.compareAccounts(accountA, accountB, orderFallback);
       }
 
-      if (order === 'tags') {
-        const tagsA = [].concat(accountA.meta.tags)
-          .filter(t => t)
-          .sort();
-        const tagsB = [].concat(accountB.meta.tags)
-          .filter(t => t)
-          .sort();
-
-        if (tagsA.length === 0) return 1;
-        if (tagsB.length === 0) return -1;
-
-        return tagsA.join('').localeCompare(tagsB.join(''));
-      }
+      return sort;
     });
   }
 
+  compareAccounts (accountA, accountB, key) {
+    if (key === 'name') {
+      return accountA.name.localeCompare(accountB.name);
+    }
+
+    if (key === 'eth') {
+      const { balances } = this.props;
+
+      const balanceA = balances[accountA.address];
+      const balanceB = balances[accountB.address];
+
+      if (!balanceA && !balanceB) return 0;
+      if (balanceA && !balanceB) return -1;
+      if (!balanceA && balanceB) return 1;
+
+      const ethA = balanceA.tokens
+        .find(token => token.token.tag.toLowerCase() === 'eth')
+        .value;
+      const ethB = balanceB.tokens
+        .find(token => token.token.tag.toLowerCase() === 'eth')
+        .value;
+
+      return -1 * ethA.comparedTo(ethB);
+    }
+
+    if (key === 'tags') {
+      const tagsA = [].concat(accountA.meta.tags)
+        .filter(t => t)
+        .sort()
+        .join('');
+
+      const tagsB = [].concat(accountB.meta.tags)
+        .filter(t => t)
+        .sort()
+        .join('');
+
+      if (!tagsA && !tagsB) return 0;
+      if (tagsA && !tagsB) return -1;
+      if (!tagsA && tagsB) return 1;
+
+      return tagsA.localeCompare(tagsB);
+    }
+
+    const metaA = accountA.meta[key];
+    const metaB = accountB.meta[key];
+
+    if (!metaA && !metaB) {
+      return 0;
+    }
+
+    if ((metaA && !metaB) || (metaA < metaB)) {
+      return -1;
+    }
+
+    if ((!metaA && metaB) || (metaA > metaB)) {
+      return 1;
+    }
+
+    return 0;
+  }
+
   getFilteredAddresses () {
     const { accounts, search } = this.props;
     const searchValues = (search || []).map(v => v.toLowerCase());
diff --git a/js/src/views/Accounts/Summary/summary.js b/js/src/views/Accounts/Summary/summary.js
index 241806722..51bb81215 100644
--- a/js/src/views/Accounts/Summary/summary.js
+++ b/js/src/views/Accounts/Summary/summary.js
@@ -17,7 +17,7 @@
 import React, { Component, PropTypes } from 'react';
 import { Link } from 'react-router';
 
-import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags } from '../../../ui';
+import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags, Input } from '../../../ui';
 
 export default class Summary extends Component {
   static contextTypes = {
@@ -47,6 +47,15 @@ export default class Summary extends Component {
     const { address } = account;
     const viewLink = `/${link || 'account'}/${address}`;
 
+    const addressComponent = (
+      <Input
+        readOnly
+        hideUnderline
+        value={ address }
+        allowCopy={ address }
+      />
+    );
+
     return (
       <Container>
         <Tags tags={ tags } handleAddSearchToken={ handleAddSearchToken } />
@@ -54,7 +63,7 @@ export default class Summary extends Component {
           address={ address } />
         <ContainerTitle
           title={ <Link to={ viewLink }>{ <IdentityName address={ address } unknown /> }</Link> }
-          byline={ address } />
+          byline={ addressComponent } />
         <Balance
           balance={ balance } />
         { children }
diff --git a/js/src/views/Address/Delete/delete.js b/js/src/views/Address/Delete/delete.js
index 66e6edb95..8aeaf48e2 100644
--- a/js/src/views/Address/Delete/delete.js
+++ b/js/src/views/Address/Delete/delete.js
@@ -81,7 +81,7 @@ class Delete extends Component {
 
     account.meta.deleted = true;
 
-    api.personal
+    api.parity
       .setAccountMeta(account.address, account.meta)
       .then(() => {
         router.push(route);
diff --git a/js/src/views/Application/Status/status.css b/js/src/views/Application/Status/status.css
index 974c3e990..de043a1ad 100644
--- a/js/src/views/Application/Status/status.css
+++ b/js/src/views/Application/Status/status.css
@@ -15,25 +15,34 @@
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
 .status {
-  clear: both;
-  padding: 1.5em;
-  text-align: right;
-  color: #ddd;
+  padding: 0.5em;
+  font-size: x-small;
+  color: #ccc;
+  background-color: rgba(0, 0, 0, 0.2)
 }
 
 .title {
   margin: 0 0.5em 0 2em;
 }
 
+.enode {
+  word-wrap: break-word;
+  float: right;
+}
+
+.enode > * {
+  display: inline-block;
+  margin: 0.25em 0.5em;
+  vertical-align: top;
+}
+
 .block {
 }
 
 .netinfo {
   display: flex;
   align-items: center;
-  flex-direction: row;
-  justify-content: flex-end;
-  margin-top: 0.25em;
+  color: #ddd;  
 }
 
 .netinfo > * {
@@ -61,6 +70,8 @@
 }
 
 .version {
+  padding: 0.25em 0.5em;
+  float: left;
 }
 
 .syncing {
diff --git a/js/src/views/Application/Status/status.js b/js/src/views/Application/Status/status.js
index 5b1da779d..6417d5d28 100644
--- a/js/src/views/Application/Status/status.js
+++ b/js/src/views/Application/Status/status.js
@@ -19,6 +19,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
 import { BlockStatus } from '../../../ui';
+import CopyToClipboard from '../../../ui/CopyToClipboard';
 
 import styles from './status.css';
 
@@ -26,6 +27,7 @@ class Status extends Component {
   static propTypes = {
     blockNumber: PropTypes.object.isRequired,
     clientVersion: PropTypes.string,
+    enode: PropTypes.string,
     netPeers: PropTypes.object,
     netChain: PropTypes.string,
     isTest: PropTypes.bool
@@ -44,28 +46,47 @@ class Status extends Component {
         <div className={ styles.version }>
           { clientVersion }
         </div>
+        { this.renderEnode() }
         <div className={ styles.netinfo }>
-          <div>
-            <BlockStatus />
-            <div className={ styles.peers }>
-              { netPeers.active.toFormat() }/{ netPeers.connected.toFormat() }/{ netPeers.max.toFormat() } peers
-            </div>
-          </div>
+          <BlockStatus />
           <div className={ netStyle }>
             { isTest ? 'test' : netChain }
           </div>
+          <div className={ styles.peers }>
+            { netPeers.active.toFormat() }/{ netPeers.connected.toFormat() }/{ netPeers.max.toFormat() } peers
+          </div>
         </div>
       </div>
     );
   }
+
+  renderEnode () {
+    const { enode } = this.props;
+
+    if (!enode) {
+      return null;
+    }
+
+    const [protocol, rest] = enode.split('://');
+    const [id, host] = rest.split('@');
+    const abbreviated = `${protocol}://${id.slice(0, 3)}…${id.slice(-3)}@${host}`;
+
+    return (
+      <div className={ styles.enode }>
+        <CopyToClipboard data={ enode } />
+        <div>{ abbreviated }</div>
+      </div>
+    );
+  }
 }
 
 function mapStateToProps (state) {
-  const { blockNumber, clientVersion, netPeers, netChain, isTest } = state.nodeStatus;
+  const { blockNumber, clientVersion, enode, netPeers, netChain, isTest } = state.nodeStatus;
 
   return {
     blockNumber,
     clientVersion,
+    enode,
     netPeers,
     netChain,
     isTest
diff --git a/js/src/views/Application/TabBar/tabBar.js b/js/src/views/Application/TabBar/tabBar.js
index 057ffd169..f90bc4438 100644
--- a/js/src/views/Application/TabBar/tabBar.js
+++ b/js/src/views/Application/TabBar/tabBar.js
@@ -149,15 +149,15 @@ class TabBar extends Component {
   }
 
   renderStatusLabel = (label) => {
-    const { isTest, netChain } = this.props;
-    const bubble = (
-      <Badge
-        color={ isTest ? 'red' : 'default' }
-        className={ styles.labelBubble }
-        value={ isTest ? 'TEST' : netChain } />
-      );
+    // const { isTest, netChain } = this.props;
+    // const bubble = (
+    //   <Badge
+    //     color={ isTest ? 'red' : 'default' }
+    //     className={ styles.labelBubble }
+    //     value={ isTest ? 'TEST' : netChain } />
+    //   );
 
-    return this.renderLabel(label, bubble);
+    return this.renderLabel(label, null);
   }
 
   onActivate = (activeRoute) => {
diff --git a/js/src/views/Application/application.js b/js/src/views/Application/application.js
index af213faf8..d49aa5d90 100644
--- a/js/src/views/Application/application.js
+++ b/js/src/views/Application/application.js
@@ -42,7 +42,8 @@ class Application extends Component {
     children: PropTypes.node,
     netChain: PropTypes.string,
     isTest: PropTypes.bool,
-    pending: PropTypes.array
+    pending: PropTypes.array,
+    blockNumber: PropTypes.object
   }
 
   state = {
@@ -73,7 +74,7 @@ class Application extends Component {
   }
 
   renderApp () {
-    const { children, pending, netChain, isTest } = this.props;
+    const { children, pending, netChain, isTest, blockNumber } = this.props;
     const { showFirstRun } = this.state;
 
     return (
@@ -85,7 +86,7 @@ class Application extends Component {
           isTest={ isTest }
           pending={ pending } />
         { children }
-        <Status />
+        { blockNumber ? (<Status />) : null }
       </Container>
     );
   }
@@ -103,8 +104,8 @@ class Application extends Component {
   checkAccounts () {
     const { api } = this.context;
 
-    api.personal
-      .listAccounts()
+    api.eth
+      .accounts()
       .then((accounts) => {
         this.setState({
           showFirstRun: showFirstRun || accounts.length === 0
@@ -124,7 +125,7 @@ class Application extends Component {
 }
 
 function mapStateToProps (state) {
-  const { netChain, isTest } = state.nodeStatus;
+  const { netChain, isTest, blockNumber } = state.nodeStatus;
   const { hasAccounts } = state.personal;
   const { pending } = state.signer;
 
@@ -132,7 +133,8 @@ function mapStateToProps (state) {
     hasAccounts,
     netChain,
     isTest,
-    pending
+    pending,
+    blockNumber
   };
 }
 
diff --git a/js/src/views/Contract/Events/Event/event.js b/js/src/views/Contract/Events/Event/event.js
index bf9bf593c..f45975f94 100644
--- a/js/src/views/Contract/Events/Event/event.js
+++ b/js/src/views/Contract/Events/Event/event.js
@@ -17,27 +17,24 @@
 import BigNumber from 'bignumber.js';
 import moment from 'moment';
 import React, { Component, PropTypes } from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
 
-import { fetchBlock, fetchTransaction } from '../../../../redux/providers/blockchainActions';
 import { IdentityIcon, IdentityName, Input, InputAddress } from '../../../../ui';
 import { txLink } from '../../../../3rdparty/etherscan/links';
 
 import styles from '../../contract.css';
 
-class Event extends Component {
+export default class Event extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
   }
 
   static propTypes = {
     event: PropTypes.object.isRequired,
-    blocks: PropTypes.object,
-    transactions: PropTypes.object,
-    isTest: PropTypes.bool,
-    fetchBlock: PropTypes.func.isRequired,
-    fetchTransaction: PropTypes.func.isRequired
+    isTest: PropTypes.bool
+  }
+
+  state = {
+    transaction: {}
   }
 
   componentDidMount () {
@@ -45,10 +42,9 @@ class Event extends Component {
   }
 
   render () {
-    const { event, blocks, transactions, isTest } = this.props;
+    const { event, isTest } = this.props;
+    const { block, transaction } = this.state;
 
-    const block = blocks[event.blockNumber.toString()];
-    const transaction = transactions[event.transactionHash] || {};
     const classes = `${styles.event} ${styles[event.state]}`;
     const url = txLink(event.transactionHash, isTest);
     const keys = Object.keys(event.params).join(', ');
@@ -129,10 +125,12 @@ class Event extends Component {
 
         return (
           <Input
-            disabled
+            readOnly
+            allowCopy
             className={ styles.input }
             value={ value }
-            label={ name } />
+            label={ name }
+          />
         );
     }
   }
@@ -154,31 +152,19 @@ class Event extends Component {
   }
 
   retrieveTransaction () {
-    const { event, fetchBlock, fetchTransaction } = this.props;
+    const { api } = this.context;
+    const { event } = this.props;
 
-    fetchBlock(event.blockNumber);
-    fetchTransaction(event.transactionHash);
+    Promise
+      .all([
+        api.eth.getBlockByNumber(event.blockNumber),
+        api.eth.getTransactionByHash(event.transactionHash)
+      ])
+      .then(([block, transaction]) => {
+        this.setState({ block, transaction });
+      })
+      .catch((error) => {
+        console.warn('retrieveTransaction', error);
+      });
   }
 }
-
-function mapStateToProps (state) {
-  const { isTest } = state.nodeStatus;
-  const { blocks, transactions } = state.blockchain;
-
-  return {
-    isTest,
-    blocks,
-    transactions
-  };
-}
-
-function mapDispatchToProps (dispatch) {
-  return bindActionCreators({
-    fetchBlock, fetchTransaction
-  }, dispatch);
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(Event);
diff --git a/js/src/views/Contract/Events/events.js b/js/src/views/Contract/Events/events.js
index 0428a0ee3..382a1c658 100644
--- a/js/src/views/Contract/Events/events.js
+++ b/js/src/views/Contract/Events/events.js
@@ -27,21 +27,31 @@ export default class Events extends Component {
   }
 
   static propTypes = {
-    events: PropTypes.array
+    events: PropTypes.array,
+    isTest: PropTypes.bool.isRequired
   }
 
   render () {
-    const { events } = this.props;
+    const { events, isTest } = this.props;
 
     if (!events || !events.length) {
       return null;
     }
 
+    const list = events.map((event) => {
+      return (
+        <Event
+          key={ event.key }
+          event={ event }
+          isTest={ isTest } />
+      );
+    });
+
     return (
       <Container>
         <ContainerTitle title='events' />
         <table className={ styles.events }>
-          <tbody>{ events.map((event) => <Event event={ event } key={ event.key } />) }</tbody>
+          <tbody>{ list }</tbody>
         </table>
       </Container>
     );
diff --git a/js/src/views/Contract/Queries/inputQuery.js b/js/src/views/Contract/Queries/inputQuery.js
index 5f528a5e0..94c569412 100644
--- a/js/src/views/Contract/Queries/inputQuery.js
+++ b/js/src/views/Contract/Queries/inputQuery.js
@@ -16,11 +16,10 @@
 
 import BigNumber from 'bignumber.js';
 import React, { Component, PropTypes } from 'react';
-import Chip from 'material-ui/Chip';
 import LinearProgress from 'material-ui/LinearProgress';
 import { Card, CardActions, CardTitle, CardText } from 'material-ui/Card';
 
-import { Button, Input } from '../../../ui';
+import { Button, Input, InputAddressSelect } from '../../../ui';
 
 import styles from './queries.css';
 
@@ -104,21 +103,29 @@ export default class InputQuery extends Component {
         display: this.renderValue(results[index])
       }))
       .sort((outA, outB) => outA.display.length - outB.display.length)
-      .map((out, index) => (<div key={ index }>
-        <div className={ styles.queryResultName }>{ out.name }</div>
-        <Chip className={ styles.queryValue }>
-          { out.display }
-        </Chip>
-        <br />
-      </div>));
+      .map((out, index) => (
+        <div key={ index }>
+          <div className={ styles.queryResultName }>
+            { out.name }
+          </div>
+
+          <Input
+            className={ styles.queryValue }
+            readOnly
+            allowCopy
+            value={ out.display }
+          />
+          <br />
+        </div>
+      ));
   }
 
   renderInput (input) {
     const { name, type } = input;
     const label = `${name ? `${name}: ` : ''}${type}`;
 
-    const onChange = (event) => {
-      const value = event.target.value;
+    const onChange = (event, input) => {
+      const value = event && event.target.value || input;
       const { values } = this.state;
 
       this.setState({
@@ -129,6 +136,19 @@ export default class InputQuery extends Component {
       });
     };
 
+    if (type === 'address') {
+      return (
+        <div key={ name }>
+          <InputAddressSelect
+            hint={ type }
+            label={ label }
+            required
+            onChange={ onChange }
+          />
+        </div>
+      );
+    }
+
     return (
       <div key={ name }>
         <Input
diff --git a/js/src/views/Contract/Queries/queries.css b/js/src/views/Contract/Queries/queries.css
index 0caa1006f..9a47511b4 100644
--- a/js/src/views/Contract/Queries/queries.css
+++ b/js/src/views/Contract/Queries/queries.css
@@ -63,25 +63,25 @@
 }
 
 .methodResults > div {
-  margin: 0.5rem;
+  padding: 0.25rem 0.5rem;
   display: flex;
   flex-direction: column;
   align-items: center;
-  max-width: 100%;
+  flex: 1 1 50%;
+  box-sizing: border-box;
+
+  & > div {
+    width: 100%;
+  }
+}
+
+.queryValue {
+  width: 100%;
 }
 
 .queryValue, .queryValue * {
-  user-select: text !important;
-  max-width: 100%;
-  box-sizing: border-box;
   white-space: normal !important;
   overflow-wrap: break-word !important;
-}
-
-.queryValue:hover {
-  cursor: text !important;
-}
-
-.queryResultName {
-  margin-bottom: 0.25rem;
+  max-width: 100%;
+  box-sizing: border-box;
 }
diff --git a/js/src/views/Contract/Queries/queries.js b/js/src/views/Contract/Queries/queries.js
index a2dcba16e..b880140ef 100644
--- a/js/src/views/Contract/Queries/queries.js
+++ b/js/src/views/Contract/Queries/queries.js
@@ -16,11 +16,10 @@
 
 import BigNumber from 'bignumber.js';
 import React, { Component, PropTypes } from 'react';
-import Chip from 'material-ui/Chip';
 import { Card, CardTitle, CardText } from 'material-ui/Card';
 
 import InputQuery from './inputQuery';
-import { Container, ContainerTitle } from '../../../ui';
+import { Container, ContainerTitle, Input } from '../../../ui';
 
 import styles from './queries.css';
 
@@ -126,9 +125,12 @@ export default class Queries extends Component {
     }
 
     return (
-      <Chip className={ styles.queryValue }>
-        { valueToDisplay }
-      </Chip>
+      <Input
+        className={ styles.queryValue }
+        value={ valueToDisplay }
+        readOnly
+        allowCopy
+      />
     );
   }
 
diff --git a/js/src/views/Contract/contract.css b/js/src/views/Contract/contract.css
index 4c6e93a3a..582cfe427 100644
--- a/js/src/views/Contract/contract.css
+++ b/js/src/views/Contract/contract.css
@@ -39,6 +39,7 @@
 
 .txhash {
   text-overflow: ellipsis;
+  width: 20%;
 }
 
 .key {
@@ -82,6 +83,7 @@
 .eventAddress {
   display: inline-block;
   position: relative;
+  white-space: nowrap;
 }
 
 .eventIdentityicon {
diff --git a/js/src/views/Contract/contract.js b/js/src/views/Contract/contract.js
index 394f8b360..5a65a69b5 100644
--- a/js/src/views/Contract/contract.js
+++ b/js/src/views/Contract/contract.js
@@ -116,6 +116,7 @@ class Contract extends Component {
             contract={ contract }
             values={ queryValues } />
           <Events
+            isTest={ isTest }
             events={ allEvents } />
         </Page>
       </div>
@@ -312,7 +313,7 @@ class Contract extends Component {
 
     const contract = api.newContract(account.meta.abi, params.address);
     contract
-      .subscribe(null, { limit: 50, fromBlock: 0, toBlock: 'pending' }, this._receiveEvents)
+      .subscribe(null, { limit: 25, fromBlock: 0, toBlock: 'pending' }, this._receiveEvents)
       .then((subscriptionId) => {
         this.setState({ subscriptionId });
       });
diff --git a/js/src/views/Contracts/contracts.js b/js/src/views/Contracts/contracts.js
index f4cbc6dcc..ef408cae2 100644
--- a/js/src/views/Contracts/contracts.js
+++ b/js/src/views/Contracts/contracts.js
@@ -42,7 +42,7 @@ class Contracts extends Component {
   state = {
     addContract: false,
     deployContract: false,
-    sortOrder: '',
+    sortOrder: 'timestamp',
     searchValues: [],
     searchTokens: []
   }
@@ -65,6 +65,7 @@ class Contracts extends Component {
             balances={ balances }
             empty={ !hasContracts }
             order={ sortOrder }
+            orderFallback='name'
             handleAddSearchToken={ this.onAddSearchToken } />
         </Page>
       </div>
@@ -80,6 +81,10 @@ class Contracts extends Component {
       <ActionbarSort
         key='sortAccounts'
         order={ this.state.sortOrder }
+        metas={ [
+          { key: 'timestamp', label: 'date' }
+        ] }
+        showDefault={ false }
         onChange={ onChange } />
     );
   }
diff --git a/js/src/views/Dapp/dapp.js b/js/src/views/Dapp/dapp.js
index 3cc096f66..399d7b125 100644
--- a/js/src/views/Dapp/dapp.js
+++ b/js/src/views/Dapp/dapp.js
@@ -15,21 +15,48 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { observer } from 'mobx-react';
+
+import DappsStore from '../Dapps/dappsStore';
 
 import styles from './dapp.css';
 
-const dapphost = process.env.NODE_ENV === 'production' ? 'http://127.0.0.1:8080/ui' : '';
-
+@observer
 export default class Dapp extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
   static propTypes = {
     params: PropTypes.object
   };
 
+  store = new DappsStore(this.context.api);
+
   render () {
-    const { name, type } = this.props.params;
-    const src = (type === 'builtin')
-      ? `${dapphost}/${name}.html`
-      : `http://127.0.0.1:8080/${name}/`;
+    const { dappsUrl } = this.context.api;
+    const { id } = this.props.params;
+    const app = this.store.apps.find((app) => app.id === id);
+
+    if (!app) {
+      return null;
+    }
+
+    let src = null;
+    switch (app.type) {
+      case 'local':
+        src = `${dappsUrl}/${app.id}/`;
+        break;
+      case 'network':
+        src = `${dappsUrl}/${app.contentHash}/`;
+        break;
+      default:
+        const dapphost = process.env.NODE_ENV === 'production' && !app.secure
+          ? `${dappsUrl}/ui`
+          : '';
+        src = `${dapphost}/${app.url}.html`;
+        break;
+    }
 
     return (
       <iframe
diff --git a/js/src/views/Dapps/AddDapps/AddDapps.js b/js/src/views/Dapps/AddDapps/AddDapps.js
index 208a65004..38bb64792 100644
--- a/js/src/views/Dapps/AddDapps/AddDapps.js
+++ b/js/src/views/Dapps/AddDapps/AddDapps.js
@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { observer } from 'mobx-react';
 import DoneIcon from 'material-ui/svg-icons/action/done';
 import { List, ListItem } from 'material-ui/List';
 import Checkbox from 'material-ui/Checkbox';
@@ -23,57 +24,67 @@ import { Modal, Button } from '../../../ui';
 
 import styles from './AddDapps.css';
 
+@observer
 export default class AddDapps extends Component {
   static propTypes = {
-    available: PropTypes.array.isRequired,
-    hidden: PropTypes.array.isRequired,
-    open: PropTypes.bool.isRequired,
-    onHideApp: PropTypes.func.isRequired,
-    onShowApp: PropTypes.func.isRequired,
-    onClose: PropTypes.func.isRequired
+    store: PropTypes.object.isRequired
   };
 
   render () {
-    const { onClose, open, available } = this.props;
+    const { store } = this.props;
+
+    if (!store.modalOpen) {
+      return null;
+    }
 
     return (
       <Modal
         compact
         title='visible applications'
         actions={ [
-          <Button label={ 'Done' } key='done' onClick={ onClose } icon={ <DoneIcon /> } />
+          <Button
+            label={ 'Done' }
+            key='done'
+            onClick={ store.closeModal }
+            icon={ <DoneIcon /> }
+          />
         ] }
-        visible={ open }
+        visible
         scroll>
         <List>
-          { available.map(this.renderApp) }
+          { store.apps.map(this.renderApp) }
         </List>
       </Modal>
     );
   }
 
   renderApp = (app) => {
-    const { hidden, onHideApp, onShowApp } = this.props;
-    const isHidden = hidden.includes(app.id);
-    const description = (
-      <div className={ styles.description }>
-        { app.description }
-      </div>
-    );
+    const { store } = this.props;
+    const isHidden = store.hidden.includes(app.id);
     const onCheck = () => {
       if (isHidden) {
-        onShowApp(app.id);
+        store.showApp(app.id);
       } else {
-        onHideApp(app.id);
+        store.hideApp(app.id);
       }
     };
 
     return (
       <ListItem
         key={ app.id }
-        leftCheckbox={ <Checkbox checked={ !isHidden } onCheck={ onCheck } /> }
+        leftCheckbox={
+          <Checkbox
+            checked={ !isHidden }
+            onCheck={ onCheck }
+          />
+        }
         primaryText={ app.name }
-        secondaryText={ description } />
+        secondaryText={
+          <div className={ styles.description }>
+            { app.description }
+          </div>
+        }
+      />
     );
   }
 }
diff --git a/js/src/views/Dapps/Summary/summary.js b/js/src/views/Dapps/Summary/summary.js
index c06b6341c..a1c9f48b6 100644
--- a/js/src/views/Dapps/Summary/summary.js
+++ b/js/src/views/Dapps/Summary/summary.js
@@ -32,33 +32,36 @@ export default class Summary extends Component {
   }
 
   render () {
+    const { dappsPort } = this.context.api;
     const { app } = this.props;
 
     if (!app) {
       return null;
     }
 
-    let type = 'builtin';
-    if (app.network) {
-      type = 'network';
-    } else if (app.local) {
-      type = 'local';
+    let image = <div className={ styles.image }>&nbsp;</div>;
+    if (app.type === 'local') {
+      image = <img src={ `http://127.0.0.1:${dappsPort}/${app.id}/${app.iconUrl}` } className={ styles.image } />;
+    } else {
+      image = <img src={ `http://127.0.0.1:${dappsPort}${app.image}` } className={ styles.image } />;
     }
 
-    const url = `/app/${type}/${app.url || app.contentHash || app.id}`;
-    const image = app.image || app.iconUrl
-      ? <img src={ app.image || `http://127.0.0.1:8080/${app.id}/${app.iconUrl}` } className={ styles.image } />
-      : <div className={ styles.image }>&nbsp;</div>;
-
     return (
       <Container className={ styles.container }>
         { image }
         <div className={ styles.description }>
           <ContainerTitle
             className={ styles.title }
-            title={ <Link to={ url }>{ app.name }</Link> }
-            byline={ app.description } />
-          <div className={ styles.author }>{ app.author }, v{ app.version }</div>
+            title={
+              <Link to={ `/app/${app.id}` }>
+                { app.name }
+              </Link>
+            }
+            byline={ app.description }
+          />
+          <div className={ styles.author }>
+            { app.author }, v{ app.version }
+          </div>
           { this.props.children }
         </div>
       </Container>
diff --git a/js/src/views/Dapps/dapps.js b/js/src/views/Dapps/dapps.js
index 4c1b7baab..708c52cb5 100644
--- a/js/src/views/Dapps/dapps.js
+++ b/js/src/views/Dapps/dapps.js
@@ -15,60 +15,46 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Component, PropTypes } from 'react';
+import { observer } from 'mobx-react';
 
-import Contracts from '../../contracts';
-import { hashToImageUrl } from '../../redux/util';
 import { Actionbar, Page } from '../../ui';
 import FlatButton from 'material-ui/FlatButton';
 import EyeIcon from 'material-ui/svg-icons/image/remove-red-eye';
 
-import { fetchAvailable } from './registry';
-import { readHiddenApps, writeHiddenApps } from './hidden';
+import DappsStore from './dappsStore';
 
 import AddDapps from './AddDapps';
 import Summary from './Summary';
 
 import styles from './dapps.css';
 
+@observer
 export default class Dapps extends Component {
   static contextTypes = {
     api: PropTypes.object.isRequired
   }
 
-  state = {
-    available: [],
-    hidden: [],
-    modalOpen: false
-  }
-
-  componentDidMount () {
-    this.loadAvailableApps();
-  }
+  store = new DappsStore(this.context.api);
 
   render () {
-    const { available, hidden, modalOpen } = this.state;
-    const apps = available.filter((app) => !hidden.includes(app.id));
-
     return (
       <div>
-        <AddDapps
-          available={ available }
-          hidden={ hidden }
-          open={ modalOpen }
-          onHideApp={ this.onHideApp }
-          onShowApp={ this.onShowApp }
-          onClose={ this.closeModal }
-        />
+        <AddDapps store={ this.store } />
         <Actionbar
           className={ styles.toolbar }
           title='Decentralized Applications'
           buttons={ [
-            <FlatButton label='edit' key='edit' icon={ <EyeIcon /> } onClick={ this.openModal } />
+            <FlatButton
+              label='edit'
+              key='edit'
+              icon={ <EyeIcon /> }
+              onClick={ this.store.openModal }
+            />
           ] }
         />
         <Page>
           <div className={ styles.list }>
-            { apps.map(this.renderApp) }
+            { this.store.visible.map(this.renderApp) }
           </div>
         </Page>
       </div>
@@ -76,10 +62,6 @@ export default class Dapps extends Component {
   }
 
   renderApp = (app) => {
-    if (!app.name) {
-      return null;
-    }
-
     return (
       <div
         className={ styles.item }
@@ -88,81 +70,4 @@ export default class Dapps extends Component {
       </div>
     );
   }
-
-  onHideApp = (id) => {
-    const { hidden } = this.state;
-    const newHidden = hidden.concat(id);
-
-    this.setState({ hidden: newHidden });
-    writeHiddenApps(newHidden);
-  }
-
-  onShowApp = (id) => {
-    const { hidden } = this.state;
-    const newHidden = hidden.filter((_id) => _id !== id);
-
-    this.setState({ hidden: newHidden });
-    writeHiddenApps(newHidden);
-  }
-
-  openModal = () => {
-    this.setState({ modalOpen: true });
-  };
-
-  closeModal = () => {
-    this.setState({ modalOpen: false });
-  };
-
-  loadAvailableApps () {
-    const { api } = this.context;
-
-    fetchAvailable(api)
-      .then((available) => {
-        this.setState({
-          available,
-          hidden: readHiddenApps()
-        });
-
-        this.loadContent();
-      });
-  }
-
-  loadContent () {
-    const { api } = this.context;
-    const { available } = this.state;
-    const { dappReg } = Contracts.get();
-
-    return Promise
-      .all(available.map((app) => dappReg.getImage(app.id)))
-      .then((images) => {
-        const _available = images
-          .map(hashToImageUrl)
-          .map((image, index) => Object.assign({}, available[index], { image }));
-
-        this.setState({ available: _available });
-        const _networkApps = _available.filter((app) => app.network);
-
-        return Promise
-          .all(_networkApps.map((app) => dappReg.getContent(app.id)))
-          .then((content) => {
-            const networkApps = content.map((_contentHash, index) => {
-              const networkApp = _networkApps[index];
-              const contentHash = api.util.bytesToHex(_contentHash).substr(2);
-              const app = _available.find((_app) => _app.id === networkApp.id);
-
-              console.log(`found content for ${app.id} at ${contentHash}`);
-              return Object.assign({}, app, { contentHash });
-            });
-
-            this.setState({
-              available: _available.map((app) => {
-                return Object.assign({}, networkApps.find((napp) => app.id === napp.id) || app);
-              })
-            });
-          });
-      })
-      .catch((error) => {
-        console.warn('loadImages', error);
-      });
-  }
 }
diff --git a/js/src/views/Dapps/dappsStore.js b/js/src/views/Dapps/dappsStore.js
new file mode 100644
index 000000000..01877c38b
--- /dev/null
+++ b/js/src/views/Dapps/dappsStore.js
@@ -0,0 +1,257 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { action, computed, observable } from 'mobx';
+
+import Contracts from '../../contracts';
+import { hashToImageUrl } from '../../redux/util';
+
+const builtinApps = [
+  {
+    id: '0xf9f2d620c2e08f83e45555247146c62185e4ab7cf82a4b9002a265a0d020348f',
+    url: 'basiccoin',
+    name: 'Token Deployment',
+    description: 'Deploy new basic tokens that you are able to send around',
+    author: 'Parity Team <admin@ethcore.io>',
+    version: '1.0.0'
+  },
+  {
+    id: '0xd1adaede68d344519025e2ff574650cd99d3830fe6d274c7a7843cdc00e17938',
+    url: 'registry',
+    name: 'Registry',
+    description: 'A global registry of addresses on the network',
+    author: 'Parity Team <admin@ethcore.io>',
+    version: '1.0.0'
+  },
+  {
+    id: '0x0a8048117e51e964628d0f2d26342b3cd915248b59bcce2721e1d05f5cfa2208',
+    url: 'tokenreg',
+    name: 'Token Registry',
+    description: 'A registry of transactable tokens on the network',
+    author: 'Parity Team <admin@ethcore.io>',
+    version: '1.0.0'
+  },
+  {
+    id: '0xf49089046f53f5d2e5f3513c1c32f5ff57d986e46309a42d2b249070e4e72c46',
+    url: 'signaturereg',
+    name: 'Method Registry',
+    description: 'A registry of method signatures for lookups on transactions',
+    author: 'Parity Team <admin@ethcore.io>',
+    version: '1.0.0'
+  },
+  {
+    id: '0x058740ee9a5a3fb9f1cfa10752baec87e09cc45cd7027fd54708271aca300c75',
+    url: 'githubhint',
+    name: 'GitHub Hint',
+    description: 'A mapping of GitHub URLs to hashes for use in contracts as references',
+    author: 'Parity Team <admin@ethcore.io>',
+    version: '1.0.0',
+    secure: true
+  }
+];
+
+export default class DappsStore {
+  @observable apps = [];
+  @observable hidden = [];
+  @observable modalOpen = false;
+
+  constructor (api) {
+    this._api = api;
+
+    this._readHiddenApps();
+    this._fetch();
+  }
+
+  @computed get visible () {
+    return this.apps.filter((app) => !this.hidden.includes(app.id));
+  }
+
+  @action openModal = () => {
+    this.modalOpen = true;
+  }
+
+  @action closeModal = () => {
+    this.modalOpen = false;
+  }
+
+  @action hideApp = (id) => {
+    this.hidden = this.hidden.concat(id);
+    this._writeHiddenApps();
+  }
+
+  @action showApp = (id) => {
+    this.hidden = this.hidden.filter((_id) => _id !== id);
+    this._writeHiddenApps();
+  }
+
+  _getHost (api) {
+    return process.env.NODE_ENV === 'production'
+      ? this._api.dappsUrl
+      : '';
+  }
+
+  _fetch () {
+    Promise
+      .all([
+        this._fetchLocal(),
+        this._fetchRegistry()
+      ])
+      .then(([localApps, registryApps]) => {
+        this.apps = []
+          .concat(localApps)
+          .concat(registryApps)
+          .filter((app) => app.id)
+          .sort((a, b) => (a.name || '').localeCompare(b.name || ''));
+      })
+      .catch((error) => {
+        console.warn('DappStore:fetch', error);
+      });
+  }
+
+  _fetchRegistry () {
+    const { dappReg } = Contracts.get();
+
+    return dappReg
+      .count()
+      .then((_count) => {
+        const count = _count.toNumber();
+        const promises = [];
+
+        for (let index = 0; index < count; index++) {
+          promises.push(dappReg.at(index));
+        }
+
+        return Promise.all(promises);
+      })
+      .then((appsInfo) => {
+        const appIds = appsInfo.map(([appId, owner]) => {
+          return this._api.util.bytesToHex(appId);
+        });
+
+        return Promise
+          .all([
+            Promise.all(appIds.map((appId) => dappReg.getImage(appId))),
+            Promise.all(appIds.map((appId) => dappReg.getContent(appId))),
+            Promise.all(appIds.map((appId) => dappReg.getManifest(appId)))
+          ])
+          .then(([imageIds, contentIds, manifestIds]) => {
+            return appIds.map((appId, index) => {
+              const app = builtinApps.find((ba) => ba.id === appId) || {
+                id: appId,
+                contentHash: this._api.util.bytesToHex(contentIds[index]).substr(2),
+                manifestHash: this._api.util.bytesToHex(manifestIds[index]).substr(2),
+                type: 'network'
+              };
+
+              app.image = hashToImageUrl(imageIds[index]);
+              app.type = app.type || 'builtin';
+
+              return app;
+            });
+          });
+      })
+      .then((apps) => {
+        return Promise
+          .all(apps.map((app) => {
+            return app.manifestHash
+              ? this._fetchManifest(app.manifestHash)
+              : null;
+          }))
+          .then((manifests) => {
+            return apps.map((app, index) => {
+              const manifest = manifests[index];
+
+              if (manifest) {
+                app.manifestHash = null;
+                Object.keys(manifest)
+                  .filter((key) => key !== 'id')
+                  .forEach((key) => {
+                    app[key] = manifest[key];
+                  });
+              }
+
+              return app;
+            });
+          })
+          .then((apps) => {
+            return apps.filter((app) => {
+              return !app.manifestHash && app.id;
+            });
+          });
+      })
+      .catch((error) => {
+        console.warn('DappsStore:fetchRegistry', error);
+      });
+  }
+
+  _fetchManifest (manifestHash, count = 0) {
+    return fetch(`${this._getHost()}/api/content/${manifestHash}/`)
+      .then((response) => {
+        if (response.ok) {
+          return response.json();
+        }
+
+        if (count < 1) {
+          return this._fetchManifest(manifestHash, count + 1);
+        }
+
+        return null;
+      })
+      .catch(() => {
+        if (count < 1) {
+          return this._fetchManifest(manifestHash, count + 1);
+        }
+
+        return null;
+      });
+  }
+
+  _fetchLocal () {
+    return fetch(`${this._getHost()}/api/apps`)
+      .then((response) => {
+        return response.ok
+          ? response.json()
+          : [];
+      })
+      .then((localApps) => {
+        return localApps
+          .filter((app) => app && app.id && !['ui'].includes(app.id))
+          .map((app) => {
+            app.type = 'local';
+            return app;
+          });
+      })
+      .catch((error) => {
+        console.warn('DappsStore:fetchLocal', error);
+      });
+  }
+
+  _readHiddenApps () {
+    const stored = localStorage.getItem('hiddenApps');
+
+    if (stored) {
+      try {
+        this.hidden = JSON.parse(stored);
+      } catch (error) {
+        console.warn('DappsStore:readHiddenApps', error);
+      }
+    }
+  }
+
+  _writeHiddenApps () {
+    localStorage.setItem('hiddenApps', JSON.stringify(this.hidden));
+  }
+}
diff --git a/js/src/views/Dapps/registry.js b/js/src/views/Dapps/registry.js
deleted file mode 100644
index 57668c651..000000000
--- a/js/src/views/Dapps/registry.js
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity 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 General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity. If not, see <http://www.gnu.org/licenses/>.
-
-import BigNumber from 'bignumber.js';
-
-import { parityNode } from '../../environment';
-
-const builtinApps = [
-  {
-    id: '0xf9f2d620c2e08f83e45555247146c62185e4ab7cf82a4b9002a265a0d020348f',
-    url: 'basiccoin',
-    name: 'Token Deployment',
-    description: 'Deploy new basic tokens that you are able to send around',
-    author: 'Parity Team <admin@ethcore.io>',
-    version: '1.0.0'
-  },
-  {
-    id: '0xd1adaede68d344519025e2ff574650cd99d3830fe6d274c7a7843cdc00e17938',
-    url: 'registry',
-    name: 'Registry',
-    description: 'A global registry of addresses on the network',
-    author: 'Parity Team <admin@ethcore.io>',
-    version: '1.0.0'
-  },
-  {
-    id: '0x0a8048117e51e964628d0f2d26342b3cd915248b59bcce2721e1d05f5cfa2208',
-    url: 'tokenreg',
-    name: 'Token Registry',
-    description: 'A registry of transactable tokens on the network',
-    author: 'Parity Team <admin@ethcore.io>',
-    version: '1.0.0'
-  },
-  {
-    id: '0xf49089046f53f5d2e5f3513c1c32f5ff57d986e46309a42d2b249070e4e72c46',
-    url: 'signaturereg',
-    name: 'Method Registry',
-    description: 'A registry of method signatures for lookups on transactions',
-    author: 'Parity Team <admin@ethcore.io>',
-    version: '1.0.0'
-  },
-  {
-    id: '0x058740ee9a5a3fb9f1cfa10752baec87e09cc45cd7027fd54708271aca300c75',
-    url: 'githubhint',
-    name: 'GitHub Hint',
-    description: 'A mapping of GitHub URLs to hashes for use in contracts as references',
-    author: 'Parity Team <admin@ethcore.io>',
-    version: '1.0.0'
-  }
-];
-
-// TODO: This is just since we are moving gavcoin to its own repo, for a proper network solution
-// we need to pull the network apps from the dapp registry. (Builtins & local apps unaffected)
-// TODO: Manifest needs to be pulled from the content as well, however since the content may or may
-// not be available locally (and refreshes work for index, and will give a 503), we are putting it
-// in here. This part needs to be cleaned up.
-const networkApps = [
-  {
-    id: '0xd798a48831b4ccdbc71de206a1d6a4aa73546c7b6f59c22a47452af414dc64d6',
-    name: 'GAVcoin',
-    description: 'Manage your GAVcoins, the hottest new property in crypto',
-    author: 'Gavin Wood',
-    version: '1.0.0'
-  }
-];
-
-export function fetchAvailable (api) {
-  // TODO: Since we don't have an extensive GithubHint app, get the value somehow
-  // RESULT: 0x22cd66e1b05882c0fa17a16d252d3b3ee2238ccbac8153f69a35c83f02ca76ee
-  // api.ethcore
-  //   .hashContent('https://codeload.github.com/gavofyork/gavcoin/zip/5a9f11ff2ad0d05c565a938ceffdfa0d23af9981')
-  //   .then((sha3) => {
-  //     console.log('archive', sha3);
-  //   });
-
-  return fetch(`${parityNode}/api/apps`)
-    .then((response) => {
-      return response.ok
-        ? response.json()
-        : [];
-    })
-    .catch((error) => {
-      console.warn('fetchAvailable', error);
-      return [];
-    })
-    .then((_localApps) => {
-      const localApps = _localApps
-        .filter((app) => !['ui'].includes(app.id))
-        .map((app) => {
-          app.local = true;
-          return app;
-        });
-
-      return api.ethcore
-        .registryAddress()
-        .then((registryAddress) => {
-          if (new BigNumber(registryAddress).eq(0)) {
-            return [];
-          }
-
-          const _builtinApps = builtinApps
-            .map((app) => {
-              app.builtin = true;
-              return app;
-            });
-
-          return networkApps
-            .map((app) => {
-              app.network = true;
-              return app;
-            })
-            .concat(_builtinApps);
-        })
-        .then((registryApps) => {
-          return registryApps
-            .concat(localApps)
-            .sort((a, b) => (a.name || '').localeCompare(b.name || ''));
-        });
-    })
-    .catch((error) => {
-      console.warn('fetchAvailable', error);
-    });
-}
-
-export function fetchManifest (app, contentHash) {
-  return fetch(`${parityNode}/${contentHash}/manifest.json`)
-    .then((response) => {
-      return response.ok
-        ? response.json()
-        : {};
-    })
-    .then((manifest) => {
-      Object.keys.forEach((key) => {
-        app[key] = manifest[key];
-      });
-
-      return app;
-    })
-    .catch((error) => {
-      console.warn('fetchManifest', error);
-    });
-}
diff --git a/js/src/views/Settings/Background/background.js b/js/src/views/Settings/Background/background.js
index 77c9b1810..e34c5d348 100644
--- a/js/src/views/Settings/Background/background.js
+++ b/js/src/views/Settings/Background/background.js
@@ -82,9 +82,9 @@ class Background extends Component {
     const { settings } = this.props;
     const { seeds } = this.state;
 
-    return seeds.map((seed) => {
+    return seeds.map((seed, index) => {
       return (
-        <div className={ styles.bgflex } key={ seed }>
+        <div className={ styles.bgflex } key={ index }>
           <div className={ styles.bgseed }>
             <ParityBackground
               className={ settings.backgroundSeed === seed ? styles.seedactive : styles.seed }
diff --git a/js/src/views/Settings/Parity/index.js b/js/src/views/Settings/Parity/index.js
new file mode 100644
index 000000000..38f08f725
--- /dev/null
+++ b/js/src/views/Settings/Parity/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './parity';
diff --git a/js/src/views/Settings/Parity/parity.js b/js/src/views/Settings/Parity/parity.js
new file mode 100644
index 000000000..abec8cc8a
--- /dev/null
+++ b/js/src/views/Settings/Parity/parity.js
@@ -0,0 +1,116 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+import { MenuItem } from 'material-ui';
+
+import { Select, Container, ContainerTitle } from '../../../ui';
+
+import layout from '../layout.css';
+
+const MODES = {
+  'active': 'Parity continuously syncs the chain',
+  'passive': 'Parity syncs initially, then sleeps and wakes regularly to resync',
+  'dark': 'Parity syncs only when the RPC is active',
+  'offline': 'Parity doesn\'t sync'
+};
+
+export default class Parity extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
+  state = {
+    mode: 'active'
+  }
+
+  componentWillMount () {
+    this.loadMode();
+  }
+
+  render () {
+    return (
+      <Container>
+        <ContainerTitle title='Parity' />
+        <div className={ layout.layout }>
+          <div className={ layout.overview }>
+            <div>Control the Parity node settings and mode of operation via this interface.</div>
+          </div>
+          <div className={ layout.details }>
+            { this.renderModes() }
+          </div>
+        </div>
+      </Container>
+    );
+  }
+
+  renderModes () {
+    const modes = Object
+      .keys(MODES)
+      .map((mode) => {
+        const description = MODES[mode];
+
+        return (
+          <MenuItem
+            key={ mode }
+            value={ mode }
+            label={ description }>
+            { description }
+          </MenuItem>
+        );
+      });
+
+    const { mode } = this.state;
+
+    return (
+      <Select
+        label='mode of operation'
+        hint='the syning mode for the Parity node'
+        value={ mode }
+        onChange={ this.onChangeMode }>
+        { modes }
+      </Select>
+    );
+  }
+
+  onChangeMode = (event, index, mode) => {
+    const { api } = this.context;
+
+    api.parity
+      .setMode(mode)
+      .then((result) => {
+        if (result) {
+          this.setState({ mode });
+        }
+      })
+      .catch((error) => {
+        console.warn('onChangeMode', error);
+      });
+  }
+
+  loadMode () {
+    const { api } = this.context;
+
+    api.parity
+      .mode()
+      .then((mode) => {
+        this.setState({ mode });
+      })
+      .catch((error) => {
+        console.warn('loadMode', error);
+      });
+  }
+}
diff --git a/js/src/views/Settings/Proxy/proxy.js b/js/src/views/Settings/Proxy/proxy.js
index 8c68a8cfe..69e415d1f 100644
--- a/js/src/views/Settings/Proxy/proxy.js
+++ b/js/src/views/Settings/Proxy/proxy.js
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import React, { Component } from 'react';
+import React, { Component, PropTypes } from 'react';
 
 import { Container, ContainerTitle } from '../../../ui';
 
@@ -22,15 +22,20 @@ import layout from '../layout.css';
 import styles from './proxy.css';
 
 export default class Proxy extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
   render () {
-    const proxyurl = 'http://127.0.0.1:8080/proxy/proxy.pac';
+    const { dappsUrl } = this.context.api;
+    const proxyurl = `${dappsUrl}/proxy/proxy.pac`;
 
     return (
       <Container>
         <ContainerTitle title='Proxy' />
         <div className={ layout.layout }>
           <div className={ layout.overview }>
-            <div>The proxy setup allows you to access Parity and all associated decentralized applications via memororable addresses.</div>
+            <div>The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.</div>
           </div>
           <div className={ layout.details }>
             <div className={ styles.details }>
diff --git a/js/src/views/Settings/Views/defaults.js b/js/src/views/Settings/Views/defaults.js
index 3d1eb889f..819e3938d 100644
--- a/js/src/views/Settings/Views/defaults.js
+++ b/js/src/views/Settings/Views/defaults.js
@@ -49,7 +49,7 @@ const defaultViews = {
     label: 'Applications',
     route: '/apps',
     value: 'app',
-    description: 'Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and interact with application from around the newtork.'
+    description: 'Distributed applications that interact with the underlying network. Add applications, manage you application portfolio and interact with application from around the network.'
   },
 
   contracts: {
diff --git a/js/src/views/Settings/Views/views.js b/js/src/views/Settings/Views/views.js
index 27dcc7ee4..a485876c8 100644
--- a/js/src/views/Settings/Views/views.js
+++ b/js/src/views/Settings/Views/views.js
@@ -40,7 +40,7 @@ class Views extends Component {
           <div className={ layout.overview }>
             <div>Manage the available application views, using only the parts of the application that is applicable to you.</div>
             <div>Are you an end-user? The defaults are setups for both beginner and advanced users alike.</div>
-            <div>Are you a developer? Add some features to manage contracts are interact with application develoyments.</div>
+            <div>Are you a developer? Add some features to manage contracts are interact with application deployments.</div>
             <div>Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.</div>
           </div>
           <div className={ layout.details }>
diff --git a/js/src/views/Settings/index.js b/js/src/views/Settings/index.js
index 6971db224..4c5414f71 100644
--- a/js/src/views/Settings/index.js
+++ b/js/src/views/Settings/index.js
@@ -17,6 +17,7 @@
 import settingsReducer from './reducers';
 import { toggleView, updateBackground } from './actions';
 import SettingsBackground from './Background';
+import SettingsParity from './Parity';
 import SettingsProxy from './Proxy';
 import SettingsViews, { defaultViews } from './Views';
 
@@ -24,6 +25,7 @@ export default from './settings';
 
 export {
   SettingsBackground,
+  SettingsParity,
   SettingsProxy,
   SettingsViews,
   defaultViews,
diff --git a/js/src/views/Settings/settings.css b/js/src/views/Settings/settings.css
index ebd7b4ec0..91138db68 100644
--- a/js/src/views/Settings/settings.css
+++ b/js/src/views/Settings/settings.css
@@ -61,3 +61,13 @@
   vertical-align: top;
   display: inline-block;
 }
+
+.imageIcon {
+  height: 20px;
+  margin: 2px 0.5em 2px 0 !important;
+  opacity: 0.5;
+}
+
+.tabactive .imageIcon {
+  opacity: 1;
+}
diff --git a/js/src/views/Settings/settings.js b/js/src/views/Settings/settings.js
index 2b9579993..4b38b1ccf 100644
--- a/js/src/views/Settings/settings.js
+++ b/js/src/views/Settings/settings.js
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-// 0xecf69634885f27a8f78161e530f15a8d3b57d39e755c222c92cf297b6e25aaaa
-
 import React, { Component, PropTypes } from 'react';
 import { Tab, Tabs } from 'material-ui';
 import ActionSettingsEthernet from 'material-ui/svg-icons/action/settings-ethernet';
@@ -23,6 +21,7 @@ import ImageBlurOn from 'material-ui/svg-icons/image/blur-on';
 import ImageRemoveRedEye from 'material-ui/svg-icons/image/remove-red-eye';
 
 import { Actionbar, Page } from '../../ui';
+import imagesEthcoreBlock from '../../../assets/images/parity-logo-white-no-text.svg';
 
 import styles from './settings.css';
 
@@ -37,11 +36,23 @@ export default class Settings extends Component {
 
   render () {
     const { children } = this.props;
+    const hash = (window.location.hash || '').split('?')[0].split('/')[2];
+    const isProxied = window.location.hostname.indexOf('.parity') !== -1;
+    let proxy = null;
+
+    if (!isProxied) {
+      proxy = this.renderTab(hash, 'proxy', <ActionSettingsEthernet />);
+    }
 
     return (
       <div className={ styles.layout }>
         <Actionbar title='settings' className={ styles.bar }>
-          { this.renderTabs() }
+          <Tabs className={ styles.tabs } value={ hash }>
+            { this.renderTab(hash, 'views', <ImageRemoveRedEye />) }
+            { this.renderTab(hash, 'background', <ImageBlurOn />) }
+            { proxy }
+            { this.renderTab(hash, 'parity', <img src={ imagesEthcoreBlock } className={ styles.imageIcon } />) }
+          </Tabs>
         </Actionbar>
         <Page>
           { children }
@@ -50,41 +61,15 @@ export default class Settings extends Component {
     );
   }
 
-  renderTabs () {
-    const hash = (window.location.hash || '').split('?')[0].split('/')[2];
-    const isProxied = window.location.hostname.indexOf('.parity') !== -1;
-    let proxy = null;
-
-    if (!isProxied) {
-      proxy = (
-        <Tab
-          className={ hash === 'proxy' ? styles.tabactive : styles.tab }
-          value='proxy'
-          key='proxy'
-          icon={ <ActionSettingsEthernet /> }
-          label={ <div className={ styles.menu }>proxy</div> }
-          onActive={ this.onActivate('proxy') } />
-      );
-    }
-
+  renderTab (hash, section, icon) {
     return (
-      <Tabs className={ styles.tabs } value={ hash }>
-        <Tab
-          className={ hash === 'views' ? styles.tabactive : styles.tab }
-          value='views'
-          key='views'
-          icon={ <ImageRemoveRedEye /> }
-          label={ <div className={ styles.menu }>views</div> }
-          onActive={ this.onActivate('views') } />
-        <Tab
-          className={ hash === 'background' ? styles.tabactive : styles.tab }
-          value='background'
-          key='background'
-          icon={ <ImageBlurOn /> }
-          label={ <div className={ styles.menu }>background</div> }
-          onActive={ this.onActivate('background') } />
-        { proxy }
-      </Tabs>
+      <Tab
+        className={ hash === section ? styles.tabactive : styles.tab }
+        value={ section }
+        key={ section }
+        icon={ icon }
+        label={ <div className={ styles.menu }>{ section }</div> }
+        onActive={ this.onActivate(section) } />
     );
   }
 
diff --git a/js/src/views/Signer/components/SignRequest/SignRequest.js b/js/src/views/Signer/components/SignRequest/SignRequest.js
index 25b3dd77d..395bc2c7f 100644
--- a/js/src/views/Signer/components/SignRequest/SignRequest.js
+++ b/js/src/views/Signer/components/SignRequest/SignRequest.js
@@ -50,7 +50,7 @@ export default class SignRequest extends Component {
   }
 
   componentWillMount () {
-    this.context.api.ethcore.netChain()
+    this.context.api.parity.netChain()
       .then((chain) => {
         this.setState({ chain });
       })
diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
index b781adb6d..08ed1f7ed 100644
--- a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
+++ b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
@@ -65,7 +65,7 @@ export default class TransactionFinished extends Component {
     const totalValue = tUtil.getTotalValue(fee, value);
     this.setState({ totalValue });
 
-    this.context.api.ethcore.netChain()
+    this.context.api.parity.netChain()
       .then((chain) => {
         this.setState({ chain });
       })
diff --git a/js/src/views/Signer/components/TransactionPending/TransactionPending.js b/js/src/views/Signer/components/TransactionPending/TransactionPending.js
index 3ca078b83..77d02d0b1 100644
--- a/js/src/views/Signer/components/TransactionPending/TransactionPending.js
+++ b/js/src/views/Signer/components/TransactionPending/TransactionPending.js
@@ -64,7 +64,7 @@ export default class TransactionPending extends Component {
     const gasToDisplay = tUtil.getGasDisplay(gas);
     this.setState({ gasPriceEthmDisplay, totalValue, gasToDisplay });
 
-    this.context.api.ethcore.netChain()
+    this.context.api.parity.netChain()
       .then((chain) => {
         this.setState({ chain });
       })
diff --git a/js/src/views/Status/components/MiningSettings/MiningSettings.js b/js/src/views/Status/components/MiningSettings/MiningSettings.js
index c13e2eeae..163c103f5 100644
--- a/js/src/views/Status/components/MiningSettings/MiningSettings.js
+++ b/js/src/views/Status/components/MiningSettings/MiningSettings.js
@@ -45,26 +45,41 @@ export default class MiningSettings extends Component {
           hint='the mining author'
           value={ coinbase }
           onSubmit={ this.onAuthorChange }
-          { ...this._test('author') } />
+          allowCopy
+          floatCopy
+          { ...this._test('author') }
+        />
+
         <Input
           label='extradata'
           hint='extra data for mined blocks'
           value={ decodeExtraData(extraData) }
           onSubmit={ this.onExtraDataChange }
           defaultValue={ decodeExtraData(defaultExtraData) }
-          { ...this._test('extra-data') } />
+          allowCopy
+          floatCopy
+          { ...this._test('extra-data') }
+        />
+
         <Input
           label='minimal gas price'
           hint='the minimum gas price for mining'
           value={ toNiceNumber(minGasPrice) }
           onSubmit={ this.onMinGasPriceChange }
-          { ...this._test('min-gas-price') } />
+          allowCopy={ minGasPrice.toString() }
+          floatCopy
+          { ...this._test('min-gas-price') }
+        />
+
         <Input
           label='gas floor target'
           hint='the gas floor target for mining'
           value={ toNiceNumber(gasFloorTarget) }
           onSubmit={ this.onGasFloorTargetChange }
-          { ...this._test('gas-floor-target') } />
+          allowCopy={ gasFloorTarget.toString() }
+          floatCopy
+          { ...this._test('gas-floor-target') }
+        />
       </div>
     );
   }
@@ -72,7 +87,7 @@ export default class MiningSettings extends Component {
   onMinGasPriceChange = (newVal) => {
     const { api } = this.context;
 
-    api.ethcore.setMinGasPrice(numberFromString(newVal));
+    api.parity.setMinGasPrice(numberFromString(newVal));
   };
 
   onExtraDataChange = (newVal, isResetToDefault) => {
@@ -82,18 +97,18 @@ export default class MiningSettings extends Component {
     // In case of resetting to default we are just using raw bytes from defaultExtraData
     // When user sets new value we can safely send a string that will be converted to hex by formatter.
     const val = isResetToDefault ? nodeStatus.defaultExtraData : newVal;
-    api.ethcore.setExtraData(val);
+    api.parity.setExtraData(val);
   };
 
   onAuthorChange = (newVal) => {
     const { api } = this.context;
 
-    api.ethcore.setAuthor(newVal);
+    api.parity.setAuthor(newVal);
   };
 
   onGasFloorTargetChange = (newVal) => {
     const { api } = this.context;
 
-    api.ethcore.setGasFloorTarget(numberFromString(newVal));
+    api.parity.setGasFloorTarget(numberFromString(newVal));
   };
 }
diff --git a/js/src/views/Status/components/Status/Status.js b/js/src/views/Status/components/Status/Status.js
index 3304ee233..949efc85d 100644
--- a/js/src/views/Status/components/Status/Status.js
+++ b/js/src/views/Status/components/Status/Status.js
@@ -97,21 +97,21 @@ export default class Status extends Component {
       <div { ...this._test('settings') }>
         <ContainerTitle title='network settings' />
         <Input
-          disabled
+          readOnly
           label='chain'
           value={ nodeStatus.netChain }
           { ...this._test('chain') } />
         <div className={ styles.row }>
           <div className={ styles.col6 }>
             <Input
-              disabled
+              readOnly
               label='peers'
               value={ peers }
               { ...this._test('peers') } />
           </div>
           <div className={ styles.col6 }>
             <Input
-              disabled
+              readOnly
               label='network port'
               value={ nodeStatus.netPort.toString() }
               { ...this._test('network-port') } />
@@ -119,21 +119,21 @@ export default class Status extends Component {
         </div>
 
         <Input
-          disabled
+          readOnly
           label='rpc enabled'
           value={ rpcSettings.enabled ? 'yes' : 'no' }
           { ...this._test('rpc-enabled') } />
         <div className={ styles.row }>
           <div className={ styles.col6 }>
             <Input
-              disabled
+              readOnly
               label='rpc interface'
               value={ rpcSettings.interface }
               { ...this._test('rpc-interface') } />
           </div>
           <div className={ styles.col6 }>
             <Input
-              disabled
+              readOnly
               label='rpc port'
               value={ rpcSettings.port.toString() }
               { ...this._test('rpc-port') } />
diff --git a/js/src/views/Status/data/rpc.json b/js/src/views/Status/data/rpc.json
index 97c7e4055..ebb2800e8 100644
--- a/js/src/views/Status/data/rpc.json
+++ b/js/src/views/Status/data/rpc.json
@@ -926,6 +926,16 @@
       ],
       "outputFormatter": null
     },
+    {
+      "name": "ethcore_setMode",
+      "desc": "Changes current operating mode",
+      "params": [
+        "`DATA`- Mode name"
+      ],
+      "returns": "`Boolean` - whether the call was successful",
+      "inputFormatters": null,
+      "outputFormatter": null
+    },
     {
       "name": "ethcore_setMinGasPrice",
       "desc": "Changes minimal gas price for transaction to be accepted to the queue.",
@@ -1030,6 +1040,14 @@
       "inputFormatters": [],
       "outputFormatter": null
     },
+    {
+      "name": "ethcore_mode",
+      "desc": "Returns current mode",
+      "params": [],
+      "returns": "`DATA` - Mode",
+      "inputFormatters": [],
+      "outputFormatter": null
+    },
     {
       "name": "trace_filter",
       "desc": "Returns traces matching given filter",
diff --git a/js/src/views/index.js b/js/src/views/index.js
index c40219c49..b102d389a 100644
--- a/js/src/views/index.js
+++ b/js/src/views/index.js
@@ -24,7 +24,7 @@ import Contracts from './Contracts';
 import Dapp from './Dapp';
 import Dapps from './Dapps';
 import ParityBar from './ParityBar';
-import Settings, { SettingsBackground, SettingsProxy, SettingsViews } from './Settings';
+import Settings, { SettingsBackground, SettingsParity, SettingsProxy, SettingsViews } from './Settings';
 import Signer from './Signer';
 import Status from './Status';
 
@@ -41,6 +41,7 @@ export {
   ParityBar,
   Settings,
   SettingsBackground,
+  SettingsParity,
   SettingsProxy,
   SettingsViews,
   Signer,
diff --git a/js/webpack.config.js b/js/webpack.config.js
index 41da9aa25..a85fefa9f 100644
--- a/js/webpack.config.js
+++ b/js/webpack.config.js
@@ -41,10 +41,6 @@ module.exports = {
     'registry': ['./dapps/registry.js'],
     'signaturereg': ['./dapps/signaturereg.js'],
     'tokenreg': ['./dapps/tokenreg.js'],
-    // library
-    'inject': ['./web3.js'],
-    'web3': ['./web3.js'],
-    'parity': ['./parity.js'],
     // app
     'index': ['./index.js']
   },
diff --git a/json/src/spec/ethash.rs b/json/src/spec/ethash.rs
index 025ae8475..10f0c6293 100644
--- a/json/src/spec/ethash.rs
+++ b/json/src/spec/ethash.rs
@@ -70,6 +70,28 @@ pub struct EthashParams {
 	/// See main EthashParams docs.
 	#[serde(rename="eip150Transition")]
 	pub eip150_transition: Option<Uint>,
+
+	/// See main EthashParams docs.
+	#[serde(rename="eip155Transition")]
+	pub eip155_transition: Option<Uint>,
+
+	/// See main EthashParams docs.
+	#[serde(rename="eip160Transition")]
+	pub eip160_transition: Option<Uint>,
+
+	/// See main EthashParams docs.
+	#[serde(rename="eip161abcTransition")]
+	pub eip161abc_transition: Option<Uint>,
+	/// See main EthashParams docs.
+	#[serde(rename="eip161dTransition")]
+	pub eip161d_transition: Option<Uint>,
+
+	/// See main EthashParams docs.
+	#[serde(rename="ecip1010PauseTransition")]
+	pub ecip1010_pause_transition: Option<Uint>,
+	/// See main EthashParams docs.
+	#[serde(rename="ecip1010ContinueTransition")]
+	pub ecip1010_continue_transition: Option<Uint>,
 }
 
 /// Ethash engine deserialization.
@@ -122,7 +144,11 @@ mod tests {
 				"difficultyHardforkTransition": "0x59d9",
 				"difficultyHardforkBoundDivisor": "0x0200",
 				"bombDefuseTransition": "0x42",
-				"eip150Transition": "0x42"
+				"eip150Transition": "0x42",
+				"eip155Transition": "0x42",
+				"eip160Transition": "0x42",
+				"eip161abcTransition": "0x42",
+				"eip161dTransition": "0x42"
 			}
 		}"#;
 
diff --git a/json/src/spec/params.rs b/json/src/spec/params.rs
index ba81fb48a..aa634221d 100644
--- a/json/src/spec/params.rs
+++ b/json/src/spec/params.rs
@@ -28,15 +28,17 @@ pub struct Params {
 	/// Maximum size of extra data.
 	#[serde(rename="maximumExtraDataSize")]
 	pub maximum_extra_data_size: Uint,
+	/// Minimum gas limit.
+	#[serde(rename="minGasLimit")]
+	pub min_gas_limit: Uint,
+
 	/// Network id.
 	#[serde(rename="networkID")]
 	pub network_id: Uint,
 	/// Name of the main ("eth") subprotocol.
 	#[serde(rename="subprotocolName")]
 	pub subprotocol_name: Option<String>,
-	/// Minimum gas limit.
-	#[serde(rename="minGasLimit")]
-	pub min_gas_limit: Uint,
+
 	/// Option fork block number to check.
 	#[serde(rename="forkBlock")]
 	pub fork_block: Option<Uint>,
diff --git a/logger/Cargo.toml b/logger/Cargo.toml
index 61b7dfdc5..590eb0b2d 100644
--- a/logger/Cargo.toml
+++ b/logger/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
 name = "ethcore-logger"
-version = "1.4.0"
+version = "1.5.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
diff --git a/logger/src/lib.rs b/logger/src/lib.rs
index a79f6fc43..7e13f406c 100644
--- a/logger/src/lib.rs
+++ b/logger/src/lib.rs
@@ -36,7 +36,7 @@ use regex::Regex;
 use util::RotatingLogger;
 use util::log::Colour;
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub struct Config {
 	pub mode: Option<String>,
 	pub color: bool,
diff --git a/mac/Parity Ethereum.app/Contents/Info.plist b/mac/Parity Ethereum.app/Contents/Info.plist
new file mode 100644
index 000000000..8bb76f95c
--- /dev/null
+++ b/mac/Parity Ethereum.app/Contents/Info.plist	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"><dict><key>CFBundlePackageType</key><string>APPL</string><key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
+
+    <key>CFBundleName</key>                      <string>Parity Ethereum</string>
+    <key>CFBundleExecutable</key>                <string>go.sh</string>
+    <key>CFBundleIdentifier</key>                <string>io.parity.ethereum</string>
+
+    <key>CFBundleVersion</key>            <string>1.4.0</string>
+    <key>CFBundleGetInfoString</key>      <string>Parity 1.4.0</string>
+    <key>CFBundleShortVersionString</key> <string>1.4.0</string>
+
+</dict></plist>
diff --git a/mac/Parity Ethereum.app/Contents/MacOS/go.sh b/mac/Parity Ethereum.app/Contents/MacOS/go.sh
new file mode 100755
index 000000000..3392515c4
--- /dev/null
+++ b/mac/Parity Ethereum.app/Contents/MacOS/go.sh	
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+open http://127.0.0.1:8080/
diff --git a/mac/Parity.pkgproj b/mac/Parity.pkgproj
new file mode 100755
index 000000000..538b22710
--- /dev/null
+++ b/mac/Parity.pkgproj
@@ -0,0 +1,872 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PACKAGES</key>
+	<array>
+		<dict>
+			<key>PACKAGE_FILES</key>
+			<dict>
+				<key>DEFAULT_INSTALL_LOCATION</key>
+				<string>/</string>
+				<key>HIERARCHY</key>
+				<dict>
+					<key>CHILDREN</key>
+					<array>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Parity Ethereum.app</string>
+									<key>PATH_TYPE</key>
+									<integer>3</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>3</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Applications</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>509</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Application Support</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Automator</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Documentation</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Extensions</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Filesystems</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Frameworks</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Input Methods</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Internet Plug-Ins</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchAgents</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>LaunchDaemons</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PreferencePanes</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Preferences</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>80</integer>
+									<key>PATH</key>
+									<string>Printers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>PrivilegedHelperTools</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickLook</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>QuickTime</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Screen Savers</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Scripts</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Services</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Widgets</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>Library</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array/>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>Shared</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>1023</integer>
+									<key>TYPE</key>
+									<integer>1</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>80</integer>
+							<key>PATH</key>
+							<string>Users</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>1</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>CHILDREN</key>
+							<array>
+								<dict>
+									<key>CHILDREN</key>
+									<array>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>../target/release/deps/ethstore</string>
+													<key>PATH_TYPE</key>
+													<integer>3</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>bin</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+										<dict>
+											<key>CHILDREN</key>
+											<array>
+												<dict>
+													<key>CHILDREN</key>
+													<array/>
+													<key>GID</key>
+													<integer>0</integer>
+													<key>PATH</key>
+													<string>../target/release/parity</string>
+													<key>PATH_TYPE</key>
+													<integer>3</integer>
+													<key>PERMISSIONS</key>
+													<integer>493</integer>
+													<key>TYPE</key>
+													<integer>3</integer>
+													<key>UID</key>
+													<integer>0</integer>
+												</dict>
+											</array>
+											<key>GID</key>
+											<integer>0</integer>
+											<key>PATH</key>
+											<string>libexec</string>
+											<key>PATH_TYPE</key>
+											<integer>0</integer>
+											<key>PERMISSIONS</key>
+											<integer>493</integer>
+											<key>TYPE</key>
+											<integer>2</integer>
+											<key>UID</key>
+											<integer>0</integer>
+										</dict>
+									</array>
+									<key>GID</key>
+									<integer>0</integer>
+									<key>PATH</key>
+									<string>local</string>
+									<key>PATH_TYPE</key>
+									<integer>0</integer>
+									<key>PERMISSIONS</key>
+									<integer>493</integer>
+									<key>TYPE</key>
+									<integer>2</integer>
+									<key>UID</key>
+									<integer>0</integer>
+								</dict>
+							</array>
+							<key>GID</key>
+							<integer>0</integer>
+							<key>PATH</key>
+							<string>usr</string>
+							<key>PATH_TYPE</key>
+							<integer>0</integer>
+							<key>PERMISSIONS</key>
+							<integer>493</integer>
+							<key>TYPE</key>
+							<integer>2</integer>
+							<key>UID</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>/</string>
+					<key>PATH_TYPE</key>
+					<integer>0</integer>
+					<key>PERMISSIONS</key>
+					<integer>493</integer>
+					<key>TYPE</key>
+					<integer>1</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+				<key>PAYLOAD_TYPE</key>
+				<integer>0</integer>
+				<key>SPLIT_FORKS</key>
+				<true/>
+				<key>VERSION</key>
+				<integer>4</integer>
+			</dict>
+			<key>PACKAGE_SCRIPTS</key>
+			<dict>
+				<key>POSTINSTALL_PATH</key>
+				<dict>
+					<key>PATH</key>
+					<string>post-install.sh</string>
+					<key>PATH_TYPE</key>
+					<integer>3</integer>
+				</dict>
+				<key>RESOURCES</key>
+				<array/>
+			</dict>
+			<key>PACKAGE_SETTINGS</key>
+			<dict>
+				<key>AUTHENTICATION</key>
+				<true/>
+				<key>CONCLUSION_ACTION</key>
+				<integer>0</integer>
+				<key>IDENTIFIER</key>
+				<string>io.parity.pkg.parity-ethereum</string>
+				<key>NAME</key>
+				<string>Parity</string>
+				<key>OVERWRITE_PERMISSIONS</key>
+				<false/>
+				<key>VERSION</key>
+				<string>1.4</string>
+			</dict>
+			<key>UUID</key>
+			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
+		</dict>
+	</array>
+	<key>PROJECT</key>
+	<dict>
+		<key>PROJECT_COMMENTS</key>
+		<dict>
+			<key>NOTES</key>
+			<data>
+			PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M
+			IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv
+			c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l
+			cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7
+			IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250
+			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
+			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
+			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
+			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE0MDQuNDciPgo8c3R5bGUg
+			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
+			Pgo8L2JvZHk+CjwvaHRtbD4K
+			</data>
+		</dict>
+		<key>PROJECT_PRESENTATION</key>
+		<dict>
+			<key>INSTALLATION_STEPS</key>
+			<array>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewIntroductionController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>Introduction</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewReadMeController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>ReadMe</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewLicenseController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>License</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewDestinationSelectController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>TargetSelect</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewInstallationTypeController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>PackageSelection</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewInstallationController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>Install</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+				<dict>
+					<key>ICPRESENTATION_CHAPTER_VIEW_CONTROLLER_CLASS</key>
+					<string>ICPresentationViewSummaryController</string>
+					<key>INSTALLER_PLUGIN</key>
+					<string>Summary</string>
+					<key>LIST_TITLE_KEY</key>
+					<string>InstallerSectionTitle</string>
+				</dict>
+			</array>
+			<key>INTRODUCTION</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array/>
+			</dict>
+			<key>TITLE</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>English</string>
+						<key>VALUE</key>
+						<string>Parity</string>
+					</dict>
+				</array>
+			</dict>
+		</dict>
+		<key>PROJECT_REQUIREMENTS</key>
+		<dict>
+			<key>LIST</key>
+			<array/>
+			<key>POSTINSTALL_PATH</key>
+			<dict/>
+			<key>PREINSTALL_PATH</key>
+			<dict/>
+			<key>RESOURCES</key>
+			<array/>
+			<key>ROOT_VOLUME_ONLY</key>
+			<false/>
+		</dict>
+		<key>PROJECT_SETTINGS</key>
+		<dict>
+			<key>ADVANCED_OPTIONS</key>
+			<dict/>
+			<key>BUILD_FORMAT</key>
+			<integer>0</integer>
+			<key>BUILD_PATH</key>
+			<dict>
+				<key>PATH</key>
+				<string>../target/release</string>
+				<key>PATH_TYPE</key>
+				<integer>1</integer>
+			</dict>
+			<key>EXCLUDED_FILES</key>
+			<array>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.DS_Store</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove .DS_Store files</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove ".DS_Store" files created by the Finder.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.pbdevelopment</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove .pbdevelopment files</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove ".pbdevelopment" files created by ProjectBuilder or Xcode.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>CVS</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.cvsignore</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.cvspass</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.svn</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.git</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>.gitignore</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove SCM metadata</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove helper files and folders used by the CVS, SVN or Git Source Code Management systems.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>classes.nib</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>designable.db</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>info.nib</string>
+							<key>TYPE</key>
+							<integer>0</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Optimize nib files</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>PATTERNS_ARRAY</key>
+					<array>
+						<dict>
+							<key>REGULAR_EXPRESSION</key>
+							<false/>
+							<key>STRING</key>
+							<string>Resources Disabled</string>
+							<key>TYPE</key>
+							<integer>1</integer>
+						</dict>
+					</array>
+					<key>PROTECTED</key>
+					<true/>
+					<key>PROXY_NAME</key>
+					<string>Remove Resources Disabled folders</string>
+					<key>PROXY_TOOLTIP</key>
+					<string>Remove "Resources Disabled" folders.</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>SEPARATOR</key>
+					<true/>
+				</dict>
+			</array>
+			<key>NAME</key>
+			<string>Parity Ethereum</string>
+		</dict>
+	</dict>
+	<key>TYPE</key>
+	<integer>0</integer>
+	<key>VERSION</key>
+	<integer>2</integer>
+</dict>
+</plist>
diff --git a/mac/post-install.sh b/mac/post-install.sh
new file mode 100755
index 000000000..62e011054
--- /dev/null
+++ b/mac/post-install.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+mkdir -p $HOME/Library/LaunchAgents
+cat > $HOME/Library/LaunchAgents/io.parity.ethereum.plist <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>io.parity.ethereum</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>/usr/local/libexec/parity</string>
+        <string>--warp</string>
+    </array>
+    <key>KeepAlive</key>
+    <true/>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>StandardOutPath</key>
+    <string>$HOME/.parity/log.out</string>
+    <key>StandardErrorPath</key>
+    <string>$HOME/.parity/log.err</string>
+</dict>
+</plist>
+EOF
+
+mkdir -p $HOME/.parity/906a34e69aec8c0d
+echo -n '{"fat_db":false,"mode":"passive","pruning":"fast","tracing":false}' > $HOME/.parity/906a34e69aec8c0d/user_defaults
+
+chown -R $USER $HOME/.parity $HOME/Library/LaunchAgents $HOME/Library/LaunchAgents/io.parity.ethereum.plist
+
+su $USER -c "launchctl load $HOME/Library/LaunchAgents/io.parity.ethereum.plist"
+sleep 1
+
+open http://127.0.0.1:8080/
+
diff --git a/nsis/installer.nsi b/nsis/installer.nsi
index 2c7c37428..889c8bc81 100644
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -1,10 +1,18 @@
+!include WinMessages.nsh
 
+!define WND_CLASS "Parity"
+!define WND_TITLE "Parity"
+!define WAIT_MS 5000
+!define SYNC_TERM 0x00100001
+  
 !define APPNAME "Parity"
 !define COMPANYNAME "Ethcore"
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
-!define VERSIONMINOR 4
+!define VERSIONMINOR 5
 !define VERSIONBUILD 0
+!define ARGS "--warp"
+!define FIRST_START_ARGS "--warp --mode=passive"
 
 !addplugindir .\
 
@@ -13,6 +21,10 @@
 !define ABOUTURL "https://github.com/ethcore/parity" # "Publisher" link
 !define INSTALLSIZE 26120
 
+!define termMsg "Installer cannot stop running ${WND_TITLE}.$\nDo you want to terminate process?"
+!define stopMsg "Stopping ${WND_TITLE} Application"
+
+
 RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on)
 
 InstallDir "$PROGRAMFILES64\${COMPANYNAME}\${APPNAME}"
@@ -26,7 +38,7 @@ outFile "installer.exe"
 
 page license
 page directory
-Page instfiles
+page instfiles
 
 !macro VerifyUserIsAdmin
 UserInfo::GetAccountType
@@ -38,6 +50,31 @@ ${If} $0 != "admin" ;Require admin rights on NT4+
 ${EndIf}
 !macroend
 
+!macro TerminateApp
+    Push $0 ; window handle
+    Push $1
+    Push $2 ; process handle
+    DetailPrint "$(stopMsg)"
+    FindWindow $0 '${WND_CLASS}' ''
+    IntCmp $0 0 done
+    System::Call 'user32.dll::GetWindowThreadProcessId(i r0, *i .r1) i .r2'
+    System::Call 'kernel32.dll::OpenProcess(i ${SYNC_TERM}, i 0, i r1) i .r2'
+    SendMessage $0 ${WM_CLOSE} 0 0 /TIMEOUT=${TO_MS}
+    System::Call 'kernel32.dll::WaitForSingleObject(i r2, i ${WAIT_MS}) i .r1'
+    IntCmp $1 0 close
+    MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION "$(termMsg)" /SD IDYES IDYES terminate IDNO close
+    System::Call 'kernel32.dll::CloseHandle(i r2) i .r1'
+    Quit
+  terminate:
+    System::Call 'kernel32.dll::TerminateProcess(i r2, i 0) i .r1'
+  close:
+    System::Call 'kernel32.dll::CloseHandle(i r2) i .r1'
+  done:
+    Pop $2
+    Pop $1
+    Pop $0
+!macroend
+
 function .onInit
 	setShellVarContext all
 	!insertmacro VerifyUserIsAdmin
@@ -48,10 +85,13 @@ section "install"
 	setOutPath $INSTDIR
 	# Files added here should be removed by the uninstaller (see section "uninstall")
 	file /oname=parity.exe ..\target\release\parity.exe
+	file /oname=ptray.exe ..\windows\ptray\x64\Release\ptray.exe
+	
 	file "logo.ico"
 	file vc_redist.x64.exe
 
 	ExecWait '"$INSTDIR\vc_redist.x64.exe"  /passive /norestart'
+	delete $INSTDIR\vc_redist.x64.exe
 	# Add any other files for the install directory (license files, app data, etc) here
 
 	# Uninstaller - See function un.onInit and section "uninstall" for configuration
@@ -59,7 +99,8 @@ section "install"
 
 	# Start Menu
 	createDirectory "$SMPROGRAMS\${COMPANYNAME}"
-	createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\parity.exe" "ui" "$INSTDIR\logo.ico"
+	createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME} Ethereum.lnk" "$INSTDIR\ptray.exe" "ui" "$INSTDIR\logo.ico"
+	createShortCut "$DESKTOP\${APPNAME} Ethereum.lnk" "$INSTDIR\ptray.exe" "ui" "$INSTDIR\logo.ico"
 
 	# Firewall remove rules if exists
 	SimpleFC::AdvRemoveRule "Parity incoming peers (TCP:30303)"
@@ -79,11 +120,11 @@ section "install"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayIcon" "$\"$INSTDIR\logo.ico$\""
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "Publisher" "$\"${COMPANYNAME}$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "Publisher" "${COMPANYNAME}"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "HelpLink" "$\"${HELPURL}$\""
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "URLUpdateInfo" "$\"${UPDATEURL}$\""
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "URLInfoAbout" "$\"${ABOUTURL}$\""
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayVersion" "$\"${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}$\""
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "DisplayVersion" "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "VersionMajor" ${VERSIONMAJOR}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "VersionMinor" ${VERSIONMINOR}
 	# There is no option for modifying or repairing the install
@@ -91,6 +132,9 @@ section "install"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "NoRepair" 1
 	# Set the INSTALLSIZE constant (!defined at the top of this script) so Add/Remove Programs can accurately report the size
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" "EstimatedSize" ${INSTALLSIZE}
+
+	WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Run" ${APPNAME} "$INSTDIR\ptray.exe ${ARGS}"
+	ExecShell "" "$INSTDIR\ptray.exe" "${FIRST_START_ARGS}"
 sectionEnd
 
 # Uninstaller
@@ -107,7 +151,7 @@ function un.onInit
 functionEnd
 
 section "uninstall"
-
+	!insertmacro TerminateApp
 	# Remove Start Menu launcher
 	delete "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk"
 	# Try to remove the Start Menu folder - this will only happen if it is empty
@@ -115,6 +159,7 @@ section "uninstall"
 
 	# Remove files
 	delete $INSTDIR\parity.exe
+	delete $INSTDIR\ptray.exe
 	delete $INSTDIR\logo.ico
 
 	# Always delete uninstaller as the last action
@@ -131,5 +176,6 @@ section "uninstall"
 
 	# Remove uninstaller information from the registry
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}"
-
+	DeleteRegValue HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "${APPNAME}"
 sectionEnd
+
diff --git a/nsis/logo.ico b/nsis/logo.ico
index 4fbaa4d39..61e68b90b 100644
Binary files a/nsis/logo.ico and b/nsis/logo.ico differ
diff --git a/parity/blockchain.rs b/parity/blockchain.rs
index 2e0fb4233..9575b293a 100644
--- a/parity/blockchain.rs
+++ b/parity/blockchain.rs
@@ -21,7 +21,6 @@ use std::time::{Instant, Duration};
 use std::thread::sleep;
 use std::sync::Arc;
 use rustc_serialize::hex::FromHex;
-use ethcore_logger::{setup_log, Config as LogConfig};
 use io::{PanicHandler, ForwardPanic};
 use util::{ToPretty, Uint};
 use rlp::PayloadInfo;
@@ -71,7 +70,6 @@ pub enum BlockchainCmd {
 #[derive(Debug, PartialEq)]
 pub struct ImportBlockchain {
 	pub spec: SpecType,
-	pub logger_config: LogConfig,
 	pub cache_config: CacheConfig,
 	pub dirs: Directories,
 	pub file_path: Option<String>,
@@ -80,17 +78,16 @@ pub struct ImportBlockchain {
 	pub pruning_history: u64,
 	pub compaction: DatabaseCompactionProfile,
 	pub wal: bool,
-	pub mode: Mode,
 	pub tracing: Switch,
 	pub fat_db: Switch,
 	pub vm_type: VMType,
 	pub check_seal: bool,
+	pub with_color: bool,
 }
 
 #[derive(Debug, PartialEq)]
 pub struct ExportBlockchain {
 	pub spec: SpecType,
-	pub logger_config: LogConfig,
 	pub cache_config: CacheConfig,
 	pub dirs: Directories,
 	pub file_path: Option<String>,
@@ -99,7 +96,6 @@ pub struct ExportBlockchain {
 	pub pruning_history: u64,
 	pub compaction: DatabaseCompactionProfile,
 	pub wal: bool,
-	pub mode: Mode,
 	pub fat_db: Switch,
 	pub tracing: Switch,
 	pub from_block: BlockID,
@@ -120,9 +116,6 @@ fn execute_import(cmd: ImportBlockchain) -> Result<String, String> {
 	// Setup panic handler
 	let panic_handler = PanicHandler::new_in_arc();
 
-	// Setup logging
-	let _logger = setup_log(&cmd.logger_config);
-
 	// create dirs used by parity
 	try!(cmd.dirs.create_dirs());
 
@@ -160,7 +153,7 @@ fn execute_import(cmd: ImportBlockchain) -> Result<String, String> {
 	try!(execute_upgrades(&db_dirs, algorithm, cmd.compaction.compaction_profile(db_dirs.fork_path().as_path())));
 
 	// prepare client config
-	let client_config = to_client_config(&cmd.cache_config, cmd.mode, tracing, fat_db, cmd.compaction, cmd.wal, cmd.vm_type,  "".into(), algorithm, cmd.pruning_history, cmd.check_seal);
+	let client_config = to_client_config(&cmd.cache_config, Mode::Active, tracing, fat_db, cmd.compaction, cmd.wal, cmd.vm_type,  "".into(), algorithm, cmd.pruning_history, cmd.check_seal);
 
 	// build client
 	let service = try!(ClientService::start(
@@ -196,7 +189,7 @@ fn execute_import(cmd: ImportBlockchain) -> Result<String, String> {
 		}
 	};
 
-	let informant = Informant::new(client.clone(), None, None, None, cmd.logger_config.color);
+	let informant = Informant::new(client.clone(), None, None, None, cmd.with_color);
 
 	try!(service.register_io_handler(Arc::new(ImportIoHandler {
 		info: Arc::new(informant),
@@ -269,9 +262,6 @@ fn execute_export(cmd: ExportBlockchain) -> Result<String, String> {
 	// Setup panic handler
 	let panic_handler = PanicHandler::new_in_arc();
 
-	// Setup logging
-	let _logger = setup_log(&cmd.logger_config);
-
 	// create dirs used by parity
 	try!(cmd.dirs.create_dirs());
 
@@ -311,7 +301,7 @@ fn execute_export(cmd: ExportBlockchain) -> Result<String, String> {
 	try!(execute_upgrades(&db_dirs, algorithm, cmd.compaction.compaction_profile(db_dirs.fork_path().as_path())));
 
 	// prepare client config
-	let client_config = to_client_config(&cmd.cache_config, cmd.mode, tracing, fat_db, cmd.compaction, cmd.wal, VMType::default(), "".into(), algorithm, cmd.pruning_history, cmd.check_seal);
+	let client_config = to_client_config(&cmd.cache_config, Mode::Active, tracing, fat_db, cmd.compaction, cmd.wal, VMType::default(), "".into(), algorithm, cmd.pruning_history, cmd.check_seal);
 
 	let service = try!(ClientService::start(
 		client_config,
diff --git a/parity/cli/config.full.toml b/parity/cli/config.full.toml
index 84e44ee77..841cf5f24 100644
--- a/parity/cli/config.full.toml
+++ b/parity/cli/config.full.toml
@@ -1,5 +1,5 @@
 [parity]
-mode = "active"
+mode = "last"
 mode_timeout = 300
 mode_alarm = 3600
 chain = "homestead"
@@ -12,7 +12,7 @@ unlock = ["0xdeadbeefcafe0000000000000000000000000000"]
 password = ["~/.safe/password.file"]
 keys_iterations = 10240
 
-[signer]
+[ui]
 force = false
 disable = false
 port = 8180
@@ -25,7 +25,7 @@ port = 30303
 min_peers = 25
 max_peers = 50
 nat = "any"
-id = "0x1"
+id = 1
 bootnodes = []
 discovery = true
 warp = true
@@ -41,13 +41,13 @@ disable = false
 port = 8545
 interface = "local"
 cors = "null"
-apis = ["web3", "eth", "net", "ethcore", "traces", "rpc", "personal_safe"]
+apis = ["web3", "eth", "net", "parity", "traces", "rpc"]
 hosts = ["none"]
 
 [ipc]
 disable = false
 path = "$HOME/.parity/jsonrpc.ipc"
-apis = ["web3", "eth", "net", "ethcore", "traces", "rpc", "personal_safe"]
+apis = ["web3", "eth", "net", "parity", "parity_accounts", "personal", "traces", "rpc"]
 
 [dapps]
 disable = false
diff --git a/parity/cli/config.toml b/parity/cli/config.toml
index e6f01e1ae..c9bd563a8 100644
--- a/parity/cli/config.toml
+++ b/parity/cli/config.toml
@@ -8,7 +8,7 @@ chain = "./chain.json"
 unlock = ["0x1", "0x2", "0x3"]
 password = ["passwdfile path"]
 
-[signer]
+[ui]
 disable = true
 
 [network]
diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs
index d13d791ad..3ad6259b8 100644
--- a/parity/cli/mod.rs
+++ b/parity/cli/mod.rs
@@ -46,7 +46,7 @@ usage! {
 		flag_testnet: bool,
 		flag_import_geth_keys: bool,
 		flag_datadir: Option<String>,
-		flag_networkid: Option<String>,
+		flag_networkid: Option<usize>,
 		flag_peers: Option<u16>,
 		flag_nodekey: Option<String>,
 		flag_nodiscover: bool,
@@ -74,7 +74,7 @@ usage! {
 	}
 	{
 		// -- Operating Options
-		flag_mode: String = "active", or |c: &Config| otry!(c.parity).mode.clone(),
+		flag_mode: String = "last", or |c: &Config| otry!(c.parity).mode.clone(),
 		flag_mode_timeout: u64 = 300u64, or |c: &Config| otry!(c.parity).mode_timeout.clone(),
 		flag_mode_alarm: u64 = 3600u64, or |c: &Config| otry!(c.parity).mode_alarm.clone(),
 		flag_chain: String = "homestead", or |c: &Config| otry!(c.parity).chain.clone(),
@@ -90,22 +90,20 @@ usage! {
 		flag_keys_iterations: u32 = 10240u32,
 			or |c: &Config| otry!(c.account).keys_iterations.clone(),
 
-		flag_force_signer: bool = false,
-			or |c: &Config| otry!(c.signer).force.clone(),
-		flag_no_signer: bool = false,
-			or |c: &Config| otry!(c.signer).disable.clone(),
-		flag_signer_port: u16 = 8180u16,
-			or |c: &Config| otry!(c.signer).port.clone(),
-		flag_signer_interface: String = "local",
-			or |c: &Config| otry!(c.signer).interface.clone(),
-		flag_signer_path: String = "$HOME/.parity/signer",
-			or |c: &Config| otry!(c.signer).path.clone(),
+		flag_force_ui: bool = false,
+			or |c: &Config| otry!(c.ui).force.clone(),
+		flag_no_ui: bool = false,
+			or |c: &Config| otry!(c.ui).disable.clone(),
+		flag_ui_port: u16 = 8180u16,
+			or |c: &Config| otry!(c.ui).port.clone(),
+		flag_ui_interface: String = "local",
+			or |c: &Config| otry!(c.ui).interface.clone(),
+		flag_ui_path: String = "$HOME/.parity/signer",
+			or |c: &Config| otry!(c.ui).path.clone(),
 		// NOTE [todr] For security reasons don't put this to config files
-		flag_signer_no_validation: bool = false, or |_| None,
+		flag_ui_no_validation: bool = false, or |_| None,
 
 		// -- Networking Options
-		flag_no_network: bool = false,
-			or |c: &Config| otry!(c.network).disable.clone(),
 		flag_warp: bool = false,
 			or |c: &Config| otry!(c.network).warp.clone(),
 		flag_port: u16 = 30303u16,
@@ -122,7 +120,7 @@ usage! {
 			or |c: &Config| otry!(c.network).nat.clone(),
 		flag_allow_ips: String = "all",
 			or |c: &Config| otry!(c.network).allow_ips.clone(),
-		flag_network_id: Option<String> = None,
+		flag_network_id: Option<usize> = None,
 			or |c: &Config| otry!(c.network).id.clone().map(Some),
 		flag_bootnodes: Option<String> = None,
 			or |c: &Config| otry!(c.network).bootnodes.clone().map(|vec| Some(vec.join(","))),
@@ -145,7 +143,7 @@ usage! {
 			or |c: &Config| otry!(c.rpc).interface.clone(),
 		flag_jsonrpc_cors: Option<String> = None,
 			or |c: &Config| otry!(c.rpc).cors.clone().map(Some),
-		flag_jsonrpc_apis: String = "web3,eth,net,ethcore,traces,rpc,personal_safe",
+		flag_jsonrpc_apis: String = "web3,eth,net,parity,traces,rpc",
 			or |c: &Config| otry!(c.rpc).apis.clone().map(|vec| vec.join(",")),
 		flag_jsonrpc_hosts: String = "none",
 			or |c: &Config| otry!(c.rpc).hosts.clone().map(|vec| vec.join(",")),
@@ -155,7 +153,7 @@ usage! {
 			or |c: &Config| otry!(c.ipc).disable.clone(),
 		flag_ipc_path: String = "$HOME/.parity/jsonrpc.ipc",
 			or |c: &Config| otry!(c.ipc).path.clone(),
-		flag_ipc_apis: String = "web3,eth,net,ethcore,traces,rpc,personal_safe",
+		flag_ipc_apis: String = "web3,eth,net,parity,parity_accounts,traces,rpc",
 			or |c: &Config| otry!(c.ipc).apis.clone().map(|vec| vec.join(",")),
 
 		// DAPPS
@@ -273,7 +271,7 @@ usage! {
 struct Config {
 	parity: Option<Operating>,
 	account: Option<Account>,
-	signer: Option<Signer>,
+	ui: Option<Ui>,
 	network: Option<Network>,
 	rpc: Option<Rpc>,
 	ipc: Option<Ipc>,
@@ -304,7 +302,7 @@ struct Account {
 }
 
 #[derive(Default, Debug, PartialEq, RustcDecodable)]
-struct Signer {
+struct Ui {
 	force: Option<bool>,
 	disable: Option<bool>,
 	port: Option<u16>,
@@ -323,7 +321,7 @@ struct Network {
 	max_pending_peers: Option<u16>,
 	nat: Option<String>,
 	allow_ips: Option<String>,
-	id: Option<String>,
+	id: Option<usize>,
 	bootnodes: Option<Vec<String>>,
 	discovery: Option<bool>,
 	node_key: Option<String>,
@@ -420,7 +418,7 @@ struct Misc {
 mod tests {
 	use super::{
 		Args, ArgsError,
-		Config, Operating, Account, Signer, Network, Rpc, Ipc, Dapps, Mining, Footprint, Snapshots, VM, Misc
+		Config, Operating, Account, Ui, Network, Rpc, Ipc, Dapps, Mining, Footprint, Snapshots, VM, Misc
 	};
 	use toml;
 
@@ -500,7 +498,7 @@ mod tests {
 			arg_path: vec![],
 
 			// -- Operating Options
-			flag_mode: "active".into(),
+			flag_mode: "last".into(),
 			flag_mode_timeout: 300u64,
 			flag_mode_alarm: 3600u64,
 			flag_chain: "xyz".into(),
@@ -513,15 +511,14 @@ mod tests {
 			flag_password: vec!["~/.safe/password.file".into()],
 			flag_keys_iterations: 10240u32,
 
-			flag_force_signer: false,
-			flag_no_signer: false,
-			flag_signer_port: 8180u16,
-			flag_signer_interface: "127.0.0.1".into(),
-			flag_signer_path: "$HOME/.parity/signer".into(),
-			flag_signer_no_validation: false,
+			flag_force_ui: false,
+			flag_no_ui: false,
+			flag_ui_port: 8180u16,
+			flag_ui_interface: "127.0.0.1".into(),
+			flag_ui_path: "$HOME/.parity/signer".into(),
+			flag_ui_no_validation: false,
 
 			// -- Networking Options
-			flag_no_network: false,
 			flag_warp: true,
 			flag_port: 30303u16,
 			flag_min_peers: 25u16,
@@ -530,7 +527,7 @@ mod tests {
 			flag_snapshot_peers: 0u16,
 			flag_allow_ips: "all".into(),
 			flag_nat: "any".into(),
-			flag_network_id: Some("0x1".into()),
+			flag_network_id: Some(1),
 			flag_bootnodes: Some("".into()),
 			flag_no_discovery: false,
 			flag_node_key: None,
@@ -543,13 +540,13 @@ mod tests {
 			flag_jsonrpc_port: 8545u16,
 			flag_jsonrpc_interface: "local".into(),
 			flag_jsonrpc_cors: Some("null".into()),
-			flag_jsonrpc_apis: "web3,eth,net,ethcore,traces,rpc,personal_safe".into(),
+			flag_jsonrpc_apis: "web3,eth,net,parity,traces,rpc".into(),
 			flag_jsonrpc_hosts: "none".into(),
 
 			// IPC
 			flag_no_ipc: false,
 			flag_ipc_path: "$HOME/.parity/jsonrpc.ipc".into(),
-			flag_ipc_apis: "web3,eth,net,ethcore,traces,rpc,personal_safe".into(),
+			flag_ipc_apis: "web3,eth,net,parity,parity_accounts,personal,traces,rpc".into(),
 
 			// DAPPS
 			flag_no_dapps: false,
@@ -678,7 +675,7 @@ mod tests {
 				password: Some(vec!["passwdfile path".into()]),
 				keys_iterations: None,
 			}),
-			signer: Some(Signer {
+			ui: Some(Ui {
 				force: None,
 				disable: Some(true),
 				port: None,
diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt
index bf7e82561..ba27c4902 100644
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@@ -18,11 +18,12 @@ Usage:
 
 Operating Options:
   --mode MODE              Set the operating mode. MODE can be one of:
+                           last - Uses the last-used mode, active if none.
                            active - Parity continuously syncs the chain.
                            passive - Parity syncs initially, then sleeps and
                            wakes regularly to resync.
-                           dark - Parity syncs only when an external interface
-                           is active. (default: {flag_mode}).
+                           dark - Parity syncs only when the RPC is active.
+                           offline - Parity doesn't sync. (default: {flag_mode}).
   --mode-timeout SECS      Specify the number of seconds before inactivity
                            timeout occurs when mode is dark or passive
                            (default: {flag_mode_timeout}).
@@ -42,31 +43,31 @@ Operating Options:
 Account Options:
   --unlock ACCOUNTS        Unlock ACCOUNTS for the duration of the execution.
                            ACCOUNTS is a comma-delimited list of addresses.
-                           Implies --no-signer. (default: {flag_unlock:?})
+                           Implies --no-ui. (default: {flag_unlock:?})
   --password FILE          Provide a file containing a password for unlocking
                            an account. Leading and trailing whitespace is trimmed.
                            (default: {flag_password:?})
   --keys-iterations NUM    Specify the number of iterations to use when
                            deriving key from the password (bigger is more
                            secure) (default: {flag_keys_iterations}).
-  --force-signer           Enable Trusted Signer WebSocket endpoint used by
-                           Signer UIs, even when --unlock is in use.
-                           (default: ${flag_force_signer})
-  --no-signer              Disable Trusted Signer WebSocket endpoint used by
-                           Signer UIs. (default: ${flag_no_signer})
-  --signer-port PORT       Specify the port of Trusted Signer server
-                           (default: {flag_signer_port}).
-  --signer-interface IP    Specify the hostname portion of the Trusted Signer
+
+UI Options:
+  --force-ui               Enable Trusted UI WebSocket endpoint,
+                           even when --unlock is in use. (default: ${flag_force_ui})
+  --no-ui                  Disable Trusted UI WebSocket endpoint.
+                           (default: ${flag_no_ui})
+  --ui-port PORT           Specify the port of Trusted UI server
+                           (default: {flag_ui_port}).
+  --ui-interface IP        Specify the hostname portion of the Trusted UI
                            server, IP should be an interface's IP address,
-                           or local (default: {flag_signer_interface}).
-  --signer-path PATH       Specify directory where Signer UIs tokens should
-                           be stored. (default: {flag_signer_path})
-  --signer-no-validation   Disable Origin and Host headers validation for
-                           Trusted Signer. WARNING: INSECURE. Used only for
-                           development. (default: {flag_signer_no_validation})
+                           or local (default: {flag_ui_interface}).
+  --ui-path PATH           Specify directory where Trusted UIs tokens should
+                           be stored. (default: {flag_ui_path})
+  --ui-no-validation       Disable Origin and Host headers validation for
+                           Trusted UI. WARNING: INSECURE. Used only for
+                           development. (default: {flag_ui_no_validation})
 
 Networking Options:
-  --no-network             Disable p2p networking. (default: {flag_no_network})
   --warp                   Enable syncing from the snapshot over the network. (default: {flag_warp})
   --port PORT              Override the port on which the node should listen
                            (default: {flag_port}).
@@ -107,7 +108,7 @@ API and Console Options:
   --jsonrpc-apis APIS      Specify the APIs available through the JSONRPC
                            interface. APIS is a comma-delimited list of API
                            name. Possible name are web3, eth, net, personal,
-                           ethcore, ethcore_set, traces, rpc, personal_safe.
+                           parity, parity_set, traces, rpc, parity_accounts.
                            (default: {flag_jsonrpc_apis}).
   --jsonrpc-hosts HOSTS    List of allowed Host header values. This option will
                            validate the Host header sent by the browser, it
@@ -284,7 +285,7 @@ Legacy Options:
   --geth                   Run in Geth-compatibility mode. Sets the IPC path
                            to be the same as Geth's. Overrides the --ipc-path
                            and --ipcpath options. Alters RPCs to reflect Geth
-                           bugs.
+                           bugs. Includes the personal_ RPC by default.
   --testnet                Geth-compatible testnet mode. Equivalent to --chain
                            testnet --keys-path $HOME/parity/testnet-keys.
                            Overrides the --keys-path option.
diff --git a/parity/cli/version.txt b/parity/cli/version.txt
index acb7cd9e6..259efe941 100644
--- a/parity/cli/version.txt
+++ b/parity/cli/version.txt
@@ -5,5 +5,6 @@ License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.
 
-By Wood/Paronyan/Kotewicz/Drwięga/Volf.
+By Wood/Paronyan/Kotewicz/Drwięga/Volf
+   Habermeier/Czaban/Greeff/Gotchac/Redmann
 
diff --git a/parity/configuration.rs b/parity/configuration.rs
index 1972b9f1e..aff868ce2 100644
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -23,7 +23,7 @@ use cli::{Args, ArgsError};
 use util::{Hashable, U256, Uint, Bytes, version_data, Secret, Address};
 use util::log::Colour;
 use ethsync::{NetworkConfiguration, is_valid_node_url, AllowIP};
-use ethcore::client::{VMType, Mode};
+use ethcore::client::VMType;
 use ethcore::miner::{MinerOptions, Banning};
 
 use rpc::{IpcConfiguration, HttpConfiguration};
@@ -35,7 +35,7 @@ use params::{ResealPolicy, AccountsConfig, GasPricerConfig, MinerExtras};
 use ethcore_logger::Config as LogConfig;
 use dir::Directories;
 use dapps::Configuration as DappsConfiguration;
-use signer::Configuration as SignerConfiguration;
+use signer::{Configuration as SignerConfiguration, SignerCommand};
 use run::RunCmd;
 use blockchain::{BlockchainCmd, ImportBlockchain, ExportBlockchain, DataFormat};
 use presale::ImportWallet;
@@ -49,11 +49,16 @@ pub enum Cmd {
 	Account(AccountCmd),
 	ImportPresaleWallet(ImportWallet),
 	Blockchain(BlockchainCmd),
-	SignerToken(String),
+	SignerToken(SignerCommand),
 	Snapshot(SnapshotCommand),
 	Hash(Option<String>),
 }
 
+pub struct Execute {
+	pub logger: LogConfig,
+	pub cmd: Cmd,
+}
+
 #[derive(Debug, PartialEq)]
 pub struct Configuration {
 	pub args: Args,
@@ -70,28 +75,27 @@ impl Configuration {
 		Ok(config)
 	}
 
-	pub fn into_command(self) -> Result<Cmd, String> {
+	pub fn into_command(self) -> Result<Execute, String> {
 		let dirs = self.directories();
 		let pruning = try!(self.args.flag_pruning.parse());
 		let pruning_history = self.args.flag_pruning_history;
 		let vm_type = try!(self.vm_type());
-		let mode = try!(to_mode(&self.args.flag_mode, self.args.flag_mode_timeout, self.args.flag_mode_alarm));
+		let mode = match self.args.flag_mode.as_ref() { "last" => None, mode => Some(try!(to_mode(&mode, self.args.flag_mode_timeout, self.args.flag_mode_alarm))), };
 		let miner_options = try!(self.miner_options());
 		let logger_config = self.logger_config();
 		let http_conf = try!(self.http_config());
 		let ipc_conf = try!(self.ipc_config());
 		let net_conf = try!(self.net_config());
-		let network_id = try!(self.network_id());
+		let network_id = self.network_id();
 		let cache_config = self.cache_config();
 		let spec = try!(self.chain().parse());
 		let tracing = try!(self.args.flag_tracing.parse());
 		let fat_db = try!(self.args.flag_fat_db.parse());
 		let compaction = try!(self.args.flag_db_compaction.parse());
 		let wal = !self.args.flag_fast_and_loose;
-		let enable_network = self.enable_network(&mode);
 		let warp_sync = self.args.flag_warp;
 		let geth_compatibility = self.args.flag_geth;
-		let signer_port = self.signer_port();
+		let ui_port = self.ui_port();
 		let dapps_conf = self.dapps_config();
 		let signer_conf = self.signer_config();
 		let format = try!(self.format());
@@ -99,7 +103,9 @@ impl Configuration {
 		let cmd = if self.args.flag_version {
 			Cmd::Version
 		} else if self.args.cmd_signer && self.args.cmd_new_token {
-			Cmd::SignerToken(dirs.signer)
+			Cmd::SignerToken(SignerCommand {
+				path: dirs.signer
+			})
 		} else if self.args.cmd_tools && self.args.cmd_hash {
 			Cmd::Hash(self.args.arg_file)
 		} else if self.args.cmd_account {
@@ -141,7 +147,6 @@ impl Configuration {
 		} else if self.args.cmd_import {
 			let import_cmd = ImportBlockchain {
 				spec: spec,
-				logger_config: logger_config,
 				cache_config: cache_config,
 				dirs: dirs,
 				file_path: self.args.arg_file.clone(),
@@ -150,17 +155,16 @@ impl Configuration {
 				pruning_history: pruning_history,
 				compaction: compaction,
 				wal: wal,
-				mode: mode,
 				tracing: tracing,
 				fat_db: fat_db,
 				vm_type: vm_type,
 				check_seal: !self.args.flag_no_seal_check,
+				with_color: logger_config.color,
 			};
 			Cmd::Blockchain(BlockchainCmd::Import(import_cmd))
 		} else if self.args.cmd_export {
 			let export_cmd = ExportBlockchain {
 				spec: spec,
-				logger_config: logger_config,
 				cache_config: cache_config,
 				dirs: dirs,
 				file_path: self.args.arg_file.clone(),
@@ -169,7 +173,6 @@ impl Configuration {
 				pruning_history: pruning_history,
 				compaction: compaction,
 				wal: wal,
-				mode: mode,
 				tracing: tracing,
 				fat_db: fat_db,
 				from_block: try!(to_block_id(&self.args.flag_from)),
@@ -184,8 +187,6 @@ impl Configuration {
 				spec: spec,
 				pruning: pruning,
 				pruning_history: pruning_history,
-				logger_config: logger_config,
-				mode: mode,
 				tracing: tracing,
 				fat_db: fat_db,
 				compaction: compaction,
@@ -202,8 +203,6 @@ impl Configuration {
 				spec: spec,
 				pruning: pruning,
 				pruning_history: pruning_history,
-				logger_config: logger_config,
-				mode: mode,
 				tracing: tracing,
 				fat_db: fat_db,
 				compaction: compaction,
@@ -227,7 +226,7 @@ impl Configuration {
 				pruning: pruning,
 				pruning_history: pruning_history,
 				daemon: daemon,
-				logger_config: logger_config,
+				logger_config: logger_config.clone(),
 				miner_options: miner_options,
 				http_conf: http_conf,
 				ipc_conf: ipc_conf,
@@ -242,10 +241,9 @@ impl Configuration {
 				compaction: compaction,
 				wal: wal,
 				vm_type: vm_type,
-				enable_network: enable_network,
 				warp_sync: warp_sync,
 				geth_compatibility: geth_compatibility,
-				signer_port: signer_port,
+				ui_port: ui_port,
 				net_settings: self.network_settings(),
 				dapps_conf: dapps_conf,
 				signer_conf: signer_conf,
@@ -258,14 +256,10 @@ impl Configuration {
 			Cmd::Run(run_cmd)
 		};
 
-		Ok(cmd)
-	}
-
-	fn enable_network(&self, mode: &Mode) -> bool {
-		match *mode {
-			Mode::Dark(_) => false,
-			_ => !self.args.flag_no_network,
-		}
+		Ok(Execute {
+			logger: logger_config,
+			cmd: cmd,
+		})
 	}
 
 	fn vm_type(&self) -> Result<VMType, String> {
@@ -402,11 +396,11 @@ impl Configuration {
 
 	fn signer_config(&self) -> SignerConfiguration {
 		SignerConfiguration {
-			enabled: self.signer_enabled(),
-			port: self.args.flag_signer_port,
-			interface: self.signer_interface(),
+			enabled: self.ui_enabled(),
+			port: self.args.flag_ui_port,
+			interface: self.ui_interface(),
 			signer_path: self.directories().signer,
-			skip_origin_validation: self.args.flag_signer_no_validation,
+			skip_origin_validation: self.args.flag_ui_no_validation,
 		}
 	}
 
@@ -510,16 +504,16 @@ impl Configuration {
 		Ok(ret)
 	}
 
-	fn network_id(&self) -> Result<Option<U256>, String> {
-		let net_id = self.args.flag_network_id.as_ref().or(self.args.flag_networkid.as_ref());
-		match net_id {
-			Some(id) => Ok(Some(try!(to_u256(id)))),
-			None => Ok(None),
-		}
+	fn network_id(&self) -> Option<usize> {
+		self.args.flag_network_id.or(self.args.flag_networkid)
 	}
 
 	fn rpc_apis(&self) -> String {
-		self.args.flag_rpcapi.clone().unwrap_or(self.args.flag_jsonrpc_apis.clone())
+		let mut apis = self.args.flag_rpcapi.clone().unwrap_or(self.args.flag_jsonrpc_apis.clone());
+		if self.args.flag_geth {
+			apis.push_str(",personal");
+		}
+		apis
 	}
 
 	fn rpc_cors(&self) -> Option<Vec<String>> {
@@ -551,7 +545,13 @@ impl Configuration {
 		let conf = IpcConfiguration {
 			enabled: !(self.args.flag_ipcdisable || self.args.flag_ipc_off || self.args.flag_no_ipc),
 			socket_addr: self.ipc_path(),
-			apis: try!(self.args.flag_ipcapi.clone().unwrap_or(self.args.flag_ipc_apis.clone()).parse()),
+			apis: {
+				let mut apis = self.args.flag_ipcapi.clone().unwrap_or(self.args.flag_ipc_apis.clone());
+				if self.args.flag_geth {
+					apis.push_str("personal");
+				}
+				try!(apis.parse())
+			},
 		};
 
 		Ok(conf)
@@ -595,7 +595,7 @@ impl Configuration {
 		);
 
 		let dapps_path = replace_home(&self.args.flag_dapps_path);
-		let signer_path = replace_home(&self.args.flag_signer_path);
+		let ui_path = replace_home(&self.args.flag_ui_path);
 
 		if self.args.flag_geth  && !cfg!(windows) {
 			let geth_root  = if self.args.flag_testnet { path::ethereum::test() } else {  path::ethereum::default() };
@@ -616,7 +616,7 @@ impl Configuration {
 			keys: keys_path,
 			db: db_path,
 			dapps: dapps_path,
-			signer: signer_path,
+			signer: ui_path,
 		}
 	}
 
@@ -628,16 +628,16 @@ impl Configuration {
 		}
 	}
 
-	fn signer_port(&self) -> Option<u16> {
-		if !self.signer_enabled() {
+	fn ui_port(&self) -> Option<u16> {
+		if !self.ui_enabled() {
 			None
 		} else {
-			Some(self.args.flag_signer_port)
+			Some(self.args.flag_ui_port)
 		}
 	}
 
-	fn signer_interface(&self) -> String {
-		match self.args.flag_signer_interface.as_str() {
+	fn ui_interface(&self) -> String {
+		match self.args.flag_ui_interface.as_str() {
 			"local" => "127.0.0.1",
 			x => x,
 		}.into()
@@ -662,16 +662,16 @@ impl Configuration {
 		!self.args.flag_dapps_off && !self.args.flag_no_dapps && cfg!(feature = "dapps")
 	}
 
-	fn signer_enabled(&self) -> bool {
-		if self.args.flag_force_signer {
+	fn ui_enabled(&self) -> bool {
+		if self.args.flag_force_ui {
 			return true;
 		}
 
-		let signer_disabled = self.args.flag_unlock.is_some() ||
+		let ui_disabled = self.args.flag_unlock.is_some() ||
 			self.args.flag_geth ||
-			self.args.flag_no_signer;
+			self.args.flag_no_ui;
 
-		!signer_disabled
+		!ui_disabled
 	}
 }
 
@@ -684,7 +684,7 @@ mod tests {
 	use ethcore::miner::{MinerOptions, PrioritizationStrategy};
 	use helpers::{replace_home, default_network_config};
 	use run::RunCmd;
-	use signer::Configuration as SignerConfiguration;
+	use signer::{Configuration as SignerConfiguration, SignerCommand};
 	use blockchain::{BlockchainCmd, ImportBlockchain, ExportBlockchain, DataFormat};
 	use presale::ImportWallet;
 	use account::{AccountCmd, NewAccount, ImportAccounts};
@@ -705,14 +705,14 @@ mod tests {
 	fn test_command_version() {
 		let args = vec!["parity", "--version"];
 		let conf = parse(&args);
-		assert_eq!(conf.into_command().unwrap(), Cmd::Version);
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::Version);
 	}
 
 	#[test]
 	fn test_command_account_new() {
 		let args = vec!["parity", "account", "new"];
 		let conf = parse(&args);
-		assert_eq!(conf.into_command().unwrap(), Cmd::Account(AccountCmd::New(NewAccount {
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::Account(AccountCmd::New(NewAccount {
 			iterations: 10240,
 			path: replace_home("$HOME/.parity/keys"),
 			password_file: None,
@@ -723,16 +723,16 @@ mod tests {
 	fn test_command_account_list() {
 		let args = vec!["parity", "account", "list"];
 		let conf = parse(&args);
-		assert_eq!(conf.into_command().unwrap(), Cmd::Account(
-			AccountCmd::List(replace_home("$HOME/.parity/keys")))
-		);
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::Account(
+			AccountCmd::List(replace_home("$HOME/.parity/keys")),
+		));
 	}
 
 	#[test]
 	fn test_command_account_import() {
 		let args = vec!["parity", "account", "import", "my_dir", "another_dir"];
 		let conf = parse(&args);
-		assert_eq!(conf.into_command().unwrap(), Cmd::Account(AccountCmd::Import(ImportAccounts {
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::Account(AccountCmd::Import(ImportAccounts {
 			from: vec!["my_dir".into(), "another_dir".into()],
 			to: replace_home("$HOME/.parity/keys"),
 		})));
@@ -742,7 +742,7 @@ mod tests {
 	fn test_command_wallet_import() {
 		let args = vec!["parity", "wallet", "import", "my_wallet.json", "--password", "pwd"];
 		let conf = parse(&args);
-		assert_eq!(conf.into_command().unwrap(), Cmd::ImportPresaleWallet(ImportWallet {
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::ImportPresaleWallet(ImportWallet {
 			iterations: 10240,
 			path: replace_home("$HOME/.parity/keys"),
 			wallet_path: "my_wallet.json".into(),
@@ -754,9 +754,8 @@ mod tests {
 	fn test_command_blockchain_import() {
 		let args = vec!["parity", "import", "blockchain.json"];
 		let conf = parse(&args);
-		assert_eq!(conf.into_command().unwrap(), Cmd::Blockchain(BlockchainCmd::Import(ImportBlockchain {
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::Blockchain(BlockchainCmd::Import(ImportBlockchain {
 			spec: Default::default(),
-			logger_config: Default::default(),
 			cache_config: Default::default(),
 			dirs: Default::default(),
 			file_path: Some("blockchain.json".into()),
@@ -765,11 +764,11 @@ mod tests {
 			pruning_history: 64,
 			compaction: Default::default(),
 			wal: true,
-			mode: Default::default(),
 			tracing: Default::default(),
 			fat_db: Default::default(),
 			vm_type: VMType::Interpreter,
 			check_seal: true,
+			with_color: !cfg!(windows),
 		})));
 	}
 
@@ -777,9 +776,8 @@ mod tests {
 	fn test_command_blockchain_export() {
 		let args = vec!["parity", "export", "blockchain.json"];
 		let conf = parse(&args);
-		assert_eq!(conf.into_command().unwrap(), Cmd::Blockchain(BlockchainCmd::Export(ExportBlockchain {
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::Blockchain(BlockchainCmd::Export(ExportBlockchain {
 			spec: Default::default(),
-			logger_config: Default::default(),
 			cache_config: Default::default(),
 			dirs: Default::default(),
 			file_path: Some("blockchain.json".into()),
@@ -788,7 +786,6 @@ mod tests {
 			format: Default::default(),
 			compaction: Default::default(),
 			wal: true,
-			mode: Default::default(),
 			tracing: Default::default(),
 			fat_db: Default::default(),
 			from_block: BlockID::Number(1),
@@ -801,9 +798,8 @@ mod tests {
 	fn test_command_blockchain_export_with_custom_format() {
 		let args = vec!["parity", "export", "--format", "hex", "blockchain.json"];
 		let conf = parse(&args);
-		assert_eq!(conf.into_command().unwrap(), Cmd::Blockchain(BlockchainCmd::Export(ExportBlockchain {
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::Blockchain(BlockchainCmd::Export(ExportBlockchain {
 			spec: Default::default(),
-			logger_config: Default::default(),
 			cache_config: Default::default(),
 			dirs: Default::default(),
 			file_path: Some("blockchain.json".into()),
@@ -812,7 +808,6 @@ mod tests {
 			format: Some(DataFormat::Hex),
 			compaction: Default::default(),
 			wal: true,
-			mode: Default::default(),
 			tracing: Default::default(),
 			fat_db: Default::default(),
 			from_block: BlockID::Number(1),
@@ -826,14 +821,16 @@ mod tests {
 		let args = vec!["parity", "signer", "new-token"];
 		let conf = parse(&args);
 		let expected = replace_home("$HOME/.parity/signer");
-		assert_eq!(conf.into_command().unwrap(), Cmd::SignerToken(expected));
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::SignerToken(SignerCommand {
+			path: expected,
+		}));
 	}
 
 	#[test]
 	fn test_run_cmd() {
 		let args = vec!["parity"];
 		let conf = parse(&args);
-		assert_eq!(conf.into_command().unwrap(), Cmd::Run(RunCmd {
+		assert_eq!(conf.into_command().unwrap().cmd, Cmd::Run(RunCmd {
 			cache_config: Default::default(),
 			dirs: Default::default(),
 			spec: Default::default(),
@@ -855,9 +852,8 @@ mod tests {
 			compaction: Default::default(),
 			wal: true,
 			vm_type: Default::default(),
-			enable_network: true,
 			geth_compatibility: false,
-			signer_port: Some(8180),
+			ui_port: Some(8180),
 			net_settings: Default::default(),
 			dapps_conf: Default::default(),
 			signer_conf: Default::default(),
@@ -980,11 +976,11 @@ mod tests {
 
 		// when
 		let conf0 = parse(&["parity", "--geth"]);
-		let conf1 = parse(&["parity", "--geth", "--force-signer"]);
+		let conf1 = parse(&["parity", "--geth", "--force-ui"]);
 
 		// then
-		assert_eq!(conf0.signer_enabled(), false);
-		assert_eq!(conf1.signer_enabled(), true);
+		assert_eq!(conf0.ui_enabled(), false);
+		assert_eq!(conf1.ui_enabled(), true);
 	}
 
 	#[test]
@@ -995,7 +991,7 @@ mod tests {
 		let conf0 = parse(&["parity", "--unlock", "0x0"]);
 
 		// then
-		assert_eq!(conf0.signer_enabled(), false);
+		assert_eq!(conf0.ui_enabled(), false);
 	}
 
 	#[test]
@@ -1003,10 +999,10 @@ mod tests {
 		// given
 
 		// when
-		let conf0 = parse(&["parity", "--signer-path", "signer"]);
-		let conf1 = parse(&["parity", "--signer-path", "signer", "--signer-no-validation"]);
-		let conf2 = parse(&["parity", "--signer-path", "signer", "--signer-port", "3123"]);
-		let conf3 = parse(&["parity", "--signer-path", "signer", "--signer-interface", "test"]);
+		let conf0 = parse(&["parity", "--ui-path", "signer"]);
+		let conf1 = parse(&["parity", "--ui-path", "signer", "--ui-no-validation"]);
+		let conf2 = parse(&["parity", "--ui-path", "signer", "--ui-port", "3123"]);
+		let conf3 = parse(&["parity", "--ui-path", "signer", "--ui-interface", "test"]);
 
 		// then
 		assert_eq!(conf0.signer_config(), SignerConfiguration {
diff --git a/parity/helpers.rs b/parity/helpers.rs
index 5d6859f5b..761a148e4 100644
--- a/parity/helpers.rs
+++ b/parity/helpers.rs
@@ -46,7 +46,7 @@ fn to_seconds(s: &str) -> Result<u64, String> {
 		"hourly" | "1hour" | "1 hour" | "hour" => Ok(60 * 60),
 		"daily" | "1day" | "1 day" | "day" => Ok(24 * 60 * 60),
 		x if x.ends_with("seconds") => x[0..x.len() - 7].parse().map_err(bad),
-		x if x.ends_with("minutes") => x[0..x.len() -7].parse::<u64>().map_err(bad).map(|x| x * 60),
+		x if x.ends_with("minutes") => x[0..x.len() - 7].parse::<u64>().map_err(bad).map(|x| x * 60),
 		x if x.ends_with("hours") => x[0..x.len() - 5].parse::<u64>().map_err(bad).map(|x| x * 60 * 60),
 		x if x.ends_with("days") => x[0..x.len() - 4].parse::<u64>().map_err(bad).map(|x| x * 24 * 60 * 60),
 		x => x.parse().map_err(bad),
@@ -58,7 +58,8 @@ pub fn to_mode(s: &str, timeout: u64, alarm: u64) -> Result<Mode, String> {
 		"active" => Ok(Mode::Active),
 		"passive" => Ok(Mode::Passive(Duration::from_secs(timeout), Duration::from_secs(alarm))),
 		"dark" => Ok(Mode::Dark(Duration::from_secs(timeout))),
-		_ => Err(format!("{}: Invalid address for --mode. Must be one of active, passive or dark.", s)),
+		"offline" => Ok(Mode::Off),
+		_ => Err(format!("{}: Invalid value for --mode. Must be one of active, passive, dark or offline.", s)),
 	}
 }
 
diff --git a/parity/main.rs b/parity/main.rs
index 83598231a..0fc88d8e7 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -114,12 +114,13 @@ mod user_defaults;
 mod stratum;
 
 use std::{process, env};
-use std::io::BufReader;
+use std::io::{self as stdio, BufReader, Write};
 use std::fs::File;
 use util::sha3::sha3;
 use cli::Args;
-use configuration::{Cmd, Configuration};
+use configuration::{Cmd, Execute, Configuration};
 use deprecated::find_deprecated;
+use ethcore_logger::setup_log;
 
 fn print_hash_of(maybe_file: Option<String>) -> Result<String, String> {
 	if let Some(file) = maybe_file {
@@ -131,10 +132,12 @@ fn print_hash_of(maybe_file: Option<String>) -> Result<String, String> {
 	}
 }
 
-fn execute(command: Cmd) -> Result<String, String> {
-	match command {
+fn execute(command: Execute) -> Result<String, String> {
+	let logger = setup_log(&command.logger).expect("Logger is initialized only once; qed");
+
+	match command.cmd {
 		Cmd::Run(run_cmd) => {
-			try!(run::execute(run_cmd));
+			try!(run::execute(run_cmd, logger));
 			Ok("".into())
 		},
 		Cmd::Version => Ok(Args::print_version()),
@@ -142,7 +145,7 @@ fn execute(command: Cmd) -> Result<String, String> {
 		Cmd::Account(account_cmd) => account::execute(account_cmd),
 		Cmd::ImportPresaleWallet(presale_cmd) => presale::execute(presale_cmd),
 		Cmd::Blockchain(blockchain_cmd) => blockchain::execute(blockchain_cmd),
-		Cmd::SignerToken(path) => signer::new_token(path),
+		Cmd::SignerToken(signer_cmd) => signer::execute(signer_cmd),
 		Cmd::Snapshot(snapshot_cmd) => snapshot::execute(snapshot_cmd),
 	}
 }
@@ -198,7 +201,7 @@ fn sync_main() -> bool {
 fn main() {
 	// Always print backtrace on panic.
 	::std::env::set_var("RUST_BACKTRACE", "1");
-	
+
 	if sync_main() {
 		return;
 	}
@@ -210,7 +213,7 @@ fn main() {
 			info!("{}", result);
 		},
 		Err(err) => {
-			info!("{}", err);
+			writeln!(&mut stdio::stderr(), "{}", err).expect("StdErr available; qed");
 			process::exit(1);
 		}
 	}
diff --git a/parity/params.rs b/parity/params.rs
index faba029b2..5a81fba7f 100644
--- a/parity/params.rs
+++ b/parity/params.rs
@@ -20,6 +20,7 @@ use util::{Address, U256, version_data};
 use util::journaldb::Algorithm;
 use ethcore::spec::Spec;
 use ethcore::ethereum;
+use ethcore::client::Mode;
 use ethcore::miner::{GasPricer, GasPriceCalibratorOptions};
 use user_defaults::UserDefaults;
 
@@ -264,6 +265,10 @@ pub fn fatdb_switch_to_bool(switch: Switch, user_defaults: &UserDefaults, algori
 	result
 }
 
+pub fn mode_switch_to_bool(switch: Option<Mode>, user_defaults: &UserDefaults) -> Result<Mode, String> {
+	Ok(switch.unwrap_or(user_defaults.mode.clone()))
+}
+
 #[cfg(test)]
 mod tests {
 	use util::journaldb::Algorithm;
diff --git a/parity/rpc.rs b/parity/rpc.rs
index c5a4df18a..59279eaea 100644
--- a/parity/rpc.rs
+++ b/parity/rpc.rs
@@ -63,7 +63,7 @@ impl Default for IpcConfiguration {
 		IpcConfiguration {
 			enabled: true,
 			socket_addr: parity_ipc_path("$HOME/.parity/jsonrpc.ipc"),
-			apis: ApiSet::UnsafeContext,
+			apis: ApiSet::IpcContext,
 		}
 	}
 }
diff --git a/parity/rpc_apis.rs b/parity/rpc_apis.rs
index 1aae27dd2..9ffd8e0dd 100644
--- a/parity/rpc_apis.rs
+++ b/parity/rpc_apis.rs
@@ -31,15 +31,25 @@ pub use ethcore_rpc::SignerService;
 
 #[derive(Debug, PartialEq, Clone, Eq, Hash)]
 pub enum Api {
+	/// Web3 (Safe)
 	Web3,
+	/// Net (Safe)
 	Net,
+	/// Eth (Safe)
 	Eth,
-	PersonalSafe,
-	PersonalAccounts,
+	/// Geth-compatible "personal" API (DEPRECATED; only used in `--geth` mode.) 
+	Personal,
+	/// Signer - Confirm transactions in Signer (UNSAFE: Passwords, List of transactions)
 	Signer,
-	Ethcore,
-	EthcoreSet,
+	/// Parity - Custom extensions (Safe)
+	Parity,
+	/// Parity Accounts extensions (UNSAFE: Passwords, Side Effects (new account))
+	ParityAccounts,
+	/// Parity - Set methods (UNSAFE: Side Effects affecting node operation)
+	ParitySet,
+	/// Traces (Safe)
 	Traces,
+	/// Rpc (Safe)
 	Rpc,
 }
 
@@ -53,11 +63,11 @@ impl FromStr for Api {
 			"web3" => Ok(Web3),
 			"net" => Ok(Net),
 			"eth" => Ok(Eth),
-			"personal" => Ok(PersonalAccounts),
-			"personal_safe" => Ok(PersonalSafe),
+			"personal" => Ok(Personal),
 			"signer" => Ok(Signer),
-			"ethcore" => Ok(Ethcore),
-			"ethcore_set" => Ok(EthcoreSet),
+			"parity" => Ok(Parity),
+			"parity_accounts" => Ok(ParityAccounts),
+			"parity_set" => Ok(ParitySet),
 			"traces" => Ok(Traces),
 			"rpc" => Ok(Rpc),
 			api => Err(format!("Unknown api: {}", api))
@@ -69,6 +79,7 @@ impl FromStr for Api {
 pub enum ApiSet {
 	SafeContext,
 	UnsafeContext,
+	IpcContext,
 	List(HashSet<Api>),
 }
 
@@ -118,11 +129,11 @@ fn to_modules(apis: &[Api]) -> BTreeMap<String, String> {
 			Api::Web3 => ("web3", "1.0"),
 			Api::Net => ("net", "1.0"),
 			Api::Eth => ("eth", "1.0"),
-			Api::PersonalSafe => ("personal_safe", "1.0"),
-			Api::PersonalAccounts => ("personal", "1.0"),
+			Api::Personal => ("personal", "1.0"),
 			Api::Signer => ("signer", "1.0"),
-			Api::Ethcore => ("ethcore", "1.0"),
-			Api::EthcoreSet => ("ethcore_set", "1.0"),
+			Api::Parity => ("parity", "1.0"),
+			Api::ParityAccounts => ("parity_accounts", "1.0"),
+			Api::ParitySet => ("parity_set", "1.0"),
 			Api::Traces => ("traces", "1.0"),
 			Api::Rpc => ("rpc", "1.0"),
 		};
@@ -133,20 +144,37 @@ fn to_modules(apis: &[Api]) -> BTreeMap<String, String> {
 
 impl ApiSet {
 	pub fn list_apis(&self) -> HashSet<Api> {
+		let mut safe_list = vec![Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc]
+			.into_iter().collect();
 		match *self {
 			ApiSet::List(ref apis) => apis.clone(),
-			ApiSet::UnsafeContext => {
-				vec![Api::Web3, Api::Net, Api::Eth, Api::Ethcore, Api::Traces, Api::Rpc, Api::PersonalSafe]
-					.into_iter().collect()
+			ApiSet::UnsafeContext => safe_list,
+			ApiSet::IpcContext => {
+				safe_list.insert(Api::ParityAccounts);
+				safe_list
 			},
 			ApiSet::SafeContext => {
-				vec![Api::Web3, Api::Net, Api::Eth, Api::PersonalAccounts, Api::PersonalSafe, Api::Signer, Api::Ethcore, Api::EthcoreSet, Api::Traces, Api::Rpc]
-					.into_iter().collect()
+				safe_list.insert(Api::ParityAccounts);
+				safe_list.insert(Api::ParitySet);
+				safe_list.insert(Api::Signer);
+				safe_list
 			},
 		}
 	}
 }
 
+macro_rules! add_signing_methods {
+	($namespace:ident, $server:expr, $deps:expr) => {
+		let server = &$server;
+		let deps = &$deps;
+		if deps.signer_service.is_enabled() {
+			server.add_delegate($namespace::to_delegate(SigningQueueClient::new(&deps.signer_service, &deps.client, &deps.miner, &deps.secret_store)))
+		} else {
+			server.add_delegate($namespace::to_delegate(SigningUnsafeClient::new(&deps.client, &deps.secret_store, &deps.miner)))
+		}
+	}
+}
+
 pub fn setup_rpc<T: Extendable>(server: T, deps: Arc<Dependencies>, apis: ApiSet) -> T {
 	use ethcore_rpc::v1::*;
 
@@ -178,39 +206,39 @@ pub fn setup_rpc<T: Extendable>(server: T, deps: Arc<Dependencies>, apis: ApiSet
 				let filter_client = EthFilterClient::new(&deps.client, &deps.miner);
 				server.add_delegate(filter_client.to_delegate());
 
-				if deps.signer_service.is_enabled() {
-					server.add_delegate(EthSigningQueueClient::new(&deps.signer_service, &deps.client, &deps.miner, &deps.secret_store).to_delegate());
-				} else {
-					server.add_delegate(EthSigningUnsafeClient::new(&deps.client, &deps.secret_store, &deps.miner).to_delegate());
-				}
+				add_signing_methods!(EthSigning, server, deps);
 			},
-			Api::PersonalAccounts => {
-				server.add_delegate(PersonalAccountsClient::new(&deps.secret_store, &deps.client, &deps.miner, deps.geth_compatibility).to_delegate());
-			},
-			Api::PersonalSafe => {
-				server.add_delegate(PersonalClient::new(&deps.secret_store, &deps.client).to_delegate());
+			Api::Personal => {
+				server.add_delegate(PersonalClient::new(&deps.secret_store, &deps.client, &deps.miner, deps.geth_compatibility).to_delegate());
 			},
 			Api::Signer => {
 				server.add_delegate(SignerClient::new(&deps.secret_store, &deps.client, &deps.miner, &deps.signer_service).to_delegate());
 			},
-			Api::Ethcore => {
+			Api::Parity => {
 				let signer = match deps.signer_service.is_enabled() {
 					true => Some(deps.signer_service.clone()),
 					false => None,
 				};
-				server.add_delegate(EthcoreClient::new(
+				server.add_delegate(ParityClient::new(
 					&deps.client,
 					&deps.miner,
 					&deps.sync,
 					&deps.net_service,
+					&deps.secret_store,
 					deps.logger.clone(),
 					deps.settings.clone(),
 					signer,
 					deps.dapps_port,
-				).to_delegate())
+				).to_delegate());
+
+				add_signing_methods!(EthSigning, server, deps);
+				add_signing_methods!(ParitySigning, server, deps);
 			},
-			Api::EthcoreSet => {
-				server.add_delegate(EthcoreSetClient::new(&deps.client, &deps.miner, &deps.net_service).to_delegate())
+			Api::ParityAccounts => {
+				server.add_delegate(ParityAccountsClient::new(&deps.secret_store, &deps.client).to_delegate());
+			},
+			Api::ParitySet => {
+				server.add_delegate(ParitySetClient::new(&deps.client, &deps.miner, &deps.net_service).to_delegate())
 			},
 			Api::Traces => {
 				server.add_delegate(TracesClient::new(&deps.client, &deps.miner).to_delegate())
@@ -233,11 +261,11 @@ mod test {
 		assert_eq!(Api::Web3, "web3".parse().unwrap());
 		assert_eq!(Api::Net, "net".parse().unwrap());
 		assert_eq!(Api::Eth, "eth".parse().unwrap());
-		assert_eq!(Api::PersonalAccounts, "personal".parse().unwrap());
-		assert_eq!(Api::PersonalSafe, "personal_safe".parse().unwrap());
+		assert_eq!(Api::Personal, "personal".parse().unwrap());
 		assert_eq!(Api::Signer, "signer".parse().unwrap());
-		assert_eq!(Api::Ethcore, "ethcore".parse().unwrap());
-		assert_eq!(Api::EthcoreSet, "ethcore_set".parse().unwrap());
+		assert_eq!(Api::Parity, "parity".parse().unwrap());
+		assert_eq!(Api::ParityAccounts, "parity_accounts".parse().unwrap());
+		assert_eq!(Api::ParitySet, "parity_set".parse().unwrap());
 		assert_eq!(Api::Traces, "traces".parse().unwrap());
 		assert_eq!(Api::Rpc, "rpc".parse().unwrap());
 		assert!("rp".parse::<Api>().is_err());
@@ -255,15 +283,34 @@ mod test {
 
 	#[test]
 	fn test_api_set_unsafe_context() {
-		let expected = vec![Api::Web3, Api::Net, Api::Eth, Api::Ethcore, Api::Traces, Api::Rpc, Api::PersonalSafe]
-			.into_iter().collect();
+		let expected = vec![
+			// make sure this list contains only SAFE methods
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc
+		].into_iter().collect();
 		assert_eq!(ApiSet::UnsafeContext.list_apis(), expected);
 	}
 
+	#[test]
+	fn test_api_set_ipc_context() {
+		let expected = vec![
+			// safe
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc,
+			// semi-safe
+			Api::ParityAccounts
+		].into_iter().collect();
+		assert_eq!(ApiSet::IpcContext.list_apis(), expected);
+	}
+
 	#[test]
 	fn test_api_set_safe_context() {
-		let expected = vec![Api::Web3, Api::Net, Api::Eth, Api::PersonalAccounts, Api::PersonalSafe, Api::Signer, Api::Ethcore, Api::EthcoreSet, Api::Traces, Api::Rpc]
-			.into_iter().collect();
+		let expected = vec![
+			// safe
+			Api::Web3, Api::Net, Api::Eth, Api::Parity, Api::Traces, Api::Rpc,
+			// semi-safe
+			Api::ParityAccounts,
+			// Unsafe
+			Api::ParitySet, Api::Signer,
+		].into_iter().collect();
 		assert_eq!(ApiSet::SafeContext.list_apis(), expected);
 	}
 }
diff --git a/parity/run.rs b/parity/run.rs
index 8a3ae06ec..2af0d35ca 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -15,13 +15,14 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::sync::{Arc, Mutex, Condvar};
+use std::net::{TcpListener};
 use ctrlc::CtrlC;
 use fdlimit::raise_fd_limit;
-use ethcore_logger::{Config as LogConfig, setup_log};
 use ethcore_rpc::{NetworkSettings, is_major_importing};
 use ethsync::NetworkConfiguration;
-use util::{Colour, version, U256};
+use util::{Colour, version, RotatingLogger};
 use io::{MayPanic, ForwardPanic, PanicHandler};
+use ethcore_logger::{Config as LogConfig};
 use ethcore::client::{Mode, DatabaseCompactionProfile, VMType, ChainNotify, BlockChainClient};
 use ethcore::service::ClientService;
 use ethcore::account_provider::AccountProvider;
@@ -36,7 +37,7 @@ use dapps::WebappServer;
 use io_handler::ClientIoHandler;
 use params::{
 	SpecType, Pruning, AccountsConfig, GasPricerConfig, MinerExtras, Switch,
-	tracing_switch_to_bool, fatdb_switch_to_bool,
+	tracing_switch_to_bool, fatdb_switch_to_bool, mode_switch_to_bool
 };
 use helpers::{to_client_config, execute_upgrades, passwords_from_files};
 use dir::Directories;
@@ -69,20 +70,19 @@ pub struct RunCmd {
 	pub http_conf: HttpConfiguration,
 	pub ipc_conf: IpcConfiguration,
 	pub net_conf: NetworkConfiguration,
-	pub network_id: Option<U256>,
+	pub network_id: Option<usize>,
 	pub warp_sync: bool,
 	pub acc_conf: AccountsConfig,
 	pub gas_pricer: GasPricerConfig,
 	pub miner_extras: MinerExtras,
-	pub mode: Mode,
+	pub mode: Option<Mode>,
 	pub tracing: Switch,
 	pub fat_db: Switch,
 	pub compaction: DatabaseCompactionProfile,
 	pub wal: bool,
 	pub vm_type: VMType,
-	pub enable_network: bool,
 	pub geth_compatibility: bool,
-	pub signer_port: Option<u16>,
+	pub ui_port: Option<u16>,
 	pub net_settings: NetworkSettings,
 	pub dapps_conf: dapps::Configuration,
 	pub signer_conf: signer::Configuration,
@@ -93,13 +93,19 @@ pub struct RunCmd {
 	pub check_seal: bool,
 }
 
-pub fn execute(cmd: RunCmd) -> Result<(), String> {
+pub fn execute(cmd: RunCmd, logger: Arc<RotatingLogger>) -> Result<(), String> {
+	if cmd.ui && cmd.dapps_conf.enabled {
+		// Check if Parity is already running
+		let addr = format!("{}:{}", cmd.dapps_conf.interface, cmd.dapps_conf.port);
+		if !TcpListener::bind(&addr as &str).is_ok() {
+			url::open(&format!("http://{}:{}/", cmd.dapps_conf.interface, cmd.dapps_conf.port));
+			return Ok(());
+		}
+	}
+
 	// set up panic handler
 	let panic_handler = PanicHandler::new_in_arc();
 
-	// set up logger
-	let logger = try!(setup_log(&cmd.logger_config));
-
 	// increase max number of open files
 	raise_fd_limit();
 
@@ -130,6 +136,11 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 	// check if fatdb is on
 	let fat_db = try!(fatdb_switch_to_bool(cmd.fat_db, &user_defaults, algorithm));
 
+	// get the mode
+	let mode = try!(mode_switch_to_bool(cmd.mode, &user_defaults));
+	trace!(target: "mode", "mode is {:?}", mode);
+	let network_enabled = match &mode { &Mode::Dark(_) | &Mode::Off => false, _ => true, };
+
 	// prepare client and snapshot paths.
 	let client_path = db_dirs.client_path(algorithm);
 	let snapshot_path = db_dirs.snapshot_path();
@@ -155,6 +166,7 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 			false => "".to_owned(),
 		}
 	);
+	info!("Operating mode: {}", Colour::White.bold().paint(format!("{}", mode)));
 
 	// display warning about using experimental journaldb alorithm
 	if !algorithm.is_stable() {
@@ -189,7 +201,7 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 	// create client config
 	let client_config = to_client_config(
 		&cmd.cache_config,
-		cmd.mode,
+		mode,
 		tracing,
 		fat_db,
 		cmd.compaction,
@@ -241,7 +253,7 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 	service.add_notify(chain_notify.clone());
 
 	// start network
-	if cmd.enable_network {
+	if network_enabled {
 		chain_notify.start();
 	}
 
@@ -250,7 +262,7 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 	let deps_for_rpc_apis = Arc::new(rpc_apis::Dependencies {
 		signer_service: Arc::new(rpc_apis::SignerService::new(move || {
 			signer::generate_new_token(signer_path.clone()).map_err(|e| format!("{:?}", e))
-		}, cmd.signer_port)),
+		}, cmd.ui_port)),
 		snapshot: snapshot_service.clone(),
 		client: client.clone(),
 		sync: sync_provider.clone(),
@@ -314,6 +326,19 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 	});
 	service.register_io_handler(io_handler.clone()).expect("Error registering IO handler");
 
+	// save user defaults
+	user_defaults.pruning = algorithm;
+	user_defaults.tracing = tracing;
+	try!(user_defaults.save(&user_defaults_path));
+
+	let on_mode_change = move |mode: &Mode| {
+		user_defaults.mode = mode.clone();
+		let _ = user_defaults.save(&user_defaults_path);	// discard failures - there's nothing we can do
+	};
+
+	// tell client how to save the default mode if it gets changed.
+	client.on_mode_change(on_mode_change);
+
 	// the watcher must be kept alive.
 	let _watcher = match cmd.no_periodic_snapshot {
 		true => None,
@@ -340,11 +365,6 @@ pub fn execute(cmd: RunCmd) -> Result<(), String> {
 		url::open(&format!("http://{}:{}/", cmd.dapps_conf.interface, cmd.dapps_conf.port));
 	}
 
-	// save user defaults
-	user_defaults.pruning = algorithm;
-	user_defaults.tracing = tracing;
-	try!(user_defaults.save(&user_defaults_path));
-
 	// Handle exit
 	wait_for_exit(panic_handler, http_server, ipc_server, dapps_server, signer_server);
 
diff --git a/parity/signer.rs b/parity/signer.rs
index 5097192ad..a26cc431a 100644
--- a/parity/signer.rs
+++ b/parity/signer.rs
@@ -68,8 +68,13 @@ fn codes_path(path: String) -> PathBuf {
 	p
 }
 
-pub fn new_token(path: String) -> Result<String, String> {
-	generate_new_token(path)
+#[derive(Debug, PartialEq)]
+pub struct SignerCommand {
+	pub path: String,
+}
+
+pub fn execute(cmd: SignerCommand) -> Result<String, String> {
+	generate_new_token(cmd.path)
 		.map(|code| format!("This key code will authorise your System Signer UI: {}", Colour::White.bold().paint(code)))
 		.map_err(|err| format!("Error generating token: {:?}", err))
 }
@@ -104,7 +109,7 @@ fn do_start(conf: Configuration, deps: Dependencies) -> Result<SignerServer, Str
 
 	match start_result {
 		Err(signer::ServerError::IoError(err)) => match err.kind() {
-			io::ErrorKind::AddrInUse => Err(format!("Trusted Signer address {} is already in use, make sure that another instance of an Ethereum client is not running or change the address using the --signer-port and --signer-interface options.", addr)),
+			io::ErrorKind::AddrInUse => Err(format!("Trusted UI address {} is already in use, make sure that another instance of an Ethereum client is not running or change the address using the --ui-port and --ui-interface options.", addr)),
 			_ => Err(format!("Trusted Signer io error: {}", err)),
 		},
 		Err(e) => Err(format!("Trusted Signer Error: {:?}", e)),
diff --git a/parity/snapshot.rs b/parity/snapshot.rs
index 4cd972230..872e4ba5e 100644
--- a/parity/snapshot.rs
+++ b/parity/snapshot.rs
@@ -20,7 +20,6 @@ use std::time::Duration;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
-use ethcore_logger::{setup_log, Config as LogConfig};
 use ethcore::snapshot::{Progress, RestorationStatus, SnapshotService as SS};
 use ethcore::snapshot::io::{SnapshotReader, PackedReader, PackedWriter};
 use ethcore::snapshot::service::Service as SnapshotService;
@@ -55,8 +54,6 @@ pub struct SnapshotCommand {
 	pub spec: SpecType,
 	pub pruning: Pruning,
 	pub pruning_history: u64,
-	pub logger_config: LogConfig,
-	pub mode: Mode,
 	pub tracing: Switch,
 	pub fat_db: Switch,
 	pub compaction: DatabaseCompactionProfile,
@@ -69,6 +66,8 @@ pub struct SnapshotCommand {
 // helper for reading chunks from arbitrary reader and feeding them into the
 // service.
 fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService>, reader: &R, recover: bool) -> Result<(), String> {
+	use util::sha3::Hashable;
+
 	let manifest = reader.manifest();
 
 	info!("Restoring to block #{} (0x{:?})", manifest.block_number, manifest.block_hash);
@@ -96,6 +95,12 @@ fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService>, reader: &R,
 
  		let chunk = try!(reader.chunk(state_hash)
 			.map_err(|e| format!("Encountered error while reading chunk {:?}: {}", state_hash, e)));
+
+		let hash = chunk.sha3();
+		if hash != state_hash {
+			return Err(format!("Mismatched chunk hash. Expected {:?}, got {:?}", state_hash, hash));
+		}
+
  		snapshot.feed_state_chunk(state_hash, &chunk);
  	}
 
@@ -107,6 +112,11 @@ fn restore_using<R: SnapshotReader>(snapshot: Arc<SnapshotService>, reader: &R,
 
  		let chunk = try!(reader.chunk(block_hash)
 			.map_err(|e| format!("Encountered error while reading chunk {:?}: {}", block_hash, e)));
+
+		let hash = chunk.sha3();
+		if hash != block_hash {
+			return Err(format!("Mismatched chunk hash. Expected {:?}, got {:?}", block_hash, hash));
+		}
 		snapshot.feed_block_chunk(block_hash, &chunk);
 	}
 
@@ -141,9 +151,6 @@ impl SnapshotCommand {
 		// load user defaults
 		let user_defaults = try!(UserDefaults::load(&user_defaults_path));
 
-		// Setup logging
-		let _logger = setup_log(&self.logger_config);
-
 		fdlimit::raise_fd_limit();
 
 		// select pruning algorithm
@@ -163,7 +170,7 @@ impl SnapshotCommand {
 		try!(execute_upgrades(&db_dirs, algorithm, self.compaction.compaction_profile(db_dirs.fork_path().as_path())));
 
 		// prepare client config
-		let client_config = to_client_config(&self.cache_config, self.mode, tracing, fat_db, self.compaction, self.wal, VMType::default(), "".into(), algorithm, self.pruning_history, true);
+		let client_config = to_client_config(&self.cache_config, Mode::Active, tracing, fat_db, self.compaction, self.wal, VMType::default(), "".into(), algorithm, self.pruning_history, true);
 
 		let service = try!(ClientService::start(
 			client_config,
diff --git a/parity/user_defaults.rs b/parity/user_defaults.rs
index b7fc3d929..a1078b634 100644
--- a/parity/user_defaults.rs
+++ b/parity/user_defaults.rs
@@ -18,6 +18,7 @@ use std::fs::File;
 use std::io::Write;
 use std::path::Path;
 use std::collections::BTreeMap;
+use std::time::Duration;
 use serde::{Serialize, Serializer, Error, Deserialize, Deserializer};
 use serde::de::{Visitor, MapVisitor};
 use serde::de::impls::BTreeMapVisitor;
@@ -25,12 +26,14 @@ use serde_json::Value;
 use serde_json::de::from_reader;
 use serde_json::ser::to_string;
 use util::journaldb::Algorithm;
+use ethcore::client::Mode;
 
 pub struct UserDefaults {
 	pub is_first_launch: bool,
 	pub pruning: Algorithm,
 	pub tracing: bool,
 	pub fat_db: bool,
+	pub mode: Mode,
 }
 
 impl Serialize for UserDefaults {
@@ -40,6 +43,21 @@ impl Serialize for UserDefaults {
 		map.insert("pruning".into(), Value::String(self.pruning.as_str().into()));
 		map.insert("tracing".into(), Value::Bool(self.tracing));
 		map.insert("fat_db".into(), Value::Bool(self.fat_db));
+		let mode_str = match self.mode {
+			Mode::Off => "offline",
+			Mode::Dark(timeout) => {
+				map.insert("mode.timeout".into(), Value::U64(timeout.as_secs()));
+				"dark"
+			},
+			Mode::Passive(timeout, alarm) => {
+				map.insert("mode.timeout".into(), Value::U64(timeout.as_secs()));
+				map.insert("mode.alarm".into(), Value::U64(alarm.as_secs()));
+				"passive"
+			},
+			Mode::Active => "active",
+		};
+		map.insert("mode".into(), Value::String(mode_str.into()));
+
 		map.serialize(serializer)
 	}
 }
@@ -67,11 +85,28 @@ impl Visitor for UserDefaultsVisitor {
 		let fat_db: Value = map.remove("fat_db".into()).unwrap_or_else(|| Value::Bool(false));
 		let fat_db = try!(fat_db.as_bool().ok_or_else(|| Error::custom("invalid fat_db value")));
 
+		let mode: Value = map.remove("mode".into()).unwrap_or_else(|| Value::String("active".to_owned()));
+		let mode = match try!(mode.as_str().ok_or_else(|| Error::custom("invalid mode value"))) {
+			"offline" => Mode::Off,
+			"dark" => {
+				let timeout = try!(map.remove("mode.timeout".into()).and_then(|v| v.as_u64()).ok_or_else(|| Error::custom("invalid/missing mode.timeout value")));
+				Mode::Dark(Duration::from_secs(timeout))
+			},
+			"passive" => {
+				let timeout = try!(map.remove("mode.timeout".into()).and_then(|v| v.as_u64()).ok_or_else(|| Error::custom("invalid/missing mode.timeout value")));
+				let alarm = try!(map.remove("mode.alarm".into()).and_then(|v| v.as_u64()).ok_or_else(|| Error::custom("invalid/missing mode.alarm value")));
+				Mode::Passive(Duration::from_secs(timeout), Duration::from_secs(alarm))
+			},
+			"active" => Mode::Active,
+			_ => { return Err(Error::custom("invalid mode value")); },
+		};
+
 		let user_defaults = UserDefaults {
 			is_first_launch: false,
 			pruning: pruning,
 			tracing: tracing,
 			fat_db: fat_db,
+			mode: mode,
 		};
 
 		Ok(user_defaults)
@@ -85,6 +120,7 @@ impl Default for UserDefaults {
 			pruning: Algorithm::default(),
 			tracing: false,
 			fat_db: false,
+			mode: Mode::Active,
 		}
 	}
 }
@@ -97,7 +133,7 @@ impl UserDefaults {
 		}
 	}
 
-	pub fn save<P>(self, path: P) -> Result<(), String> where P: AsRef<Path> {
+	pub fn save<P>(&self, path: P) -> Result<(), String> where P: AsRef<Path> {
 		let mut file: File = try!(File::create(path).map_err(|_| "Cannot create user defaults file".to_owned()));
 		file.write_all(to_string(&self).unwrap().as_bytes()).map_err(|_| "Failed to save user defaults".to_owned())
 	}
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 9ce638ea6..4a8c4d76a 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore jsonrpc"
 name = "ethcore-rpc"
-version = "1.4.0"
+version = "1.5.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 build = "build.rs"
diff --git a/rpc/src/v1/helpers/dispatch.rs b/rpc/src/v1/helpers/dispatch.rs
index 1944d9035..457f96552 100644
--- a/rpc/src/v1/helpers/dispatch.rs
+++ b/rpc/src/v1/helpers/dispatch.rs
@@ -63,15 +63,16 @@ pub fn decrypt(accounts: &AccountProvider, address: Address, password: Option<St
 pub fn sign_and_dispatch<C, M>(client: &C, miner: &M, accounts: &AccountProvider, request: TransactionRequest, password: Option<String>) -> Result<RpcH256, Error>
 	where C: MiningBlockChainClient, M: MinerService {
 
+	let network_id = client.signing_network_id();
 	let address = request.from;
 	let signed_transaction = {
 		let t = prepare_transaction(client, miner, request);
-		let hash = t.hash();
+		let hash = t.hash(network_id);
 		let signature = try!(signature(accounts, address, password, hash));
-		t.with_signature(signature)
+		t.with_signature(signature, network_id)
 	};
 
-	trace!(target: "miner", "send_transaction: dispatching tx: {}", ::rlp::encode(&signed_transaction).to_vec().pretty());
+	trace!(target: "miner", "send_transaction: dispatching tx: {} for network ID {:?}", ::rlp::encode(&signed_transaction).to_vec().pretty(), network_id);
 	dispatch_transaction(&*client, &*miner, signed_transaction)
 }
 
diff --git a/rpc/src/v1/helpers/errors.rs b/rpc/src/v1/helpers/errors.rs
index 413ce7e7f..50c22b187 100644
--- a/rpc/src/v1/helpers/errors.rs
+++ b/rpc/src/v1/helpers/errors.rs
@@ -21,6 +21,7 @@ macro_rules! rpc_unimplemented {
 }
 
 use std::fmt;
+use rlp::DecoderError;
 use ethcore::error::{Error as EthcoreError, CallError};
 use ethcore::account_provider::{Error as AccountError};
 use fetch::FetchError;
@@ -41,6 +42,7 @@ mod codes {
 	pub const ACCOUNT_ERROR: i64 = -32023;
 	pub const SIGNER_DISABLED: i64 = -32030;
 	pub const DAPPS_DISABLED: i64 = -32031;
+	pub const NETWORK_DISABLED: i64 = -32035;
 	pub const REQUEST_REJECTED: i64 = -32040;
 	pub const REQUEST_REJECTED_LIMIT: i64 = -32041;
 	pub const REQUEST_NOT_FOUND: i64 = -32042;
@@ -185,6 +187,14 @@ pub fn dapps_disabled() -> Error {
 	}
 }
 
+pub fn network_disabled() -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::NETWORK_DISABLED),
+		message: "Network is disabled or not yet up.".into(),
+		data: None
+	}
+}
+
 pub fn encryption_error<T: fmt::Debug>(error: T) -> Error {
 	Error {
 		code: ErrorCode::ServerError(codes::ENCRYPTION_ERROR),
@@ -246,6 +256,7 @@ pub fn from_transaction_error(error: EthcoreError) -> Error {
 			SenderBanned => "Sender is banned in local queue.".into(),
 			RecipientBanned => "Recipient is banned in local queue.".into(),
 			CodeBanned => "Code is banned in local queue.".into(),
+			e => format!("{}", e).into(),
 		};
 		Error {
 			code: ErrorCode::ServerError(codes::TRANSACTION_ERROR),
@@ -261,6 +272,14 @@ pub fn from_transaction_error(error: EthcoreError) -> Error {
 	}
 }
 
+pub fn from_rlp_error(error: DecoderError) -> Error {
+	Error {
+		code: ErrorCode::InvalidParams,
+		message: "Invalid RLP.".into(),
+		data: Some(Value::String(format!("{:?}", error))),
+	}
+}
+
 pub fn from_call_error(error: CallError) -> Error {
 	match error {
 		CallError::StatePruned => state_pruned(),
diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
index 18f2cc37c..4e54078fb 100644
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -44,7 +44,7 @@ use ethcore::snapshot::SnapshotService;
 use self::ethash::SeedHashCompute;
 use v1::traits::Eth;
 use v1::types::{
-	Block, BlockTransactions, BlockNumber, Bytes, SyncStatus, SyncInfo,
+	RichBlock, Block, BlockTransactions, BlockNumber, Bytes, SyncStatus, SyncInfo,
 	Transaction, CallRequest, Index, Filter, Log, Receipt, Work,
 	H64 as RpcH64, H256 as RpcH256, H160 as RpcH160, U256 as RpcU256,
 };
@@ -53,6 +53,8 @@ use v1::helpers::dispatch::{default_gas_price, dispatch_transaction};
 use v1::helpers::block_import::is_major_importing;
 use v1::helpers::auto_args::Trailing;
 
+const EXTRA_INFO_PROOF: &'static str = "Object exists in in blockchain (fetched earlier), extra_info is always available if object exists; qed";
+
 /// Eth RPC options
 pub struct EthClientOptions {
 	/// Returns receipt from pending blocks
@@ -117,36 +119,39 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
 		}
 	}
 
-	fn block(&self, id: BlockID, include_txs: bool) -> Result<Option<Block>, Error> {
+	fn block(&self, id: BlockID, include_txs: bool) -> Result<Option<RichBlock>, Error> {
 		let client = take_weak!(self.client);
 		match (client.block(id.clone()), client.block_total_difficulty(id)) {
 			(Some(bytes), Some(total_difficulty)) => {
 				let block_view = BlockView::new(&bytes);
 				let view = block_view.header_view();
-				let block = Block {
-					hash: Some(view.sha3().into()),
-					size: Some(bytes.len().into()),
-					parent_hash: view.parent_hash().into(),
-					uncles_hash: view.uncles_hash().into(),
-					author: view.author().into(),
-					miner: view.author().into(),
-					state_root: view.state_root().into(),
-					transactions_root: view.transactions_root().into(),
-					receipts_root: view.receipts_root().into(),
-					number: Some(view.number().into()),
-					gas_used: view.gas_used().into(),
-					gas_limit: view.gas_limit().into(),
-					logs_bloom: view.log_bloom().into(),
-					timestamp: view.timestamp().into(),
-					difficulty: view.difficulty().into(),
-					total_difficulty: total_difficulty.into(),
-					seal_fields: view.seal().into_iter().map(|f| rlp::decode(&f)).map(Bytes::new).collect(),
-					uncles: block_view.uncle_hashes().into_iter().map(Into::into).collect(),
-					transactions: match include_txs {
-						true => BlockTransactions::Full(block_view.localized_transactions().into_iter().map(Into::into).collect()),
-						false => BlockTransactions::Hashes(block_view.transaction_hashes().into_iter().map(Into::into).collect()),
+				let block = RichBlock {
+					block: Block {
+						hash: Some(view.sha3().into()),
+						size: Some(bytes.len().into()),
+						parent_hash: view.parent_hash().into(),
+						uncles_hash: view.uncles_hash().into(),
+						author: view.author().into(),
+						miner: view.author().into(),
+						state_root: view.state_root().into(),
+						transactions_root: view.transactions_root().into(),
+						receipts_root: view.receipts_root().into(),
+						number: Some(view.number().into()),
+						gas_used: view.gas_used().into(),
+						gas_limit: view.gas_limit().into(),
+						logs_bloom: view.log_bloom().into(),
+						timestamp: view.timestamp().into(),
+						difficulty: view.difficulty().into(),
+						total_difficulty: total_difficulty.into(),
+						seal_fields: view.seal().into_iter().map(|f| rlp::decode(&f)).map(Bytes::new).collect(),
+						uncles: block_view.uncle_hashes().into_iter().map(Into::into).collect(),
+						transactions: match include_txs {
+							true => BlockTransactions::Full(block_view.localized_transactions().into_iter().map(Into::into).collect()),
+							false => BlockTransactions::Hashes(block_view.transaction_hashes().into_iter().map(Into::into).collect()),
+						},
+						extra_data: Bytes::new(view.extra_data()),
 					},
-					extra_data: Bytes::new(view.extra_data())
+					extra_info: client.block_extra_info(id.clone()).expect(EXTRA_INFO_PROOF),
 				};
 				Ok(Some(block))
 			},
@@ -161,7 +166,7 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
 		}
 	}
 
-	fn uncle(&self, id: UncleID) -> Result<Option<Block>, Error> {
+	fn uncle(&self, id: UncleID) -> Result<Option<RichBlock>, Error> {
 		let client = take_weak!(self.client);
 		let uncle: BlockHeader = match client.uncle(id) {
 			Some(rlp) => rlp::decode(&rlp),
@@ -172,27 +177,30 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> EthClient<C, SN, S, M, EM> where
 			None => { return Ok(None); }
 		};
 
-		let block = Block {
-			hash: Some(uncle.hash().into()),
-			size: None,
-			parent_hash: uncle.parent_hash().clone().into(),
-			uncles_hash: uncle.uncles_hash().clone().into(),
-			author: uncle.author().clone().into(),
-			miner: uncle.author().clone().into(),
-			state_root: uncle.state_root().clone().into(),
-			transactions_root: uncle.transactions_root().clone().into(),
-			number: Some(uncle.number().into()),
-			gas_used: uncle.gas_used().clone().into(),
-			gas_limit: uncle.gas_limit().clone().into(),
-			logs_bloom: uncle.log_bloom().clone().into(),
-			timestamp: uncle.timestamp().into(),
-			difficulty: uncle.difficulty().clone().into(),
-			total_difficulty: (uncle.difficulty().clone() + parent_difficulty).into(),
-			receipts_root: uncle.receipts_root().clone().into(),
-			extra_data: uncle.extra_data().clone().into(),
-			seal_fields: uncle.seal().clone().into_iter().map(|f| rlp::decode(&f)).map(Bytes::new).collect(),
-			uncles: vec![],
-			transactions: BlockTransactions::Hashes(vec![]),
+		let block = RichBlock {
+			block: Block {
+				hash: Some(uncle.hash().into()),
+				size: None,
+				parent_hash: uncle.parent_hash().clone().into(),
+				uncles_hash: uncle.uncles_hash().clone().into(),
+				author: uncle.author().clone().into(),
+				miner: uncle.author().clone().into(),
+				state_root: uncle.state_root().clone().into(),
+				transactions_root: uncle.transactions_root().clone().into(),
+				number: Some(uncle.number().into()),
+				gas_used: uncle.gas_used().clone().into(),
+				gas_limit: uncle.gas_limit().clone().into(),
+				logs_bloom: uncle.log_bloom().clone().into(),
+				timestamp: uncle.timestamp().into(),
+				difficulty: uncle.difficulty().clone().into(),
+				total_difficulty: (uncle.difficulty().clone() + parent_difficulty).into(),
+				receipts_root: uncle.receipts_root().clone().into(),
+				extra_data: uncle.extra_data().clone().into(),
+				seal_fields: uncle.seal().clone().into_iter().map(|f| rlp::decode(&f)).map(Bytes::new).collect(),
+				uncles: vec![],
+				transactions: BlockTransactions::Hashes(vec![]),
+			},
+			extra_info: client.uncle_extra_info(id).expect(EXTRA_INFO_PROOF),
 		};
 		Ok(Some(block))
 	}
@@ -435,13 +443,13 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 		}
 	}
 
-	fn block_by_hash(&self, hash: RpcH256, include_txs: bool) -> Result<Option<Block>, Error> {
+	fn block_by_hash(&self, hash: RpcH256, include_txs: bool) -> Result<Option<RichBlock>, Error> {
 		try!(self.active());
 
 		self.block(BlockID::Hash(hash.into()), include_txs)
 	}
 
-	fn block_by_number(&self, num: BlockNumber, include_txs: bool) -> Result<Option<Block>, Error> {
+	fn block_by_number(&self, num: BlockNumber, include_txs: bool) -> Result<Option<RichBlock>, Error> {
 		try!(self.active());
 
 		self.block(num.into(), include_txs)
@@ -483,13 +491,13 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 		}
 	}
 
-	fn uncle_by_block_hash_and_index(&self, hash: RpcH256, index: Index) -> Result<Option<Block>, Error> {
+	fn uncle_by_block_hash_and_index(&self, hash: RpcH256, index: Index) -> Result<Option<RichBlock>, Error> {
 		try!(self.active());
 
 		self.uncle(UncleID { block: BlockID::Hash(hash.into()), position: index.value() })
 	}
 
-	fn uncle_by_block_number_and_index(&self, num: BlockNumber, index: Index) -> Result<Option<Block>, Error> {
+	fn uncle_by_block_number_and_index(&self, num: BlockNumber, index: Index) -> Result<Option<RichBlock>, Error> {
 		try!(self.active());
 
 		self.uncle(UncleID { block: num.into(), position: index.value() })
@@ -603,7 +611,7 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 		let raw_transaction = raw.to_vec();
 		match UntrustedRlp::new(&raw_transaction).as_val() {
 			Ok(signed_transaction) => dispatch_transaction(&*take_weak!(self.client), &*take_weak!(self.miner), signed_transaction),
-			Err(_) => Ok(RpcH256::from(H256::from(0))),
+			Err(e) => Err(errors::from_rlp_error(e)),
 		}
 	}
 
@@ -613,15 +621,15 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 		let request = CallRequest::into(request);
 		let signed = try!(self.sign_call(request));
 
-		let r = match num.0 {
+		let result = match num.0 {
 			BlockNumber::Pending => take_weak!(self.miner).call(&*take_weak!(self.client), &signed, Default::default()),
 			num => take_weak!(self.client).call(&signed, num.into(), Default::default()),
 		};
 
-		match r {
-			Ok(b) => Ok(Bytes(b.output)),
-			Err(e) => Err(errors::from_call_error(e)),
-		}
+
+		result
+			.map(|b| b.output.into())
+			.map_err(errors::from_call_error)
 	}
 
 	fn estimate_gas(&self, request: CallRequest, num: Trailing<BlockNumber>) -> Result<RpcU256, Error> {
@@ -629,12 +637,14 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
 
 		let request = CallRequest::into(request);
 		let signed = try!(self.sign_call(request));
-		let r = match num.0 {
+		let result = match num.0 {
 			BlockNumber::Pending => take_weak!(self.miner).call(&*take_weak!(self.client), &signed, Default::default()),
 			num => take_weak!(self.client).call(&signed, num.into(), Default::default()),
 		};
 
-		Ok(RpcU256::from(r.map(|res| res.gas_used + res.refunded).unwrap_or(From::from(0))))
+		result
+			.map(|res| (res.gas_used + res.refunded).into())
+			.map_err(errors::from_call_error)
 	}
 
 	fn compile_lll(&self, _: String) -> Result<Bytes, Error> {
diff --git a/rpc/src/v1/impls/mod.rs b/rpc/src/v1/impls/mod.rs
index c108f0b6b..e4083ca95 100644
--- a/rpc/src/v1/impls/mod.rs
+++ b/rpc/src/v1/impls/mod.rs
@@ -27,13 +27,14 @@ macro_rules! take_weak {
 
 mod eth;
 mod eth_filter;
-mod eth_signing;
-mod ethcore;
-mod ethcore_set;
 mod net;
+mod parity;
+mod parity_accounts;
+mod parity_set;
 mod personal;
-mod personal_accounts;
-mod personal_signer;
+mod signer;
+mod signing;
+mod signing_unsafe;
 mod rpc;
 mod traces;
 mod web3;
@@ -41,12 +42,13 @@ mod web3;
 pub use self::web3::Web3Client;
 pub use self::eth::{EthClient, EthClientOptions};
 pub use self::eth_filter::EthFilterClient;
-pub use self::eth_signing::{EthSigningUnsafeClient, EthSigningQueueClient};
 pub use self::net::NetClient;
+pub use self::parity::ParityClient;
+pub use self::parity_accounts::ParityAccountsClient;
+pub use self::parity_set::ParitySetClient;
 pub use self::personal::PersonalClient;
-pub use self::personal_accounts::PersonalAccountsClient;
-pub use self::personal_signer::SignerClient;
-pub use self::ethcore::EthcoreClient;
-pub use self::ethcore_set::EthcoreSetClient;
+pub use self::signer::SignerClient;
+pub use self::signing::SigningQueueClient;
+pub use self::signing_unsafe::SigningUnsafeClient;
 pub use self::traces::TracesClient;
 pub use self::rpc::RpcClient;
diff --git a/rpc/src/v1/impls/ethcore.rs b/rpc/src/v1/impls/parity.rs
similarity index 74%
rename from rpc/src/v1/impls/ethcore.rs
rename to rpc/src/v1/impls/parity.rs
index dbb27037c..b9c19f667 100644
--- a/rpc/src/v1/impls/ethcore.rs
+++ b/rpc/src/v1/impls/parity.rs
@@ -14,16 +14,15 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Ethcore-specific rpc implementation.
-use std::{fs, io};
-use std::sync::{mpsc, Arc, Weak};
+//! Parity-specific rpc implementation.
+use std::sync::{Arc, Weak};
 use std::str::FromStr;
+use std::collections::BTreeMap;
 
-use util::{RotatingLogger, Address, Mutex, sha3};
+use util::{RotatingLogger, Address};
 use util::misc::version_data;
 
 use crypto::ecies;
-use fetch::{Client as FetchClient, Fetch};
 use ethkey::{Brain, Generator};
 use ethstore::random_phrase;
 use ethsync::{SyncProvider, ManageNetwork};
@@ -31,77 +30,57 @@ use ethcore::miner::MinerService;
 use ethcore::client::{MiningBlockChainClient};
 use ethcore::ids::BlockID;
 use ethcore::mode::Mode;
+use ethcore::account_provider::AccountProvider;
 
 use jsonrpc_core::Error;
-use v1::traits::Ethcore;
+use v1::traits::Parity;
 use v1::types::{Bytes, U256, H160, H256, H512, Peers, Transaction, RpcSettings, Histogram};
 use v1::helpers::{errors, SigningQueue, SignerService, NetworkSettings};
 use v1::helpers::dispatch::DEFAULT_MAC;
-use v1::helpers::auto_args::Ready;
 
-/// Ethcore implementation.
-pub struct EthcoreClient<C, M, S: ?Sized, F=FetchClient> where
+/// Parity implementation.
+pub struct ParityClient<C, M, S: ?Sized> where
 	C: MiningBlockChainClient,
 	M: MinerService,
 	S: SyncProvider,
-	F: Fetch {
-
+{
 	client: Weak<C>,
 	miner: Weak<M>,
 	sync: Weak<S>,
 	net: Weak<ManageNetwork>,
+	accounts: Weak<AccountProvider>,
 	logger: Arc<RotatingLogger>,
 	settings: Arc<NetworkSettings>,
 	signer: Option<Arc<SignerService>>,
-	fetch: Mutex<F>,
 	dapps_port: Option<u16>,
 }
 
-impl<C, M, S: ?Sized> EthcoreClient<C, M, S> where
+impl<C, M, S: ?Sized> ParityClient<C, M, S> where
 	C: MiningBlockChainClient,
 	M: MinerService,
-	S: SyncProvider, {
-	/// Creates new `EthcoreClient` with default `Fetch`.
+	S: SyncProvider,
+{
+	/// Creates new `ParityClient`.
 	pub fn new(
 		client: &Arc<C>,
 		miner: &Arc<M>,
 		sync: &Arc<S>,
 		net: &Arc<ManageNetwork>,
+		store: &Arc<AccountProvider>,
 		logger: Arc<RotatingLogger>,
 		settings: Arc<NetworkSettings>,
 		signer: Option<Arc<SignerService>>,
 		dapps_port: Option<u16>,
 	) -> Self {
-		Self::with_fetch(client, miner, sync, net, logger, settings, signer, dapps_port)
-	}
-}
-
-impl<C, M, S: ?Sized, F> EthcoreClient<C, M, S, F> where
-	C: MiningBlockChainClient,
-	M: MinerService,
-	S: SyncProvider,
-	F: Fetch, {
-
-	/// Creates new `EthcoreClient` with customizable `Fetch`.
-	pub fn with_fetch(
-		client: &Arc<C>,
-		miner: &Arc<M>,
-		sync: &Arc<S>,
-		net: &Arc<ManageNetwork>,
-		logger: Arc<RotatingLogger>,
-		settings: Arc<NetworkSettings>,
-		signer: Option<Arc<SignerService>>,
-		dapps_port: Option<u16>,
-		) -> Self {
-		EthcoreClient {
+		ParityClient {
 			client: Arc::downgrade(client),
 			miner: Arc::downgrade(miner),
 			sync: Arc::downgrade(sync),
 			net: Arc::downgrade(net),
+			accounts: Arc::downgrade(store),
 			logger: logger,
 			settings: settings,
 			signer: signer,
-			fetch: Mutex::new(F::default()),
 			dapps_port: dapps_port,
 		}
 	}
@@ -113,11 +92,10 @@ impl<C, M, S: ?Sized, F> EthcoreClient<C, M, S, F> where
 	}
 }
 
-impl<C, M, S: ?Sized, F> Ethcore for EthcoreClient<C, M, S, F> where
+impl<C, M, S: ?Sized> Parity for ParityClient<C, M, S> where
 	M: MinerService + 'static,
 	C: MiningBlockChainClient + 'static,
-	S: SyncProvider + 'static,
-	F: Fetch + 'static {
+	S: SyncProvider + 'static {
 
 	fn transactions_limit(&self) -> Result<usize, Error> {
 		try!(self.active());
@@ -278,44 +256,6 @@ impl<C, M, S: ?Sized, F> Ethcore for EthcoreClient<C, M, S, F> where
 		Ok(take_weak!(self.miner).all_transactions().into_iter().map(Into::into).collect::<Vec<_>>())
 	}
 
-	fn hash_content(&self, ready: Ready<H256>, url: String) {
-		let res = self.active();
-
-		let hash_content = |result| {
-			let path = try!(result);
-			let mut file = io::BufReader::new(try!(fs::File::open(&path)));
-			// Try to hash
-			let result = sha3(&mut file);
-			// Remove file (always)
-			try!(fs::remove_file(&path));
-			// Return the result
-			Ok(try!(result))
-		};
-
-		match res {
-			Err(e) => ready.ready(Err(e)),
-			Ok(()) => {
-				let (tx, rx) = mpsc::channel();
-				let res = self.fetch.lock().request_async(&url, Default::default(), Box::new(move |result| {
-					let result = hash_content(result)
-							.map_err(errors::from_fetch_error)
-							.map(Into::into);
-
-					// Receive ready and invoke with result.
-					let ready: Ready<H256> = rx.try_recv().expect("When on_done is invoked ready object is always sent.");
-					ready.ready(result);
-				}));
-
-				// Either invoke ready right away or transfer it to the closure.
-				if let Err(e) = res {
-					ready.ready(Err(errors::from_fetch_error(e)));
-				} else {
-					tx.send(ready).expect("Rx end is sent to on_done closure.");
-				}
-			}
-		}
-	}
-
 	fn signer_port(&self) -> Result<u16, Error> {
 		try!(self.active());
 
@@ -347,10 +287,32 @@ impl<C, M, S: ?Sized, F> Ethcore for EthcoreClient<C, M, S, F> where
 
 	fn mode(&self) -> Result<String, Error> {
 		Ok(match take_weak!(self.client).mode() {
-			Mode::Off => "off",
+			Mode::Off => "offline",
 			Mode::Dark(..) => "dark",
 			Mode::Passive(..) => "passive",
 			Mode::Active => "active",
 		}.into())
 	}
+
+	fn enode(&self) -> Result<String, Error> {
+		take_weak!(self.sync).enode().ok_or_else(errors::network_disabled)
+	}
+
+	fn accounts(&self) -> Result<BTreeMap<String, BTreeMap<String, String>>, Error> {
+		try!(self.active());
+		let store = take_weak!(self.accounts);
+		let info = try!(store.accounts_info().map_err(|e| errors::account("Could not fetch account info.", e)));
+		let other = store.addresses_info().expect("addresses_info always returns Ok; qed");
+
+		Ok(info.into_iter().chain(other.into_iter()).map(|(a, v)| {
+			let mut m = map![
+				"name".to_owned() => v.name,
+				"meta".to_owned() => v.meta
+			];
+			if let &Some(ref uuid) = &v.uuid {
+				m.insert("uuid".to_owned(), format!("{}", uuid));
+			}
+			(format!("0x{}", a.hex()), m)
+		}).collect())
+	}
 }
diff --git a/rpc/src/v1/impls/personal_accounts.rs b/rpc/src/v1/impls/parity_accounts.rs
similarity index 68%
rename from rpc/src/v1/impls/personal_accounts.rs
rename to rpc/src/v1/impls/parity_accounts.rs
index 56c92fc64..2644c59e3 100644
--- a/rpc/src/v1/impls/personal_accounts.rs
+++ b/rpc/src/v1/impls/parity_accounts.rs
@@ -16,33 +16,30 @@
 
 //! Account management (personal) rpc implementation
 use std::sync::{Arc, Weak};
+use std::collections::BTreeMap;
 use util::{Address};
-use jsonrpc_core::*;
+
 use ethkey::{Brain, Generator};
-use v1::traits::PersonalAccounts;
-use v1::types::{H160 as RpcH160, H256 as RpcH256, TransactionRequest};
-use v1::helpers::errors;
-use v1::helpers::dispatch::sign_and_dispatch;
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::MiningBlockChainClient;
-use ethcore::miner::MinerService;
+
+use jsonrpc_core::{Value, Error, to_value};
+use v1::traits::ParityAccounts;
+use v1::types::{H160 as RpcH160, H256 as RpcH256};
+use v1::helpers::errors;
 
 /// Account management (personal) rpc implementation.
-pub struct PersonalAccountsClient<C, M> where C: MiningBlockChainClient, M: MinerService {
+pub struct ParityAccountsClient<C> where C: MiningBlockChainClient {
 	accounts: Weak<AccountProvider>,
 	client: Weak<C>,
-	miner: Weak<M>,
-	allow_perm_unlock: bool,
 }
 
-impl<C, M> PersonalAccountsClient<C, M> where C: MiningBlockChainClient, M: MinerService {
+impl<C> ParityAccountsClient<C> where C: MiningBlockChainClient {
 	/// Creates new PersonalClient
-	pub fn new(store: &Arc<AccountProvider>, client: &Arc<C>, miner: &Arc<M>, allow_perm_unlock: bool) -> Self {
-		PersonalAccountsClient {
+	pub fn new(store: &Arc<AccountProvider>, client: &Arc<C>) -> Self {
+		ParityAccountsClient {
 			accounts: Arc::downgrade(store),
 			client: Arc::downgrade(client),
-			miner: Arc::downgrade(miner),
-			allow_perm_unlock: allow_perm_unlock,
 		}
 	}
 
@@ -53,15 +50,25 @@ impl<C, M> PersonalAccountsClient<C, M> where C: MiningBlockChainClient, M: Mine
 	}
 }
 
-impl<C: 'static, M: 'static> PersonalAccounts for PersonalAccountsClient<C, M> where C: MiningBlockChainClient, M: MinerService {
-
-	fn new_account(&self, pass: String) -> Result<RpcH160, Error> {
+impl<C: 'static> ParityAccounts for ParityAccountsClient<C> where C: MiningBlockChainClient {
+	fn accounts_info(&self) -> Result<BTreeMap<String, Value>, Error> {
 		try!(self.active());
 		let store = take_weak!(self.accounts);
+		let info = try!(store.accounts_info().map_err(|e| errors::account("Could not fetch account info.", e)));
+		let other = store.addresses_info().expect("addresses_info always returns Ok; qed");
 
-		store.new_account(&pass)
-			.map(Into::into)
-			.map_err(|e| errors::account("Could not create account.", e))
+		Ok(info.into_iter().chain(other.into_iter()).map(|(a, v)| {
+			let m = map![
+				"name".to_owned() => to_value(&v.name),
+				"meta".to_owned() => to_value(&v.meta),
+				"uuid".to_owned() => if let &Some(ref uuid) = &v.uuid {
+					to_value(uuid)
+				} else {
+					Value::Null
+				}
+			];
+			(format!("0x{}", a.hex()), Value::Object(m))
+		}).collect())
 	}
 
 	fn new_account_from_phrase(&self, phrase: String, pass: String) -> Result<RpcH160, Error> {
@@ -92,24 +99,6 @@ impl<C: 'static, M: 'static> PersonalAccounts for PersonalAccountsClient<C, M> w
 			.map_err(|e| errors::account("Could not create account.", e))
 	}
 
-	fn unlock_account(&self, account: RpcH160, account_pass: String, duration: Option<u64>) -> Result<bool, Error> {
-		try!(self.active());
-		let account: Address = account.into();
-		let store = take_weak!(self.accounts);
-
-		let r = match (self.allow_perm_unlock, duration) {
-			(false, _) => store.unlock_account_temporarily(account, account_pass),
-			(true, Some(0)) => store.unlock_account_permanently(account, account_pass),
-			(true, Some(d)) => store.unlock_account_timed(account, account_pass, d as u32 * 1000),
-			(true, None) => store.unlock_account_timed(account, account_pass, 300_000),
-		};
-		match r {
-			Ok(_) => Ok(true),
-			// TODO [ToDr] Proper error here?
-			Err(_) => Ok(false),
-		}
-	}
-
 	fn test_password(&self, account: RpcH160, password: String) -> Result<bool, Error> {
 		try!(self.active());
 		let account: Address = account.into();
@@ -128,18 +117,6 @@ impl<C: 'static, M: 'static> PersonalAccounts for PersonalAccountsClient<C, M> w
 			.map_err(|e| errors::account("Could not fetch account info.", e))
 	}
 
-	fn sign_and_send_transaction(&self, request: TransactionRequest, password: String) -> Result<RpcH256, Error> {
-		try!(self.active());
-
-		sign_and_dispatch(
-			&*take_weak!(self.client),
-			&*take_weak!(self.miner),
-			&*take_weak!(self.accounts),
-			request.into(),
-			Some(password)
-		)
-	}
-
 	fn set_account_name(&self, addr: RpcH160, name: String) -> Result<bool, Error> {
 		try!(self.active());
 		let store = take_weak!(self.accounts);
@@ -162,6 +139,10 @@ impl<C: 'static, M: 'static> PersonalAccounts for PersonalAccountsClient<C, M> w
 		Ok(true)
 	}
 
+	fn set_account_visibility(&self, _address: RpcH160, _dapp: RpcH256, _visible: bool) -> Result<bool, Error> {
+		Ok(false)
+	}
+
 	fn import_geth_accounts(&self, addresses: Vec<RpcH160>) -> Result<Vec<RpcH160>, Error> {
 		let store = take_weak!(self.accounts);
 
diff --git a/rpc/src/v1/impls/ethcore_set.rs b/rpc/src/v1/impls/parity_set.rs
similarity index 61%
rename from rpc/src/v1/impls/ethcore_set.rs
rename to rpc/src/v1/impls/parity_set.rs
index 27464cff3..47634d518 100644
--- a/rpc/src/v1/impls/ethcore_set.rs
+++ b/rpc/src/v1/impls/parity_set.rs
@@ -14,36 +14,57 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-/// Ethcore-specific rpc interface for operations altering the settings.
-use std::sync::{Arc, Weak};
-use jsonrpc_core::*;
+/// Parity-specific rpc interface for operations altering the settings.
+use std::{fs, io};
+use std::sync::{Arc, Weak, mpsc};
+
 use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;
 use ethcore::mode::Mode;
 use ethsync::ManageNetwork;
-use v1::helpers::errors;
-use v1::traits::EthcoreSet;
-use v1::types::{Bytes, H160, U256};
+use fetch::{Client as FetchClient, Fetch};
+use util::{Mutex, sha3};
 
-/// Ethcore-specific rpc interface for operations altering the settings.
-pub struct EthcoreSetClient<C, M> where
+use jsonrpc_core::Error;
+use v1::helpers::auto_args::Ready;
+use v1::helpers::errors;
+use v1::traits::ParitySet;
+use v1::types::{Bytes, H160, H256, U256};
+
+/// Parity-specific rpc interface for operations altering the settings.
+pub struct ParitySetClient<C, M, F=FetchClient> where
 	C: MiningBlockChainClient,
-	M: MinerService
+	M: MinerService,
+	F: Fetch,
 {
 	client: Weak<C>,
 	miner: Weak<M>,
 	net: Weak<ManageNetwork>,
+	fetch: Mutex<F>,
 }
 
-impl<C, M> EthcoreSetClient<C, M> where
+impl<C, M> ParitySetClient<C, M, FetchClient> where
 	C: MiningBlockChainClient,
-	M: MinerService {
-	/// Creates new `EthcoreSetClient`.
+	M: MinerService
+{
+	/// Creates new `ParitySetClient` with default `FetchClient`.
 	pub fn new(client: &Arc<C>, miner: &Arc<M>, net: &Arc<ManageNetwork>) -> Self {
-		EthcoreSetClient {
+		Self::with_fetch(client, miner, net)
+	}
+}
+
+impl<C, M, F> ParitySetClient<C, M, F> where
+	C: MiningBlockChainClient,
+	M: MinerService,
+	F: Fetch,
+{
+	/// Creates new `ParitySetClient` with default `FetchClient`.
+	pub fn with_fetch(client: &Arc<C>, miner: &Arc<M>, net: &Arc<ManageNetwork>) -> Self {
+		ParitySetClient {
 			client: Arc::downgrade(client),
 			miner: Arc::downgrade(miner),
 			net: Arc::downgrade(net),
+			fetch: Mutex::new(F::default()),
 		}
 	}
 
@@ -54,9 +75,11 @@ impl<C, M> EthcoreSetClient<C, M> where
 	}
 }
 
-impl<C, M> EthcoreSet for EthcoreSetClient<C, M> where
+impl<C, M, F> ParitySet for ParitySetClient<C, M, F> where
 	C: MiningBlockChainClient + 'static,
-	M: MinerService + 'static {
+	M: MinerService + 'static,
+	F: Fetch + 'static,
+{
 
 	fn set_min_gas_price(&self, gas_price: U256) -> Result<bool, Error> {
 		try!(self.active());
@@ -151,7 +174,7 @@ impl<C, M> EthcoreSet for EthcoreSetClient<C, M> where
 
 	fn set_mode(&self, mode: String) -> Result<bool, Error> {
 		take_weak!(self.client).set_mode(match mode.as_str() {
-			"off" => Mode::Off,
+			"offline" => Mode::Off,
 			"dark" => Mode::Dark(300),
 			"passive" => Mode::Passive(300, 3600),
 			"active" => Mode::Active,
@@ -159,4 +182,46 @@ impl<C, M> EthcoreSet for EthcoreSetClient<C, M> where
 		});
 		Ok(true)
 	}
+
+	fn hash_content(&self, ready: Ready<H256>, url: String) {
+		let res = self.active();
+
+		let hash_content = |result| {
+			let path = try!(result);
+			let mut file = io::BufReader::new(try!(fs::File::open(&path)));
+			// Try to hash
+			let result = sha3(&mut file);
+			// Remove file (always)
+			try!(fs::remove_file(&path));
+			// Return the result
+			Ok(try!(result))
+		};
+
+		match res {
+			Err(e) => ready.ready(Err(e)),
+			Ok(()) => {
+				let (tx, rx) = mpsc::channel();
+				let res = self.fetch.lock().request_async(&url, Default::default(), Box::new(move |result| {
+					let result = hash_content(result)
+							.map_err(errors::from_fetch_error)
+							.map(Into::into);
+
+					// Receive ready and invoke with result.
+					let ready: Ready<H256> = rx.recv().expect(
+						"recv() fails when `tx` has been dropped, if this closure is invoked `tx` is not dropped (`res == Ok()`); qed"
+					);
+					ready.ready(result);
+				}));
+
+				// Either invoke ready right away or transfer it to the closure.
+				if let Err(e) = res {
+					ready.ready(Err(errors::from_fetch_error(e)));
+				} else {
+					tx.send(ready).expect(
+						"send() fails when `rx` end is dropped, if `res == Ok()`: `rx` is moved to the closure; qed"
+					);
+				}
+			}
+		}
+	}
 }
diff --git a/rpc/src/v1/impls/personal.rs b/rpc/src/v1/impls/personal.rs
index bace56db1..ffb20610c 100644
--- a/rpc/src/v1/impls/personal.rs
+++ b/rpc/src/v1/impls/personal.rs
@@ -16,26 +16,34 @@
 
 //! Account management (personal) rpc implementation
 use std::sync::{Arc, Weak};
-use std::collections::{BTreeMap};
-use jsonrpc_core::*;
-use v1::traits::Personal;
-use v1::types::{H160 as RpcH160};
-use v1::helpers::errors;
+
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::MiningBlockChainClient;
+use ethcore::miner::MinerService;
+use util::Address;
+
+use jsonrpc_core::Error;
+use v1::traits::Personal;
+use v1::types::{H160 as RpcH160, H256 as RpcH256, TransactionRequest};
+use v1::helpers::errors;
+use v1::helpers::dispatch::sign_and_dispatch;
 
 /// Account management (personal) rpc implementation.
-pub struct PersonalClient<C> where C: MiningBlockChainClient {
+pub struct PersonalClient<C, M> where C: MiningBlockChainClient, M: MinerService {
 	accounts: Weak<AccountProvider>,
 	client: Weak<C>,
+	miner: Weak<M>,
+	allow_perm_unlock: bool,
 }
 
-impl<C> PersonalClient<C> where C: MiningBlockChainClient {
+impl<C, M> PersonalClient<C, M> where C: MiningBlockChainClient, M: MinerService {
 	/// Creates new PersonalClient
-	pub fn new(store: &Arc<AccountProvider>, client: &Arc<C>) -> Self {
+	pub fn new(store: &Arc<AccountProvider>, client: &Arc<C>, miner: &Arc<M>, allow_perm_unlock: bool) -> Self {
 		PersonalClient {
 			accounts: Arc::downgrade(store),
 			client: Arc::downgrade(client),
+			miner: Arc::downgrade(miner),
+			allow_perm_unlock: allow_perm_unlock,
 		}
 	}
 
@@ -46,8 +54,7 @@ impl<C> PersonalClient<C> where C: MiningBlockChainClient {
 	}
 }
 
-impl<C: 'static> Personal for PersonalClient<C> where C: MiningBlockChainClient {
-
+impl<C: 'static, M: 'static> Personal for PersonalClient<C, M> where C: MiningBlockChainClient, M: MinerService {
 	fn accounts(&self) -> Result<Vec<RpcH160>, Error> {
 		try!(self.active());
 
@@ -56,23 +63,42 @@ impl<C: 'static> Personal for PersonalClient<C> where C: MiningBlockChainClient
 		Ok(accounts.into_iter().map(Into::into).collect::<Vec<RpcH160>>())
 	}
 
-	fn accounts_info(&self) -> Result<BTreeMap<String, Value>, Error> {
+	fn new_account(&self, pass: String) -> Result<RpcH160, Error> {
 		try!(self.active());
 		let store = take_weak!(self.accounts);
-		let info = try!(store.accounts_info().map_err(|e| errors::account("Could not fetch account info.", e)));
-		let other = store.addresses_info().expect("addresses_info always returns Ok; qed");
 
-		Ok(info.into_iter().chain(other.into_iter()).map(|(a, v)| {
-			let m = map![
-				"name".to_owned() => to_value(&v.name),
-				"meta".to_owned() => to_value(&v.meta),
-				"uuid".to_owned() => if let &Some(ref uuid) = &v.uuid {
-					to_value(uuid)
-				} else {
-					Value::Null
-				}
-			];
-			(format!("0x{}", a.hex()), Value::Object(m))
-		}).collect())
+		store.new_account(&pass)
+			.map(Into::into)
+			.map_err(|e| errors::account("Could not create account.", e))
+	}
+
+	fn unlock_account(&self, account: RpcH160, account_pass: String, duration: Option<u64>) -> Result<bool, Error> {
+		try!(self.active());
+		let account: Address = account.into();
+		let store = take_weak!(self.accounts);
+
+		let r = match (self.allow_perm_unlock, duration) {
+			(false, _) => store.unlock_account_temporarily(account, account_pass),
+			(true, Some(0)) => store.unlock_account_permanently(account, account_pass),
+			(true, Some(d)) => store.unlock_account_timed(account, account_pass, d as u32 * 1000),
+			(true, None) => store.unlock_account_timed(account, account_pass, 300_000),
+		};
+		match r {
+			Ok(_) => Ok(true),
+			// TODO [ToDr] Proper error here?
+			Err(_) => Ok(false),
+		}
+	}
+
+	fn sign_and_send_transaction(&self, request: TransactionRequest, password: String) -> Result<RpcH256, Error> {
+		try!(self.active());
+
+		sign_and_dispatch(
+			&*take_weak!(self.client),
+			&*take_weak!(self.miner),
+			&*take_weak!(self.accounts),
+			request.into(),
+			Some(password)
+		)
 	}
 }
diff --git a/rpc/src/v1/impls/personal_signer.rs b/rpc/src/v1/impls/signer.rs
similarity index 94%
rename from rpc/src/v1/impls/personal_signer.rs
rename to rpc/src/v1/impls/signer.rs
index 95db21e9f..61453e02b 100644
--- a/rpc/src/v1/impls/personal_signer.rs
+++ b/rpc/src/v1/impls/signer.rs
@@ -14,14 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Transactions Confirmations (personal) rpc implementation
+//! Transactions Confirmations rpc implementation
 
 use std::sync::{Arc, Weak};
 use jsonrpc_core::*;
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::MiningBlockChainClient;
 use ethcore::miner::MinerService;
-use v1::traits::PersonalSigner;
+use v1::traits::Signer;
 use v1::types::{TransactionModification, ConfirmationRequest, U256};
 use v1::helpers::{errors, SignerService, SigningQueue, ConfirmationPayload};
 use v1::helpers::dispatch::{sign_and_dispatch, sign, decrypt};
@@ -58,7 +58,7 @@ impl<C: 'static, M: 'static> SignerClient<C, M> where C: MiningBlockChainClient,
 	}
 }
 
-impl<C: 'static, M: 'static> PersonalSigner for SignerClient<C, M> where C: MiningBlockChainClient, M: MinerService {
+impl<C: 'static, M: 'static> Signer for SignerClient<C, M> where C: MiningBlockChainClient, M: MinerService {
 
 	fn requests_to_confirm(&self) -> Result<Vec<ConfirmationRequest>, Error> {
 		try!(self.active());
diff --git a/rpc/src/v1/impls/eth_signing.rs b/rpc/src/v1/impls/signing.rs
similarity index 72%
rename from rpc/src/v1/impls/eth_signing.rs
rename to rpc/src/v1/impls/signing.rs
index dd71af6a5..f54847757 100644
--- a/rpc/src/v1/impls/eth_signing.rs
+++ b/rpc/src/v1/impls/signing.rs
@@ -14,43 +14,22 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Eth Signing RPC implementation.
+//! Signing RPC implementation.
 
 use std::sync::{Arc, Weak};
-use jsonrpc_core::*;
+
+use ethcore::account_provider::AccountProvider;
 use ethcore::miner::MinerService;
 use ethcore::client::MiningBlockChainClient;
-use util::{U256, Address, H256, Mutex};
 use transient_hashmap::TransientHashMap;
-use ethcore::account_provider::AccountProvider;
+use util::{U256, Address, H256, Mutex};
+
+use jsonrpc_core::*;
 use v1::helpers::{errors, SigningQueue, ConfirmationPromise, ConfirmationResult, ConfirmationPayload, TransactionRequest as TRequest, FilledTransactionRequest as FilledRequest, SignerService};
 use v1::helpers::dispatch::{default_gas_price, sign_and_dispatch, sign, decrypt};
-use v1::traits::EthSigning;
+use v1::traits::{EthSigning, ParitySigning};
 use v1::types::{TransactionRequest, H160 as RpcH160, H256 as RpcH256, U256 as RpcU256, Bytes as RpcBytes};
 
-fn fill_optional_fields<C, M>(request: TRequest, client: &C, miner: &M) -> FilledRequest
-	where C: MiningBlockChainClient, M: MinerService {
-	FilledRequest {
-		from: request.from,
-		to: request.to,
-		nonce: request.nonce,
-		gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(client, miner)),
-		gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()),
-		value: request.value.unwrap_or_else(|| 0.into()),
-		data: request.data.unwrap_or_else(Vec::new),
-	}
-}
-
-/// Implementation of functions that require signing when no trusted signer is used.
-pub struct EthSigningQueueClient<C, M> where C: MiningBlockChainClient, M: MinerService {
-	signer: Weak<SignerService>,
-	accounts: Weak<AccountProvider>,
-	client: Weak<C>,
-	miner: Weak<M>,
-
-	pending: Mutex<TransientHashMap<U256, ConfirmationPromise>>,
-}
-
 const MAX_PENDING_DURATION: u64 = 60 * 60;
 
 pub enum DispatchResult {
@@ -58,10 +37,23 @@ pub enum DispatchResult {
 	Value(Value),
 }
 
-impl<C, M> EthSigningQueueClient<C, M> where C: MiningBlockChainClient, M: MinerService {
+/// Implementation of functions that require signing when no trusted signer is used.
+pub struct SigningQueueClient<C, M> where C: MiningBlockChainClient, M: MinerService {
+	signer: Weak<SignerService>,
+	accounts: Weak<AccountProvider>,
+	client: Weak<C>,
+	miner: Weak<M>,
+
+	pending: Mutex<TransientHashMap<U256, ConfirmationPromise>>,
+}
+
+impl<C, M> SigningQueueClient<C, M> where
+	C: MiningBlockChainClient,
+	M: MinerService,
+{
 	/// Creates a new signing queue client given shared signing queue.
 	pub fn new(signer: &Arc<SignerService>, client: &Arc<C>, miner: &Arc<M>, accounts: &Arc<AccountProvider>) -> Self {
-		EthSigningQueueClient {
+		SigningQueueClient {
 			signer: Arc::downgrade(signer),
 			accounts: Arc::downgrade(accounts),
 			client: Arc::downgrade(client),
@@ -132,10 +124,10 @@ impl<C, M> EthSigningQueueClient<C, M> where C: MiningBlockChainClient, M: Miner
 	}
 }
 
-impl<C, M> EthSigning for EthSigningQueueClient<C, M>
-	where C: MiningBlockChainClient + 'static, M: MinerService + 'static
+impl<C: 'static, M: 'static> ParitySigning for SigningQueueClient<C, M> where
+	C: MiningBlockChainClient,
+	M: MinerService,
 {
-
 	fn post_sign(&self, params: Params) -> Result<Value, Error> {
 		try!(self.active());
 		self.dispatch_sign(params).map(|result| match result {
@@ -178,16 +170,6 @@ impl<C, M> EthSigning for EthSigningQueueClient<C, M>
 		})
 	}
 
-	fn sign(&self, params: Params, ready: Ready) {
-		let res = self.active().and_then(|_| self.dispatch_sign(params));
-		self.handle_dispatch(res, ready);
-	}
-
-	fn send_transaction(&self, params: Params, ready: Ready) {
-		let res = self.active().and_then(|_| self.dispatch_transaction(params));
-		self.handle_dispatch(res, ready);
-	}
-
 	fn decrypt_message(&self, params: Params, ready: Ready) {
 		let res = self.active()
 			.and_then(|_| from_params::<(RpcH160, RpcBytes)>(params))
@@ -205,76 +187,30 @@ impl<C, M> EthSigning for EthSigningQueueClient<C, M>
 	}
 }
 
-/// Implementation of functions that require signing when no trusted signer is used.
-pub struct EthSigningUnsafeClient<C, M> where
+impl<C: 'static, M: 'static> EthSigning for SigningQueueClient<C, M> where
 	C: MiningBlockChainClient,
-	M: MinerService {
-	client: Weak<C>,
-	accounts: Weak<AccountProvider>,
-	miner: Weak<M>,
-}
-
-impl<C, M> EthSigningUnsafeClient<C, M> where
-	C: MiningBlockChainClient,
-	M: MinerService {
-
-	/// Creates new EthClient.
-	pub fn new(client: &Arc<C>, accounts: &Arc<AccountProvider>, miner: &Arc<M>)
-		-> Self {
-		EthSigningUnsafeClient {
-			client: Arc::downgrade(client),
-			miner: Arc::downgrade(miner),
-			accounts: Arc::downgrade(accounts),
-		}
-	}
-
-	fn active(&self) -> Result<(), Error> {
-		// TODO: only call every 30s at most.
-		take_weak!(self.client).keep_alive();
-		Ok(())
-	}
-}
-
-impl<C, M> EthSigning for EthSigningUnsafeClient<C, M> where
-	C: MiningBlockChainClient + 'static,
-	M: MinerService + 'static {
-
+	M: MinerService,
+{
 	fn sign(&self, params: Params, ready: Ready) {
-		ready.ready(self.active()
-			.and_then(|_| from_params::<(RpcH160, RpcH256)>(params))
-			.and_then(|(address, msg)| {
-				sign(&*take_weak!(self.accounts), address.into(), None, msg.into())
-			}))
+		let res = self.active().and_then(|_| self.dispatch_sign(params));
+		self.handle_dispatch(res, ready);
 	}
 
 	fn send_transaction(&self, params: Params, ready: Ready) {
-		ready.ready(self.active()
-			.and_then(|_| from_params::<(TransactionRequest, )>(params))
-			.and_then(|(request, )| {
-				sign_and_dispatch(&*take_weak!(self.client), &*take_weak!(self.miner), &*take_weak!(self.accounts), request.into(), None).map(to_value)
-			}))
-	}
-
-	fn decrypt_message(&self, params: Params, ready: Ready) {
-		ready.ready(self.active()
-			.and_then(|_| from_params::<(RpcH160, RpcBytes)>(params))
-			.and_then(|(address, ciphertext)| {
-				decrypt(&*take_weak!(self.accounts), address.into(), None, ciphertext.0)
-			}))
-	}
-
-	fn post_sign(&self, _: Params) -> Result<Value, Error> {
-		// We don't support this in non-signer mode.
-		Err(errors::signer_disabled())
-	}
-
-	fn post_transaction(&self, _: Params) -> Result<Value, Error> {
-		// We don't support this in non-signer mode.
-		Err(errors::signer_disabled())
-	}
-
-	fn check_request(&self, _: Params) -> Result<Value, Error> {
-		// We don't support this in non-signer mode.
-		Err(errors::signer_disabled())
+		let res = self.active().and_then(|_| self.dispatch_transaction(params));
+		self.handle_dispatch(res, ready);
+	}
+}
+
+fn fill_optional_fields<C, M>(request: TRequest, client: &C, miner: &M) -> FilledRequest
+	where C: MiningBlockChainClient, M: MinerService {
+	FilledRequest {
+		from: request.from,
+		to: request.to,
+		nonce: request.nonce,
+		gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(client, miner)),
+		gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()),
+		value: request.value.unwrap_or_else(|| 0.into()),
+		data: request.data.unwrap_or_else(Vec::new),
 	}
 }
diff --git a/rpc/src/v1/impls/signing_unsafe.rs b/rpc/src/v1/impls/signing_unsafe.rs
new file mode 100644
index 000000000..251ce9329
--- /dev/null
+++ b/rpc/src/v1/impls/signing_unsafe.rs
@@ -0,0 +1,110 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Unsafe Signing RPC implementation.
+
+use std::sync::{Arc, Weak};
+
+use ethcore::account_provider::AccountProvider;
+use ethcore::miner::MinerService;
+use ethcore::client::MiningBlockChainClient;
+
+use jsonrpc_core::*;
+use v1::helpers::errors;
+use v1::helpers::dispatch::{sign_and_dispatch, sign, decrypt};
+use v1::traits::{EthSigning, ParitySigning};
+use v1::types::{TransactionRequest, H160 as RpcH160, H256 as RpcH256, Bytes as RpcBytes};
+
+/// Implementation of functions that require signing when no trusted signer is used.
+pub struct SigningUnsafeClient<C, M> where
+	C: MiningBlockChainClient,
+	M: MinerService,
+{
+	accounts: Weak<AccountProvider>,
+	client: Weak<C>,
+	miner: Weak<M>,
+}
+
+impl<C, M> SigningUnsafeClient<C, M> where
+	C: MiningBlockChainClient,
+	M: MinerService,
+{
+
+	/// Creates new SigningUnsafeClient.
+	pub fn new(client: &Arc<C>, accounts: &Arc<AccountProvider>, miner: &Arc<M>)
+		-> Self {
+		SigningUnsafeClient {
+			client: Arc::downgrade(client),
+			miner: Arc::downgrade(miner),
+			accounts: Arc::downgrade(accounts),
+		}
+	}
+
+	fn active(&self) -> Result<(), Error> {
+		// TODO: only call every 30s at most.
+		take_weak!(self.client).keep_alive();
+		Ok(())
+	}
+}
+
+impl<C: 'static, M: 'static> EthSigning for SigningUnsafeClient<C, M> where
+	C: MiningBlockChainClient,
+	M: MinerService,
+{
+	fn sign(&self, params: Params, ready: Ready) {
+		ready.ready(self.active()
+			.and_then(|_| from_params::<(RpcH160, RpcH256)>(params))
+			.and_then(|(address, msg)| {
+				sign(&*take_weak!(self.accounts), address.into(), None, msg.into())
+			}))
+	}
+
+	fn send_transaction(&self, params: Params, ready: Ready) {
+		ready.ready(self.active()
+			.and_then(|_| from_params::<(TransactionRequest, )>(params))
+			.and_then(|(request, )| {
+				sign_and_dispatch(&*take_weak!(self.client), &*take_weak!(self.miner), &*take_weak!(self.accounts), request.into(), None).map(to_value)
+			}))
+	}
+}
+
+impl<C: 'static, M: 'static> ParitySigning for SigningUnsafeClient<C, M> where
+	C: MiningBlockChainClient,
+	M: MinerService,
+{
+	fn decrypt_message(&self, params: Params, ready: Ready) {
+		ready.ready(self.active()
+			.and_then(|_| from_params::<(RpcH160, RpcBytes)>(params))
+			.and_then(|(address, ciphertext)| {
+				decrypt(&*take_weak!(self.accounts), address.into(), None, ciphertext.0)
+			}))
+	}
+
+	fn post_sign(&self, _: Params) -> Result<Value, Error> {
+		// We don't support this in non-signer mode.
+		Err(errors::signer_disabled())
+	}
+
+	fn post_transaction(&self, _: Params) -> Result<Value, Error> {
+		// We don't support this in non-signer mode.
+		Err(errors::signer_disabled())
+	}
+
+	fn check_request(&self, _: Params) -> Result<Value, Error> {
+		// We don't support this in non-signer mode.
+		Err(errors::signer_disabled())
+	}
+}
diff --git a/rpc/src/v1/mod.rs b/rpc/src/v1/mod.rs
index 24560160c..966a87f26 100644
--- a/rpc/src/v1/mod.rs
+++ b/rpc/src/v1/mod.rs
@@ -26,6 +26,6 @@ pub mod traits;
 pub mod tests;
 pub mod types;
 
-pub use self::traits::{Web3, Eth, EthFilter, EthSigning, Personal, PersonalAccounts, PersonalSigner, Net, Ethcore, EthcoreSet, Traces, Rpc};
+pub use self::traits::{Web3, Eth, EthFilter, EthSigning, Net, Parity, ParityAccounts, ParitySet, ParitySigning, Signer, Personal, Traces, Rpc};
 pub use self::impls::*;
 pub use self::helpers::{SigningQueue, SignerService, ConfirmationsQueue, NetworkSettings, block_import};
diff --git a/rpc/src/v1/tests/eth.rs b/rpc/src/v1/tests/eth.rs
index c4341622e..2f5131f32 100644
--- a/rpc/src/v1/tests/eth.rs
+++ b/rpc/src/v1/tests/eth.rs
@@ -33,7 +33,7 @@ use util::{U256, H256, Uint, Address};
 use jsonrpc_core::IoHandler;
 use ethjson::blockchain::BlockChain;
 
-use v1::impls::{EthClient, EthSigningUnsafeClient};
+use v1::impls::{EthClient, SigningUnsafeClient};
 use v1::types::U256 as NU256;
 use v1::traits::eth::Eth;
 use v1::traits::eth_signing::EthSigning;
@@ -45,7 +45,7 @@ fn account_provider() -> Arc<AccountProvider> {
 
 fn sync_provider() -> Arc<TestSyncProvider> {
 	Arc::new(TestSyncProvider::new(Config {
-		network_id: U256::from(3),
+		network_id: 3,
 		num_peers: 120,
 	}))
 }
@@ -140,7 +140,7 @@ impl EthTester {
 			&external_miner,
 			Default::default(),
 		);
-		let eth_sign = EthSigningUnsafeClient::new(
+		let eth_sign = SigningUnsafeClient::new(
 			&client,
 			&account_provider,
 			&miner_service
diff --git a/rpc/src/v1/tests/helpers/miner_service.rs b/rpc/src/v1/tests/helpers/miner_service.rs
index dcabba214..af158d564 100644
--- a/rpc/src/v1/tests/helpers/miner_service.rs
+++ b/rpc/src/v1/tests/helpers/miner_service.rs
@@ -209,6 +209,8 @@ impl MinerService for TestMinerService {
 				gas_used: r.gas_used.clone(),
 				contract_address: None,
 				logs: r.logs.clone(),
+				log_bloom: r.log_bloom,
+				state_root: r.state_root,
 			}
 		)
 	}
diff --git a/rpc/src/v1/tests/helpers/sync_provider.rs b/rpc/src/v1/tests/helpers/sync_provider.rs
index c85fddea5..e0f811fc0 100644
--- a/rpc/src/v1/tests/helpers/sync_provider.rs
+++ b/rpc/src/v1/tests/helpers/sync_provider.rs
@@ -16,13 +16,13 @@
 
 //! Test implementation of SyncProvider.
 
-use util::{RwLock, U256};
+use util::{RwLock};
 use ethsync::{SyncProvider, SyncStatus, SyncState, PeerInfo};
 
 /// TestSyncProvider config.
 pub struct Config {
 	/// Protocol version.
-	pub network_id: U256,
+	pub network_id: usize,
 	/// Number of peers.
 	pub num_peers: usize,
 }
@@ -93,5 +93,9 @@ impl SyncProvider for TestSyncProvider {
 			}
 		]
 	}
+
+	fn enode(&self) -> Option<String> {
+		None
+	}
 }
 
diff --git a/rpc/src/v1/tests/mocked/eth.rs b/rpc/src/v1/tests/mocked/eth.rs
index 24aa5e480..9f654e7e0 100644
--- a/rpc/src/v1/tests/mocked/eth.rs
+++ b/rpc/src/v1/tests/mocked/eth.rs
@@ -27,7 +27,7 @@ use ethcore::receipt::LocalizedReceipt;
 use ethcore::transaction::{Transaction, Action};
 use ethcore::miner::{ExternalMiner, MinerService};
 use ethsync::SyncState;
-use v1::{Eth, EthClient, EthClientOptions, EthFilter, EthFilterClient, EthSigning, EthSigningUnsafeClient};
+use v1::{Eth, EthClient, EthClientOptions, EthFilter, EthFilterClient, EthSigning, SigningUnsafeClient};
 use v1::tests::helpers::{TestSyncProvider, Config, TestMinerService, TestSnapshotService};
 use rustc_serialize::hex::ToHex;
 use time::get_time;
@@ -43,7 +43,7 @@ fn accounts_provider() -> Arc<AccountProvider> {
 
 fn sync_provider() -> Arc<TestSyncProvider> {
 	Arc::new(TestSyncProvider::new(Config {
-		network_id: U256::from(3),
+		network_id: 3,
 		num_peers: 120,
 	}))
 }
@@ -83,7 +83,7 @@ impl EthTester {
 		let external_miner = Arc::new(ExternalMiner::new(hashrates.clone()));
 		let eth = EthClient::new(&client, &snapshot, &sync, &ap, &miner, &external_miner, options).to_delegate();
 		let filter = EthFilterClient::new(&client, &miner).to_delegate();
-		let sign = EthSigningUnsafeClient::new(&client, &ap, &miner).to_delegate();
+		let sign = SigningUnsafeClient::new(&client, &ap, &miner).to_delegate();
 		let io = IoHandler::new();
 		io.add_delegate(eth);
 		io.add_delegate(sign);
@@ -485,7 +485,7 @@ fn rpc_eth_pending_transaction_by_hash() {
 		tester.miner.pending_transactions.lock().insert(H256::zero(), tx);
 	}
 
-	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":null,"blockNumber":null,"creates":null,"from":"0x0f65fe9276bc9a24ae7083ae28e2660ef72df99e","gas":"0x5208","gasPrice":"0x1","hash":"0x41df922fd0d4766fcc02e161f8295ec28522f329ae487f14d811e4b64c8d6e31","input":"0x","nonce":"0x0","publicKey":"0x7ae46da747962c2ee46825839c1ef9298e3bd2e70ca2938495c3693a485ec3eaa8f196327881090ff64cf4fbb0a48485d4f83098e189ed3b7a87d5941b59f789","raw":"0xf85f800182520894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804","to":"0x095e7baea6a6c7c4c2dfeb977efac326af552d87","transactionIndex":null,"value":"0xa"},"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":null,"blockNumber":null,"creates":null,"from":"0x0f65fe9276bc9a24ae7083ae28e2660ef72df99e","gas":"0x5208","gasPrice":"0x1","hash":"0x41df922fd0d4766fcc02e161f8295ec28522f329ae487f14d811e4b64c8d6e31","input":"0x","nonce":"0x0","publicKey":"0x7ae46da747962c2ee46825839c1ef9298e3bd2e70ca2938495c3693a485ec3eaa8f196327881090ff64cf4fbb0a48485d4f83098e189ed3b7a87d5941b59f789","r":"0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353","raw":"0xf85f800182520894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804","s":"0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804","to":"0x095e7baea6a6c7c4c2dfeb977efac326af552d87","transactionIndex":null,"v":0,"value":"0xa"},"id":1}"#;
 	let request = r#"{
 		"jsonrpc": "2.0",
 		"method": "eth_getTransactionByHash",
@@ -737,8 +737,8 @@ fn rpc_eth_send_transaction() {
 		value: U256::from(0x9184e72au64),
 		data: vec![]
 	};
-	let signature = tester.accounts_provider.sign(address, None, t.hash()).unwrap();
-	let t = t.with_signature(signature);
+	let signature = tester.accounts_provider.sign(address, None, t.hash(None)).unwrap();
+	let t = t.with_signature(signature, None);
 
 	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{:?}", t.hash()).as_ref() + r#"","id":1}"#;
 
@@ -754,8 +754,8 @@ fn rpc_eth_send_transaction() {
 		value: U256::from(0x9184e72au64),
 		data: vec![]
 	};
-	let signature = tester.accounts_provider.sign(address, None, t.hash()).unwrap();
-	let t = t.with_signature(signature);
+	let signature = tester.accounts_provider.sign(address, None, t.hash(None)).unwrap();
+	let t = t.with_signature(signature, None);
 
 	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{:?}", t.hash()).as_ref() + r#"","id":1}"#;
 
@@ -805,6 +805,23 @@ fn rpc_eth_send_transaction_error() {
 	assert_eq!(tester.io.handle_request_sync(&request), Some(response.into()));
 }
 
+#[test]
+fn rpc_eth_send_raw_transaction_error() {
+	let tester = EthTester::default();
+
+	let req = r#"{
+		"jsonrpc": "2.0",
+		"method": "eth_sendRawTransaction",
+		"params": [
+			"0x0123"
+		],
+		"id": 1
+	}"#;
+	let res = r#"{"jsonrpc":"2.0","error":{"code":-32602,"message":"Invalid RLP.","data":"RlpIncorrectListLen"},"id":1}"#.into();
+
+	assert_eq!(tester.io.handle_request_sync(&req), Some(res));
+}
+
 #[test]
 fn rpc_eth_send_raw_transaction() {
 	let tester = EthTester::default();
@@ -819,8 +836,8 @@ fn rpc_eth_send_raw_transaction() {
 		value: U256::from(0x9184e72au64),
 		data: vec![]
 	};
-	let signature = tester.accounts_provider.sign(address, None, t.hash()).unwrap();
-	let t = t.with_signature(signature);
+	let signature = tester.accounts_provider.sign(address, None, t.hash(None)).unwrap();
+	let t = t.with_signature(signature, None);
 
 	let rlp = ::rlp::encode(&t).to_vec().to_hex();
 
@@ -862,7 +879,9 @@ fn rpc_eth_transaction_receipt() {
 			transaction_hash: H256::new(),
 			transaction_index: 0,
 			log_index: 1,
-		}]
+		}],
+		log_bloom: 0.into(),
+		state_root: 0.into(),
 	};
 
 	let hash = H256::from_str("b903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238").unwrap();
@@ -875,7 +894,7 @@ fn rpc_eth_transaction_receipt() {
 		"params": ["0xb903239f8543d04b5dc1ba6579132b143087c68db1b2168786408fcbce568238"],
 		"id": 1
 	}"#;
-	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","contractAddress":null,"cumulativeGasUsed":"0x20","gasUsed":"0x10","logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","data":"0x","logIndex":"0x1","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","type":"mined"}],"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0"},"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":{"blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","contractAddress":null,"cumulativeGasUsed":"0x20","gasUsed":"0x10","logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","data":"0x","logIndex":"0x1","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","type":"mined"}],"logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","root":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0"},"id":1}"#;
 
 	assert_eq!(tester.io.handle_request_sync(request), Some(response.to_owned()));
 }
diff --git a/rpc/src/v1/tests/mocked/mod.rs b/rpc/src/v1/tests/mocked/mod.rs
index cc54555b7..a7d7156b4 100644
--- a/rpc/src/v1/tests/mocked/mod.rs
+++ b/rpc/src/v1/tests/mocked/mod.rs
@@ -18,12 +18,13 @@
 //! method calls properly.
 
 mod eth;
-mod eth_signing;
 mod net;
 mod web3;
 mod personal;
-mod personal_signer;
-mod ethcore;
-mod ethcore_set;
+mod parity;
+mod parity_accounts;
+mod parity_set;
 mod rpc;
+mod signer;
+mod signing;
 mod manage_network;
diff --git a/rpc/src/v1/tests/mocked/net.rs b/rpc/src/v1/tests/mocked/net.rs
index 3bc341dcb..0a5eb43e7 100644
--- a/rpc/src/v1/tests/mocked/net.rs
+++ b/rpc/src/v1/tests/mocked/net.rs
@@ -21,7 +21,7 @@ use v1::tests::helpers::{Config, TestSyncProvider};
 
 fn sync_provider() -> Arc<TestSyncProvider> {
 	Arc::new(TestSyncProvider::new(Config {
-		network_id: 3.into(),
+		network_id: 3,
 		num_peers: 120,
 	}))
 }
diff --git a/rpc/src/v1/tests/mocked/ethcore.rs b/rpc/src/v1/tests/mocked/parity.rs
similarity index 73%
rename from rpc/src/v1/tests/mocked/ethcore.rs
rename to rpc/src/v1/tests/mocked/parity.rs
index e33f1a8f7..8baecbd90 100644
--- a/rpc/src/v1/tests/mocked/ethcore.rs
+++ b/rpc/src/v1/tests/mocked/parity.rs
@@ -16,19 +16,19 @@
 
 use std::sync::Arc;
 use util::log::RotatingLogger;
-use util::{U256, Address};
+use util::Address;
 use ethsync::ManageNetwork;
 use ethcore::client::{TestBlockChainClient};
+use ethcore::account_provider::AccountProvider;
 use ethstore::ethkey::{Generator, Random};
 
 use jsonrpc_core::IoHandler;
-use v1::{Ethcore, EthcoreClient};
+use v1::{Parity, ParityClient};
 use v1::helpers::{SignerService, NetworkSettings};
-use v1::tests::helpers::{TestSyncProvider, Config, TestMinerService, TestFetch};
+use v1::tests::helpers::{TestSyncProvider, Config, TestMinerService};
 use super::manage_network::TestManageNetwork;
 
-
-pub type TestEthcoreClient = EthcoreClient<TestBlockChainClient, TestMinerService, TestSyncProvider, TestFetch>;
+pub type TestParityClient = ParityClient<TestBlockChainClient, TestMinerService, TestSyncProvider>;
 
 pub struct Dependencies {
 	pub miner: Arc<TestMinerService>,
@@ -37,6 +37,7 @@ pub struct Dependencies {
 	pub logger: Arc<RotatingLogger>,
 	pub settings: Arc<NetworkSettings>,
 	pub network: Arc<ManageNetwork>,
+	pub accounts: Arc<AccountProvider>,
 	pub dapps_port: Option<u16>,
 }
 
@@ -46,7 +47,7 @@ impl Dependencies {
 			miner: Arc::new(TestMinerService::default()),
 			client: Arc::new(TestBlockChainClient::default()),
 			sync: Arc::new(TestSyncProvider::new(Config {
-				network_id: U256::from(3),
+				network_id: 3,
 				num_peers: 120,
 			})),
 			logger: Arc::new(RotatingLogger::new("rpc=trace".to_owned())),
@@ -59,16 +60,18 @@ impl Dependencies {
 				rpc_port: 8545,
 			}),
 			network: Arc::new(TestManageNetwork),
+			accounts: Arc::new(AccountProvider::transient_provider()),
 			dapps_port: Some(18080),
 		}
 	}
 
-	pub fn client(&self, signer: Option<Arc<SignerService>>) -> TestEthcoreClient {
-		EthcoreClient::with_fetch(
+	pub fn client(&self, signer: Option<Arc<SignerService>>) -> TestParityClient {
+		ParityClient::new(
 			&self.client,
 			&self.miner,
 			&self.sync,
 			&self.network,
+			&self.accounts,
 			self.logger.clone(),
 			self.settings.clone(),
 			signer,
@@ -90,105 +93,105 @@ impl Dependencies {
 }
 
 #[test]
-fn rpc_ethcore_extra_data() {
+fn rpc_parity_extra_data() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_extraData", "params": [], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_extraData", "params": [], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":"0x01020304","id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_default_extra_data() {
+fn rpc_parity_default_extra_data() {
 	use util::misc;
 	use util::ToPretty;
 
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_defaultExtraData", "params": [], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_defaultExtraData", "params": [], "id": 1}"#;
 	let response = format!(r#"{{"jsonrpc":"2.0","result":"0x{}","id":1}}"#, misc::version_data().to_hex());
 
 	assert_eq!(io.handle_request_sync(request), Some(response));
 }
 
 #[test]
-fn rpc_ethcore_gas_floor_target() {
+fn rpc_parity_gas_floor_target() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_gasFloorTarget", "params": [], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_gasFloorTarget", "params": [], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":"0x3039","id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_min_gas_price() {
+fn rpc_parity_min_gas_price() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_minGasPrice", "params": [], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_minGasPrice", "params": [], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":"0x1312d00","id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_dev_logs() {
+fn rpc_parity_dev_logs() {
 	let deps = Dependencies::new();
 	deps.logger.append("a".to_owned());
 	deps.logger.append("b".to_owned());
 
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_devLogs", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_devLogs", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":["b","a"],"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_dev_logs_levels() {
+fn rpc_parity_dev_logs_levels() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_devLogsLevels", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_devLogsLevels", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":"rpc=trace","id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_transactions_limit() {
+fn rpc_parity_transactions_limit() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_transactionsLimit", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_transactionsLimit", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":1024,"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_net_chain() {
+fn rpc_parity_net_chain() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_netChain", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_netChain", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":"testchain","id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_net_peers() {
+fn rpc_parity_net_peers() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_netPeers", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_netPeers", "params":[], "id": 1}"#;
 	let response = "{\"jsonrpc\":\"2.0\",\"result\":{\"active\":0,\"connected\":120,\"max\":50,\"peers\":[{\"caps\":[\"eth/62\",\"eth/63\"],\
 \"id\":\"node1\",\"name\":\"Parity/1\",\"network\":{\"localAddress\":\"127.0.0.1:8888\",\"remoteAddress\":\"127.0.0.1:7777\"}\
 ,\"protocols\":{\"eth\":{\"difficulty\":\"0x28\",\"head\":\"0000000000000000000000000000000000000000000000000000000000000032\"\
@@ -200,101 +203,90 @@ fn rpc_ethcore_net_peers() {
 }
 
 #[test]
-fn rpc_ethcore_net_port() {
+fn rpc_parity_net_port() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_netPort", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_netPort", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":30303,"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_rpc_settings() {
+fn rpc_parity_rpc_settings() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_rpcSettings", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_rpcSettings", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":{"enabled":true,"interface":"all","port":8545},"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_node_name() {
+fn rpc_parity_node_name() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_nodeName", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_nodeName", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":"mynode","id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_unsigned_transactions_count() {
+fn rpc_parity_unsigned_transactions_count() {
 	let deps = Dependencies::new();
 	let io = deps.with_signer(SignerService::new_test(Some(18180)));
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_unsignedTransactionsCount", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_unsignedTransactionsCount", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":0,"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_unsigned_transactions_count_when_signer_disabled() {
+fn rpc_parity_unsigned_transactions_count_when_signer_disabled() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_unsignedTransactionsCount", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_unsignedTransactionsCount", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","error":{"code":-32030,"message":"Trusted Signer is disabled. This API is not available.","data":null},"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_hash_content() {
+fn rpc_parity_pending_transactions() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_hashContent", "params":["https://ethcore.io/assets/images/ethcore-black-horizontal.png"], "id": 1}"#;
-	let response = r#"{"jsonrpc":"2.0","result":"0x2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e","id":1}"#;
-
-	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
-}
-
-#[test]
-fn rpc_ethcore_pending_transactions() {
-	let deps = Dependencies::new();
-	let io = deps.default_client();
-
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_pendingTransactions", "params":[], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_pendingTransactions", "params":[], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":[],"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
 
 #[test]
-fn rpc_ethcore_encrypt() {
+fn rpc_parity_encrypt() {
 	let deps = Dependencies::new();
 	let io = deps.default_client();
 	let key = format!("{:?}", Random.generate().unwrap().public());
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_encryptMessage", "params":["0x"#.to_owned() + &key + r#"", "0x01"], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_encryptMessage", "params":["0x"#.to_owned() + &key + r#"", "0x01"], "id": 1}"#;
 	assert!(io.handle_request_sync(&request).unwrap().contains("result"), "Should return success.");
 }
 
 #[test]
-fn rpc_ethcore_signer_port() {
+fn rpc_parity_signer_port() {
 	// given
 	let deps = Dependencies::new();
 	let io1 = deps.with_signer(SignerService::new_test(Some(18180)));
 	let io2 = deps.default_client();
 
 	// when
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_signerPort", "params": [], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_signerPort", "params": [], "id": 1}"#;
 	let response1 = r#"{"jsonrpc":"2.0","result":18180,"id":1}"#;
 	let response2 = r#"{"jsonrpc":"2.0","error":{"code":-32030,"message":"Trusted Signer is disabled. This API is not available.","data":null},"id":1}"#;
 
@@ -304,7 +296,7 @@ fn rpc_ethcore_signer_port() {
 }
 
 #[test]
-fn rpc_ethcore_dapps_port() {
+fn rpc_parity_dapps_port() {
 	// given
 	let mut deps = Dependencies::new();
 	let io1 = deps.default_client();
@@ -312,7 +304,7 @@ fn rpc_ethcore_dapps_port() {
 	let io2 = deps.default_client();
 
 	// when
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_dappsPort", "params": [], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_dappsPort", "params": [], "id": 1}"#;
 	let response1 = r#"{"jsonrpc":"2.0","result":18080,"id":1}"#;
 	let response2 = r#"{"jsonrpc":"2.0","error":{"code":-32031,"message":"Dapps Server is disabled. This API is not available.","data":null},"id":1}"#;
 
@@ -322,7 +314,7 @@ fn rpc_ethcore_dapps_port() {
 }
 
 #[test]
-fn rpc_ethcore_next_nonce() {
+fn rpc_parity_next_nonce() {
 	let deps = Dependencies::new();
 	let address = Address::default();
 	let io1 = deps.default_client();
@@ -332,7 +324,7 @@ fn rpc_ethcore_next_nonce() {
 
 	let request = r#"{
 		"jsonrpc": "2.0",
-		"method": "ethcore_nextNonce",
+		"method": "parity_nextNonce",
 		"params": [""#.to_owned() + &format!("0x{:?}", address) + r#""],
 		"id": 1
 	}"#;
diff --git a/rpc/src/v1/tests/mocked/parity_accounts.rs b/rpc/src/v1/tests/mocked/parity_accounts.rs
new file mode 100644
index 000000000..272c55f6d
--- /dev/null
+++ b/rpc/src/v1/tests/mocked/parity_accounts.rs
@@ -0,0 +1,118 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+
+use ethcore::account_provider::AccountProvider;
+use ethcore::client::TestBlockChainClient;
+
+use jsonrpc_core::IoHandler;
+use v1::{ParityAccounts, ParityAccountsClient};
+
+struct ParityAccountsTester {
+	accounts: Arc<AccountProvider>,
+	io: IoHandler,
+	// these unused fields are necessary to keep the data alive
+	// as the handler has only weak pointers.
+	_client: Arc<TestBlockChainClient>,
+}
+
+fn blockchain_client() -> Arc<TestBlockChainClient> {
+	let client = TestBlockChainClient::new();
+	Arc::new(client)
+}
+
+fn accounts_provider() -> Arc<AccountProvider> {
+	Arc::new(AccountProvider::transient_provider())
+}
+
+fn setup() -> ParityAccountsTester {
+	let accounts = accounts_provider();
+	let client = blockchain_client();
+	let parity_accounts = ParityAccountsClient::new(&accounts, &client);
+
+	let io = IoHandler::new();
+	io.add_delegate(parity_accounts.to_delegate());
+
+	let tester = ParityAccountsTester {
+		accounts: accounts,
+		io: io,
+		_client: client,
+	};
+
+	tester
+}
+
+#[test]
+fn should_be_able_to_get_account_info() {
+	let tester = setup();
+	tester.accounts.new_account("").unwrap();
+	let accounts = tester.accounts.accounts().unwrap();
+	assert_eq!(accounts.len(), 1);
+	let address = accounts[0];
+
+	let uuid = tester.accounts.accounts_info().unwrap().get(&address).unwrap().uuid.as_ref().unwrap().clone();
+	tester.accounts.set_account_name(address.clone(), "Test".to_owned()).unwrap();
+	tester.accounts.set_account_meta(address.clone(), "{foo: 69}".to_owned()).unwrap();
+
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_accountsInfo", "params": [], "id": 1}"#;
+	let res = tester.io.handle_request_sync(request);
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"meta\":\"{{foo: 69}}\",\"name\":\"Test\",\"uuid\":\"{}\"}}}},\"id\":1}}", address.hex(), uuid);
+	assert_eq!(res, Some(response));
+}
+
+#[test]
+fn should_be_able_to_set_name() {
+	let tester = setup();
+	tester.accounts.new_account("").unwrap();
+	let accounts = tester.accounts.accounts().unwrap();
+	assert_eq!(accounts.len(), 1);
+	let address = accounts[0];
+
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_setAccountName", "params": ["0x{}", "Test"], "id": 1}}"#, address.hex());
+	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
+	let res = tester.io.handle_request_sync(&request);
+	assert_eq!(res, Some(response.into()));
+
+	let uuid = tester.accounts.accounts_info().unwrap().get(&address).unwrap().uuid.as_ref().unwrap().clone();
+
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_accountsInfo", "params": [], "id": 1}"#;
+	let res = tester.io.handle_request_sync(request);
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"meta\":\"{{}}\",\"name\":\"Test\",\"uuid\":\"{}\"}}}},\"id\":1}}", address.hex(), uuid);
+	assert_eq!(res, Some(response));
+}
+
+#[test]
+fn should_be_able_to_set_meta() {
+	let tester = setup();
+	tester.accounts.new_account("").unwrap();
+	let accounts = tester.accounts.accounts().unwrap();
+	assert_eq!(accounts.len(), 1);
+	let address = accounts[0];
+
+	let request = format!(r#"{{"jsonrpc": "2.0", "method": "parity_setAccountMeta", "params": ["0x{}", "{{foo: 69}}"], "id": 1}}"#, address.hex());
+	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
+	let res = tester.io.handle_request_sync(&request);
+	assert_eq!(res, Some(response.into()));
+
+	let uuid = tester.accounts.accounts_info().unwrap().get(&address).unwrap().uuid.as_ref().unwrap().clone();
+
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_accountsInfo", "params": [], "id": 1}"#;
+	let res = tester.io.handle_request_sync(request);
+	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"meta\":\"{{foo: 69}}\",\"name\":\"{}\",\"uuid\":\"{}\"}}}},\"id\":1}}", address.hex(), uuid, uuid);
+	assert_eq!(res, Some(response));
+}
+
diff --git a/rpc/src/v1/tests/mocked/ethcore_set.rs b/rpc/src/v1/tests/mocked/parity_set.rs
similarity index 57%
rename from rpc/src/v1/tests/mocked/ethcore_set.rs
rename to rpc/src/v1/tests/mocked/parity_set.rs
index e87d49b8c..3202374a7 100644
--- a/rpc/src/v1/tests/mocked/ethcore_set.rs
+++ b/rpc/src/v1/tests/mocked/parity_set.rs
@@ -16,16 +16,18 @@
 
 use std::sync::Arc;
 use std::str::FromStr;
-use jsonrpc_core::IoHandler;
-use v1::{EthcoreSet, EthcoreSetClient};
+use rustc_serialize::hex::FromHex;
+use util::{U256, Address};
+
 use ethcore::miner::MinerService;
 use ethcore::client::TestBlockChainClient;
-use v1::tests::helpers::TestMinerService;
-use util::{U256, Address};
-use rustc_serialize::hex::FromHex;
-use super::manage_network::TestManageNetwork;
 use ethsync::ManageNetwork;
 
+use jsonrpc_core::IoHandler;
+use v1::{ParitySet, ParitySetClient};
+use v1::tests::helpers::{TestMinerService, TestFetch};
+use super::manage_network::TestManageNetwork;
+
 fn miner_service() -> Arc<TestMinerService> {
 	Arc::new(TestMinerService::default())
 }
@@ -38,19 +40,21 @@ fn network_service() -> Arc<TestManageNetwork> {
 	Arc::new(TestManageNetwork)
 }
 
-fn ethcore_set_client(client: &Arc<TestBlockChainClient>, miner: &Arc<TestMinerService>, net: &Arc<TestManageNetwork>) -> EthcoreSetClient<TestBlockChainClient, TestMinerService> {
-	EthcoreSetClient::new(client, miner, &(net.clone() as Arc<ManageNetwork>))
+pub type TestParitySetClient = ParitySetClient<TestBlockChainClient, TestMinerService, TestFetch>;
+
+fn parity_set_client(client: &Arc<TestBlockChainClient>, miner: &Arc<TestMinerService>, net: &Arc<TestManageNetwork>) -> TestParitySetClient {
+	ParitySetClient::with_fetch(client, miner, &(net.clone() as Arc<ManageNetwork>))
 }
 
 #[test]
-fn rpc_ethcore_set_min_gas_price() {
+fn rpc_parity_set_min_gas_price() {
 	let miner = miner_service();
 	let client = client_service();
 	let network = network_service();
 	let io = IoHandler::new();
-	io.add_delegate(ethcore_set_client(&client, &miner, &network).to_delegate());
+	io.add_delegate(parity_set_client(&client, &miner, &network).to_delegate());
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_setMinGasPrice", "params":["0xcd1722f3947def4cf144679da39c4c32bdc35681"], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_setMinGasPrice", "params":["0xcd1722f3947def4cf144679da39c4c32bdc35681"], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
@@ -58,14 +62,14 @@ fn rpc_ethcore_set_min_gas_price() {
 }
 
 #[test]
-fn rpc_ethcore_set_gas_floor_target() {
+fn rpc_parity_set_gas_floor_target() {
 	let miner = miner_service();
 	let client = client_service();
 	let network = network_service();
 	let io = IoHandler::new();
-	io.add_delegate(ethcore_set_client(&client, &miner, &network).to_delegate());
+	io.add_delegate(parity_set_client(&client, &miner, &network).to_delegate());
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_setGasFloorTarget", "params":["0xcd1722f3947def4cf144679da39c4c32bdc35681"], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_setGasFloorTarget", "params":["0xcd1722f3947def4cf144679da39c4c32bdc35681"], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
@@ -73,14 +77,14 @@ fn rpc_ethcore_set_gas_floor_target() {
 }
 
 #[test]
-fn rpc_ethcore_set_extra_data() {
+fn rpc_parity_set_extra_data() {
 	let miner = miner_service();
 	let client = client_service();
 	let network = network_service();
 	let io = IoHandler::new();
-	io.add_delegate(ethcore_set_client(&client, &miner, &network).to_delegate());
+	io.add_delegate(parity_set_client(&client, &miner, &network).to_delegate());
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_setExtraData", "params":["0xcd1722f3947def4cf144679da39c4c32bdc35681"], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_setExtraData", "params":["0xcd1722f3947def4cf144679da39c4c32bdc35681"], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
@@ -88,14 +92,14 @@ fn rpc_ethcore_set_extra_data() {
 }
 
 #[test]
-fn rpc_ethcore_set_author() {
+fn rpc_parity_set_author() {
 	let miner = miner_service();
 	let client = client_service();
 	let network = network_service();
 	let io = IoHandler::new();
-	io.add_delegate(ethcore_set_client(&client, &miner, &network).to_delegate());
+	io.add_delegate(parity_set_client(&client, &miner, &network).to_delegate());
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_setAuthor", "params":["0xcd1722f3947def4cf144679da39c4c32bdc35681"], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_setAuthor", "params":["0xcd1722f3947def4cf144679da39c4c32bdc35681"], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
@@ -103,16 +107,31 @@ fn rpc_ethcore_set_author() {
 }
 
 #[test]
-fn rpc_ethcore_set_transactions_limit() {
+fn rpc_parity_set_transactions_limit() {
 	let miner = miner_service();
 	let client = client_service();
 	let network = network_service();
 	let io = IoHandler::new();
-	io.add_delegate(ethcore_set_client(&client, &miner, &network).to_delegate());
+	io.add_delegate(parity_set_client(&client, &miner, &network).to_delegate());
 
-	let request = r#"{"jsonrpc": "2.0", "method": "ethcore_setTransactionsLimit", "params":[10240240], "id": 1}"#;
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_setTransactionsLimit", "params":[10240240], "id": 1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 	assert_eq!(miner.transactions_limit(), 10_240_240);
-}
\ No newline at end of file
+}
+
+#[test]
+fn rpc_parity_set_hash_content() {
+	let miner = miner_service();
+	let client = client_service();
+	let network = network_service();
+	let io = IoHandler::new();
+	io.add_delegate(parity_set_client(&client, &miner, &network).to_delegate());
+
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_hashContent", "params":["https://ethcore.io/assets/images/ethcore-black-horizontal.png"], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":"0x2be00befcf008bc0e7d9cdefc194db9c75352e8632f48498b5a6bfce9f02c88e","id":1}"#;
+
+	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
+}
+
diff --git a/rpc/src/v1/tests/mocked/personal.rs b/rpc/src/v1/tests/mocked/personal.rs
index 3bf4a9fa8..6e2de1e2e 100644
--- a/rpc/src/v1/tests/mocked/personal.rs
+++ b/rpc/src/v1/tests/mocked/personal.rs
@@ -19,7 +19,7 @@ use std::str::FromStr;
 use jsonrpc_core::IoHandler;
 use util::{U256, Uint, Address};
 use ethcore::account_provider::AccountProvider;
-use v1::{PersonalClient, PersonalAccountsClient, PersonalAccounts, Personal};
+use v1::{PersonalClient, Personal};
 use v1::tests::helpers::TestMinerService;
 use ethcore::client::TestBlockChainClient;
 use ethcore::transaction::{Action, Transaction};
@@ -50,12 +50,10 @@ fn setup() -> PersonalTester {
 	let accounts = accounts_provider();
 	let client = blockchain_client();
 	let miner = miner_service();
-	let personal = PersonalClient::new(&accounts, &client);
-	let personal_accounts = PersonalAccountsClient::new(&accounts, &client, &miner, false);
+	let personal = PersonalClient::new(&accounts, &client, &miner, false);
 
 	let io = IoHandler::new();
 	io.add_delegate(personal.to_delegate());
-	io.add_delegate(personal_accounts.to_delegate());
 
 	let tester = PersonalTester {
 		accounts: accounts,
@@ -92,66 +90,6 @@ fn new_account() {
 	assert_eq!(res, Some(response));
 }
 
-#[test]
-fn should_be_able_to_get_account_info() {
-	let tester = setup();
-	tester.accounts.new_account("").unwrap();
-	let accounts = tester.accounts.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	let address = accounts[0];
-
-	let uuid = tester.accounts.accounts_info().unwrap().get(&address).unwrap().uuid.as_ref().unwrap().clone();
-	tester.accounts.set_account_name(address.clone(), "Test".to_owned()).unwrap();
-	tester.accounts.set_account_meta(address.clone(), "{foo: 69}".to_owned()).unwrap();
-
-	let request = r#"{"jsonrpc": "2.0", "method": "personal_accountsInfo", "params": [], "id": 1}"#;
-	let res = tester.io.handle_request_sync(request);
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"meta\":\"{{foo: 69}}\",\"name\":\"Test\",\"uuid\":\"{}\"}}}},\"id\":1}}", address.hex(), uuid);
-	assert_eq!(res, Some(response));
-}
-
-#[test]
-fn should_be_able_to_set_name() {
-	let tester = setup();
-	tester.accounts.new_account("").unwrap();
-	let accounts = tester.accounts.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	let address = accounts[0];
-
-	let request = format!(r#"{{"jsonrpc": "2.0", "method": "personal_setAccountName", "params": ["0x{}", "Test"], "id": 1}}"#, address.hex());
-	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
-	let res = tester.io.handle_request_sync(&request);
-	assert_eq!(res, Some(response.into()));
-
-	let uuid = tester.accounts.accounts_info().unwrap().get(&address).unwrap().uuid.as_ref().unwrap().clone();
-
-	let request = r#"{"jsonrpc": "2.0", "method": "personal_accountsInfo", "params": [], "id": 1}"#;
-	let res = tester.io.handle_request_sync(request);
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"meta\":\"{{}}\",\"name\":\"Test\",\"uuid\":\"{}\"}}}},\"id\":1}}", address.hex(), uuid);
-	assert_eq!(res, Some(response));
-}
-
-#[test]
-fn should_be_able_to_set_meta() {
-	let tester = setup();
-	tester.accounts.new_account("").unwrap();
-	let accounts = tester.accounts.accounts().unwrap();
-	assert_eq!(accounts.len(), 1);
-	let address = accounts[0];
-
-	let request = format!(r#"{{"jsonrpc": "2.0", "method": "personal_setAccountMeta", "params": ["0x{}", "{{foo: 69}}"], "id": 1}}"#, address.hex());
-	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
-	let res = tester.io.handle_request_sync(&request);
-	assert_eq!(res, Some(response.into()));
-
-	let uuid = tester.accounts.accounts_info().unwrap().get(&address).unwrap().uuid.as_ref().unwrap().clone();
-
-	let request = r#"{"jsonrpc": "2.0", "method": "personal_accountsInfo", "params": [], "id": 1}"#;
-	let res = tester.io.handle_request_sync(request);
-	let response = format!("{{\"jsonrpc\":\"2.0\",\"result\":{{\"0x{}\":{{\"meta\":\"{{foo: 69}}\",\"name\":\"{}\",\"uuid\":\"{}\"}}}},\"id\":1}}", address.hex(), uuid, uuid);
-	assert_eq!(res, Some(response));
-}
-
 #[test]
 fn sign_and_send_transaction_with_invalid_password() {
 	let tester = setup();
@@ -201,8 +139,8 @@ fn sign_and_send_transaction() {
 		data: vec![]
 	};
 	tester.accounts.unlock_account_temporarily(address, "password123".into()).unwrap();
-	let signature = tester.accounts.sign(address, None, t.hash()).unwrap();
-	let t = t.with_signature(signature);
+	let signature = tester.accounts.sign(address, None, t.hash(None)).unwrap();
+	let t = t.with_signature(signature, None);
 
 	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{:?}", t.hash()).as_ref() + r#"","id":1}"#;
 
@@ -219,8 +157,8 @@ fn sign_and_send_transaction() {
 		data: vec![]
 	};
 	tester.accounts.unlock_account_temporarily(address, "password123".into()).unwrap();
-	let signature = tester.accounts.sign(address, None, t.hash()).unwrap();
-	let t = t.with_signature(signature);
+	let signature = tester.accounts.sign(address, None, t.hash(None)).unwrap();
+	let t = t.with_signature(signature, None);
 
 	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{:?}", t.hash()).as_ref() + r#"","id":1}"#;
 
diff --git a/rpc/src/v1/tests/mocked/personal_signer.rs b/rpc/src/v1/tests/mocked/signer.rs
similarity index 90%
rename from rpc/src/v1/tests/mocked/personal_signer.rs
rename to rpc/src/v1/tests/mocked/signer.rs
index 7b3e18b11..92e20676f 100644
--- a/rpc/src/v1/tests/mocked/personal_signer.rs
+++ b/rpc/src/v1/tests/mocked/signer.rs
@@ -21,11 +21,11 @@ use util::{U256, Uint, Address};
 use ethcore::account_provider::AccountProvider;
 use ethcore::client::TestBlockChainClient;
 use ethcore::transaction::{Transaction, Action};
-use v1::{SignerClient, PersonalSigner};
+use v1::{SignerClient, Signer};
 use v1::tests::helpers::TestMinerService;
 use v1::helpers::{SigningQueue, SignerService, FilledTransactionRequest, ConfirmationPayload};
 
-struct PersonalSignerTester {
+struct SignerTester {
 	signer: Arc<SignerService>,
 	accounts: Arc<AccountProvider>,
 	io: IoHandler,
@@ -48,7 +48,7 @@ fn miner_service() -> Arc<TestMinerService> {
 	Arc::new(TestMinerService::default())
 }
 
-fn signer_tester() -> PersonalSignerTester {
+fn signer_tester() -> SignerTester {
 	let signer = Arc::new(SignerService::new_test(None));
 	let accounts = accounts_provider();
 	let client = blockchain_client();
@@ -57,7 +57,7 @@ fn signer_tester() -> PersonalSignerTester {
 	let io = IoHandler::new();
 	io.add_delegate(SignerClient::new(&accounts, &client, &miner, &signer).to_delegate());
 
-	PersonalSignerTester {
+	SignerTester {
 		signer: signer,
 		accounts: accounts,
 		io: io,
@@ -83,7 +83,7 @@ fn should_return_list_of_items_to_confirm() {
 	tester.signer.add_request(ConfirmationPayload::Sign(1.into(), 5.into())).unwrap();
 
 	// when
-	let request = r#"{"jsonrpc":"2.0","method":"personal_requestsToConfirm","params":[],"id":1}"#;
+	let request = r#"{"jsonrpc":"2.0","method":"signer_requestsToConfirm","params":[],"id":1}"#;
 	let response = concat!(
 		r#"{"jsonrpc":"2.0","result":["#,
 		r#"{"id":"0x1","payload":{"transaction":{"data":"0x","from":"0x0000000000000000000000000000000000000001","gas":"0x989680","gasPrice":"0x2710","nonce":null,"to":"0xd46e8dd67c5d32be8058bb8eb970870f07244567","value":"0x1"}}},"#,
@@ -112,7 +112,7 @@ fn should_reject_transaction_from_queue_without_dispatching() {
 	assert_eq!(tester.signer.requests().len(), 1);
 
 	// when
-	let request = r#"{"jsonrpc":"2.0","method":"personal_rejectRequest","params":["0x1"],"id":1}"#;
+	let request = r#"{"jsonrpc":"2.0","method":"signer_rejectRequest","params":["0x1"],"id":1}"#;
 	let response = r#"{"jsonrpc":"2.0","result":true,"id":1}"#;
 
 	// then
@@ -137,7 +137,7 @@ fn should_not_remove_transaction_if_password_is_invalid() {
 	assert_eq!(tester.signer.requests().len(), 1);
 
 	// when
-	let request = r#"{"jsonrpc":"2.0","method":"personal_confirmRequest","params":["0x1",{},"xxx"],"id":1}"#;
+	let request = r#"{"jsonrpc":"2.0","method":"signer_confirmRequest","params":["0x1",{},"xxx"],"id":1}"#;
 	let response = r#"{"jsonrpc":"2.0","error":{"code":-32021,"message":"Account password is invalid or account does not exist.","data":"SStore(InvalidAccount)"},"id":1}"#;
 
 	// then
@@ -153,7 +153,7 @@ fn should_not_remove_sign_if_password_is_invalid() {
 	assert_eq!(tester.signer.requests().len(), 1);
 
 	// when
-	let request = r#"{"jsonrpc":"2.0","method":"personal_confirmRequest","params":["0x1",{},"xxx"],"id":1}"#;
+	let request = r#"{"jsonrpc":"2.0","method":"signer_confirmRequest","params":["0x1",{},"xxx"],"id":1}"#;
 	let response = r#"{"jsonrpc":"2.0","error":{"code":-32021,"message":"Account password is invalid or account does not exist.","data":"SStore(InvalidAccount)"},"id":1}"#;
 
 	// then
@@ -186,15 +186,15 @@ fn should_confirm_transaction_and_dispatch() {
 		data: vec![]
 	};
 	tester.accounts.unlock_account_temporarily(address, "test".into()).unwrap();
-	let signature = tester.accounts.sign(address, None, t.hash()).unwrap();
-	let t = t.with_signature(signature);
+	let signature = tester.accounts.sign(address, None, t.hash(None)).unwrap();
+	let t = t.with_signature(signature, None);
 
 	assert_eq!(tester.signer.requests().len(), 1);
 
 	// when
 	let request = r#"{
 		"jsonrpc":"2.0",
-		"method":"personal_confirmRequest",
+		"method":"signer_confirmRequest",
 		"params":["0x1", {"gasPrice":"0x1000"}, "test"],
 		"id":1
 	}"#;
@@ -214,7 +214,7 @@ fn should_generate_new_token() {
 	// when
 	let request = r#"{
 		"jsonrpc":"2.0",
-		"method":"personal_generateAuthorizationToken",
+		"method":"signer_generateAuthorizationToken",
 		"params":[],
 		"id":1
 	}"#;
diff --git a/rpc/src/v1/tests/mocked/eth_signing.rs b/rpc/src/v1/tests/mocked/signing.rs
similarity index 89%
rename from rpc/src/v1/tests/mocked/eth_signing.rs
rename to rpc/src/v1/tests/mocked/signing.rs
index 58b5e0546..fc460409c 100644
--- a/rpc/src/v1/tests/mocked/eth_signing.rs
+++ b/rpc/src/v1/tests/mocked/signing.rs
@@ -17,12 +17,12 @@
 use std::str::FromStr;
 use std::sync::Arc;
 use jsonrpc_core::{IoHandler, to_value, Success};
-use v1::impls::EthSigningQueueClient;
-use v1::traits::{EthSigning, Ethcore};
+use v1::impls::SigningQueueClient;
+use v1::traits::{EthSigning, ParitySigning, Parity};
 use v1::helpers::{SignerService, SigningQueue};
 use v1::types::{H256 as RpcH256, H520 as RpcH520, Bytes};
 use v1::tests::helpers::TestMinerService;
-use v1::tests::mocked::ethcore;
+use v1::tests::mocked::parity;
 
 use util::{Address, FixedHash, Uint, U256, H256, H520};
 use ethcore::account_provider::AccountProvider;
@@ -31,7 +31,7 @@ use ethcore::transaction::{Transaction, Action};
 use ethstore::ethkey::{Generator, Random};
 use serde_json;
 
-struct EthSigningTester {
+struct SigningTester {
 	pub signer: Arc<SignerService>,
 	pub client: Arc<TestBlockChainClient>,
 	pub miner: Arc<TestMinerService>,
@@ -39,16 +39,19 @@ struct EthSigningTester {
 	pub io: IoHandler,
 }
 
-impl Default for EthSigningTester {
+impl Default for SigningTester {
 	fn default() -> Self {
 		let signer = Arc::new(SignerService::new_test(None));
 		let client = Arc::new(TestBlockChainClient::default());
 		let miner = Arc::new(TestMinerService::default());
 		let accounts = Arc::new(AccountProvider::transient_provider());
 		let io = IoHandler::new();
-		io.add_delegate(EthSigningQueueClient::new(&signer, &client, &miner, &accounts).to_delegate());
+		let rpc = SigningQueueClient::new(&signer, &client, &miner, &accounts);
+		io.add_delegate(EthSigning::to_delegate(rpc));
+		let rpc = SigningQueueClient::new(&signer, &client, &miner, &accounts);
+		io.add_delegate(ParitySigning::to_delegate(rpc));
 
-		EthSigningTester {
+		SigningTester {
 			signer: signer,
 			client: client,
 			miner: miner,
@@ -58,8 +61,8 @@ impl Default for EthSigningTester {
 	}
 }
 
-fn eth_signing() -> EthSigningTester {
-	EthSigningTester::default()
+fn eth_signing() -> SigningTester {
+	SigningTester::default()
 }
 
 #[test]
@@ -101,7 +104,7 @@ fn should_post_sign_to_queue() {
 	// when
 	let request = r#"{
 		"jsonrpc": "2.0",
-		"method": "eth_postSign",
+		"method": "parity_postSign",
 		"params": [
 			""#.to_owned() + format!("0x{:?}", address).as_ref() + r#"",
 			"0x0000000000000000000000000000000000000000000000000000000000000005"
@@ -122,7 +125,7 @@ fn should_check_status_of_request() {
 	let address = Address::random();
 	let request = r#"{
 		"jsonrpc": "2.0",
-		"method": "eth_postSign",
+		"method": "parity_postSign",
 		"params": [
 			""#.to_owned() + format!("0x{:?}", address).as_ref() + r#"",
 			"0x0000000000000000000000000000000000000000000000000000000000000005"
@@ -134,7 +137,7 @@ fn should_check_status_of_request() {
 	// when
 	let request = r#"{
 		"jsonrpc": "2.0",
-		"method": "eth_checkRequest",
+		"method": "parity_checkRequest",
 		"params": ["0x1"],
 		"id": 1
 	}"#;
@@ -151,7 +154,7 @@ fn should_check_status_of_request_when_its_resolved() {
 	let address = Address::random();
 	let request = r#"{
 		"jsonrpc": "2.0",
-		"method": "eth_postSign",
+		"method": "parity_postSign",
 		"params": [
 			""#.to_owned() + format!("0x{:?}", address).as_ref() + r#"",
 			"0x0000000000000000000000000000000000000000000000000000000000000005"
@@ -164,7 +167,7 @@ fn should_check_status_of_request_when_its_resolved() {
 	// when
 	let request = r#"{
 		"jsonrpc": "2.0",
-		"method": "eth_checkRequest",
+		"method": "parity_checkRequest",
 		"params": ["0x1"],
 		"id": 1
 	}"#;
@@ -246,8 +249,8 @@ fn should_dispatch_transaction_if_account_is_unlock() {
 		value: U256::from(0x9184e72au64),
 		data: vec![]
 	};
-	let signature = tester.accounts.sign(acc, None, t.hash()).unwrap();
-	let t = t.with_signature(signature);
+	let signature = tester.accounts.sign(acc, None, t.hash(None)).unwrap();
+	let t = t.with_signature(signature, None);
 
 	// when
 	let request = r#"{
@@ -272,15 +275,15 @@ fn should_dispatch_transaction_if_account_is_unlock() {
 fn should_decrypt_message_if_account_is_unlocked() {
 	// given
 	let tester = eth_signing();
-	let ethcore = ethcore::Dependencies::new();
-	tester.io.add_delegate(ethcore.client(None).to_delegate());
+	let parity = parity::Dependencies::new();
+	tester.io.add_delegate(parity.client(None).to_delegate());
 	let (address, public) = tester.accounts.new_account_and_public("test").unwrap();
 	tester.accounts.unlock_account_permanently(address, "test".into()).unwrap();
 
 
 	// First encrypt message
 	let request = format!("{}0x{:?}{}",
-		r#"{"jsonrpc": "2.0", "method": "ethcore_encryptMessage", "params":[""#,
+		r#"{"jsonrpc": "2.0", "method": "parity_encryptMessage", "params":[""#,
 		public,
 		r#"", "0x01020304"], "id": 1}"#
 	);
@@ -288,7 +291,7 @@ fn should_decrypt_message_if_account_is_unlocked() {
 
 	// then call decrypt
 	let request = format!("{}{:?}{}{:?}{}",
-		r#"{"jsonrpc": "2.0", "method": "ethcore_decryptMessage", "params":["0x"#,
+		r#"{"jsonrpc": "2.0", "method": "parity_decryptMessage", "params":["0x"#,
 		address,
 		r#"","#,
 		encrypted.result,
@@ -311,7 +314,7 @@ fn should_add_decryption_to_the_queue() {
 	// when
 	let request = r#"{
 		"jsonrpc": "2.0",
-		"method": "ethcore_decryptMessage",
+		"method": "parity_decryptMessage",
 		"params": ["0x"#.to_owned() + &format!("{:?}", acc.address()) + r#"",
 		"0x012345"],
 		"id": 1
diff --git a/rpc/src/v1/traits/eth.rs b/rpc/src/v1/traits/eth.rs
index 7d9aa47f3..49f433ffd 100644
--- a/rpc/src/v1/traits/eth.rs
+++ b/rpc/src/v1/traits/eth.rs
@@ -17,7 +17,7 @@
 //! Eth rpc interface.
 use jsonrpc_core::*;
 
-use v1::types::{Block, BlockNumber, Bytes, CallRequest, Filter, FilterChanges, Index};
+use v1::types::{RichBlock, BlockNumber, Bytes, CallRequest, Filter, FilterChanges, Index};
 use v1::types::{Log, Receipt, SyncStatus, Transaction, Work};
 use v1::types::{H64, H160, H256, U256};
 
@@ -68,11 +68,11 @@ build_rpc_trait! {
 
 		/// Returns block with given hash.
 		#[rpc(name = "eth_getBlockByHash")]
-		fn block_by_hash(&self, H256, bool) -> Result<Option<Block>, Error>;
+		fn block_by_hash(&self, H256, bool) -> Result<Option<RichBlock>, Error>;
 
 		/// Returns block with given number.
 		#[rpc(name = "eth_getBlockByNumber")]
-		fn block_by_number(&self, BlockNumber, bool) -> Result<Option<Block>, Error>;
+		fn block_by_number(&self, BlockNumber, bool) -> Result<Option<RichBlock>, Error>;
 
 		/// Returns the number of transactions sent from given address at given time (block number).
 		#[rpc(name = "eth_getTransactionCount")]
@@ -128,11 +128,11 @@ build_rpc_trait! {
 
 		/// Returns an uncles at given block and index.
 		#[rpc(name = "eth_getUncleByBlockHashAndIndex")]
-		fn uncle_by_block_hash_and_index(&self, H256, Index) -> Result<Option<Block>, Error>;
+		fn uncle_by_block_hash_and_index(&self, H256, Index) -> Result<Option<RichBlock>, Error>;
 
 		/// Returns an uncles at given block and index.
 		#[rpc(name = "eth_getUncleByBlockNumberAndIndex")]
-		fn uncle_by_block_number_and_index(&self, BlockNumber, Index) -> Result<Option<Block>, Error>;
+		fn uncle_by_block_number_and_index(&self, BlockNumber, Index) -> Result<Option<RichBlock>, Error>;
 
 		/// Returns available compilers.
 		#[rpc(name = "eth_getCompilers")]
diff --git a/rpc/src/v1/traits/eth_signing.rs b/rpc/src/v1/traits/eth_signing.rs
index 1d6f6e501..80979a7db 100644
--- a/rpc/src/v1/traits/eth_signing.rs
+++ b/rpc/src/v1/traits/eth_signing.rs
@@ -23,41 +23,18 @@ pub trait EthSigning: Sized + Send + Sync + 'static {
 	/// Signs the data with given address signature.
 	fn sign(&self, _: Params, _: Ready);
 
-	/// Posts sign request asynchronously.
-	/// Will return a confirmation ID for later use with check_transaction.
-	fn post_sign(&self, _: Params) -> Result<Value, Error>;
-
 	/// Sends transaction; will block for 20s to try to return the
 	/// transaction hash.
 	/// If it cannot yet be signed, it will return a transaction ID for
 	/// later use with check_transaction.
 	fn send_transaction(&self, _: Params, _: Ready);
 
-	/// Posts transaction asynchronously.
-	/// Will return a transaction ID for later use with check_transaction.
-	fn post_transaction(&self, _: Params) -> Result<Value, Error>;
-
-	/// Checks the progress of a previously posted request (transaction/sign).
-	/// Should be given a valid send_transaction ID.
-	/// Returns the transaction hash, the zero hash (not yet available),
-	/// or the signature,
-	/// or an error.
-	fn check_request(&self, _: Params) -> Result<Value, Error>;
-
-	/// Decrypt some ECIES-encrypted message.
-	/// First parameter is the address with which it is encrypted, second is the ciphertext.
-	fn decrypt_message(&self, _: Params, _: Ready);
-
 	/// Should be used to convert object to io delegate.
 	fn to_delegate(self) -> IoDelegate<Self> {
 		let mut delegate = IoDelegate::new(Arc::new(self));
 		delegate.add_async_method("eth_sign", EthSigning::sign);
 		delegate.add_async_method("eth_sendTransaction", EthSigning::send_transaction);
-		delegate.add_async_method("ethcore_decryptMessage", EthSigning::decrypt_message);
 
-		delegate.add_method("eth_postSign", EthSigning::post_sign);
-		delegate.add_method("eth_postTransaction", EthSigning::post_transaction);
-		delegate.add_method("eth_checkRequest", EthSigning::check_request);
 		delegate
 	}
 }
diff --git a/rpc/src/v1/traits/mod.rs b/rpc/src/v1/traits/mod.rs
index ea0834463..86b55b7c0 100644
--- a/rpc/src/v1/traits/mod.rs
+++ b/rpc/src/v1/traits/mod.rs
@@ -20,9 +20,12 @@ pub mod web3;
 pub mod eth;
 pub mod eth_signing;
 pub mod net;
+pub mod parity;
+pub mod parity_accounts;
+pub mod parity_set;
+pub mod parity_signing;
 pub mod personal;
-pub mod ethcore;
-pub mod ethcore_set;
+pub mod signer;
 pub mod traces;
 pub mod rpc;
 
@@ -30,9 +33,12 @@ pub use self::web3::Web3;
 pub use self::eth::{Eth, EthFilter};
 pub use self::eth_signing::EthSigning;
 pub use self::net::Net;
-pub use self::personal::{Personal, PersonalAccounts, PersonalSigner};
-pub use self::ethcore::Ethcore;
-pub use self::ethcore_set::EthcoreSet;
+pub use self::parity::Parity;
+pub use self::parity_accounts::ParityAccounts;
+pub use self::parity_set::ParitySet;
+pub use self::parity_signing::ParitySigning;
+pub use self::personal::Personal;
+pub use self::signer::Signer;
 pub use self::traces::Traces;
 pub use self::rpc::Rpc;
 
diff --git a/rpc/src/v1/traits/ethcore.rs b/rpc/src/v1/traits/parity.rs
similarity index 72%
rename from rpc/src/v1/traits/ethcore.rs
rename to rpc/src/v1/traits/parity.rs
index 18279d364..23cf50ed3 100644
--- a/rpc/src/v1/traits/ethcore.rs
+++ b/rpc/src/v1/traits/parity.rs
@@ -14,124 +14,129 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Ethcore-specific rpc interface.
+//! Parity-specific rpc interface.
 use jsonrpc_core::Error;
 
-use v1::helpers::auto_args::{Wrap, WrapAsync, Ready};
+use std::collections::BTreeMap;
+use v1::helpers::auto_args::Wrap;
 use v1::types::{H160, H256, H512, U256, Bytes, Peers, Transaction, RpcSettings, Histogram};
 
 build_rpc_trait! {
-	/// Ethcore-specific rpc interface.
-	pub trait Ethcore {
+	/// Parity-specific rpc interface.
+	pub trait Parity {
 		/// Returns current transactions limit.
-		#[rpc(name = "ethcore_transactionsLimit")]
+		#[rpc(name = "parity_transactionsLimit")]
 		fn transactions_limit(&self) -> Result<usize, Error>;
 
 		/// Returns mining extra data.
-		#[rpc(name = "ethcore_extraData")]
+		#[rpc(name = "parity_extraData")]
 		fn extra_data(&self) -> Result<Bytes, Error>;
 
 		/// Returns mining gas floor target.
-		#[rpc(name = "ethcore_gasFloorTarget")]
+		#[rpc(name = "parity_gasFloorTarget")]
 		fn gas_floor_target(&self) -> Result<U256, Error>;
 
 		/// Returns mining gas floor cap.
-		#[rpc(name = "ethcore_gasCeilTarget")]
+		#[rpc(name = "parity_gasCeilTarget")]
 		fn gas_ceil_target(&self) -> Result<U256, Error>;
 
 		/// Returns minimal gas price for transaction to be included in queue.
-		#[rpc(name = "ethcore_minGasPrice")]
+		#[rpc(name = "parity_minGasPrice")]
 		fn min_gas_price(&self) -> Result<U256, Error>;
 
 		/// Returns latest logs
-		#[rpc(name = "ethcore_devLogs")]
+		#[rpc(name = "parity_devLogs")]
 		fn dev_logs(&self) -> Result<Vec<String>, Error>;
 
 		/// Returns logs levels
-		#[rpc(name = "ethcore_devLogsLevels")]
+		#[rpc(name = "parity_devLogsLevels")]
 		fn dev_logs_levels(&self) -> Result<String, Error>;
 
 		/// Returns chain name
-		#[rpc(name = "ethcore_netChain")]
+		#[rpc(name = "parity_netChain")]
 		fn net_chain(&self) -> Result<String, Error>;
 
 		/// Returns peers details
-		#[rpc(name = "ethcore_netPeers")]
+		#[rpc(name = "parity_netPeers")]
 		fn net_peers(&self) -> Result<Peers, Error>;
 
 		/// Returns network port
-		#[rpc(name = "ethcore_netPort")]
+		#[rpc(name = "parity_netPort")]
 		fn net_port(&self) -> Result<u16, Error>;
 
 		/// Returns rpc settings
-		#[rpc(name = "ethcore_rpcSettings")]
+		#[rpc(name = "parity_rpcSettings")]
 		fn rpc_settings(&self) -> Result<RpcSettings, Error>;
 
 		/// Returns node name
-		#[rpc(name = "ethcore_nodeName")]
+		#[rpc(name = "parity_nodeName")]
 		fn node_name(&self) -> Result<String, Error>;
 
 		/// Returns default extra data
-		#[rpc(name = "ethcore_defaultExtraData")]
+		#[rpc(name = "parity_defaultExtraData")]
 		fn default_extra_data(&self) -> Result<Bytes, Error>;
 
 		/// Returns distribution of gas price in latest blocks.
-		#[rpc(name = "ethcore_gasPriceHistogram")]
+		#[rpc(name = "parity_gasPriceHistogram")]
 		fn gas_price_histogram(&self) -> Result<Histogram, Error>;
 
 		/// Returns number of unsigned transactions waiting in the signer queue (if signer enabled)
 		/// Returns error when signer is disabled
-		#[rpc(name = "ethcore_unsignedTransactionsCount")]
+		#[rpc(name = "parity_unsignedTransactionsCount")]
 		fn unsigned_transactions_count(&self) -> Result<usize, Error>;
 
 		/// Returns a cryptographically random phrase sufficient for securely seeding a secret key.
-		#[rpc(name = "ethcore_generateSecretPhrase")]
+		#[rpc(name = "parity_generateSecretPhrase")]
 		fn generate_secret_phrase(&self) -> Result<String, Error>;
 
 		/// Returns whatever address would be derived from the given phrase if it were to seed a brainwallet.
-		#[rpc(name = "ethcore_phraseToAddress")]
+		#[rpc(name = "parity_phraseToAddress")]
 		fn phrase_to_address(&self, String) -> Result<H160, Error>;
 
 		/// Returns the value of the registrar for this network.
-		#[rpc(name = "ethcore_registryAddress")]
+		#[rpc(name = "parity_registryAddress")]
 		fn registry_address(&self) -> Result<Option<H160>, Error>;
 
 		/// Returns all addresses if Fat DB is enabled (`--fat-db`), or null if not.
-		#[rpc(name = "ethcore_listAccounts")]
+		#[rpc(name = "parity_listAccounts")]
 		fn list_accounts(&self) -> Result<Option<Vec<H160>>, Error>;
 
 		/// Returns all storage keys of the given address (first parameter) if Fat DB is enabled (`--fat-db`),
 		/// or null if not.
-		#[rpc(name = "ethcore_listStorageKeys")]
+		#[rpc(name = "parity_listStorageKeys")]
 		fn list_storage_keys(&self, H160) -> Result<Option<Vec<H256>>, Error>;
 
 		/// Encrypt some data with a public key under ECIES.
 		/// First parameter is the 512-byte destination public key, second is the message.
-		#[rpc(name = "ethcore_encryptMessage")]
+		#[rpc(name = "parity_encryptMessage")]
 		fn encrypt_message(&self, H512, Bytes) -> Result<Bytes, Error>;
 
 		/// Returns all pending transactions from transaction queue.
-		#[rpc(name = "ethcore_pendingTransactions")]
+		#[rpc(name = "parity_pendingTransactions")]
 		fn pending_transactions(&self) -> Result<Vec<Transaction>, Error>;
 
-		/// Hash a file content under given URL.
-		#[rpc(async, name = "ethcore_hashContent")]
-		fn hash_content(&self, Ready<H256>, String);
-
 		/// Returns current Trusted Signer port or an error if signer is disabled.
-		#[rpc(name = "ethcore_signerPort")]
+		#[rpc(name = "parity_signerPort")]
 		fn signer_port(&self) -> Result<u16, Error>;
 
 		/// Returns current Dapps Server port or an error if dapps server is disabled.
-		#[rpc(name = "ethcore_dappsPort")]
+		#[rpc(name = "parity_dappsPort")]
 		fn dapps_port(&self) -> Result<u16, Error>;
 
 		/// Returns next nonce for particular sender. Should include all transactions in the queue.
-		#[rpc(name = "ethcore_nextNonce")]
+		#[rpc(name = "parity_nextNonce")]
 		fn next_nonce(&self, H160) -> Result<U256, Error>;
 
-		/// Get the mode. Results one of: "active", "passive", "dark", "off".
-		#[rpc(name = "ethcore_mode")]
+		/// Get the mode. Results one of: "active", "passive", "dark", "offline".
+		#[rpc(name = "parity_mode")]
 		fn mode(&self) -> Result<String, Error>;
+
+		/// Get the enode of this node.
+		#[rpc(name = "parity_enode")]
+		fn enode(&self) -> Result<String, Error>;
+
+		/// Returns accounts information.
+		#[rpc(name = "parity_accounts")]
+		fn accounts(&self) -> Result<BTreeMap<String, BTreeMap<String, String>>, Error>;
 	}
 }
diff --git a/rpc/src/v1/traits/parity_accounts.rs b/rpc/src/v1/traits/parity_accounts.rs
new file mode 100644
index 000000000..0f62f59d1
--- /dev/null
+++ b/rpc/src/v1/traits/parity_accounts.rs
@@ -0,0 +1,77 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Parity Accounts-related rpc interface.
+use std::collections::BTreeMap;
+use jsonrpc_core::{Value, Error};
+
+use v1::helpers::auto_args::Wrap;
+use v1::types::{H160, H256};
+
+build_rpc_trait! {
+	/// Personal Parity rpc interface.
+	pub trait ParityAccounts {
+		/// Returns accounts information.
+		#[rpc(name = "parity_accountsInfo")]
+		fn accounts_info(&self) -> Result<BTreeMap<String, Value>, Error>;
+
+		/// Creates new account from the given phrase using standard brainwallet mechanism.
+		/// Second parameter is password for the new account.
+		#[rpc(name = "parity_newAccountFromPhrase")]
+		fn new_account_from_phrase(&self, String, String) -> Result<H160, Error>;
+
+		/// Creates new account from the given JSON wallet.
+		/// Second parameter is password for the wallet and the new account.
+		#[rpc(name = "parity_newAccountFromWallet")]
+		fn new_account_from_wallet(&self, String, String) -> Result<H160, Error>;
+
+		/// Creates new account from the given raw secret.
+		/// Second parameter is password for the new account.
+		#[rpc(name = "parity_newAccountFromSecret")]
+		fn new_account_from_secret(&self, H256, String) -> Result<H160, Error>;
+
+		/// Returns true if given `password` would unlock given `account`.
+		/// Arguments: `account`, `password`.
+		#[rpc(name = "parity_testPassword")]
+		fn test_password(&self, H160, String) -> Result<bool, Error>;
+
+		/// Changes an account's password.
+		/// Arguments: `account`, `password`, `new_password`.
+		#[rpc(name = "parity_changePassword")]
+		fn change_password(&self, H160, String, String) -> Result<bool, Error>;
+
+		/// Set an account's name.
+		#[rpc(name = "parity_setAccountName")]
+		fn set_account_name(&self, H160, String) -> Result<bool, Error>;
+
+		/// Set an account's metadata string.
+		#[rpc(name = "parity_setAccountMeta")]
+		fn set_account_meta(&self, H160, String) -> Result<bool, Error>;
+
+		/// Returns accounts information.
+		#[rpc(name = "parity_setAccountVisiblity")]
+		fn set_account_visibility(&self, H160, H256, bool) -> Result<bool, Error>;
+
+		/// Imports a number of Geth accounts, with the list provided as the argument.
+		#[rpc(name = "parity_importGethAccounts")]
+		fn import_geth_accounts(&self, Vec<H160>) -> Result<Vec<H160>, Error>;
+
+		/// Returns the accounts available for importing from Geth.
+		#[rpc(name = "parity_listGethAccounts")]
+		fn geth_accounts(&self) -> Result<Vec<H160>, Error>;
+	}
+}
+
diff --git a/rpc/src/v1/traits/ethcore_set.rs b/rpc/src/v1/traits/parity_set.rs
similarity index 67%
rename from rpc/src/v1/traits/ethcore_set.rs
rename to rpc/src/v1/traits/parity_set.rs
index 9c0d3d5d4..c83eff022 100644
--- a/rpc/src/v1/traits/ethcore_set.rs
+++ b/rpc/src/v1/traits/parity_set.rs
@@ -14,74 +14,78 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Ethcore-specific rpc interface for operations altering the settings.
+//! Parity-specific rpc interface for operations altering the settings.
 
 use jsonrpc_core::Error;
 
-use v1::helpers::auto_args::Wrap;
-use v1::types::{Bytes, H160, U256};
+use v1::helpers::auto_args::{Wrap, WrapAsync, Ready};
+use v1::types::{Bytes, H160, H256, U256};
 
 build_rpc_trait! {
-	/// Ethcore-specific rpc interface for operations altering the settings.
-	pub trait EthcoreSet {
+	/// Parity-specific rpc interface for operations altering the settings.
+	pub trait ParitySet {
 		/// Sets new minimal gas price for mined blocks.
-		#[rpc(name = "ethcore_setMinGasPrice")]
+		#[rpc(name = "parity_setMinGasPrice")]
 		fn set_min_gas_price(&self, U256) -> Result<bool, Error>;
 
 		/// Sets new gas floor target for mined blocks.
-		#[rpc(name = "ethcore_setGasFloorTarget")]
+		#[rpc(name = "parity_setGasFloorTarget")]
 		fn set_gas_floor_target(&self, U256) -> Result<bool, Error>;
 
 		/// Sets new gas ceiling target for mined blocks.
-		#[rpc(name = "ethcore_setGasCeilTarget")]
+		#[rpc(name = "parity_setGasCeilTarget")]
 		fn set_gas_ceil_target(&self, U256) -> Result<bool, Error>;
 
 		/// Sets new extra data for mined blocks.
-		#[rpc(name = "ethcore_setExtraData")]
+		#[rpc(name = "parity_setExtraData")]
 		fn set_extra_data(&self, Bytes) -> Result<bool, Error>;
 
 		/// Sets new author for mined block.
-		#[rpc(name = "ethcore_setAuthor")]
+		#[rpc(name = "parity_setAuthor")]
 		fn set_author(&self, H160) -> Result<bool, Error>;
 
 		/// Sets the limits for transaction queue.
-		#[rpc(name = "ethcore_setTransactionsLimit")]
+		#[rpc(name = "parity_setTransactionsLimit")]
 		fn set_transactions_limit(&self, usize) -> Result<bool, Error>;
 
 		/// Sets the maximum amount of gas a single transaction may consume.
-		#[rpc(name = "ethcore_setMaxTransactionGas")]
+		#[rpc(name = "parity_setMaxTransactionGas")]
 		fn set_tx_gas_limit(&self, U256) -> Result<bool, Error>;
 
 		/// Add a reserved peer.
-		#[rpc(name = "ethcore_addReservedPeer")]
+		#[rpc(name = "parity_addReservedPeer")]
 		fn add_reserved_peer(&self, String) -> Result<bool, Error>;
 
 		/// Remove a reserved peer.
-		#[rpc(name = "ethcore_removeReservedPeer")]
+		#[rpc(name = "parity_removeReservedPeer")]
 		fn remove_reserved_peer(&self, String) -> Result<bool, Error>;
 
 		/// Drop all non-reserved peers.
-		#[rpc(name = "ethcore_dropNonReservedPeers")]
+		#[rpc(name = "parity_dropNonReservedPeers")]
 		fn drop_non_reserved_peers(&self) -> Result<bool, Error>;
 
 		/// Accept non-reserved peers (default behavior)
-		#[rpc(name = "ethcore_acceptNonReservedPeers")]
+		#[rpc(name = "parity_acceptNonReservedPeers")]
 		fn accept_non_reserved_peers(&self) -> Result<bool, Error>;
 
 		/// Start the network.
-		/// 
+		///
 		/// Deprecated. Use `set_mode("active")` instead.
-		#[rpc(name = "ethcore_startNetwork")]
+		#[rpc(name = "parity_startNetwork")]
 		fn start_network(&self) -> Result<bool, Error>;
 
 		/// Stop the network.
 		///
-		/// Deprecated. Use `set_mode("off")` instead.
-		#[rpc(name = "ethcore_stopNetwork")]
+		/// Deprecated. Use `set_mode("offline")` instead.
+		#[rpc(name = "parity_stopNetwork")]
 		fn stop_network(&self) -> Result<bool, Error>;
 
-		/// Set the mode. Argument must be one of: "active", "passive", "dark", "off".
-		#[rpc(name = "ethcore_setMode")]
+		/// Set the mode. Argument must be one of: "active", "passive", "dark", "offline".
+		#[rpc(name = "parity_setMode")]
 		fn set_mode(&self, String) -> Result<bool, Error>;
+
+		/// Hash a file content under given URL.
+		#[rpc(async, name = "parity_hashContent")]
+		fn hash_content(&self, Ready<H256>, String);
 	}
-}
\ No newline at end of file
+}
diff --git a/rpc/src/v1/traits/parity_signing.rs b/rpc/src/v1/traits/parity_signing.rs
new file mode 100644
index 000000000..1c2778b31
--- /dev/null
+++ b/rpc/src/v1/traits/parity_signing.rs
@@ -0,0 +1,52 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! ParitySigning rpc interface.
+use std::sync::Arc;
+use jsonrpc_core::*;
+
+/// Signing methods implementation relying on unlocked accounts.
+pub trait ParitySigning: Sized + Send + Sync + 'static {
+	/// Posts sign request asynchronously.
+	/// Will return a confirmation ID for later use with check_transaction.
+	fn post_sign(&self, _: Params) -> Result<Value, Error>;
+
+	/// Posts transaction asynchronously.
+	/// Will return a transaction ID for later use with check_transaction.
+	fn post_transaction(&self, _: Params) -> Result<Value, Error>;
+
+	/// Checks the progress of a previously posted request (transaction/sign).
+	/// Should be given a valid send_transaction ID.
+	/// Returns the transaction hash, the zero hash (not yet available),
+	/// or the signature,
+	/// or an error.
+	fn check_request(&self, _: Params) -> Result<Value, Error>;
+
+	/// Decrypt some ECIES-encrypted message.
+	/// First parameter is the address with which it is encrypted, second is the ciphertext.
+	fn decrypt_message(&self, _: Params, _: Ready);
+
+	/// Should be used to convert object to io delegate.
+	fn to_delegate(self) -> IoDelegate<Self> {
+		let mut delegate = IoDelegate::new(Arc::new(self));
+		delegate.add_method("parity_postSign", ParitySigning::post_sign);
+		delegate.add_method("parity_postTransaction", ParitySigning::post_transaction);
+		delegate.add_method("parity_checkRequest", ParitySigning::check_request);
+		delegate.add_async_method("parity_decryptMessage", ParitySigning::decrypt_message);
+
+		delegate
+	}
+}
diff --git a/rpc/src/v1/traits/personal.rs b/rpc/src/v1/traits/personal.rs
index fe5c3cb02..42e61839e 100644
--- a/rpc/src/v1/traits/personal.rs
+++ b/rpc/src/v1/traits/personal.rs
@@ -15,11 +15,10 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Personal rpc interface.
-use std::collections::BTreeMap;
-use jsonrpc_core::{Value, Error};
+use jsonrpc_core::Error;
 
 use v1::helpers::auto_args::Wrap;
-use v1::types::{H160, H256, U256, TransactionRequest, TransactionModification, ConfirmationRequest};
+use v1::types::{H160, H256, TransactionRequest};
 
 build_rpc_trait! {
 	/// Personal rpc interface. Safe (read-only) functions.
@@ -28,91 +27,17 @@ build_rpc_trait! {
 		#[rpc(name = "personal_listAccounts")]
 		fn accounts(&self) -> Result<Vec<H160>, Error>;
 
-		/// Returns accounts information.
-		#[rpc(name = "personal_accountsInfo")]
-		fn accounts_info(&self) -> Result<BTreeMap<String, Value>, Error>;
-	}
-}
-
-build_rpc_trait! {
-	/// Personal rpc methods altering stored accounts or their settings.
-	pub trait PersonalAccounts {
-
 		/// Creates new account (it becomes new current unlocked account)
 		/// Param is the password for the account.
 		#[rpc(name = "personal_newAccount")]
 		fn new_account(&self, String) -> Result<H160, Error>;
 
-		/// Creates new account from the given phrase using standard brainwallet mechanism.
-		/// Second parameter is password for the new account.
-		#[rpc(name = "personal_newAccountFromPhrase")]
-		fn new_account_from_phrase(&self, String, String) -> Result<H160, Error>;
-
-		/// Creates new account from the given JSON wallet.
-		/// Second parameter is password for the wallet and the new account.
-		#[rpc(name = "personal_newAccountFromWallet")]
-		fn new_account_from_wallet(&self, String, String) -> Result<H160, Error>;
-
-		/// Creates new account from the given raw secret.
-		/// Second parameter is password for the new account.
-		#[rpc(name = "personal_newAccountFromSecret")]
-		fn new_account_from_secret(&self, H256, String) -> Result<H160, Error>;
-
 		/// Unlocks specified account for use (can only be one unlocked account at one moment)
 		#[rpc(name = "personal_unlockAccount")]
 		fn unlock_account(&self, H160, String, Option<u64>) -> Result<bool, Error>;
 
-		/// Returns true if given `password` would unlock given `account`.
-		/// Arguments: `account`, `password`.
-		#[rpc(name = "personal_testPassword")]
-		fn test_password(&self, H160, String) -> Result<bool, Error>;
-
-		/// Changes an account's password.
-		/// Arguments: `account`, `password`, `new_password`.
-		#[rpc(name = "personal_changePassword")]
-		fn change_password(&self, H160, String, String) -> Result<bool, Error>;
-
 		/// Sends transaction and signs it in single call. The account is not unlocked in such case.
 		#[rpc(name = "personal_signAndSendTransaction")]
 		fn sign_and_send_transaction(&self, TransactionRequest, String) -> Result<H256, Error>;
-
-		/// Set an account's name.
-		#[rpc(name = "personal_setAccountName")]
-		fn set_account_name(&self, H160, String) -> Result<bool, Error>;
-
-		/// Set an account's metadata string.
-		#[rpc(name = "personal_setAccountMeta")]
-		fn set_account_meta(&self, H160, String) -> Result<bool, Error>;
-
-		/// Imports a number of Geth accounts, with the list provided as the argument.
-		#[rpc(name = "personal_importGethAccounts")]
-		fn import_geth_accounts(&self, Vec<H160>) -> Result<Vec<H160>, Error>;
-
-		/// Returns the accounts available for importing from Geth.
-		#[rpc(name = "personal_listGethAccounts")]
-		fn geth_accounts(&self) -> Result<Vec<H160>, Error>;
 	}
 }
-
-build_rpc_trait! {
-	/// Personal extension for confirmations rpc interface.
-	pub trait PersonalSigner {
-
-		/// Returns a list of items to confirm.
-		#[rpc(name = "personal_requestsToConfirm")]
-		fn requests_to_confirm(&self) -> Result<Vec<ConfirmationRequest>, Error>;
-
-		/// Confirm specific request.
-		#[rpc(name = "personal_confirmRequest")]
-		fn confirm_request(&self, U256, TransactionModification, String) -> Result<Value, Error>;
-
-		/// Reject the confirmation request.
-		#[rpc(name = "personal_rejectRequest")]
-		fn reject_request(&self, U256) -> Result<bool, Error>;
-
-		/// Generates new authorization token.
-		#[rpc(name = "personal_generateAuthorizationToken")]
-		fn generate_token(&self) -> Result<String, Error>;
-	}
-}
-
diff --git a/rpc/src/v1/traits/signer.rs b/rpc/src/v1/traits/signer.rs
new file mode 100644
index 000000000..d80c6f1a6
--- /dev/null
+++ b/rpc/src/v1/traits/signer.rs
@@ -0,0 +1,44 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Parity Signer-related rpc interface.
+use jsonrpc_core::{Value, Error};
+
+use v1::helpers::auto_args::Wrap;
+use v1::types::{U256, TransactionModification, ConfirmationRequest};
+
+
+build_rpc_trait! {
+	/// Signer extension for confirmations rpc interface.
+	pub trait Signer {
+
+		/// Returns a list of items to confirm.
+		#[rpc(name = "signer_requestsToConfirm")]
+		fn requests_to_confirm(&self) -> Result<Vec<ConfirmationRequest>, Error>;
+
+		/// Confirm specific request.
+		#[rpc(name = "signer_confirmRequest")]
+		fn confirm_request(&self, U256, TransactionModification, String) -> Result<Value, Error>;
+
+		/// Reject the confirmation request.
+		#[rpc(name = "signer_rejectRequest")]
+		fn reject_request(&self, U256) -> Result<bool, Error>;
+
+		/// Generates new authorization token.
+		#[rpc(name = "signer_generateAuthorizationToken")]
+		fn generate_token(&self) -> Result<String, Error>;
+	}
+}
diff --git a/rpc/src/v1/types/block.rs b/rpc/src/v1/types/block.rs
index 70f39ba73..f52785e90 100644
--- a/rpc/src/v1/types/block.rs
+++ b/rpc/src/v1/types/block.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::ops::Deref;
+use std::collections::BTreeMap;
 use serde::{Serialize, Serializer};
 use v1::types::{Bytes, Transaction, H160, H256, H2048, U256};
 
@@ -93,17 +95,51 @@ pub struct Block {
 	pub size: Option<U256>,
 }
 
+/// Block representation with additional info
+#[derive(Debug)]
+pub struct RichBlock {
+	/// Standard block
+	pub block: Block,
+	/// Engine-specific fields with additional description.
+	/// Should be included directly to serialized block object.
+	#[serde(skip_serializing)]
+	pub extra_info: BTreeMap<String, String>,
+}
+
+impl Deref for RichBlock {
+	type Target = Block;
+	fn deref(&self) -> &Self::Target {
+		&self.block
+	}
+}
+
+impl Serialize for RichBlock {
+	fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error> where S: Serializer {
+		use serde_json::{to_value, Value};
+
+		let serialized = (to_value(&self.block), to_value(&self.extra_info));
+		if let (Value::Object(mut block), Value::Object(extras)) = serialized {
+			// join two objects
+			block.extend(extras);
+			// and serialize
+			try!(block.serialize(serializer));
+		}
+		Ok(())
+	}
+}
+
 #[cfg(test)]
 mod tests {
+	use std::collections::BTreeMap;
 	use serde_json;
-	use v1::types::{Transaction, H160, H256, H2048, Bytes, U256};
-	use super::{Block, BlockTransactions};
+	use v1::types::{Transaction, H64, H160, H256, H2048, Bytes, U256};
+	use super::{Block, RichBlock, BlockTransactions};
 
 	#[test]
 	fn test_serialize_block_transactions() {
 		let t = BlockTransactions::Full(vec![Transaction::default()]);
 		let serialized = serde_json::to_string(&t).unwrap();
-		assert_eq!(serialized, r#"[{"hash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0","blockHash":null,"blockNumber":null,"transactionIndex":null,"from":"0x0000000000000000000000000000000000000000","to":null,"value":"0x0","gasPrice":"0x0","gas":"0x0","input":"0x","creates":null,"raw":"0x","publicKey":null}]"#);
+		assert_eq!(serialized, r#"[{"hash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0","blockHash":null,"blockNumber":null,"transactionIndex":null,"from":"0x0000000000000000000000000000000000000000","to":null,"value":"0x0","gasPrice":"0x0","gas":"0x0","input":"0x","creates":null,"raw":"0x","publicKey":null,"v":0,"r":"0x0000000000000000000000000000000000000000000000000000000000000000","s":"0x0000000000000000000000000000000000000000000000000000000000000000"}]"#);
 
 		let t = BlockTransactions::Hashes(vec![H256::default().into()]);
 		let serialized = serde_json::to_string(&t).unwrap();
@@ -134,8 +170,17 @@ mod tests {
 			transactions: BlockTransactions::Hashes(vec![].into()),
 			size: Some(69.into()),
 		};
+		let serialized_block = serde_json::to_string(&block).unwrap();
+		let rich_block = RichBlock {
+			block: block,
+			extra_info: map![
+				"mixHash".into() => format!("0x{:?}", H256::default()),
+				"nonce".into() => format!("0x{:?}", H64::default())
+			],
+		};
+		let serialized_rich_block = serde_json::to_string(&rich_block).unwrap();
 
-		let serialized = serde_json::to_string(&block).unwrap();
-		assert_eq!(serialized, r#"{"hash":"0x0000000000000000000000000000000000000000000000000000000000000000","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000","sha3Uncles":"0x0000000000000000000000000000000000000000000000000000000000000000","author":"0x0000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","stateRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionsRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","receiptsRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","number":"0x0","gasUsed":"0x0","gasLimit":"0x0","extraData":"0x","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","timestamp":"0x0","difficulty":"0x0","totalDifficulty":"0x0","sealFields":["0x","0x"],"uncles":[],"transactions":[],"size":"0x45"}"#);
+		assert_eq!(serialized_block, r#"{"hash":"0x0000000000000000000000000000000000000000000000000000000000000000","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000","sha3Uncles":"0x0000000000000000000000000000000000000000000000000000000000000000","author":"0x0000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","stateRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionsRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","receiptsRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","number":"0x0","gasUsed":"0x0","gasLimit":"0x0","extraData":"0x","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","timestamp":"0x0","difficulty":"0x0","totalDifficulty":"0x0","sealFields":["0x","0x"],"uncles":[],"transactions":[],"size":"0x45"}"#);
+		assert_eq!(serialized_rich_block, r#"{"author":"0x0000000000000000000000000000000000000000","difficulty":"0x0","extraData":"0x","gasLimit":"0x0","gasUsed":"0x0","hash":"0x0000000000000000000000000000000000000000000000000000000000000000","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","miner":"0x0000000000000000000000000000000000000000","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0000000000000000","number":"0x0","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000","receiptsRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","sealFields":["0x","0x"],"sha3Uncles":"0x0000000000000000000000000000000000000000000000000000000000000000","size":"0x45","stateRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","timestamp":"0x0","totalDifficulty":"0x0","transactions":[],"transactionsRoot":"0x0000000000000000000000000000000000000000000000000000000000000000","uncles":[]}"#);
 	}
 }
diff --git a/rpc/src/v1/types/mod.rs.in b/rpc/src/v1/types/mod.rs.in
index 002fcecca..cba7487fc 100644
--- a/rpc/src/v1/types/mod.rs.in
+++ b/rpc/src/v1/types/mod.rs.in
@@ -35,7 +35,7 @@ mod work;
 mod histogram;
 
 pub use self::bytes::Bytes;
-pub use self::block::{Block, BlockTransactions};
+pub use self::block::{RichBlock, Block, BlockTransactions};
 pub use self::block_number::BlockNumber;
 pub use self::call_request::CallRequest;
 pub use self::confirmations::{ConfirmationPayload, ConfirmationRequest, TransactionModification};
diff --git a/rpc/src/v1/types/receipt.rs b/rpc/src/v1/types/receipt.rs
index 066195cbf..24170a14c 100644
--- a/rpc/src/v1/types/receipt.rs
+++ b/rpc/src/v1/types/receipt.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use v1::types::{Log, H160, H256, U256};
+use v1::types::{Log, H160, H256, H2048, U256};
 use ethcore::receipt::{Receipt as EthReceipt, RichReceipt, LocalizedReceipt};
 
 /// Receipt
@@ -43,6 +43,12 @@ pub struct Receipt {
 	pub contract_address: Option<H160>,
 	/// Logs
 	pub logs: Vec<Log>,
+	/// State Root
+	#[serde(rename="root")]
+	pub state_root: H256,
+	/// Logs bloom
+	#[serde(rename="logsBloom")]
+	pub logs_bloom: H2048,
 }
 
 impl From<LocalizedReceipt> for Receipt {
@@ -56,6 +62,8 @@ impl From<LocalizedReceipt> for Receipt {
 			gas_used: Some(r.gas_used.into()),
 			contract_address: r.contract_address.map(Into::into),
 			logs: r.logs.into_iter().map(Into::into).collect(),
+			state_root: r.state_root.into(),
+			logs_bloom: r.log_bloom.into(),
 		}
 	}
 }
@@ -71,6 +79,8 @@ impl From<RichReceipt> for Receipt {
 			gas_used: Some(r.gas_used.into()),
 			contract_address: r.contract_address.map(Into::into),
 			logs: r.logs.into_iter().map(Into::into).collect(),
+			state_root: r.state_root.into(),
+			logs_bloom: r.log_bloom.into(),
 		}
 	}
 }
@@ -86,6 +96,8 @@ impl From<EthReceipt> for Receipt {
 			gas_used: None,
 			contract_address: None,
 			logs: r.logs.into_iter().map(Into::into).collect(),
+			state_root: r.state_root.into(),
+			logs_bloom: r.log_bloom.into(),
 		}
 	}
 }
@@ -93,35 +105,36 @@ impl From<EthReceipt> for Receipt {
 #[cfg(test)]
 mod tests {
 	use serde_json;
-	use std::str::FromStr;
-	use v1::types::{Log, Receipt, U256, H256, H160};
+	use v1::types::{Log, Receipt};
 
 	#[test]
 	fn receipt_serialization() {
-		let s = r#"{"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","cumulativeGasUsed":"0x20","gasUsed":"0x10","contractAddress":null,"logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"data":"0x","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","logIndex":"0x1","type":"mined"}]}"#;
+		let s = r#"{"transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","cumulativeGasUsed":"0x20","gasUsed":"0x10","contractAddress":null,"logs":[{"address":"0x33990122638b9132ca29c723bdf037f1a891a70c","topics":["0xa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc","0x4861736852656700000000000000000000000000000000000000000000000000"],"data":"0x","blockHash":"0xed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5","blockNumber":"0x4510c","transactionHash":"0x0000000000000000000000000000000000000000000000000000000000000000","transactionIndex":"0x0","logIndex":"0x1","type":"mined"}],"root":"0x000000000000000000000000000000000000000000000000000000000000000a","logsBloom":"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f"}"#;
 
 		let receipt = Receipt {
-			transaction_hash: Some(H256::from(0)),
-			transaction_index: Some(U256::from(0)),
-			block_hash: Some(H256::from_str("ed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5").unwrap()),
-			block_number: Some(U256::from(0x4510c)),
-			cumulative_gas_used: U256::from(0x20),
-			gas_used: Some(U256::from(0x10)),
+			transaction_hash: Some(0.into()),
+			transaction_index: Some(0.into()),
+			block_hash: Some("ed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5".parse().unwrap()),
+			block_number: Some(0x4510c.into()),
+			cumulative_gas_used: 0x20.into(),
+			gas_used: Some(0x10.into()),
 			contract_address: None,
 			logs: vec![Log {
-				address: H160::from_str("33990122638b9132ca29c723bdf037f1a891a70c").unwrap(),
+				address: "33990122638b9132ca29c723bdf037f1a891a70c".parse().unwrap(),
 				topics: vec![
-					H256::from_str("a6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc").unwrap(),
-					H256::from_str("4861736852656700000000000000000000000000000000000000000000000000").unwrap(),
+					"a6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc".parse().unwrap(),
+					"4861736852656700000000000000000000000000000000000000000000000000".parse().unwrap(),
 				],
 				data: vec![].into(),
-				block_hash: Some(H256::from_str("ed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5").unwrap()),
-				block_number: Some(U256::from(0x4510c)),
-				transaction_hash: Some(H256::default()),
-				transaction_index: Some(U256::default()),
-				log_index: Some(U256::from(1)),
-				log_type: "mined".to_owned(),
-			}]
+				block_hash: Some("ed76641c68a1c641aee09a94b3b471f4dc0316efe5ac19cf488e2674cf8d05b5".parse().unwrap()),
+				block_number: Some(0x4510c.into()),
+				transaction_hash: Some(0.into()),
+				transaction_index: Some(0.into()),
+				log_index: Some(1.into()),
+				log_type: "mined".into(),
+			}],
+			logs_bloom: 15.into(),
+			state_root: 10.into(),
 		};
 
 		let serialized = serde_json::to_string(&receipt).unwrap();
diff --git a/rpc/src/v1/types/transaction.rs b/rpc/src/v1/types/transaction.rs
index 6aa9ee899..0982a5ef9 100644
--- a/rpc/src/v1/types/transaction.rs
+++ b/rpc/src/v1/types/transaction.rs
@@ -54,10 +54,17 @@ pub struct Transaction {
 	/// Public key of the signer.
 	#[serde(rename="publicKey")]
 	pub public_key: Option<H512>,
+	/// The V field of the signature.
+	pub v: u8,
+	/// The R field of the signature.
+	pub r: H256,
+	/// The S field of the signature.
+	pub s: H256,
 }
 
 impl From<LocalizedTransaction> for Transaction {
 	fn from(t: LocalizedTransaction) -> Transaction {
+		let signature = t.signature();
 		Transaction {
 			hash: t.hash().into(),
 			nonce: t.nonce.into(),
@@ -79,12 +86,16 @@ impl From<LocalizedTransaction> for Transaction {
 			},
 			raw: ::rlp::encode(&t.signed).to_vec().into(),
 			public_key: t.public_key().ok().map(Into::into),
+			v: signature.v(),
+			r: signature.r().into(),
+			s: signature.s().into(),
 		}
 	}
 }
 
 impl From<SignedTransaction> for Transaction {
 	fn from(t: SignedTransaction) -> Transaction {
+		let signature = t.signature();
 		Transaction {
 			hash: t.hash().into(),
 			nonce: t.nonce.into(),
@@ -106,6 +117,9 @@ impl From<SignedTransaction> for Transaction {
 			},
 			raw: ::rlp::encode(&t).to_vec().into(),
 			public_key: t.public_key().ok().map(Into::into),
+			v: signature.v(),
+			r: signature.r().into(),
+			s: signature.s().into(),
 		}
 	}
 }
@@ -119,7 +133,7 @@ mod tests {
 	fn test_transaction_serialize() {
 		let t = Transaction::default();
 		let serialized = serde_json::to_string(&t).unwrap();
-		assert_eq!(serialized, r#"{"hash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0","blockHash":null,"blockNumber":null,"transactionIndex":null,"from":"0x0000000000000000000000000000000000000000","to":null,"value":"0x0","gasPrice":"0x0","gas":"0x0","input":"0x","creates":null,"raw":"0x","publicKey":null}"#);
+		assert_eq!(serialized, r#"{"hash":"0x0000000000000000000000000000000000000000000000000000000000000000","nonce":"0x0","blockHash":null,"blockNumber":null,"transactionIndex":null,"from":"0x0000000000000000000000000000000000000000","to":null,"value":"0x0","gasPrice":"0x0","gas":"0x0","input":"0x","creates":null,"raw":"0x","publicKey":null,"v":0,"r":"0x0000000000000000000000000000000000000000000000000000000000000000","s":"0x0000000000000000000000000000000000000000000000000000000000000000"}"#);
 	}
 }
 
diff --git a/signer/Cargo.toml b/signer/Cargo.toml
index 651d96cb3..2a3742ec8 100644
--- a/signer/Cargo.toml
+++ b/signer/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore Trusted Signer"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-signer"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 
diff --git a/sync/Cargo.toml b/sync/Cargo.toml
index 95d738eb4..c7e30d6a5 100644
--- a/sync/Cargo.toml
+++ b/sync/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore blockchain sync"
 name = "ethsync"
-version = "1.4.0"
+version = "1.5.0"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io"]
 build = "build.rs"
diff --git a/sync/src/api.rs b/sync/src/api.rs
index abe18c3cd..1a33bc727 100644
--- a/sync/src/api.rs
+++ b/sync/src/api.rs
@@ -42,7 +42,7 @@ pub struct SyncConfig {
 	/// Max blocks to download ahead
 	pub max_download_ahead_blocks: usize,
 	/// Network ID
-	pub network_id: U256,
+	pub network_id: usize,
 	/// Main "eth" subprotocol name.
 	pub subprotocol_name: [u8; 3],
 	/// Fork block to check
@@ -55,7 +55,7 @@ impl Default for SyncConfig {
 	fn default() -> SyncConfig {
 		SyncConfig {
 			max_download_ahead_blocks: 20000,
-			network_id: U256::from(1),
+			network_id: 1,
 			subprotocol_name: *b"eth",
 			fork_block: None,
 			warp_sync: false,
@@ -73,6 +73,9 @@ pub trait SyncProvider: Send + Sync {
 
 	/// Get peers information
 	fn peers(&self) -> Vec<PeerInfo>;
+    
+	/// Get the enode if available.
+	fn enode(&self) -> Option<String>;
 }
 
 /// Peer connection information
@@ -143,6 +146,10 @@ impl SyncProvider for EthSync {
 			self.handler.sync.write().peers(&sync_io)
 		}).unwrap_or(Vec::new())
 	}
+
+	fn enode(&self) -> Option<String> {
+		self.network.external_url()
+	}
 }
 
 struct SyncProtocolHandler {
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index dc12fc926..063d60e6b 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -188,7 +188,7 @@ pub struct SyncStatus {
 	/// Syncing protocol version. That's the maximum protocol version we connect to.
 	pub protocol_version: u8,
 	/// The underlying p2p network version.
-	pub network_id: U256,
+	pub network_id: usize,
 	/// `BlockChain` height for the moment the sync started.
 	pub start_block_number: BlockNumber,
 	/// Last fully downloaded and imported block number (if any).
@@ -269,7 +269,7 @@ struct PeerInfo {
 	/// Peer chain genesis hash
 	genesis: H256,
 	/// Peer network id
-	network_id: U256,
+	network_id: usize,
 	/// Peer best block hash
 	latest_hash: H256,
 	/// Peer total difficulty if known
@@ -328,7 +328,7 @@ pub struct ChainSync {
 	/// Last propagated block number
 	last_sent_block_number: BlockNumber,
 	/// Network ID
-	network_id: U256,
+	network_id: usize,
 	/// Optional fork block to check
 	fork_block: Option<(BlockNumber, H256)>,
 	/// Snapshot downloader.
@@ -2145,7 +2145,7 @@ mod tests {
 			PeerInfo {
 				protocol_version: 0,
 				genesis: H256::zero(),
-				network_id: U256::zero(),
+				network_id: 0,
 				latest_hash: peer_latest_hash,
 				difficulty: None,
 				asking: PeerAsking::Nothing,
diff --git a/util/Cargo.toml b/util/Cargo.toml
index 78cca92e0..cc342eeca 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 
diff --git a/util/bigint/Cargo.toml b/util/bigint/Cargo.toml
index c21b5239f..3b6b852cb 100644
--- a/util/bigint/Cargo.toml
+++ b/util/bigint/Cargo.toml
@@ -4,7 +4,7 @@ homepage = "http://ethcore.io"
 repository = "https://github.com/ethcore/parity"
 license = "GPL-3.0"
 name = "ethcore-bigint"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
 
diff --git a/util/bigint/src/hash.rs b/util/bigint/src/hash.rs
index f782d1f90..20cdbae03 100644
--- a/util/bigint/src/hash.rs
+++ b/util/bigint/src/hash.rs
@@ -386,6 +386,12 @@ macro_rules! impl_hash {
 				}
 			}
 		}
+
+		impl<'a> From<&'a [u8]> for $from {
+			fn from(s: &'a [u8]) -> $from {
+				$from::from_slice(s)
+			}
+		}
 	}
 }
 
diff --git a/util/io/Cargo.toml b/util/io/Cargo.toml
index 3cd51e656..8c7f46cb9 100644
--- a/util/io/Cargo.toml
+++ b/util/io/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore IO library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-io"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
 [dependencies]
diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml
index 1a79df0e0..02a54375c 100644
--- a/util/network/Cargo.toml
+++ b/util/network/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore network library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-network"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
 [dependencies]
diff --git a/util/network/src/session.rs b/util/network/src/session.rs
index 3a4779208..a1336a0ad 100644
--- a/util/network/src/session.rs
+++ b/util/network/src/session.rs
@@ -32,7 +32,8 @@ use node_table::NodeId;
 use stats::NetworkStats;
 use time;
 
-const PING_TIMEOUT_SEC: u64 = 65;
+// Timeout must be less than (interval - 1).
+const PING_TIMEOUT_SEC: u64 = 15;
 const PING_INTERVAL_SEC: u64 = 30;
 
 /// Peer session over encrypted connection.
diff --git a/util/src/stats.rs b/util/src/stats.rs
index f05c1b757..a106ba29c 100644
--- a/util/src/stats.rs
+++ b/util/src/stats.rs
@@ -28,13 +28,17 @@ pub struct Histogram {
 }
 
 impl Histogram {
-	/// Histogram if a sorted corpus is at least fills the buckets.
+	/// Histogram of a sorted corpus if it at least spans the buckets. Bounds are left closed.
 	pub fn new(corpus: &[U256], bucket_number: usize) -> Option<Histogram> {
-		if corpus.len() < bucket_number { return None; }
-		let corpus_end = corpus.last().expect("there are at least bucket_number elements; qed").clone();
-		// If there are extremely few transactions, go from zero.
-		let corpus_start = corpus.first().expect("there are at least bucket_number elements; qed").clone();
-		let bucket_size = (corpus_end - corpus_start + 1.into()) / bucket_number.into();
+		if corpus.len() < 1 { return None; }
+		let corpus_end = corpus.last().expect("there is at least 1 element; qed").clone();
+		let corpus_start = corpus.first().expect("there is at least 1 element; qed").clone();
+		// Bucket needs to be at least 1 wide.
+		let bucket_size = {
+			// Round up to get the entire corpus included.
+			let raw_bucket_size = (corpus_end - corpus_start + bucket_number.into()) / bucket_number.into();
+			if raw_bucket_size == 0.into() { 1.into() } else { raw_bucket_size }
+		};
 		let mut bucket_end = corpus_start + bucket_size;
 
 		let mut bucket_bounds = vec![corpus_start; bucket_number + 1];
@@ -42,10 +46,12 @@ impl Histogram {
 		let mut corpus_i = 0;
 		// Go through the corpus adding to buckets.
 		for bucket in 0..bucket_number {
-			while corpus[corpus_i] < bucket_end {
+			while corpus.get(corpus_i).map_or(false, |v| v < &bucket_end) {
+				// Initialized to size bucket_number above; iterates up to bucket_number; qed
 				counts[bucket] += 1;
 				corpus_i += 1;
 			}
+			// Initialized to size bucket_number + 1 above; iterates up to bucket_number; subscript is in range; qed
 			bucket_bounds[bucket + 1] = bucket_end;
 			bucket_end = bucket_end + bucket_size;
 		}
@@ -62,9 +68,36 @@ mod tests {
 	#[test]
 	fn check_histogram() {
 		let hist = Histogram::new(&vec_into![643,689,1408,2000,2296,2512,4250,4320,4842,4958,5804,6065,6098,6354,7002,7145,7845,8589,8593,8895], 5).unwrap();
-		let correct_bounds: Vec<U256> = vec_into![643,2293,3943,5593,7243,8893];
-		assert_eq!(Histogram { bucket_bounds: correct_bounds, counts: vec![4,2,4,6,3] }, hist);
+		let correct_bounds: Vec<U256> = vec_into![643, 2294, 3945, 5596, 7247, 8898];
+		assert_eq!(Histogram { bucket_bounds: correct_bounds, counts: vec![4,2,4,6,4] }, hist);
+	}
 
-		assert!(Histogram::new(&vec_into![1, 2], 5).is_none());
+	#[test]
+	fn smaller_data_range_than_bucket_range() {
+		assert_eq!(
+			Histogram::new(&vec_into![1, 2, 2], 3),
+			Some(Histogram { bucket_bounds: vec_into![1, 2, 3, 4], counts: vec![1, 2, 0] })
+		);
+	}
+
+	#[test]
+	fn data_range_is_not_multiple_of_bucket_range() {
+		assert_eq!(
+			Histogram::new(&vec_into![1, 2, 5], 2),
+			Some(Histogram { bucket_bounds: vec_into![1, 4, 7], counts: vec![2, 1] })
+		);
+	}
+
+	#[test]
+	fn data_range_is_multiple_of_bucket_range() {
+		assert_eq!(
+			Histogram::new(&vec_into![1, 2, 6], 2),
+			Some(Histogram { bucket_bounds: vec_into![1, 4, 7], counts: vec![2, 1] })
+		);
+	}
+
+	#[test]
+	fn none_when_too_few_data() {
+		assert!(Histogram::new(&vec_into![], 1).is_none());
 	}
 }
diff --git a/windows/ptray/ptray.cpp b/windows/ptray/ptray.cpp
new file mode 100644
index 000000000..81c9b8a16
--- /dev/null
+++ b/windows/ptray/ptray.cpp
@@ -0,0 +1,278 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity 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 General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#define WIN32_LEAN_AND_MEAN 
+#include <stdlib.h>
+#include <malloc.h>
+#include <memory.h>
+#include <tchar.h>
+#include <Windows.h>
+#include <Shellapi.h>
+#include <Shlwapi.h>
+#include <tlhelp32.h>
+
+#include <SDKDDKVer.h>
+
+#include "resource.h"
+
+#pragma comment(lib, "shlwapi.lib")
+
+#define MAX_LOADSTRING 100
+#define IDM_EXIT 100
+#define IDM_OPEN 101
+#define	WM_USER_SHELLICON WM_USER + 1
+
+HANDLE parityHandle = INVALID_HANDLE_VALUE;
+DWORD parityProcId = 0;
+NOTIFYICONDATA nidApp;
+WCHAR szTitle[MAX_LOADSTRING];
+WCHAR szWindowClass[MAX_LOADSTRING];
+
+LPCWSTR cParityExe = _T("parity.exe");
+
+ATOM MyRegisterClass(HINSTANCE hInstance);
+bool InitInstance(HINSTANCE, int, LPWSTR cmdLine);
+LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
+void KillParity();
+void OpenUI();
+bool ParityIsRunning();
+
+bool GetParityExePath(TCHAR* dest, size_t destSize)
+{
+	if (!dest || MAX_PATH > destSize)
+		return false;
+	GetModuleFileName(NULL, dest, destSize);
+	if (!PathRemoveFileSpec(dest))
+		return false;
+	return PathAppend(dest, _T("parity.exe")) == TRUE;
+}
+
+int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
+	_In_opt_ HINSTANCE hPrevInstance,
+	_In_ LPWSTR    lpCmdLine,
+	_In_ int       nCmdShow)
+{
+	UNREFERENCED_PARAMETER(hPrevInstance);
+	UNREFERENCED_PARAMETER(lpCmdLine);
+
+	CreateMutex(0, FALSE, _T("Local\\ParityTray"));
+	if (GetLastError() == ERROR_ALREADY_EXISTS) {
+		// open the UI
+		OpenUI();
+		return 0;
+	}
+		
+
+	LoadStringW(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
+	LoadStringW(hInstance, IDC_PTRAY, szWindowClass, MAX_LOADSTRING);
+	MyRegisterClass(hInstance);
+
+	if (!InitInstance(hInstance, nCmdShow, lpCmdLine))
+		return FALSE;
+
+	HACCEL hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_PTRAY));
+	MSG msg;
+	// Main message loop:
+	while (GetMessage(&msg, nullptr, 0, 0))
+	{
+		if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg))
+		{
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+	}
+
+	return (int)msg.wParam;
+}
+
+ATOM MyRegisterClass(HINSTANCE hInstance)
+{
+	WNDCLASSEXW wcex;
+
+	wcex.cbSize = sizeof(WNDCLASSEX);
+
+	wcex.style = CS_HREDRAW | CS_VREDRAW;
+	wcex.lpfnWndProc = WndProc;
+	wcex.cbClsExtra = 0;
+	wcex.cbWndExtra = 0;
+	wcex.hInstance = hInstance;
+	wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_PTRAY));
+	wcex.hCursor = LoadCursor(nullptr, IDC_ARROW);
+	wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+	wcex.lpszMenuName = MAKEINTRESOURCEW(IDC_PTRAY);
+	wcex.lpszClassName = szWindowClass;
+	wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
+
+	return RegisterClassExW(&wcex);
+}
+
+
+bool InitInstance(HINSTANCE hInstance, int nCmdShow, LPWSTR cmdLine)
+{
+	// Check if already running
+	PROCESSENTRY32 entry;
+	entry.dwSize = sizeof(PROCESSENTRY32);
+
+	HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, NULL);
+	if (Process32First(snapshot, &entry) == TRUE)
+	{
+		while (Process32Next(snapshot, &entry) == TRUE)
+		{
+			if (lstrcmp(entry.szExeFile, cParityExe) == 0)
+			{
+				parityHandle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID);
+				parityProcId = entry.th32ProcessID;
+				break;
+			}
+		}
+	}
+
+	CloseHandle(snapshot);
+
+	if (parityHandle == INVALID_HANDLE_VALUE)
+	{
+		// Launch parity
+		TCHAR path[MAX_PATH] = { 0 };
+		if (!GetParityExePath(path, MAX_PATH))
+			return false;
+
+		PROCESS_INFORMATION procInfo = { 0 };
+		STARTUPINFO startupInfo = { sizeof(STARTUPINFO) };
+
+		LPWSTR cmd = new WCHAR[lstrlen(cmdLine) + lstrlen(path) + 2];
+		lstrcpy(cmd, path);
+		lstrcat(cmd, _T(" "));
+		lstrcat(cmd, cmdLine);
+		if (!CreateProcess(nullptr, cmd, nullptr, nullptr, false, CREATE_NO_WINDOW, nullptr, nullptr, &startupInfo, &procInfo))
+			return false;
+		delete[] cmd;
+		parityHandle = procInfo.hProcess;
+		parityProcId = procInfo.dwProcessId;
+	}
+
+	HWND hWnd = CreateWindowW(szWindowClass, szTitle, 0,
+		CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, nullptr, nullptr, hInstance, nullptr);
+
+	if (!hWnd)
+		return false;
+
+	HICON hMainIcon = LoadIcon(hInstance, (LPCTSTR)MAKEINTRESOURCE(IDI_PTRAY));
+
+	nidApp.cbSize = sizeof(NOTIFYICONDATA); // sizeof the struct in bytes 
+	nidApp.hWnd = (HWND)hWnd;              //handle of the window which will process this app. messages 
+	nidApp.uID = IDI_PTRAY;           //ID of the icon that willl appear in the system tray 
+	nidApp.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; //ORing of all the flags 
+	nidApp.hIcon = hMainIcon; // handle of the Icon to be displayed, obtained from LoadIcon 
+	nidApp.uCallbackMessage = WM_USER_SHELLICON;
+	LoadString(hInstance, IDS_CONTROL_PARITY, nidApp.szTip, MAX_LOADSTRING);
+	Shell_NotifyIcon(NIM_ADD, &nidApp);
+	return TRUE;
+
+}
+
+LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+{
+	switch (message)
+	{
+	case WM_USER_SHELLICON:
+		// systray msg callback 
+		POINT lpClickPoint;
+		switch (LOWORD(lParam))
+		{
+		case WM_LBUTTONDOWN:
+			OpenUI();
+			break;
+		case WM_RBUTTONDOWN:
+			UINT uFlag = MF_BYPOSITION | MF_STRING;
+			GetCursorPos(&lpClickPoint);
+			HMENU hPopMenu = CreatePopupMenu();
+			InsertMenu(hPopMenu, 0xFFFFFFFF, MF_BYPOSITION | MF_STRING, IDM_OPEN, _T("Open"));
+			InsertMenu(hPopMenu, 0xFFFFFFFF, MF_SEPARATOR | MF_BYPOSITION, 0, nullptr);
+			InsertMenu(hPopMenu, 0xFFFFFFFF, MF_BYPOSITION | MF_STRING, IDM_EXIT, _T("Exit"));
+
+			SetForegroundWindow(hWnd);
+			TrackPopupMenu(hPopMenu, TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_BOTTOMALIGN, lpClickPoint.x, lpClickPoint.y, 0, hWnd, NULL);
+			return TRUE;
+
+		}
+		break;
+	case WM_COMMAND:
+	{
+		int wmId = LOWORD(wParam);
+		// Parse the menu selections:
+		switch (wmId)
+		{
+		case IDM_EXIT:
+			DestroyWindow(hWnd);
+			break;
+		case IDM_OPEN:
+			OpenUI();
+			break;
+		default:
+			return DefWindowProc(hWnd, message, wParam, lParam);
+		}
+	}
+	break;
+	case WM_DESTROY:
+		Shell_NotifyIcon(NIM_DELETE, &nidApp);
+		KillParity();
+		PostQuitMessage(0);
+		break;
+	case WM_TIMER:
+		if (!ParityIsRunning())
+			DestroyWindow(hWnd);
+	default:
+		return DefWindowProc(hWnd, message, wParam, lParam);
+	}
+	return 0;
+}
+
+void KillParity()
+{
+	DWORD procId = parityProcId;
+	//This does not require the console window to be visible.
+	if (AttachConsole(procId))
+	{
+		// Disable Ctrl-C handling for our program
+		SetConsoleCtrlHandler(nullptr, true);
+		GenerateConsoleCtrlEvent(CTRL_C_EVENT, 0);
+		FreeConsole();
+
+		//Re-enable Ctrl-C handling or any subsequently started
+		//programs will inherit the disabled state.
+		SetConsoleCtrlHandler(nullptr, false);
+	}
+	WaitForSingleObject(parityHandle, INFINITE);
+}
+
+bool ParityIsRunning()
+{
+	return WaitForSingleObject(parityHandle, 0) == WAIT_TIMEOUT;
+}
+
+void OpenUI()
+{
+	// Launch parity
+	TCHAR path[MAX_PATH] = { 0 };
+	if (!GetParityExePath(path, MAX_PATH))
+		return;
+
+	PROCESS_INFORMATION procInfo = { 0 };
+	STARTUPINFO startupInfo = { sizeof(STARTUPINFO) };
+
+	LPWSTR cmd = _T("parity.exe ui");
+	CreateProcess(path, cmd, nullptr, nullptr, false, CREATE_NO_WINDOW, nullptr, nullptr, &startupInfo, &procInfo);
+}
diff --git a/windows/ptray/ptray.ico b/windows/ptray/ptray.ico
new file mode 100644
index 000000000..61e68b90b
Binary files /dev/null and b/windows/ptray/ptray.ico differ
diff --git a/windows/ptray/ptray.rc b/windows/ptray/ptray.rc
new file mode 100644
index 000000000..9f10e0aa8
Binary files /dev/null and b/windows/ptray/ptray.rc differ
diff --git a/windows/ptray/ptray.vcxproj b/windows/ptray/ptray.vcxproj
new file mode 100644
index 000000000..2d2fe87a8
--- /dev/null
+++ b/windows/ptray/ptray.vcxproj
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{37C89E90-8C9E-4FFC-AAE7-B3695D5EB6F4}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>ptray</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="Resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ptray.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="ptray.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="ptray.ico" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/windows/ptray/resource.h b/windows/ptray/resource.h
new file mode 100644
index 000000000..1f4b02343
Binary files /dev/null and b/windows/ptray/resource.h differ
diff --git a/windows/ptray/targetver.h b/windows/ptray/targetver.h
new file mode 100644
index 000000000..87c0086de
--- /dev/null
+++ b/windows/ptray/targetver.h
@@ -0,0 +1,8 @@
+#pragma once
+
+// Including SDKDDKVer.h defines the highest available Windows platform.
+
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+
+#include <SDKDDKVer.h>