diff --git a/loan-approval-portal.iws b/loan-approval-portal.iws
index 2bc189d..8cfab77 100644
--- a/loan-approval-portal.iws
+++ b/loan-approval-portal.iws
@@ -2,72 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b9d5d1f8-0b7a-4d7a-8e51-f59a7880ce51" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/loan-approval-portal.iml" beforeDir="false" afterPath="$PROJECT_DIR$/loan-approval-portal.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/loan-approval-portal.ipr" beforeDir="false" afterPath="$PROJECT_DIR$/loan-approval-portal.ipr" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/loan-approval-portal.iws" beforeDir="false" afterPath="$PROJECT_DIR$/loan-approval-portal.iws" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/db/PortalSessionFactoryBean.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/db/PortalSessionFactoryBean.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/db/dao/DataAccess.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/db/entity/Agency.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/db/entity/Agency.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/DevController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/DevController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/LoanRequestController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/LoanRequestController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/NewRequestController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/NewRequestController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/NewRequestValidator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/NewRequestValidator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/PortalController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/PortalController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/ProfileController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/ProfileController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/SessionValidator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/SessionValidator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/CreditBrokerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/CreditBrokerController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/ManagerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/ManagerController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/StaffLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/StaffLoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/StaffUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/StaffUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/SupervisorClerkController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/mvc/staff/controller/SupervisorClerkController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/proxy/LoanApprovalProcessProxy.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/proxy/LoanApprovalProcessProxy.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/util/DateUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/db/DateHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/util/DbUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/db/DbHelper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/bankinformation/_2018/_06/BankInformation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/bankinformation/_2018/_06/BankInformation.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/bankinformation/_2018/_06/BankInformation_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/bankinformation/_2018/_06/BankInformation_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/bankprivilege/_2018/_06/BankPrivilege.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/bankprivilege/_2018/_06/BankPrivilege.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/bankprivilege/_2018/_06/BankPrivilege_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/bankprivilege/_2018/_06/BankPrivilege_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/creditworthiness/_2018/_06/CreditWorthiness.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/creditworthiness/_2018/_06/CreditWorthiness.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/creditworthiness/_2018/_06/CreditWorthiness_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/creditworthiness/_2018/_06/CreditWorthiness_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanapprovalclosing/_2018/_06/LoanApprovalClosing.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanapprovalclosing/_2018/_06/LoanApprovalClosing.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanapprovalclosing/_2018/_06/LoanApprovalClosing_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanapprovalclosing/_2018/_06/LoanApprovalClosing_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loancontract/_2018/_06/LoanContract.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loancontract/_2018/_06/LoanContract.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loancontract/_2018/_06/LoanContract_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loancontract/_2018/_06/LoanContract_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanfile/_2018/_06/LoanFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanfile/_2018/_06/LoanFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanfile/_2018/_06/LoanFile_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanfile/_2018/_06/LoanFile_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanrisk/_2018/_06/LoanRisk.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanrisk/_2018/_06/LoanRisk.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanrisk/_2018/_06/LoanRisk_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loanrisk/_2018/_06/LoanRisk_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loansettlement/_2018/_06/LoanSettlement.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loansettlement/_2018/_06/LoanSettlement.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loansettlement/_2018/_06/LoanSettlement_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/loansettlement/_2018/_06/LoanSettlement_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/taskdispatch/_2018/_06/TaskDispatch.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/taskdispatch/_2018/_06/TaskDispatch.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/taskdispatch/_2018/_06/TaskDispatch_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/business/taskdispatch/_2018/_06/TaskDispatch_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/client/callbackloanapproval/CallbackLoanApproval.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/client/callbackloanapproval/CallbackLoanApproval.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/client/callbackloanapproval/CallbackLoanApproval_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/client/callbackloanapproval/CallbackLoanApproval_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/client/callbackloancontract/CallbackLoanContract.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/client/callbackloancontract/CallbackLoanContract.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/client/callbackloancontract/CallbackLoanContract_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/client/callbackloancontract/CallbackLoanContract_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/BankInformationImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/BankInformationImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/BankPrivilegeImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/BankPrivilegeImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/CallbackLoanApprovalImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/CallbackLoanApprovalImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/CallbackLoanContractImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/CallbackLoanContractImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/CreditWorthinessImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/CreditWorthinessImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanApprovalClosingImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanApprovalClosingImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanApprovalImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanApprovalImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanContractImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanContractImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanFileImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanFileImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanRiskImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanRiskImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanSettlementImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanSettlementImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/TaskDispatchImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/TaskDispatchImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/process/loanapproval/_2018/_06/LoanApproval.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/process/loanapproval/_2018/_06/LoanApproval.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/westbank/ws/process/loanapproval/_2018/_06/LoanApproval_Service.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/westbank/ws/process/loanapproval/_2018/_06/LoanApproval_Service.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/hibernate-extra.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/hibernate-extra.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/cxf.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/cxf.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/data-access.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/data-config.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/logback.dev.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback.dev.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/dao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/dao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/data-config.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/data-config.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/mvc-servlet.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/mvc-servlet.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/test-beans.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/test-beans.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -247,38 +187,14 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="web.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
+      <file leaf-file-name="PortalSessionFactoryBean.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/db/PortalSessionFactoryBean.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="15" column="61" selection-start-line="15" selection-start-column="61" selection-end-line="15" selection-end-column="61" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="dao.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/dao.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="6" selection-start-line="6" selection-end-line="6" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="data-config.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/data-config.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="93">
-              <caret line="27" column="48" selection-start-line="27" selection-start-column="48" selection-end-line="27" selection-end-column="48" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="cxf.xml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/cxf.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="276">
-              <caret line="76" selection-start-line="76" selection-end-line="76" />
+            <state relative-caret-position="363">
+              <caret line="111" column="32" selection-start-line="111" selection-start-column="32" selection-end-line="111" selection-end-column="32" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -321,9 +237,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/TaskDispatchImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanRiskImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/BankPrivilegeImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/BankInformationImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/CallbackLoanApprovalImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/CallbackLoanContractImpl.java" />
@@ -362,16 +275,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/service/LoanContractServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/service/LoanFileServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/service/StaffServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/dao.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/dao/AgencyDaoImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/data-config.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/PortalSessionFactoryBean.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/dao/LoanContractDaoImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/dao/LoanFileDaoImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/dao/StaffDaoImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/dao/CustomerDaoImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanApprovalImpl.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/cxf.xml" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/dao.xml" />
+        <option value="$PROJECT_DIR$/src/main/resources/logback.xml" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/mvc-servlet.xml" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/data-config.xml" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/test-beans.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/westbank/db/PortalSessionFactoryBean.java" />
       </list>
     </option>
   </component>
