diff --git a/.gitignore b/.gitignore
index 9c97bbd..02551b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 dist
 .env
+.idea
diff --git a/basic-wallet/package.json b/basic-wallet/package.json
index 0dac42b..e5684ef 100644
--- a/basic-wallet/package.json
+++ b/basic-wallet/package.json
@@ -4,9 +4,9 @@
   "private": true,
   "dependencies": {
     "@burner-wallet/assets": "^1.0.0",
-    "@burner-wallet/core": "^1.0.0",
+    "@burner-wallet/core": "^1.0.3",
     "@burner-wallet/exchange": "^1.0.0",
-    "@burner-wallet/modern-ui": "^1.0.0",
+    "@burner-wallet/modern-ui": "^1.0.5",
     "@types/node": "12.0.4",
     "@types/react": "*",
     "@types/react-dom": "16.8.4",
diff --git a/basic-wallet/src/index.tsx b/basic-wallet/src/index.tsx
index fe7790c..795b188 100644
--- a/basic-wallet/src/index.tsx
+++ b/basic-wallet/src/index.tsx
@@ -6,7 +6,7 @@ import { InjectedSigner, LocalSigner } from '@burner-wallet/core/signers';
 import { InfuraGateway, InjectedGateway, XDaiGateway, } from '@burner-wallet/core/gateways';
 import Exchange, { Uniswap, XDaiBridge } from '@burner-wallet/exchange';
 import ModernUI from '@burner-wallet/modern-ui';
-import MyPlugin from 'my-plugin';
+// import MyPlugin from 'my-plugin';
 
 const core = new BurnerCore({
   signers: [new InjectedSigner(), new LocalSigner()],
@@ -26,7 +26,7 @@ const BurnerWallet = () =>
   <ModernUI
     title="Basic Wallet"
     core={core}
-    plugins={[exchange, new MyPlugin()]}
+    plugins={[exchange]}
   />
 
 
diff --git a/local-wallet/package.json b/local-wallet/package.json
index 6ca3605..556fd7a 100644
--- a/local-wallet/package.json
+++ b/local-wallet/package.json
@@ -4,8 +4,9 @@
   "private": true,
   "dependencies": {
     "@burner-wallet/assets": "^1.0.0",
-    "@burner-wallet/core": "^1.0.0",
-    "@burner-wallet/modern-ui": "^1.0.0",
+    "@burner-wallet/core": "^1.0.3",
+    "@burner-wallet/exchange": "^1.0.0",
+    "@burner-wallet/modern-ui": "^1.0.5",
     "@types/node": "12.0.4",
     "@types/react": "16.8.19",
     "@types/react-dom": "16.8.4",
diff --git a/local-wallet/src/index.tsx b/local-wallet/src/index.tsx
index 272ea80..ae2132e 100644
--- a/local-wallet/src/index.tsx
+++ b/local-wallet/src/index.tsx
@@ -5,7 +5,8 @@ import BurnerCore from '@burner-wallet/core';
 import { InjectedSigner, LocalSigner } from '@burner-wallet/core/signers';
 import { HTTPGateway } from '@burner-wallet/core/gateways';
 import ModernUI from '@burner-wallet/modern-ui';
-import MyPlugin from 'my-plugin';
+import Exchange, { Uniswap, XDaiBridge } from '@burner-wallet/exchange';
+// import MyPlugin from 'my-plugin';
 
 const core = new BurnerCore({
   signers: [
@@ -31,11 +32,15 @@ const core = new BurnerCore({
   ],
 });
 
+const exchange = new Exchange({
+  pairs: [new XDaiBridge(), new Uniswap('dai')],
+});
+
 const BurnerWallet = () =>
   <ModernUI
     title="Local Wallet"
     core={core}
-    plugins={[new MyPlugin()]}
+    plugins={[exchange]}
   />
 
 
diff --git a/my-plugin/package.json b/my-plugin/package.json
index 3957198..470aa46 100644
--- a/my-plugin/package.json
+++ b/my-plugin/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@burner-wallet/assets": "^1.0.0",
-    "@burner-wallet/types": "^1.0.0",
+    "@burner-wallet/types": "^1.0.6",
     "@types/react": "*"
   },
   "devDependencies": {
diff --git a/my-plugin/src/ui/MyElement.tsx b/my-plugin/src/ui/MyElement.tsx
index 81d1fd4..31b2493 100644
--- a/my-plugin/src/ui/MyElement.tsx
+++ b/my-plugin/src/ui/MyElement.tsx
@@ -7,7 +7,7 @@ const MyElement: React.FC<PluginElementContext> = ({ plugin }) => {
   const _plugin = plugin as MyPlugin;
 
   useEffect(() => {
-    _plugin.getBlockNum().then((num: string) => setBlock(num))
+    _plugin.getBlockNum().then((num: number) => setBlock(num.toString()))
   }, []);
 
   return (
diff --git a/yarn.lock b/yarn.lock
index 81adcf5..239b83a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1077,6 +1077,14 @@
     isomorphic-fetch "^2.2.1"
     web3-utils "^1.2.2"
 
+"@burner-wallet/assets@^1.1.0":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@burner-wallet/assets/-/assets-1.1.5.tgz#e3654303555671c2850723d1c6dc2bc4803741e1"
+  integrity sha512-6VIGHHuJ6fdL48B3MxaJ2fxNhzBlgzUveuQ5QuVmztz20iRQyf78MYtppeEpfwsRjuqSRL56a42QMNn7RR/j6w==
+  dependencies:
+    isomorphic-fetch "^2.2.1"
+    web3-utils "^1.2.2"
+
 "@burner-wallet/core@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@burner-wallet/core/-/core-1.0.0.tgz#caa15c34e9560e270ed5cffebd8c377789245e32"
@@ -1087,6 +1095,16 @@
     web3 "^1.2.2"
     web3-provider-engine "15.0.3"
 
+"@burner-wallet/core@^1.0.3", "@burner-wallet/core@^1.1.7":
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/@burner-wallet/core/-/core-1.1.8.tgz#1f0688d7e56127d51f96aee55e74fdd9064260e2"
+  integrity sha512-SQdTY1MUPs2jZrr66wSoFbuIx6TOmbir+No9IgwqFD+3ncoUCTYC19CdJVnnOwWiQh3gEw+VPxXyH+72guN62A==
+  dependencies:
+    "@burner-wallet/assets" "^1.1.0"
+    "@dmihal/tabookey-gasless" "^0.4.1"
+    web3 "^1.2.2"
+    web3-provider-engine "15.0.3"
+
 "@burner-wallet/exchange@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@burner-wallet/exchange/-/exchange-1.0.0.tgz#a5a1ac11ff95d07965868095fa1a8dbe70200635"
@@ -1095,13 +1113,13 @@
     "@burner-wallet/types" "^1.0.0"
     "@types/react" "*"
 
-"@burner-wallet/modern-ui@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@burner-wallet/modern-ui/-/modern-ui-1.0.0.tgz#b348a702c69b54a9887d80872feea163bd6d3d00"
-  integrity sha512-NEratdWp/B2bSxu61ffuHK69tFtL4WhC/7GLiRpzjQBmPs8bZfFDCbYgGSAmOKV6rfuD/XQfYNXzWOip14tTyg==
+"@burner-wallet/modern-ui@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@burner-wallet/modern-ui/-/modern-ui-1.0.5.tgz#9c19f2f313754cce94c66e9107e9b546a7a67f39"
+  integrity sha512-CefyGu3IQFebwGrf3epE5k7yjPtrdW+2EbCtYVZkc5nyKMrbAhshcqQW+FDdN80i13ton8q7YE9/3zQKICbvcw==
   dependencies:
-    "@burner-wallet/types" "^1.0.0"
-    "@burner-wallet/ui-core" "^1.0.0"
+    "@burner-wallet/types" "^1.0.2"
+    "@burner-wallet/ui-core" "^1.0.2"
     "@types/clipboard" "^2.0.1"
     "@types/color" "^3.0.0"
     "@types/ethereumjs-util" "^5.2.0"
@@ -1127,15 +1145,30 @@
     "@types/react-router-dom" "*"
     web3 "^1.2.2"
 
-"@burner-wallet/ui-core@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@burner-wallet/ui-core/-/ui-core-1.0.0.tgz#9f95f3396e4bb02016a26c862c05279c9a665cec"
-  integrity sha512-LmiESDGAPsQ+NZlDqNR4ogGwKfc4dadO88ZLz+bNfmgeZrG3yRKYjLFMI8gJNTFxzc9nrac/iEXnKPFE3GNNIQ==
+"@burner-wallet/types@^1.0.2", "@burner-wallet/types@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@burner-wallet/types/-/types-1.0.6.tgz#44d24bd54ac3e172d61e01725b0ed012878ae0fb"
+  integrity sha512-6g86fQdOVwB1anFrToSocxZqMyaROysTxeivvtPZW3lgShnvBcwfEjqlm9DdIlrCxPBmcQv3gUCCOumaudM8nA==
   dependencies:
+    "@burner-wallet/assets" "^1.0.0"
     "@burner-wallet/core" "^1.0.0"
-    "@burner-wallet/types" "^1.0.0"
+    "@types/react" "*"
+    "@types/react-router-dom" "*"
+    i18next "^19.0.2"
+    web3 "^1.2.2"
+
+"@burner-wallet/ui-core@^1.0.2":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@burner-wallet/ui-core/-/ui-core-1.0.7.tgz#4277332d729a8197882c80e9266bb7732b6b9b54"
+  integrity sha512-vLG7kIMD2QBM9qP73yfpiQo/z8TlQMmdua94xE21lRDOZdz23MEinG3c8a43HpBCibnu7++U0IxKPtdeibdP3g==
+  dependencies:
+    "@burner-wallet/core" "^1.1.7"
+    "@burner-wallet/types" "^1.0.2"
     "@types/react" "*"
     "@types/react-router-dom" "^4.3.4"
+    i18next "^19.0.2"
+    i18next-browser-languagedetector "^4.0.1"
+    react-i18next "^11.2.7"
     react-router-dom "^5.0.1"
 
 "@cnakazawa/watch@^1.0.3":
@@ -7430,6 +7463,13 @@ html-minifier@^3.5.20:
     relateurl "0.2.x"
     uglify-js "3.4.x"
 
+html-parse-stringify2@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz#dc5670b7292ca158b7bc916c9a6735ac8872834a"
+  integrity sha1-3FZwtyksoVi3vJFsmmc1rIhyg0o=
+  dependencies:
+    void-elements "^2.0.1"
+
 html-webpack-plugin@4.0.0-beta.5:
   version "4.0.0-beta.5"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz#2c53083c1151bfec20479b1f8aaf0039e77b5513"
@@ -7567,6 +7607,20 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
+i18next-browser-languagedetector@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-4.0.1.tgz#6a0b44a93835146287130da36ce3d04a1836879f"
+  integrity sha512-RxSoX6mB8cab0CTIQ+klCS764vYRj+Jk621cnFVsINvcdlb/cdi3vQFyrPwmnowB7ReUadjHovgZX+RPIzHVQQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+
+i18next@^19.0.2:
+  version "19.2.0"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.2.0.tgz#befeea5e9a5d133e9438b8a402cd55102ca41526"
+  integrity sha512-Pj/WKE0ABTwZ1CA5CHSsrcUm1KD0BxLEs30m7AAJCBKtRVOB9rqQCpXX4qzRHwFB8Fm6xqy6Dlcz/7IKb8nkQQ==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -11909,6 +11963,14 @@ react-error-overlay@^6.0.3:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.3.tgz#c378c4b0a21e88b2e159a3e62b2f531fd63bf60d"
   integrity sha512-bOUvMWFQVk5oz8Ded9Xb7WVdEi3QGLC8tH7HmYP0Fdp4Bn3qw0tRFmr5TW6mvahzvmrK4a6bqWGfCevBflP+Xw==
 
+react-i18next@^11.2.7:
+  version "11.3.3"
+  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.3.3.tgz#a84dcc32e3ad013012964d836790d8c6afac8e88"
+  integrity sha512-sGnPwJ0Kf8qTRLTnTRk030KiU6WYEZ49rP9ILPvCnsmgEKyucQfTxab+klSYnCSKYija+CWL+yo+c9va9BmJeg==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+    html-parse-stringify2 "2.0.1"
+
 react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
   version "16.11.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz#b85dfecd48ad1ce469ff558a882ca8e8313928fa"
@@ -14314,6 +14376,11 @@ vm-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
   integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
 
+void-elements@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
+
 w3c-hr-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"