diff --git a/templates/06-cross-contract-calls/README.md b/templates/06-cross-contract-calls/README.md
new file mode 100755
index 0000000..f609c91
--- /dev/null
+++ b/templates/06-cross-contract-calls/README.md
@@ -0,0 +1,48 @@
+# Using Token in AssemblyScript
+
+## Description
+
+This project contains example of contract using token similar to [ERC20](https://theethereum.wiki/w/index.php/ERC20_Token_Standard).
+
+The contract allows multiple participants to lock up same amount of funds in a "deal". They cannot unlock finances until they all confirm that "deal" conditions have been upheld.
+
+This is a back-end contract only so there is no front-end included.
+
+
+## To Run
+
+*In NEAR Studio (https://studio.nearprotocol.com)*
+
+1. Click the "Run" button on the top of the Studio window
+
+2. You will be redirected to the output for the JavaScript tests described in `src/main.js` to show that the contract is performing properly. This is a fully back-end contract so there is no front end.
+
+
+## To Explore
+
+See `assembly/main.ts` for the contract code and `src/main.js` for the JavaScript tests which define its usage.
+
+## Usage Example (from JS)
+
+Create a deal to lock 5 tokens between <code>test1.near</code> and <code>vasya.near</code>:
+
+```
+await contract.makeDeal({ dealId: DEAL_ID, amount: "5", participants: ["test1.near", "vasya.near"] });
+```
+
+Lock funds into the deal:
+```
+await tokenContract.approve({ spender: "studio-853u597r1", tokens: "5" });
+await contract.fundDeal({ dealId: DEAL_ID });
+```
+
+To see current state of the deal:
+```
+await contract.getDeal({ dealId: DEAL_ID });
+```
+
+Funds are returned back when all participants confirm deal completion:
+```
+await contract.confirmDeal({ dealId: DEAL_ID })
+```
+<code>DEAL_ID</code> can be any unique string used to identify given deal.
\ No newline at end of file
diff --git a/templates/06-cross-contract-calls/assembly/main.ts b/templates/06-cross-contract-calls/assembly/main.ts
new file mode 100755
index 0000000..5a02a61
--- /dev/null
+++ b/templates/06-cross-contract-calls/assembly/main.ts
@@ -0,0 +1,92 @@
+import "allocator/arena";
+export { memory };
+
+import { contractContext, globalStorage, near, ContractPromise } from "./near";
+import { Deal, TransferCompleteArgs } from "./model.near";
+import { Token } from "./token";
+
+// --- contract code goes below 
+
+// TODO: Replace contract address with actual DAI bridge or any other token
+let token = new Token("studio-31fz6jnjv");
+
+// TODO: Replace with name of current contract
+let CONTRACT_NAME = "studio-853u597r1";
+
+export function getDeal(dealId: string): Deal {
+  let dealKey = "deal:" + dealId;
+  return Deal.decode(globalStorage.getBytes(dealKey));
+}
+
+export function makeDeal(dealId: string, amount: string, participants: string[]): void {
+  near.log("makeDeal: " + dealId + " amount: " + amount + " participants: " + participants.toString());
+
+  let dealKey = "deal:" + dealId;
+  let existingDeal = globalStorage.getBytes(dealKey);
+  assert(!existingDeal, "Deal " + dealId + " already exists");
+
+  let everythingFalse: bool[] = new Array(participants.length);
+  let deal: Deal = { amount, participants, approved: everythingFalse, deposited: everythingFalse, confirmed: everythingFalse };
+  globalStorage.setBytes(dealKey, deal.encode()); 
+}
+
+export function fundDeal(dealId: string): void {
+  near.log("fundDeal: " + dealId);
+
+  let dealKey = "deal:" + dealId;
+  let deal = Deal.decode(globalStorage.getBytes(dealKey));
+  let senderIndex = deal.participants.indexOf(contractContext.sender);
+
+  assert(senderIndex != -1, contractContext.sender + " is not part of the deal");
+  assert(!deal.approved[senderIndex], contractContext.sender + " already funding the deal");
+
+  deal.approved[senderIndex] = true;
+  globalStorage.setBytes(dealKey, deal.encode()); 
+
+  let args: TransferCompleteArgs = { dealId, sender: contractContext.sender };
+  token.transferFrom(contractContext.sender, CONTRACT_NAME, deal.amount).then("transferComplete", args.encode(), 1).returnAsResult();
+}
+
+export function transferComplete(dealId: string, sender: string): void {
+  near.log("transferComplete: " + dealId + " sender: " + sender);
+
+  let transferResults = ContractPromise.getResults();
+  assert(transferResults.length == 1, "Expect only one result from transfer call");
+  
+  let dealKey = "deal:" + dealId;
+  let deal = Deal.decode(globalStorage.getBytes(dealKey));
+  let senderIndex = deal.participants.indexOf(sender);
+  assert(senderIndex != -1, sender + " is not part of the deal");
+
+  if (transferResults[0].success) {
+    deal.deposited[senderIndex] = true;
+  } else {
+    deal.approved[senderIndex] = false;
+  }
+
+  globalStorage.setBytes(dealKey, deal.encode());
+}
+
+export function cancelDeal(dealId: string): void {
+  // TODO: Allow to get out of deal if not everybody funded yet
+}
+
+export function confirmDeal(dealId: string): void {
+  let dealKey = "deal:" + dealId;
+  let deal = Deal.decode(globalStorage.getBytes(dealKey));
+  let senderIndex = deal.participants.indexOf(contractContext.sender);
+  assert(senderIndex != -1, contractContext.sender + " is not part of the deal");
+  assert(deal.confirmed[senderIndex] == false, contractContext.sender + " already confirmed the deal")
+
+  deal.confirmed[senderIndex] = true;
+  globalStorage.setBytes(dealKey, deal.encode());
+
+  let allConfirmed = deal.confirmed.every((confirmed: bool, index: i32, arr: Array<bool>): bool => confirmed);
+  if (allConfirmed) {
+    // TODO: Robust implementation should also track who actually got paid out
+    for (let i = 0; i < deal.participants.length; i++) {
+      let participant = deal.participants[i];
+      token.transfer(participant, deal.amount);
+    }
+  }
+}
\ No newline at end of file
diff --git a/templates/06-cross-contract-calls/assembly/model.ts b/templates/06-cross-contract-calls/assembly/model.ts
new file mode 100755
index 0000000..5231cf9
--- /dev/null
+++ b/templates/06-cross-contract-calls/assembly/model.ts
@@ -0,0 +1,40 @@
+export class Deal {
+  amount: string;
+  participants: string[];
+  approved: bool[];
+  deposited: bool[];
+  confirmed: bool[];
+}
+
+export class TransferCompleteArgs {
+  sender: string;
+  dealId: string;
+}
+
+export class BalanceOfArgs {
+  tokenOwner: string;
+}
+
+export class TransferArgs {
+  to: string;
+  tokens: string;
+}
+
+export class AllowanceArgs {
+  tokenOwner: string;
+  spender: string;
+}
+
+export class ApproveArgs {
+  spender: string;
+  tokens: string;
+}
+
+export class TransferFromArgs {
+  from: string;
+  to: string;
+  tokens: string;
+}
+
+export class EmptyArgs {
+}
\ No newline at end of file
diff --git a/templates/06-cross-contract-calls/assembly/token.ts b/templates/06-cross-contract-calls/assembly/token.ts
new file mode 100755
index 0000000..932c535
--- /dev/null
+++ b/templates/06-cross-contract-calls/assembly/token.ts
@@ -0,0 +1,41 @@
+import "allocator/arena";
+import { contractContext, globalStorage, near, ContractPromise } from "./near";
+import { BalanceOfArgs, TransferArgs, AllowanceArgs, ApproveArgs, TransferFromArgs, EmptyArgs } from "./model.near";
+
+export class Token {
+  contract: string;
+  
+  constructor(contract: string) {
+    this.contract = contract;
+  }
+
+  totalSupply(): ContractPromise {
+    let args: EmptyArgs = {};
+    return ContractPromise.create(this.contract, "totalSupply", args.encode(), 1);
+  }
+
+  balanceOf(tokenOwner: string): ContractPromise {
+    let args: BalanceOfArgs = { tokenOwner };
+    return ContractPromise.create(this.contract, "balanceOf", args.encode(), 1);
+  }
+
+  allowance(tokenOwner: string, spender: string): ContractPromise {
+    let args: AllowanceArgs = { tokenOwner, spender };
+    return ContractPromise.create(this.contract, "allowance", args.encode(), 1);
+  }
+
+  transfer(to: string, tokens: string): ContractPromise {
+    let args: TransferArgs = { to, tokens };
+    return ContractPromise.create(this.contract, "transfer", args.encode(), 1);
+  }
+
+  approve(spender: string, tokens: string): boolean {
+    let args: ApproveArgs = { spender, tokens };
+    return ContractPromise.create(this.contract, "approve", args.encode(), 1);
+  }
+
+  transferFrom(from: string, to: string, tokens: string): ContractPromise {
+    let args: TransferFromArgs = { from, to, tokens };
+    return ContractPromise.create(this.contract, "transferFrom", args.encode(), 1);
+  }
+}
\ No newline at end of file
diff --git a/templates/06-cross-contract-calls/assembly/tsconfig.json b/templates/06-cross-contract-calls/assembly/tsconfig.json
new file mode 100755
index 0000000..c76b0d8
--- /dev/null
+++ b/templates/06-cross-contract-calls/assembly/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../node_modules/assemblyscript/std/assembly.json",
+  "include": [
+    "./**/*.ts"
+  ]
+}
diff --git a/templates/06-cross-contract-calls/gulpfile.js b/templates/06-cross-contract-calls/gulpfile.js
new file mode 100755
index 0000000..26623f6
--- /dev/null
+++ b/templates/06-cross-contract-calls/gulpfile.js
@@ -0,0 +1,48 @@
+const gulp = require("gulp");
+
+function generateBindings(inputFile, outputFile, callback) {
+  const asc = require("assemblyscript/bin/asc");
+  asc.main([
+    inputFile,
+    "--baseDir", "assembly",
+    "--nearFile", outputFile, 
+    "--measure"
+  ], callback);
+}
+
+function compile(inputFile, outputFile, callback) {
+  const asc = require("assemblyscript/bin/asc");
+  asc.main([
+    inputFile,
+    "--baseDir", "assembly",
+    "--binaryFile", outputFile,
+    "--sourceMap",
+    "--measure"
+  ], callback);
+}
+
+gulp.task("build:model", callback => {
+  generateBindings("model.ts", "../out/model.near.ts", callback);
+});
+
+gulp.task("build:bindings", ["build:model"], callback => {
+  generateBindings("main.ts", "../out/main.near.ts", callback);
+});
+
+gulp.task("build", ["build:bindings"], callback => {
+  compile("../out/main.near.ts", "../out/main.wasm", callback);
+});
+
+gulp.task("default", ["build"]);
+
+// This task is not required when running the project locally. Its purpose is to set up the
+// AssemblyScript compiler when a new project has been loaded in WebAssembly Studio.
+gulp.task("project:load", () => {
+  const utils = require("@wasm/studio-utils");
+  utils.eval(utils.project.getFile("setup.js").getData(), {
+    logLn,
+    project,
+    monaco,
+    fileTypeForExtension,
+  });
+});
diff --git a/templates/06-cross-contract-calls/package.json b/templates/06-cross-contract-calls/package.json
new file mode 100755
index 0000000..c2bb8df
--- /dev/null
+++ b/templates/06-cross-contract-calls/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@wasm/token_contract_ts",
+  "description": "",
+  "version": "1.0.0",
+  "scripts": {
+    "build": "gulp"
+  },
+  "devDependencies": {
+    "assemblyscript": "AssemblyScript/assemblyscript",
+    "gulp": "^3"
+  },
+  "wasmStudio": {
+    "name": "Token Smart Contract",
+    "description": "# Token Smart Contract\n\nThis project contains implementation of token contract similar to ERC20. The contract allows you to launch a new token on top of the NEAR blockchain which users can interact with as if it were any other token -- checking balances, transferring, etc.\n\n[AssemblyScript](https://github.com/AssemblyScript/assemblyscript) compiles strictly typed TypeScript to WebAssembly using Binaryen. See the [AssemblyScript wiki](https://github.com/AssemblyScript/assemblyscript/wiki) for further instructions and documentation.",
+    "icon": "typescript-lang-file-icon"
+  }
+}
diff --git a/templates/06-cross-contract-calls/setup.js b/templates/06-cross-contract-calls/setup.js
new file mode 100755
index 0000000..fe9df07
--- /dev/null
+++ b/templates/06-cross-contract-calls/setup.js
@@ -0,0 +1,80 @@
+// This file is not required when running the project locally. Its purpose is to set up the
+// AssemblyScript compiler when a new project has been loaded in WebAssembly Studio.
+
+// Path manipulation lifted from https://gist.github.com/creationix/7435851
+
+// Joins path segments.  Preserves initial "/" and resolves ".." and "."
+// Does not support using ".." to go above/outside the root.
+// This means that join("foo", "../../bar") will not resolve to "../bar"
+function join(/* path segments */) {
+  // Split the inputs into a list of path commands.
+  var parts = [];
+  for (var i = 0, l = arguments.length; i < l; i++) {
+    parts = parts.concat(arguments[i].split("/"));
+  }
+  // Interpret the path commands to get the new resolved path.
+  var newParts = [];
+  for (i = 0, l = parts.length; i < l; i++) {
+    var part = parts[i];
+    // Remove leading and trailing slashes
+    // Also remove "." segments
+    if (!part || part === ".") continue;
+    // Interpret ".." to pop the last segment
+    if (part === "..") newParts.pop();
+    // Push new path segments.
+    else newParts.push(part);
+  }
+  // Preserve the initial slash if there was one.
+  if (parts[0] === "") newParts.unshift("");
+  // Turn back into a single string path.
+  return newParts.join("/") || (newParts.length ? "/" : ".");
+}
+
+// A simple function to get the dirname of a path
+// Trailing slashes are ignored. Leading slash is preserved.
+function dirname(path) {
+  return join(path, "..");
+}
+
+require.config({
+  paths: {
+    "binaryen": "https://cdn.jsdelivr.net/npm/binaryen@64.0.0/index",
+    "assemblyscript": "https://cdn.jsdelivr.net/gh/nearprotocol/assemblyscript@2337262883226a5431b80610ade7b4d379e82a30/dist/assemblyscript",
+    "assemblyscript/bin/asc": "https://cdn.jsdelivr.net/gh/nearprotocol/assemblyscript@2337262883226a5431b80610ade7b4d379e82a30/dist/asc",
+  }
+});
+logLn("Loading AssemblyScript compiler ...");
+require(["assemblyscript/bin/asc"], asc => {
+  monaco.languages.typescript.typescriptDefaults.addExtraLib(asc.definitionFiles.assembly);
+  asc.main = (main => (args, options, fn) => {
+    if (typeof options === "function") {
+      fn = options;
+      options = undefined;
+    }
+
+    return main(args, options || {
+      stdout: asc.createMemoryStream(),
+      stderr: asc.createMemoryStream(logLn),
+      readFile: (filename, baseDir) => {
+        let path = join(baseDir, filename);
+        console.log("readFile", path);
+        if (path.startsWith("out/") && path.indexOf(".near.ts") == -1) {
+          path = path.replace(/^out/, baseDir );
+          console.log("path", path);
+        } else if (path.startsWith(baseDir) && path.indexOf(".near.ts") != -1) {
+          path = path.replace(new RegExp("^" + baseDir), "out");
+          console.log("path", path);
+        }
+        const file = project.getFile(path);
+        return file ? file.data : null;
+      },
+      writeFile: (filename, contents) => {
+        const name = filename.startsWith("../") ? filename.substring(3) : filename;
+        const type = fileTypeForExtension(name.substring(name.lastIndexOf(".") + 1));
+        project.newFile(name, type, true).setData(contents);
+      },
+      listFiles: () => []
+    }, fn);
+  })(asc.main);
+  logLn("AssemblyScript compiler is ready!");
+});
\ No newline at end of file
diff --git a/templates/06-cross-contract-calls/src/loader.html b/templates/06-cross-contract-calls/src/loader.html
new file mode 100755
index 0000000..defe470
--- /dev/null
+++ b/templates/06-cross-contract-calls/src/loader.html
@@ -0,0 +1,11 @@
+<head>
+    <script>
+        window.paceOptions = {
+            elements: {
+                selectors: ['.never-appears']
+            }
+        };
+    </script>
+    <script src="https://cdn.jsdelivr.net/gh/HubSpot/pace@v0.5.3/pace.min.js"></script>
+    <link href="https://cdn.jsdelivr.net/gh/HubSpot/pace@v0.5.3/themes/black/pace-theme-center-radar.css" rel="stylesheet" />
+</head>
\ No newline at end of file
diff --git a/templates/06-cross-contract-calls/src/main.html b/templates/06-cross-contract-calls/src/main.html
new file mode 100755
index 0000000..29bd7d0
--- /dev/null
+++ b/templates/06-cross-contract-calls/src/main.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+  <title>NEAR DAI Bridge</title>
+
+  <!-- Bootstrap -->
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  <style>
+      .glyphicon-refresh-animate {
+          -animation: spin .7s infinite linear;
+          -webkit-animation: spin2 .7s infinite linear;
+      }
+
+      @-webkit-keyframes spin2 {
+          from { -webkit-transform: rotate(0deg);}
+          to { -webkit-transform: rotate(360deg);}
+      }
+
+      @keyframes spin {
+          from { transform: scale(1) rotate(0deg);}
+          to { transform: scale(1) rotate(360deg);}
+      }
+
+      .hints {
+        margin-top: 2em;
+      }
+  </style>
+</head>
+<body style="padding-top: 70px; padding-bottom: 30px;">
+
+  <!-- Fixed navbar -->
+  <nav class="navbar navbar-inverse navbar-fixed-top">
+      <div class="container">
+      <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="./">NEAR DAI Bridge</a>
+      </div>
+      <div id="navbar" class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+          <li class="active"><a href="./">Home</a></li>
+          <li><a href="" class="wallet disabled">Wallet</a></li>
+          <li class="hidden" id="logout-option"><a href="#logout" id="logout-button">Logout</a></li>
+          </ul>
+      </div><!--/.nav-collapse -->
+      </div>
+  </nav>
+
+  <div class="container" role="main">
+    <div id="sign-in-container">
+      <h2> Hello stranger! Who are you?</h2>
+      <div id="login-form">
+        <div class="col-md-4"><button id="login-button" class="btn btn-lg btn-block btn-primary">Login with NEAR Wallet</button></div>
+      </div>
+    </div>
+
+    <div id="guest-book-container" class="hidden">
+      <div id="hello">
+        <h2 id="hello">Hi, <span class='account-id'></span>!</h2>
+      </div>
+      <div>
+        DAI Balance on NEAR: <span style='font-weight: bold' id='near-balance'></span><br>
+      </div>
+    </div>
+
+    <div class="hints">
+      <p> Create a deal to lock 5 tokens between <code>test1.near</code> and <code>vasya.near</code>:
+      <pre>
+await contract.makeDeal({ dealId: DEAL_ID, amount: "5", participants: ["test1.near", "vasya.near"] });</pre>
+      <p> Lock funds into the deal:
+      <pre>
+await tokenContract.approve({ spender: "studio-853u597r1", tokens: "5" });
+await contract.fundDeal({ dealId: DEAL_ID });</pre>
+
+      <p> To see current state of the deal:
+      <pre>
+await contract.getDeal({ dealId: DEAL_ID });</pre>
+         
+      <p> Funds are returned back when all participants confirm deal completion:
+      <pre>
+await contract.confirmDeal({ dealId: DEAL_ID })</pre>
+
+      <code>DEAL_ID</code> can be any unique string used to identify given deal.
+    </div>
+  </div>
+
+  <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+  <!-- Include all compiled plugins (below), or include individual files as needed -->
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/nearlib@0.3.3/dist/nearlib.js"></script>
+  <script src="./main.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/06-cross-contract-calls/src/main.js b/templates/06-cross-contract-calls/src/main.js
new file mode 100755
index 0000000..e245a01
--- /dev/null
+++ b/templates/06-cross-contract-calls/src/main.js
@@ -0,0 +1,106 @@
+// Defining some global constants
+const animateClass = 'glyphicon-refresh-animate';
+const loadingHtml = '<span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span> Loading'; 
+const appTitle = 'NEAR DAI Bridge';
+
+// Defining global variables that we initialize asynchronously later.
+let config;
+let walletAccount;
+let accountId;
+let contractId;
+let baseUrl;
+let near;
+let contract;
+let refreshTimeout;
+
+// TODO: This should point to ERC-20 compatible contract on NEAR
+let TOKEN_CONTRACT = "studio-31fz6jnjv";
+let tokenContract;
+
+// Function that initializes the signIn button using WalletAccount 
+function signedOutFlow() {
+  $('#login-button').click(() => {
+    walletAccount.requestSignIn(
+      contractId,
+      appTitle,
+      baseUrl + '/',
+      baseUrl + '/',
+    );
+  });
+}
+
+// Main function for the signed-in flow (already authorized by the wallet).
+function signedInFlow() {
+  // Hiding sign-in html parts and showing post message things
+  $('#sign-in-container').addClass('hidden');
+  $('#guest-book-container').removeClass('hidden');
+  $('#logout-option').removeClass('hidden');
+
+  // Displaying the accountId
+  $('.account-id').text(accountId);
+  // Adding handling for logging out
+  $('#logout-button').click(() => {
+    // It removes the auth token from the local storage.
+    walletAccount.signOut();
+    // Forcing redirect.
+    window.location.replace(baseUrl + '/');
+  });
+
+  tokenContract.balanceOf({'tokenOwner': accountId}).then(x => $('#near-balance').text(x));
+}
+
+// Initialization code
+async function init() {
+  // Fetching studio/app specific config. It contains contract name and devnet url.
+  config = await nearlib.dev.getConfig();
+  contractId = config.contractName;
+  baseUrl = config.appUrl;
+
+  // Enable wallet link now that config is available
+  $('a.wallet').removeClass('disabled').attr('href', config.walletUrl);
+
+  // Initializing Wallet based Account. It can work with NEAR DevNet wallet that
+  // is hosted at https://wallet.nearprotocol.com
+  // The wallet is managing the accounts and keys for the user using localStorage.
+  // It never exposes the keys to the application, so in order to send transactions
+  // on behalf of the user we need to talk to the wallet page.
+  // To talk to the wallet we use the in-browser iframe messaging system and auth tokens.
+  // Then wallet uses keys from the local storage under wallet.nearprotocol.com
+  // and signs the transaction and returns it back to our app.
+  walletAccount = new nearlib.WalletAccount(contractId, config.walletUrl);
+
+  // Getting the Account ID. If unauthorized yet, it's just empty string.
+  accountId = walletAccount.getAccountId();
+
+  console.log("accountId", accountId);
+
+  // Initializing near and near client from the nearlib.
+  near = new nearlib.Near(new nearlib.NearClient(
+      walletAccount,
+      new nearlib.LocalNodeConnection(config.nodeUrl),
+  ));
+
+  // Initializing the contract.
+  // For now we need to specify method names from the contract manually.
+  // It also takes the Account ID which it would use for signing transactions.
+  contract = await near.loadContract(config.contractName, {
+    viewMethods: ["getDeal"],
+    changeMethods: ["makeDeal", "fundDeal", "cancelDeal", "confirmDeal"],
+    sender: accountId,
+  });
+
+  tokenContract = await near.loadContract(TOKEN_CONTRACT, {
+    viewMethods: ["totalSupply", "balanceOf", "allowance"],
+    changeMethods: ["init", "transfer", "approve", "transferFrom"],
+    sender: accountId,
+  });
+
+  // Based on whether you've authorized, checking which flow we should go.
+  if (!walletAccount.isSignedIn()) {
+    signedOutFlow();
+  } else {
+    signedInFlow();
+  }
+}
+
+init().catch(console.log);
\ No newline at end of file
diff --git a/templates/06-cross-contract-calls/src/test.html b/templates/06-cross-contract-calls/src/test.html
new file mode 100755
index 0000000..fad7369
--- /dev/null
+++ b/templates/06-cross-contract-calls/src/test.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/jasmine/3.3.0/jasmine.css">
+  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/3.3.0/jasmine.js"></script>
+  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/3.3.0/jasmine-html.js"></script>
+  <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jasmine/3.3.0/boot.js"></script>
+</head>
+<body style="background: #fff">
+  <script src="https://cdn.jsdelivr.net/npm/nearlib@0.3.3/dist/nearlib.js"></script>
+  <script src="./test.js"></script>
+</body>
+</html>
diff --git a/templates/06-cross-contract-calls/src/test.js b/templates/06-cross-contract-calls/src/test.js
new file mode 100755
index 0000000..07b00e8
--- /dev/null
+++ b/templates/06-cross-contract-calls/src/test.js
@@ -0,0 +1,101 @@
+describe("Token", function() {
+    let near;
+    let contract;
+    let alice;
+    let bob = "bob.near";
+    let carol = "carol.near";
+    let dave = "dave.near";
+    let eve = "eve.near";
+
+    let validators;
+  
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
+
+    beforeAll(async function() {
+      const config = await nearlib.dev.getConfig();
+      near = await nearlib.dev.connect();
+      alice = nearlib.dev.myAccountId;
+      const url = new URL(window.location.href);
+      config.contractName = url.searchParams.get("contractName");
+      console.log("nearConfig", config);
+      console.log("alice", alice);
+      contract = await near.loadContract(config.contractName, {
+        // NOTE: This configuration only needed while NEAR is still in development
+        viewMethods: ["totalSupply", "balanceOf", "allowance", "getValidatorApprovals", "getValidatorToEthereumData"],
+        changeMethods: ["init", "transfer", "approve", "transferFrom", "validatorApprove", "transferToEthereum", "updateToEthereumIndex"],
+        sender: alice
+      });
+    });
+
+    describe("with alice, bob, dave, carol as validators", function() {
+      beforeAll(async function() {
+        validators = [alice, bob, carol, dave];
+        let hash = await contract.init({ initialOwner: alice, approvedValidators: validators });
+      });
+  
+      it("alice can approve 100 tokens for Eve", async function() {
+        await contract.validatorApprove({'destination': eve, 'tokens': "100"});
+        const approvals = await contract.getValidatorApprovals({destination: eve});
+        expect(approvals).toBe("100;0;0;0;");
+
+        //await contract.transfer({'to': 'alex3.near', 'tokens': '100000'})
+      });
+  
+      it("alice can send tokens to Ethereum, and validate it", async function() {
+        await contract.transferToEthereum({'to': "0xDEADBEEF", 'tokens': "110"});
+        const data = await contract.getValidatorToEthereumData({"who": alice});
+        expect(data.address).toBe("0xDEADBEEF");
+        expect(data.amount).toBe("110");
+        await contract.updateToEthereumIndex();
+        const data2 = await contract.getValidatorToEthereumData({"who": alice});
+        expect(data2).toBe(null);
+      });
+    });
+
+    describe("with alice as initial owner", function() {
+      beforeAll(async function() {
+        validators = [alice, bob, carol, dave];
+        let hash = await contract.init({ initialOwner: alice, approvedValidators: validators });
+  
+        const aliceStartBalance = await contract.balanceOf({tokenOwner: alice});
+        expect(aliceStartBalance).toBe("1000000");
+      });
+  
+      it("can transfer to other account", async function() {
+        const aliceStartBalance = await contract.balanceOf({tokenOwner: alice});
+        const bobStartBalance = await contract.balanceOf({tokenOwner: bob});
+  
+        await contract.transfer({ to: bob, tokens: "100" });
+  
+        const aliceEndBalance = await contract.balanceOf({tokenOwner: alice});
+        const bobEndBalance = await contract.balanceOf({tokenOwner: bob});
+        expect(parseInt(aliceEndBalance)).toBe(parseInt(aliceStartBalance) - 100);
+        expect(parseInt(bobEndBalance)).toBe(parseInt(bobStartBalance) + 100);
+      });
+  
+      it("can transfer from approved account to another account", async function() {
+        const aliceStartBalance = await contract.balanceOf({tokenOwner: alice});
+        const bobStartBalance = await contract.balanceOf({tokenOwner: bob});
+        const eveStartBalance = await contract.balanceOf({tokenOwner: eve});
+  
+        await contract.approve({ spender: eve, tokens: "100" });
+  
+        const aliceMidBalance = await contract.balanceOf({tokenOwner: alice});
+        const bobMidBalance = await contract.balanceOf({tokenOwner: bob});
+        const eveMidBalance = await contract.balanceOf({tokenOwner: eve});
+        expect(aliceMidBalance).toBe(aliceStartBalance);
+        expect(bobMidBalance).toBe(bobStartBalance);
+        expect(eveMidBalance).toBe(eveStartBalance);
+  
+        // TODO: Use "eve" as sender
+        await contract.transferFrom({ from: alice, to: eve, tokens: "50" });
+  
+        const aliceEndBalance = await contract.balanceOf({tokenOwner: alice});
+        const bobEndBalance = await contract.balanceOf({tokenOwner: bob});
+        const eveEndBalance = await contract.balanceOf({tokenOwner: eve});
+        expect(parseInt(aliceEndBalance)).toBe(parseInt(aliceStartBalance) - 50);
+        expect(bobEndBalance).toBe(bobStartBalance);
+        expect(parseInt(eveEndBalance)).toBe(parseInt(eveStartBalance) + 50);
+      });
+    });
+  });
\ No newline at end of file