@@ -509,106 +425,22 @@
               <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="db" type="462c0819:PsiDirectoryNode" />
-              <item name="dao" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="db" type="462c0819:PsiDirectoryNode" />
-              <item name="service" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="mvc" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="mvc" type="462c0819:PsiDirectoryNode" />
-              <item name="customer" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="mvc" type="462c0819:PsiDirectoryNode" />
-              <item name="customer" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="mvc" type="462c0819:PsiDirectoryNode" />
-              <item name="staff" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="mvc" type="462c0819:PsiDirectoryNode" />
-              <item name="staff" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="proxy" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
-              <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="ws" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
               <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="westbank" type="462c0819:PsiDirectoryNode" />
-              <item name="ws" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
               <item name="loan-approval-portal" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
@@ -616,6 +448,8 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="jsp" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="loan-approval-portal" type="b2602c69:ProjectViewProjectNode" />
@@ -624,6 +458,8 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="webapp" type="462c0819:PsiDirectoryNode" />
               <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="jsp" type="462c0819:PsiDirectoryNode" />
+              <item name="dev" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -746,12 +582,12 @@
       <workItem from="1529399879138" duration="11967000" />
       <workItem from="1529457441339" duration="7267000" />
       <workItem from="1529488704841" duration="604000" />
-      <workItem from="1529489827061" duration="31465000" />
+      <workItem from="1529489827061" duration="33346000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="93817000" />
+    <option name="totallyTimeSpent" value="95698000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -873,55 +709,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanSettlementImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="19" selection-start-line="19" selection-end-line="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/proxy/LoanApprovalProcessProxy.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="352" selection-start-line="352" selection-end-line="352" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/DevController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="33" column="52" selection-start-line="33" selection-start-column="52" selection-end-line="33" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/LoanRequestController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-975">
-          <caret line="39" selection-start-line="39" selection-end-line="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/LoginController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="68" column="35" selection-start-line="68" selection-start-column="35" selection-end-line="68" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/NewRequestController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="28" column="81" selection-start-line="28" selection-start-column="81" selection-end-line="28" selection-end-column="81" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/NewRequestValidator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_172.jdk/Contents/Home/src.zip!/java/lang/String.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="300">
@@ -958,13 +745,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/Constants.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-21">
-          <caret line="26" column="42" lean-forward="true" selection-start-line="26" selection-start-column="42" selection-end-line="26" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/controller/SessionValidator.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="252">
@@ -1082,13 +862,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/mvc-servlet.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="468">
-          <caret line="26" column="40" lean-forward="true" selection-start-line="26" selection-start-column="40" selection-end-line="26" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/hibernate-extra.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="18">
@@ -1153,20 +926,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="15" column="61" selection-start-line="15" selection-start-column="61" selection-end-line="15" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/dao.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" selection-start-line="6" selection-end-line="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/5.0.7.RELEASE/spring-tx-5.0.7.RELEASE.jar!/org/springframework/dao/support/DaoSupport.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="108">
@@ -1174,13 +933,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE-sources.jar!/org/springframework/orm/hibernate5/HibernateTemplate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="539" column="23" selection-start-line="539" selection-start-column="23" selection-end-line="539" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE-sources.jar!/org/springframework/orm/hibernate5/LocalSessionFactoryBean.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="580">
@@ -1188,13 +940,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/db/PortalSessionFactoryBean.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="342">
-          <caret line="37" column="25" selection-start-line="37" selection-start-column="25" selection-end-line="37" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE-sources.jar!/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="178">
@@ -1259,10 +1004,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanApprovalImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="386">
+          <caret line="95" selection-start-line="95" selection-end-line="95" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/db/dao/CustomerDaoImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="573">
-          <caret line="120" column="34" selection-start-line="120" selection-start-column="34" selection-end-line="120" selection-end-column="34" />
+        <state relative-caret-position="216">
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#3926#3927#0" expanded="true" />
@@ -1271,30 +1026,113 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/data-config.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="93">
-          <caret line="27" column="48" selection-start-line="27" selection-start-column="48" selection-end-line="27" selection-end-column="48" />
+        <state relative-caret-position="270">
+          <caret line="15" column="61" selection-start-line="15" selection-start-column="61" selection-end-line="15" selection-end-column="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/ws/impl/LoanApprovalImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/model/ApplicationForm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="386">
-          <caret line="95" selection-start-line="95" selection-end-line="95" />
+        <state relative-caret-position="-3965">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/model/LoginForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="36">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/customer/model/TaskForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="36">
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/mvc/Constants.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="468">
+          <caret line="26" column="42" lean-forward="true" selection-start-line="26" selection-start-column="42" selection-end-line="26" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/db/entity/Staff.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-31">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/jsp/dev/list.jsp">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="324">
+          <caret line="18" column="8" lean-forward="true" selection-start-line="18" selection-start-column="8" selection-end-line="18" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/cxf.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
+        <state relative-caret-position="325">
           <caret line="76" selection-start-line="76" selection-end-line="76" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/dao.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="396">
