diff --git a/scripts/setup-swap.js b/scripts/setup-swap.js
index dfd7645..fc558d8 100644
--- a/scripts/setup-swap.js
+++ b/scripts/setup-swap.js
@@ -1,23 +1,23 @@
 const hre = require("hardhat");
 
 async function main() {
+    // Basic setup and definitions
     var signers = await ethers.getSigners();
+    var aliceSigner = signers[0];
+    var bobSigner = signers[0];
     var aliceAddress = signers[0].address;
     var bobAddress = signers[1].address;
-
     var DEFAULT_HARDDEPOSIT_DECREASE_TIMEOUT = ethers.BigNumber.from(86400)
 
     // Deploy ERC20 Token
     const ERC20 = await hre.ethers.getContractFactory("ERC20PresetMinterPauser");
     var erc20 = await ERC20.deploy("TestToken", "TEST");
     await erc20.deployed();
-    console.log("ERC20:", erc20.address);
 
     // Deploy SwapFactory
     const SimpleSwapFactory = await hre.ethers.getContractFactory("SimpleSwapFactory");
     var simpleSwapFactory = await SimpleSwapFactory.deploy(erc20.address);
     await simpleSwapFactory.deployed();
-    console.log("SimpleSwapFactory:", simpleSwapFactory.address);
 
     // Setup Swap contract interface to parse logs
     var swapFactoryArtifact = await artifacts.readArtifact("SimpleSwapFactory");
@@ -26,17 +26,34 @@ async function main() {
     // Deploy Alice Swap and get address
     var resp = await simpleSwapFactory.deploySimpleSwap(aliceAddress, DEFAULT_HARDDEPOSIT_DECREASE_TIMEOUT)
     var logs = await ethers.provider.getLogs({address: simpleSwapFactory.address});
-    var AliceSwapAddress = swapFactoryInterface.parseLog(logs[0]).args.contractAddress
+    var AliceSwapAddress = swapFactoryInterface.parseLog(logs[0]).args.contractAddress;
 
     // Deploy Bob Swap and get address
     var resp = await simpleSwapFactory.deploySimpleSwap(bobAddress, DEFAULT_HARDDEPOSIT_DECREASE_TIMEOUT)
     var logs = await ethers.provider.getLogs({address: simpleSwapFactory.address});
-    var BobSwapAddress = swapFactoryInterface.parseLog(logs[0]).args.contractAddress
+    var BobSwapAddress = swapFactoryInterface.parseLog(logs[0]).args.contractAddress;
 
+    // Mint ERC20 tokens
+    // Alice is default account so issuer, which means she can mint tokens
+    // XXX Difference with getContractFactory above?
+    var erc20artifact = await artifacts.readArtifact("ERC20PresetMinterPauser");
+    var erc20contract = new ethers.Contract(erc20.address, erc20artifact.abi, aliceSigner);
+    await erc20contract.mint(aliceAddress, 10000);
+    await erc20contract.mint(bobAddress, 10000);
+
+    // Get ERC20 Balance
+    var aliceBalance = (await erc20contract.balanceOf(aliceAddress)).toNumber();
+    var bobBalance = (await erc20contract.balanceOf(bobAddress)).toNumber();
+
+    // Print stuff
+    console.log("ERC20:", erc20.address);
+    console.log("SimpleSwapFactory:", simpleSwapFactory.address);
     console.log("Alice address:", aliceAddress);
     console.log("Bob address:", bobAddress);
     console.log("AliceSwapAddress:", AliceSwapAddress)
     console.log("BobSwapAddress:", BobSwapAddress)
+    console.log("Alice ERC20 balance:", aliceBalance);
+    console.log("Bob ERC20 balance:", bobBalance);
 }
 
 // We recommend this pattern to be able to use async/await everywhere