diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fe3f66b..237a094 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="39ebc23b-c248-41a9-9993-3091849bbe12" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/accountExistsQ.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.js" afterPath="$PROJECT_DIR$/index.js" />
     </list>
@@ -18,28 +17,8 @@
       <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="374">
-              <caret line="109" column="2" lean-forward="true" selection-start-line="109" selection-start-column="2" selection-end-line="109" selection-end-column="2" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="transactionClass.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/transactionClass.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="204">
-              <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="29" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="accountClass.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/accountClass.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="5" column="1" lean-forward="false" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
+            <state relative-caret-position="1516">
+              <caret line="139" column="0" lean-forward="true" selection-start-line="139" selection-start-column="0" selection-end-line="139" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -55,16 +34,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="package.json" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/package.json">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="289">
-              <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -89,8 +58,9 @@
         <option value="$PROJECT_DIR$/accountClass.js" />
         <option value="$PROJECT_DIR$/currencyFormatter.js" />
         <option value="$PROJECT_DIR$/transactionClass.js" />
-        <option value="$PROJECT_DIR$/index.js" />
         <option value="$PROJECT_DIR$/accountExistsQ.js" />
+        <option value="$PROJECT_DIR$/parseTransactions.js" />
+        <option value="$PROJECT_DIR$/index.js" />
       </list>
     </option>
   </component>
@@ -266,12 +236,12 @@
       <option name="presentableId" value="Default" />
       <updated>1510136343530</updated>
       <workItem from="1510136344780" duration="22141000" />
-      <workItem from="1510219280573" duration="13068000" />
+      <workItem from="1510219280573" duration="13917000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="35209000" />
+    <option name="totallyTimeSpent" value="36058000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="0" width="1132" height="1167" extended-state="0" />
@@ -351,10 +321,10 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/employee.js" />
     <entry file="file://$PROJECT_DIR$/currencyFormatter.js" />
-    <entry file="file://$PROJECT_DIR$/package.json">
+    <entry file="file://$PROJECT_DIR$/transactionClass.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+        <state relative-caret-position="204">
+          <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="29" />
           <folding />
         </state>
       </provider>
@@ -367,10 +337,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/transactionClass.js">
+    <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="29" />
+        <state relative-caret-position="289">
+          <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
           <folding />
         </state>
       </provider>
@@ -383,10 +353,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/parseTransactions.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="37" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="109" column="2" lean-forward="true" selection-start-line="109" selection-start-column="2" selection-end-line="109" selection-end-column="2" />
+        <state relative-caret-position="1516">
+          <caret line="139" column="0" lean-forward="true" selection-start-line="139" selection-start-column="0" selection-end-line="139" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/index.js b/index.js
index 8918e12..10e1f3f 100644
--- a/index.js
+++ b/index.js
@@ -7,10 +7,7 @@ const moment = require('moment');
 const Transaction = require('C:\\Work\\Training\\SupportBank\\transactionClass.js');
 const Account = require('C:\\Work\\Training\\SupportBank\\accountClass.js');
 