+          <caret line="22" column="64" selection-start-line="22" selection-start-column="64" selection-end-line="22" selection-end-column="64" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/mvc-servlet.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="468">
+          <caret line="26" lean-forward="true" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/data-config.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-115">
+          <caret line="18" column="50" lean-forward="true" selection-start-line="18" selection-start-column="50" selection-end-line="18" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-orm/5.0.7.RELEASE/spring-orm-5.0.7.RELEASE-sources.jar!/org/springframework/orm/hibernate5/HibernateTemplate.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-10701">
+          <caret line="139" column="11" selection-start-line="139" selection-start-column="11" selection-end-line="139" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/test-beans.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="10">
+          <caret line="10" column="16" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/westbank/db/PortalSessionFactoryBean.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="363">
+          <caret line="111" column="32" selection-start-line="111" selection-start-column="32" selection-end-line="111" selection-end-column="32" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/westbank/db/PortalSessionFactoryBean.java b/src/main/java/com/westbank/db/PortalSessionFactoryBean.java
index 3f7d1df..1cf4e8a 100644
--- a/src/main/java/com/westbank/db/PortalSessionFactoryBean.java
+++ b/src/main/java/com/westbank/db/PortalSessionFactoryBean.java
@@ -1,6 +1,11 @@
 package com.westbank.db;
 
-import com.westbank.db.entity.*;
+import com.westbank.db.entity.Agency;
+import com.westbank.db.entity.Contract;
+import com.westbank.db.entity.Customer;
+import com.westbank.db.entity.LoanFile;
+import com.westbank.db.entity.Role;
+import com.westbank.db.entity.Staff;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
@@ -10,7 +15,6 @@
 import org.hibernate.tool.schema.TargetType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Bean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.orm.hibernate5.HibernateTemplate;
 import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
@@ -93,19 +97,28 @@ void initializeTestingData(SessionFactory sessionFactory) {
 
 		Agency agency = new Agency();
 
+		Customer alice = new Customer();
+		alice.setFirstName("Alice");
+		alice.setLastName("Power");
+		alice.setPin("abc123");
+		alice.setIncome(80000.0);
+		alice.setEmail("power@abc.com");
+
+
 		// start saving data to the database
 		final Session session = sessionFactory.openSession();
 		try {
 			final Transaction transaction = session.beginTransaction();
-			template.save(agency);
-			template.save(manager);
-			template.save(supervisor);
-			template.save(broker);
-			template.save(clerk);
-			template.save(staff1);
-			template.save(staff2);
-			template.save(staff3);
-			template.save(staff4);
+			session.save(alice);
+			session.save(agency);
+			session.save(manager);
+			session.save(supervisor);
+			session.save(broker);
+			session.save(clerk);
+			session.save(staff1);
+			session.save(staff2);
+			session.save(staff3);
+			session.save(staff4);
 			transaction.commit();
 		} finally {
 			session.close();
diff --git a/src/main/resources/logback.dev.xml b/src/main/resources/logback.dev.xml
index 6ea316b..4a615ab 100644
--- a/src/main/resources/logback.dev.xml
+++ b/src/main/resources/logback.dev.xml
@@ -18,6 +18,6 @@
     <logger name="com.mchange" level="WARN" />
      -->
     <logger name="org.hibernate.cfg" level="INFO" />
-    <logger name="org.hibernate.connection" level="DEBUG" />
-    <logger name="org.hibernate.impl" level="DEBUG" />
+    <logger name="org.hibernate.connection" level="INFO" />
+    <logger name="org.hibernate.impl" level="INFO" />
 </configuration>
diff --git a/src/main/webapp/WEB-INF/dao.xml b/src/main/webapp/WEB-INF/dao.xml
index 1181bef..2ca9599 100644
--- a/src/main/webapp/WEB-INF/dao.xml
+++ b/src/main/webapp/WEB-INF/dao.xml
@@ -4,5 +4,34 @@
        xmlns:p="http://www.springframework.org/schema/p"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
+    <!--
+<bean id="customerService" class="com.westbank.db.service.CustomerServiceImpl" >
+    <constructor-arg ref="customerDao"/>
+</bean>
+
+<bean id="loanFileService" class="com.westbank.db.service.LoanFileServiceImpl" />
+
+<bean id="contractService" class="com.westbank.db.service.LoanContractServiceImpl" >
+    <constructor-arg ref="loanContractDao" />
+</bean>
+
+<bean id="staffService" class="com.westbank.db.service.StaffServiceImpl" >
+    <constructor-arg ref="staffDao"/>
+</bean>
+-->
+
+    <bean id="customerDao" class="com.westbank.db.dao.CustomerDaoImpl"
+          p:sessionFactory-ref="sessionFactory"/>
+
+    <bean id="loanFileDao" class="com.westbank.db.dao.LoanFileDaoImpl"
+          p:sessionFactory-ref="sessionFactory"/>
+
+    <bean id="loanContractDao" class="com.westbank.db.dao.LoanContractDaoImpl"
+          p:sessionFactory-ref="sessionFactory"/>
+
+    <bean id="agencyDao" class="com.westbank.db.dao.AgencyDaoImpl"/>
+
+    <bean id="staffDao" class="com.westbank.db.dao.StaffDaoImpl"
+          p:sessionFactory-ref="sessionFactory"/>
 
 </beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/data-config.xml b/src/main/webapp/WEB-INF/data-config.xml
index 2b12f35..72ded9b 100644
--- a/src/main/webapp/WEB-INF/data-config.xml
+++ b/src/main/webapp/WEB-INF/data-config.xml
@@ -12,6 +12,7 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <import resource="dao.xml" />
+    <import resource="test-beans.xml" />
 
     <bean id="propertyPlaceholderConfigurer"
           class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
@@ -74,35 +75,4 @@
         </property>
     </bean>
 
-
-    <!--
-<bean id="customerService" class="com.westbank.db.service.CustomerServiceImpl" >
-    <constructor-arg ref="customerDao"/>
-</bean>
-
-<bean id="loanFileService" class="com.westbank.db.service.LoanFileServiceImpl" />
-
-<bean id="contractService" class="com.westbank.db.service.LoanContractServiceImpl" >
-    <constructor-arg ref="loanContractDao" />
-</bean>
-
-<bean id="staffService" class="com.westbank.db.service.StaffServiceImpl" >
-    <constructor-arg ref="staffDao"/>
-</bean>
--->
-
-    <bean id="customerDao" class="com.westbank.db.dao.CustomerDaoImpl"
-          p:sessionFactory-ref="sessionFactory"/>
-
-    <bean id="loanFileDao" class="com.westbank.db.dao.LoanFileDaoImpl"
-          p:sessionFactory-ref="sessionFactory"/>
-
-    <bean id="loanContractDao" class="com.westbank.db.dao.LoanContractDaoImpl"
-          p:sessionFactory-ref="sessionFactory"/>
-
-    <bean id="agencyDao" class="com.westbank.db.dao.AgencyDaoImpl" />
-
-    <bean id="staffDao" class="com.westbank.db.dao.StaffDaoImpl"
-          p:sessionFactory-ref="sessionFactory"/>
-
 </beans>
diff --git a/src/main/webapp/WEB-INF/mvc-servlet.xml b/src/main/webapp/WEB-INF/mvc-servlet.xml
index d4ffaea..aeff5ea 100644
--- a/src/main/webapp/WEB-INF/mvc-servlet.xml
+++ b/src/main/webapp/WEB-INF/mvc-servlet.xml
@@ -24,7 +24,6 @@
 	</bean>
 
 	<import resource="resources.xml" />
-	<import resource="test-beans.xml" />
 
 	<mvc:annotation-driven />
 
diff --git a/src/main/webapp/WEB-INF/test-beans.xml b/src/main/webapp/WEB-INF/test-beans.xml
index 6ee683a..75390ed 100644
--- a/src/main/webapp/WEB-INF/test-beans.xml
+++ b/src/main/webapp/WEB-INF/test-beans.xml
@@ -8,7 +8,7 @@
 	   http://www.springframework.org/schema/beans/spring-beans.xsd">
 
   <bean
-    id="customerAliceMeyer"
+    id="exampleLoanForm"
     class="com.westbank.mvc.customer.model.ApplicationForm"
     p:loanAmount="100000"
     p:loanReason="Home Mortgage"