-// const accountExistsQ = require('C:\\Work\\Training\\SupportBank\\accountExistsQ.js');
-// import accountExistsQ from 'C:\\Work\\Training\\SupportBank\\accountExistsQ.js';
-let accountExistsQ = require('C:\\Work\\Training\\SupportBank\\accountExistsQ.js');
-
+const accountExistsQ = require('C:\\Work\\Training\\SupportBank\\accountExistsQ.js');
 
 const formatter = new Intl.NumberFormat('en-UK', {
     style: 'currency',
@@ -23,6 +20,72 @@ log4js.configure({
     categories: {default: { appenders: ['file'], level: 'debug'}}
 });
 
+function parseTransactions(){
+    var keys = Object.keys(records[1]);
+
+    for(let i in records)
+    {
+        let lineValue = parseInt(i) + 2; // +1 for header row, +1 for zero base
+
+        if(!moment(records[i]['Date'],["DD/MM/YYYY","YYYY-MM-DD"],'en').isValid())
+        {
+            logger.error("Invalid date found in line " + lineValue +
+                " : " + records[i]['Date']);
+        }
+
+        else if (isNaN(parseFloat(records[i]['Amount'])))
+        {
+            logger.error("Invalid amount found in line " + lineValue
+                + " : " + records[i]['Amount'])
+        }
+        else
+        {
+            transaction = new Transaction(
+                records[i][keys[0]],
+                records[i][keys[1]],
+                records[i][keys[2]],
+                records[i][keys[3]],
+                records[i][keys[4]]);
+
+            transactions.push(transaction);
+            //transaction not added to list of transactions
+        }
+    }
+    logger.info("Successfully parsed " + transactions.length + " of " + records.length +
+        " transactions");
+}
+
+function createAccounts()
+{
+    for(let i in transactions)
+    {
+        if(!accountExistsQ(transactions[i].from))
+        {
+            //if the account does not exist,create the account
+            senderAccount = new Account(transactions[i].from,0);
+            accounts.push(senderAccount);
+        }
+        else
+        {
+            senderAccount = accounts.find(account => account.name === transactions[i].from);
+        }
+
+        if(!accountExistsQ(transactions[i].to))
+        {
+            //if the account does not exist,create the account
+            receiverAccount = new Account(transactions[i].to,0);
+            accounts.push(receiverAccount);
+        }
+        else
+        {
+            receiverAccount = accounts.find(account => account.name === transactions[i].to);
+        }
+
+        senderAccount.amount = senderAccount.amount - transactions[i].amount;
+        receiverAccount.amount = receiverAccount.amount + transactions[i].amount;
+    }
+}
+
 function importFile(fileName) {
     var ext = fileName.split('.').pop();
     if(ext === "csv")
@@ -73,79 +136,17 @@ logger.debug("Program starting up...")
 
 
 transactions = [];
-var keys = Object.keys(records[1]);
+parseTransactions();
+
+accounts = [];
+createAccounts();
+
 
-for(let i in records)
-{
-    let lineValue = parseInt(i) + 2; // +1 for header row, +1 for zero base
 
-    if(!moment(records[i]['Date'],["DD/MM/YYYY","YYYY-MM-DD"],'en').isValid())
-    {
-        logger.error("Invalid date found in line " + lineValue +
-            " : " + records[i]['Date']);
-    }
 
-    else if (isNaN(parseFloat(records[i]['Amount'])))
-    {
-        logger.error("Invalid amount found in line " + lineValue
-            + " : " + records[i]['Amount'])
-    }
-    else
-    {
-        transaction = new Transaction(
-            records[i][keys[0]],
-            records[i][keys[1]],
-            records[i][keys[2]],
-            records[i][keys[3]],
-            records[i][keys[4]]);
-
-        transactions.push(transaction);
-        //transaction not added to list of transactions
-    }
-}
-logger.info("Successfully parsed " + transactions.length + " of " + records.length +
-    " transactions");
 
-accounts = [];
-//
-// function accountExistsQ(string) {
-//     check = false;
-//
-//     for (let i in accounts)
-//     {
-//         if(accounts[i].name === string)
-//             check = true;
-//     }
-//     return check;
-// }
-
-for(let i in transactions)
-{
-    if(!accountExistsQ(transactions[i].from))
-    {
-        //if the account does not exist,create the account
-        senderAccount = new Account(transactions[i].from,0);
-        accounts.push(senderAccount);
-    }
-    else
-    {
-        senderAccount = accounts.find(account => account.name === transactions[i].from);
-    }
 
-    if(!accountExistsQ(transactions[i].to))
-    {
-        //if the account does not exist,create the account
-        receiverAccount = new Account(transactions[i].to,0);
-        accounts.push(receiverAccount);
-    }
-    else
-    {
-        receiverAccount = accounts.find(account => account.name === transactions[i].to);
-    }
 
-    senderAccount.amount = senderAccount.amount - transactions[i].amount;
-    receiverAccount.amount = receiverAccount.amount + transactions[i].amount;
-}
 
 const userInput = readlineSync.question('Please enter "List All" or "List [Account]" : ');
 const pattern = new RegExp("List ");