From 0cad65ffda22745c5c5b29ced2059c1705e5b79a Mon Sep 17 00:00:00 2001
From: Kevin McGoldrick <kevin_mcgoldrick@intuit.com>
Date: Mon, 2 Nov 2020 19:15:35 -0800
Subject: [PATCH] Release 3.0.0

* More test cases & code coverage for issue
Co-authored-by: vhegde1 <vaishakh_hegde@intuit.com>

* Update/Compress existing serializedScriptStep Blob

* added test coverage for com.intuit.tank.dao package to increase from 46% to 55%
Co-authored-by: Sreekakula, Manikanta <Manikanta_Sreekakula@intuit.com>

* Improving test coverage in data-model module
Co-authored-by: djagaluru <DarshanSiddesh_Jagaluru@intuit.com>

* Improving test coverage for data-model project module
Co-authored-by: djagaluru <DarshanSiddesh_Jagaluru@intuit.com>

* increase test coverage for api module
Co-authored-by: atayal <ankush_tayal@intuit.com>

* JDK11 support
Co-authored-by: Niti <gupta.sweet.niti@gmail.com>

* AWS SDK V2
Co-authored-by: dratler <Shay_Dratler@intuit.com>

Co-authored-by: Juan Parra <41169130+Ujoa@users.noreply.github.com>
Co-authored-by: vaishakhvh <72062381+vaishakhvh@users.noreply.github.com>
Co-authored-by: vhegde1 <vaishakh_hegde@intuit.com>
Co-authored-by: felixgao <guohangao@gmail.com>
Co-authored-by: Manikanta <mani.rgm448@gmail.com>
Co-authored-by: Sreekakula, Manikanta <Manikanta_Sreekakula@intuit.com>
Co-authored-by: darshan-sj <darshan-sj@users.noreply.github.com>
Co-authored-by: djagaluru <DarshanSiddesh_Jagaluru@intuit.com>
Co-authored-by: interactwithankush <interactwithankush@gmail.com>
Co-authored-by: atayal <ankush_tayal@intuit.com>
Co-authored-by: Niti <gupta.sweet.niti@gmail.com>
---
 .travis.yml                                   |   5 +-
 agent/agent_common/pom.xml                    |   7 +-
 .../tank/http/xml/GenericXMLHandler.java      |   6 +-
 .../tank/http/soap/SOAPRequestTest.java       |   2 +
 agent/agent_standalone/pom.xml                |   2 +-
 agent/agent_standalone_pkg/pom.xml            |   3 +-
 agent/agent_startup/pom.xml                   |   2 +-
 .../com/intuit/tank/agent/AgentStartup.java   |   4 +-
 agent/agent_startup_pkg/pom.xml               |   2 +-
 agent/apiharness/pom.xml                      |   7 +-
 .../com/intuit/tank/harness/APIMonitor.java   |  19 +-
 .../intuit/tank/harness/APITestHarness.java   |  40 +-
 .../harness/logging/ThreadLocalLogEvent.java  |   3 +-
 .../apiharness/src/main/resources/log4j2.xml  |   3 +-
 .../java/com/intuit/tank/common/TPSTest.java  |  17 +-
 agent/apiharness_pkg/pom.xml                  |   7 +-
 agent/http_client_3/pom.xml                   |   2 +-
 agent/http_client_4/pom.xml                   |   2 +-
 agent/http_client_5/pom.xml                   |   2 +-
 agent/pom.xml                                 |   2 +-
 all-in-one.sh                                 |  43 +-
 api/pom.xml                                   |  10 +-
 .../com/intuit/tank/harness/AmazonUtil.java   | 222 +++-----
 .../com/intuit/tank/harness/StopBehavior.java |   5 +-
 .../intuit/tank/storage/S3FileStorage.java    | 167 +++---
 .../tank/vm/api/enumerated/VMRegion.java      |   2 +-
 .../intuit/tank/vm/api/enumerated/VMSize.java |  60 ---
 .../tank/vm/common/PasswordEncoder.java       |   2 +-
 .../tank/vm/settings/CloudCredentials.java    |  41 +-
 api/src/main/resources/settings.xml           |  49 +-
 .../intuit/tank/harness/AmazonUtilTest.java   |  90 ++++
 .../com/intuit/tank/http/AuthSchemeTest.java  |  22 +
 .../intuit/tank/logging/LogEventTypeTest.java |  19 +
 .../intuit/tank/logging/SourceTypeTest.java   |  18 +
 .../tank/script/RequestDataTypeTest.java      |  19 +
 .../intuit/tank/script/TimerActionTest.java   |  19 +
 .../vm/agent/messages/AgentDataCpTest.java    |  18 +-
 .../vm/api/enumerated/VMRegionCpTest.java     |  26 +-
 .../tank/vm/api/enumerated/VMSizeCpTest.java  |  95 ----
 .../vm/common/util/MethodTimerCpTest.java     |  23 +
 .../tank/vm/common/util/ReportUtilCpTest.java |  76 +--
 .../vm/settings/CloudCredentialsCpTest.java   |  19 +-
 .../InstanceDescriptionDefaultsCpTest.java    |   5 -
 .../tank/vm/settings/InstanceTagTest.java     |  30 ++
 .../vm/settings/ModificationTypeTest.java     |  19 +
 .../settings/ModifiedEntityMessageTest.java   |   9 +
 .../tank/vm/settings/PropertiesFileTest.java  |   9 +
 .../tank/vm/settings/ReportingConfigTest.java |   9 +
 api/src/test/resources/sampleProp.properties  |   2 +
 api/src/test/resources/settings.xml           |  83 ++-
 assets/cleanup_prior_to_3.0.0.sql             |  37 ++
 assets/settings-all-in-one.xml                | 490 ++++++++++++++++++
 assets/tankIcon.png                           | Bin 0 -> 80076 bytes
 aws-config/tank_agent.yml                     | 177 +++++++
 aws-config/tank_controller.yml                | 289 +++++++++++
 aws-config/tank_instanceProfiles.yml          |  84 +++
 buildspec.yml                                 |  18 +-
 data_access/pom.xml                           |   2 +-
 .../java/com/intuit/tank/dao/GroupDao.java    |   3 -
 .../intuit/tank/dao/JobNotificationDao.java   |   6 +-
 .../java/com/intuit/tank/dao/JobQueueDao.java |   6 -
 .../java/com/intuit/tank/dao/ProjectDao.java  |   2 +-
 .../java/com/intuit/tank/dao/ScriptDao.java   |  34 +-
 .../java/com/intuit/tank/dao/UserDao.java     |   9 +-
 .../java/com/intuit/tank/dao/BaseDaoTest.java |  50 ++
 .../java/com/intuit/tank/dao/DaoTestUtil.java |  80 ++-
 .../com/intuit/tank/dao/DataFileDaoTest.java  |  57 ++
 .../intuit/tank/dao/FilterGroupDaoTest.java   |  47 ++
 .../com/intuit/tank/dao/GroupDaoTest.java     |  77 +++
 .../tank/dao/JobNotificationDaoTest.java      |  56 ++
 .../com/intuit/tank/dao/JobQueueDaoTest.java  |  56 ++
 .../com/intuit/tank/dao/JobRegionDaoTest.java |  69 +++
 .../com/intuit/tank/dao/PeriodicDataTest.java |  95 ++++
 .../com/intuit/tank/dao/ScriptDaoTest.java    |  41 +-
 .../java/com/intuit/tank/dao/UserDaoTest.java |  72 +++
 data_model/pom.xml                            |   2 +-
 .../com/intuit/tank/project/DataFile.java     |  71 +++
 .../java/com/intuit/tank/project/Group.java   |  47 ++
 .../intuit/tank/project/JobConfiguration.java |  49 ++
 .../com/intuit/tank/project/JobRegion.java    |  56 ++
 .../com/intuit/tank/project/PeriodicData.java |  99 ++++
 .../java/com/intuit/tank/project/Script.java  |  34 +-
 .../tank/project/SerializedScriptStep.java    |  11 +-
 .../java/com/intuit/tank/project/User.java    |  77 +++
 .../intuit/tank/project/ProjectDTOTest.java   |  70 +++
 .../tank/project/RevisionedEntityTest.java    |   9 +-
 .../com/intuit/tank/project/ScriptTest.java   |  19 +-
 .../tank/project/SummaryDataBuilderTest.java  |  62 +++
 .../TankDefaultRevisionEntityTest.java        |  55 ++
 .../tank/util/CreateDateComparatorTest.java   |  12 +
 .../intuit/tank/util/DataFileUtilTest.java    |  53 ++
 doc/doc_xslt/pom.xml                          |   2 +-
 doc/jdocbook_style/pom.xml                    |   2 +-
 doc/pom.xml                                   |   2 +-
 doc/tank_installation_guide/pom.xml           |   2 +-
 doc/tank_user_guide/pom.xml                   |   2 +-
 harness_data/pom.xml                          |   2 +-
 mail/pom.xml                                  |   2 +-
 pom.xml                                       | 121 ++---
 proxy-parent/WebConversation/pom.xml          |   2 +-
 .../com/intuit/tank/conversation/Header.java  |  13 +-
 .../com/intuit/tank/conversation/Request.java |   7 +-
 .../intuit/tank/conversation/Response.java    |   7 +-
 proxy-parent/owasp-proxy/pom.xml              |   2 +-
 .../server/BufferingHttpRequestHandler.java   |   3 +-
 .../org/owasp/proxy/util/AsciiString.java     |  22 +-
 .../java/org/owasp/proxy/util/Base64.java     |   3 +-
 .../org/owasp/proxy/util/TextFormatter.java   |   2 +-
 proxy-parent/pom.xml                          |   5 +-
 proxy-parent/proxy-extension/pom.xml          |   2 +-
 proxy-parent/proxy_pkg/pom.xml                |  13 +-
 readme.md                                     |   6 +-
 reporting/api/pom.xml                         |   2 +-
 reporting/db/pom.xml                          |  10 +-
 .../databases/AmazonDynamoDatabaseDocApi.java | 320 ++++++------
 .../databases/CloudWatchDataSource.java       | 109 ++--
 .../persistence/databases/S3Datasource.java   |  59 ++-
 .../reporting/db/DatabaseResultsReporter.java |   1 -
 .../databases/AmazonDynamoDatabaseTest.java   |  23 +-
 reporting/local/pom.xml                       |   2 +-
 reporting/pom.xml                             |   2 +-
 reporting/rest/pom.xml                        |   2 +-
 rest/api/agent/pom.xml                        |   2 +-
 rest/api/automation/pom.xml                   |   2 +-
 .../model/v1/automation/CreateJobRequest.java |  22 +-
 .../v1/automation/AutomationService.java      |  18 +-
 rest/api/cloud/pom.xml                        |   2 +-
 rest/api/common/pom.xml                       |   2 +-
 rest/api/datafile/pom.xml                     |   2 +-
 rest/api/filter/pom.xml                       |   2 +-
 rest/api/job/pom.xml                          |   2 +-
 rest/api/pom.xml                              |   2 +-
 rest/api/project/pom.xml                      |   2 +-
 rest/api/reporting/pom.xml                    |   2 +-
 rest/api/script/pom.xml                       |   2 +-
 rest/api/user/pom.xml                         |   2 +-
 rest/client/agent/pom.xml                     |   2 +-
 rest/client/automation/pom.xml                |   2 +-
 rest/client/cloud/pom.xml                     |   2 +-
 rest/client/common/pom.xml                    |   2 +-
 rest/client/datafile/pom.xml                  |   2 +-
 rest/client/filter/pom.xml                    |   2 +-
 rest/client/job/pom.xml                       |   2 +-
 rest/client/pom.xml                           |   2 +-
 rest/client/project/pom.xml                   |   2 +-
 rest/client/reporting/pom.xml                 |   2 +-
 rest/client/script/pom.xml                    |   2 +-
 rest/client/user/pom.xml                      |   2 +-
 rest/pom.xml                                  |   2 +-
 rest/service/agent/pom.xml                    |   2 +-
 rest/service/automation/pom.xml               |   2 +-
 .../v1/automation/AutomationServiceV1.java    |  65 +--
 rest/service/cloud/pom.xml                    |   2 +-
 .../service/impl/v1/cloud/JobController.java  |  10 +-
 rest/service/common/pom.xml                   |   2 +-
 rest/service/datafile/pom.xml                 |   2 +-
 rest/service/filter/pom.xml                   |   2 +-
 rest/service/job/pom.xml                      |   2 +-
 rest/service/pom.xml                          |   2 +-
 rest/service/project/pom.xml                  |   2 +-
 rest/service/reporting/pom.xml                |   2 +-
 rest/service/script/pom.xml                   |   2 +-
 .../impl/v1/script/ScriptServiceV1.java       | 104 ++--
 rest/service/user/pom.xml                     |   2 +-
 script_processor/pom.xml                      |   2 +-
 .../tank/script/util/ScriptServiceUtil.java   |  32 ++
 search/document_util/pom.xml                  |   2 +-
 search/lucene_indexer/pom.xml                 |   2 +-
 search/pom.xml                                |   2 +-
 search/script_search/pom.xml                  |   2 +-
 tank_common/pom.xml                           |   2 +-
 tank_vmManager/pom.xml                        |  25 +-
 .../intuit/tank/vmManager/VMTrackerImpl.java  |   2 -
 .../environment/IEnvironmentInstance.java     |   2 +-
 .../vmManager/environment/JobRequest.java     |   1 -
 .../amazon/AmazonDataConverter.java           |  38 +-
 .../environment/amazon/AmazonInstance.java    | 360 ++++++-------
 .../environment/amazon/AmazonS3.java          | 122 ++---
 .../amazon/CloudwatchInstance.java            | 166 +++---
 .../amazon/AmazonDataConverterTest.java       |  13 +-
 test_support/pom.xml                          |  17 +-
 tools/.pom.xml.un~                            | Bin 1524 -> 0 bytes
 tools/agent_debugger/pom.xml                  |   2 +-
 .../tank/tools/debugger/ActionProducer.java   |   7 +-
 .../tank/tools/debugger/SelectDialog.java     |  13 +-
 .../main/java/org/fife/io/UnicodeWriter.java  |  37 +-
 .../org/fife/ui/rtextarea/IconRowHeader.java  |   1 -
 tools/agent_debugger_pkg/pom.xml              |  19 +-
 tools/jenkins_plugin/pom.xml                  |   2 +-
 tools/pom.xml                                 |   2 +-
 tools/script_engine/pom.xml                   |   2 +-
 tools/script_filter/pom.xml                   |  11 +-
 .../tank/tools/script/ScriptFilterRunner.java |   3 +-
 .../tank/tools/script/SelectDialog.java       |  48 ++
 tools/script_filter_pkg/pom.xml               |   7 +-
 web/pom.xml                                   |   2 +-
 web/web_support/pom.xml                       |  14 +-
 .../com/intuit/tank/admin/UserLoader.java     |   1 -
 .../intuit/tank/auth/TankAuthenticator.java   |  14 +-
 .../com/intuit/tank/job/ActJobNodeBean.java   |   7 +-
 .../intuit/tank/project/ProjectLoader.java    |   1 -
 .../com/intuit/tank/script/LogicTestData.java |   1 -
 .../com/intuit/tank/script/ScriptBean.java    |   1 -
 .../intuit/tank/script/TankXmlUploadBean.java |  80 +--
 .../tank/service/InitializeEnvironment.java   |   7 +-
 .../tank/project/JobDetailFormatterTest.java  |   4 +-
 web/web_ui/enunciate.xml                      |   2 +
 web/web_ui/pom.xml                            |   6 +-
 208 files changed, 4238 insertions(+), 1822 deletions(-)
 delete mode 100644 api/src/main/java/com/intuit/tank/vm/api/enumerated/VMSize.java
 create mode 100644 api/src/test/java/com/intuit/tank/harness/AmazonUtilTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/http/AuthSchemeTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/logging/LogEventTypeTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/logging/SourceTypeTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/script/RequestDataTypeTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/script/TimerActionTest.java
 delete mode 100644 api/src/test/java/com/intuit/tank/vm/api/enumerated/VMSizeCpTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/vm/settings/InstanceTagTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/vm/settings/ModificationTypeTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/vm/settings/ModifiedEntityMessageTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/vm/settings/PropertiesFileTest.java
 create mode 100644 api/src/test/java/com/intuit/tank/vm/settings/ReportingConfigTest.java
 create mode 100644 api/src/test/resources/sampleProp.properties
 create mode 100644 assets/cleanup_prior_to_3.0.0.sql
 create mode 100644 assets/settings-all-in-one.xml
 create mode 100644 assets/tankIcon.png
 create mode 100644 aws-config/tank_agent.yml
 create mode 100644 aws-config/tank_controller.yml
 create mode 100644 aws-config/tank_instanceProfiles.yml
 create mode 100644 data_access/src/test/java/com/intuit/tank/dao/BaseDaoTest.java
 create mode 100644 data_access/src/test/java/com/intuit/tank/dao/DataFileDaoTest.java
 create mode 100644 data_access/src/test/java/com/intuit/tank/dao/FilterGroupDaoTest.java
 create mode 100644 data_access/src/test/java/com/intuit/tank/dao/GroupDaoTest.java
 create mode 100644 data_access/src/test/java/com/intuit/tank/dao/JobNotificationDaoTest.java
 create mode 100644 data_access/src/test/java/com/intuit/tank/dao/JobQueueDaoTest.java
 create mode 100644 data_access/src/test/java/com/intuit/tank/dao/JobRegionDaoTest.java
 create mode 100644 data_access/src/test/java/com/intuit/tank/dao/PeriodicDataTest.java
 create mode 100644 data_access/src/test/java/com/intuit/tank/dao/UserDaoTest.java
 create mode 100644 data_model/src/test/java/com/intuit/tank/project/ProjectDTOTest.java
 create mode 100644 data_model/src/test/java/com/intuit/tank/project/TankDefaultRevisionEntityTest.java
 create mode 100644 data_model/src/test/java/com/intuit/tank/util/DataFileUtilTest.java
 delete mode 100644 tools/.pom.xml.un~

diff --git a/.travis.yml b/.travis.yml
index 882a7a7bf..756b049d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: java
 jdk:
-  - openjdk8
+  - openjdk11
+
+env:
+  - SKIP_METHODTIMER_TEST=true
 
 script: mvn clean install -P default,coverage
diff --git a/agent/agent_common/pom.xml b/agent/agent_common/pom.xml
index 2cdf1e141..127ef4a7f 100644
--- a/agent/agent_common/pom.xml
+++ b/agent/agent_common/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>agent-common</artifactId>
@@ -36,6 +36,11 @@
       <groupId>org.jdom</groupId>
       <artifactId>jdom</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>jakarta.xml.ws</groupId>
+      <artifactId>jakarta.xml.ws-api</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/agent/agent_common/src/main/java/com/intuit/tank/http/xml/GenericXMLHandler.java b/agent/agent_common/src/main/java/com/intuit/tank/http/xml/GenericXMLHandler.java
index 554e95867..0310c6e32 100644
--- a/agent/agent_common/src/main/java/com/intuit/tank/http/xml/GenericXMLHandler.java
+++ b/agent/agent_common/src/main/java/com/intuit/tank/http/xml/GenericXMLHandler.java
@@ -33,6 +33,7 @@
 import org.jdom2.JDOMException;
 import org.jdom2.Namespace;
 import org.jdom2.input.SAXBuilder;
+import org.jdom2.input.sax.XMLReaders;
 import org.jdom2.output.XMLOutputter;
 import org.jdom2.xpath.XPath;
 import org.xml.sax.InputSource;
@@ -72,7 +73,7 @@ public GenericXMLHandler(File xmlFile) {
             this.xmlFile = xmlFile;
             this.xmlDocument = new org.jdom2.Document();
             SAXBuilder builder = new SAXBuilder();
-            builder.setValidation(false);
+            builder.setXMLReaderFactory(XMLReaders.NONVALIDATING);
             this.xmlDocument = builder.build(this.xmlFile);
             this.namespaces = new HashMap<String, String>();
         } catch (Exception ex) {
@@ -94,7 +95,7 @@ public GenericXMLHandler(String xmlFile) {
                 this.xmlFile = null;
                 this.xmlDocument = new org.jdom2.Document();
                 SAXBuilder builder = new SAXBuilder();
-                builder.setValidation(false);
+                builder.setXMLReaderFactory(XMLReaders.NONVALIDATING);
                 // LOG.debug("XML string to load: "+xmlFile);
                 xmlFile = xmlFile.substring(xmlFile.indexOf("<"));
                 this.xmlDocument = builder.build(new StringReader(xmlFile));
@@ -156,6 +157,7 @@ private Element SetElementText(String xPathExpression, int currentNode) throws J
         if (xPathExists(currentPath)) {
             if (currentPath.equals(xPathExpression)) {
                 return (org.jdom2.Element) XPath.selectSingleNode(this.xmlDocument, xPathExpression);
+
             }
             else {
                 return SetElementText(xPathExpression, currentNode + 1);
diff --git a/agent/agent_common/src/test/java/com/intuit/tank/http/soap/SOAPRequestTest.java b/agent/agent_common/src/test/java/com/intuit/tank/http/soap/SOAPRequestTest.java
index 0638540a7..198aa7ed3 100644
--- a/agent/agent_common/src/test/java/com/intuit/tank/http/soap/SOAPRequestTest.java
+++ b/agent/agent_common/src/test/java/com/intuit/tank/http/soap/SOAPRequestTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -129,6 +130,7 @@ public void testGetKey_1()
      * @generatedBy CodePro at 12/16/14 4:29 PM
      */
     @Test
+    @Disabled
     public void testSetKey_1()
         throws Exception {
         SOAPRequest fixture = new SOAPRequest(null, null);
diff --git a/agent/agent_standalone/pom.xml b/agent/agent_standalone/pom.xml
index 93a5cd7ab..cdacc09f6 100755
--- a/agent/agent_standalone/pom.xml
+++ b/agent/agent_standalone/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>agent-standalone</artifactId>
diff --git a/agent/agent_standalone_pkg/pom.xml b/agent/agent_standalone_pkg/pom.xml
index 5fe5ffc32..93b217148 100755
--- a/agent/agent_standalone_pkg/pom.xml
+++ b/agent/agent_standalone_pkg/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>agent-standalone-pkg</artifactId>
@@ -40,6 +40,7 @@
           <finalName>agent-standalone</finalName>
           <descriptors>
             <descriptor>src/main/assembly/assembly.xml</descriptor>
+            <descriptor>src/main/assembly/zip-assembly.xml</descriptor>
           </descriptors>
           <archive>
             <manifest>
diff --git a/agent/agent_startup/pom.xml b/agent/agent_startup/pom.xml
index aaf661531..e47fb6386 100755
--- a/agent/agent_startup/pom.xml
+++ b/agent/agent_startup/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
   
   <artifactId>agent-startup</artifactId>
diff --git a/agent/agent_startup/src/main/java/com/intuit/tank/agent/AgentStartup.java b/agent/agent_startup/src/main/java/com/intuit/tank/agent/AgentStartup.java
index 07737c472..5adafd412 100644
--- a/agent/agent_startup/src/main/java/com/intuit/tank/agent/AgentStartup.java
+++ b/agent/agent_startup/src/main/java/com/intuit/tank/agent/AgentStartup.java
@@ -24,7 +24,6 @@
 import java.util.zip.ZipException;
 import java.util.zip.ZipInputStream;
 
-import com.amazonaws.util.StringUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
@@ -32,6 +31,7 @@
 
 import com.intuit.tank.harness.AmazonUtil;
 import com.intuit.tank.vm.common.TankConstants;
+import software.amazon.awssdk.utils.StringUtils;
 
 public class AgentStartup implements Runnable {
     private static Logger logger = LogManager.getLogger(AgentStartup.class);
@@ -110,7 +110,7 @@ public static void main(String[] args) {
                 controllerBaseUrl = values[1];
             }
         }
-        if (StringUtils.isNullOrEmpty(controllerBaseUrl)) {
+        if (StringUtils.isEmpty(controllerBaseUrl)) {
             controllerBaseUrl = AmazonUtil.getControllerBaseUrl();
         }
         AgentStartup agentStartup = new AgentStartup(controllerBaseUrl);
diff --git a/agent/agent_startup_pkg/pom.xml b/agent/agent_startup_pkg/pom.xml
index 9d5995e6c..a27c144ad 100755
--- a/agent/agent_startup_pkg/pom.xml
+++ b/agent/agent_startup_pkg/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
   
   <artifactId>agent-startup-pkg</artifactId>
diff --git a/agent/apiharness/pom.xml b/agent/apiharness/pom.xml
index 93889de75..fdbf2701c 100644
--- a/agent/apiharness/pom.xml
+++ b/agent/apiharness/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>agent</artifactId>
@@ -81,6 +81,11 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.simpleframework</groupId>
       <artifactId>simple-http</artifactId>
diff --git a/agent/apiharness/src/main/java/com/intuit/tank/harness/APIMonitor.java b/agent/apiharness/src/main/java/com/intuit/tank/harness/APIMonitor.java
index 7c32710be..5ca31cb91 100644
--- a/agent/apiharness/src/main/java/com/intuit/tank/harness/APIMonitor.java
+++ b/agent/apiharness/src/main/java/com/intuit/tank/harness/APIMonitor.java
@@ -105,17 +105,14 @@ private CloudVmStatus createStatus(WatsAgentStatusResponse agentStatus) {
      * @return
      */
     private JobStatus calculateJobStatus(WatsAgentStatusResponse agentStatus, JobStatus currentStatus) {
-        if (APITestHarness.getInstance().getCmd() == WatsAgentCommand.pause) {
-            return JobStatus.Paused;
-        } else if (APITestHarness.getInstance().getCmd() == WatsAgentCommand.stop) {
-            return JobStatus.Stopped;
-        } else if (APITestHarness.getInstance().getCmd() == WatsAgentCommand.pause_ramp) {
-            return JobStatus.RampPaused;
-        } else if ((currentStatus == JobStatus.Unknown || currentStatus == JobStatus.Starting)
-                && agentStatus.getCurrentNumberUsers() > 0) {
-            return JobStatus.Running;
-        }
-        return currentStatus;
+        WatsAgentCommand cmd = APITestHarness.getInstance().getCmd();
+        return cmd == WatsAgentCommand.pause ? JobStatus.Paused
+                : cmd == WatsAgentCommand.stop ? JobStatus.Stopped
+                : cmd == WatsAgentCommand.pause_ramp ? JobStatus.RampPaused
+                : currentStatus == JobStatus.Unknown
+                    || currentStatus == JobStatus.Starting
+                    && agentStatus.getCurrentNumberUsers() > 0 ? JobStatus.Running
+                : currentStatus;
     }
 
     public static void setDoMonitor(boolean monitor) {
diff --git a/agent/apiharness/src/main/java/com/intuit/tank/harness/APITestHarness.java b/agent/apiharness/src/main/java/com/intuit/tank/harness/APITestHarness.java
index 01b3b4520..9bb625e3c 100644
--- a/agent/apiharness/src/main/java/com/intuit/tank/harness/APITestHarness.java
+++ b/agent/apiharness/src/main/java/com/intuit/tank/harness/APITestHarness.java
@@ -30,7 +30,6 @@
 import java.util.Vector;
 import java.util.concurrent.CountDownLatch;
 
-import com.amazonaws.regions.Regions;
 import com.google.common.collect.ImmutableMap;
 import com.intuit.tank.http.TankHttpClient;
 import org.apache.commons.io.FileUtils;
@@ -43,6 +42,7 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.logging.log4j.message.ObjectMessage;
 
 import com.intuit.tank.AgentServiceClient;
 import com.intuit.tank.api.model.v1.cloud.CloudVmStatus;
@@ -67,7 +67,7 @@
 import com.intuit.tank.vm.api.enumerated.WatsAgentCommand;
 import com.intuit.tank.vm.common.TankConstants;
 import com.intuit.tank.vm.settings.TankConfig;
-import org.apache.logging.log4j.message.ObjectMessage;
+import software.amazon.awssdk.regions.internal.util.EC2MetadataUtils;
 
 public class APITestHarness {
     private static Logger LOG = LogManager.getLogger(APITestHarness.class);
@@ -141,12 +141,13 @@ public static void main(String[] args) {
         }
 
         HostInfo hostInfo = new HostInfo();
-        ThreadContext.put("jobId", getInstance().getAgentRunData().getJobId());
-        ThreadContext.put("projectName", getInstance().getAgentRunData().getProjectName());
-        ThreadContext.put("instanceId", getInstance().getAgentRunData().getInstanceId());
+        ThreadContext.put("jobId", AmazonUtil.getJobId());
+        ThreadContext.put("projectName", AmazonUtil.getProjectName());
+        ThreadContext.put("instanceId", AmazonUtil.getInstanceId());
         ThreadContext.put("publicIp", hostInfo.getPublicIp());
-        ThreadContext.put("region", AmazonUtil.getVMRegion().getRegion());
+        ThreadContext.put("location", AmazonUtil.getZone());
         ThreadContext.put("httpHost", AmazonUtil.getControllerBaseUrl());
+        ThreadContext.put("loggingProfile", AmazonUtil.getLoggingProfile().getDisplayName());
 
         getInstance().initializeFromArgs(args);
     }
@@ -302,23 +303,12 @@ private void startHttp(String baseUrl) {
         if (capacity < 0) {
             capacity = AmazonUtil.getCapacity();
         }
-        VMRegion region = VMRegion.STANDALONE;
-        if (AmazonUtil.isInAmazon()) {
-            region = AmazonUtil.getVMRegion();
-        }
         agentRunData.setJobId(AmazonUtil.getJobId());
         agentRunData.setStopBehavior(AmazonUtil.getStopBehavior());
-
         LogUtil.getLogEvent().setJobId(agentRunData.getJobId());
-        ThreadContext.put("jobId", agentRunData.getJobId());
-        ThreadContext.put("projectName", agentRunData.getProjectName());
-        ThreadContext.put("instanceId", agentRunData.getInstanceId());
-        ThreadContext.put("publicIp", hostInfo.getPublicIp());
-        ThreadContext.put("region", Regions.getCurrentRegion().getName());
-        ThreadContext.put("httpHost", baseUrl);
-        LOG.info(new ObjectMessage(ImmutableMap.of("Message", "Active Profile" + agentRunData.getActiveProfile().getDisplayName())));
+
         AgentData data = new AgentData(agentRunData.getJobId(), instanceId, instanceUrl, capacity,
-                region, AmazonUtil.getZone());
+                AmazonUtil.getVMRegion(), AmazonUtil.getZone());
         try {
             AgentTestStartData startData = null;
             int count = 0;
@@ -614,12 +604,8 @@ public CloudVmStatus getInitialStatus() {
             VMRegion region = VMRegion.STANDALONE;
             String secGroups = "unknown";
             if (AmazonUtil.isInAmazon()) {
-                try {
-                    region = AmazonUtil.getVMRegion();
-                    secGroups = AmazonUtil.getMetaData(CloudMetaDataType.security_groups);
-                } catch (IOException e) {
-                    LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error gettting region. using Custom...")));
-                }
+                region = AmazonUtil.getVMRegion();
+                secGroups = EC2MetadataUtils.getSecurityGroups().get(0);
             }
             status = new CloudVmStatus(instanceId, agentRunData.getJobId(), secGroups, JobStatus.Unknown,
                     VMImageType.AGENT, region, VMStatus.running,
@@ -713,9 +699,9 @@ public void checkAgentThreads() {
             threadGroup.enumerate(threads);
             int activeThreads = (int) Arrays.stream(threads).filter(Objects::nonNull).filter(
                     t -> t.getState() == Thread.State.TIMED_WAITING || t.getState() == Thread.State.WAITING).count();
-            LOG.info(new ObjectMessage(ImmutableMap.of("Message", "Have " + activeThreads + " of " + activeCount
+            LOG.info(LogUtil.getLogMessage("Have " + activeThreads + " of " + activeCount
                     + " active Threads in thread group "
-                    + threadGroup.getName())));
+                    + threadGroup.getName()));
         }
         if (hasMetSimulationTime()) {          // && doneSignal.getCount() != 0) {
             LOG.info(LogUtil.getLogMessage("Max simulation time has been met and there are "
diff --git a/agent/apiharness/src/main/java/com/intuit/tank/harness/logging/ThreadLocalLogEvent.java b/agent/apiharness/src/main/java/com/intuit/tank/harness/logging/ThreadLocalLogEvent.java
index 2ba676734..3312e4927 100644
--- a/agent/apiharness/src/main/java/com/intuit/tank/harness/logging/ThreadLocalLogEvent.java
+++ b/agent/apiharness/src/main/java/com/intuit/tank/harness/logging/ThreadLocalLogEvent.java
@@ -41,8 +41,9 @@ public LogEvent initialValue() {
         ThreadContext.put("projectName", APITestHarness.getInstance().getAgentRunData().getProjectName());
         ThreadContext.put("instanceId", APITestHarness.getInstance().getAgentRunData().getInstanceId());
         ThreadContext.put("publicIp", hostInfo.getPublicIp());
-        ThreadContext.put("region", AmazonUtil.getVMRegion().getRegion());
+        ThreadContext.put("location", AmazonUtil.getZone());
         ThreadContext.put("httpHost", AmazonUtil.getControllerBaseUrl());
+        ThreadContext.put("loggingProfile", APITestHarness.getInstance().getAgentRunData().getActiveProfile().getDisplayName());
 
         return logEvent;
 
diff --git a/agent/apiharness/src/main/resources/log4j2.xml b/agent/apiharness/src/main/resources/log4j2.xml
index ad798746d..ce2ac7b9c 100644
--- a/agent/apiharness/src/main/resources/log4j2.xml
+++ b/agent/apiharness/src/main/resources/log4j2.xml
@@ -14,8 +14,9 @@
                 <KeyValuePair key="projectName" value="$${ctx:projectName:-unknown}"/>
                 <KeyValuePair key="instanceId" value="$${ctx:instanceId:-unknown}"/>
                 <KeyValuePair key="publicIp" value="$${ctx:publicIp:-unknown}"/>
-                <KeyValuePair key="region" value="$${ctx:region:-unknown}"/>
+                <KeyValuePair key="location" value="$${ctx:location:-unknown}"/>
                 <KeyValuePair key="httpHost" value="$${ctx:httpHost:-unknown}"/>
+                <KeyValuePair key="loggingProfile" value="$${ctx:loggingProfile:-unknown}"/>
             </JsonLayout>
 
             <Policies>
diff --git a/agent/apiharness/src/test/java/com/intuit/tank/common/TPSTest.java b/agent/apiharness/src/test/java/com/intuit/tank/common/TPSTest.java
index e0f7395d0..1de5d83b6 100644
--- a/agent/apiharness/src/test/java/com/intuit/tank/common/TPSTest.java
+++ b/agent/apiharness/src/test/java/com/intuit/tank/common/TPSTest.java
@@ -22,10 +22,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;
 import com.intuit.tank.persistence.databases.AmazonDynamoDatabaseDocApi;
 import com.intuit.tank.persistence.databases.DatabaseKeys;
 import com.intuit.tank.reporting.api.TPSInfo;
@@ -37,19 +33,22 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
 
 public class TPSTest {
 	private static final Logger LOG = LogManager.getLogger(TPSTest.class);
 
-    private AmazonDynamoDBClient dbclient;
+    private DynamoDbClient dynamoDbClient;
 
     @BeforeAll
     @Tag(TestGroups.EXPERIMENTAL)
     public void init() {
-        ClientConfiguration clientConfig = new ClientConfiguration();
-        AWSCredentials credentials = new BasicAWSCredentials(System.getProperty("AWS_KEY_ID"),
+        AwsCredentials credentials = AwsBasicCredentials.create(System.getProperty("AWS_KEY_ID"),
                 System.getProperty("AWS_KEY"));
-        dbclient = new AmazonDynamoDBClient(credentials, clientConfig);
+        dynamoDbClient = DynamoDbClient.builder().credentialsProvider(StaticCredentialsProvider.create(credentials)).build();
     }
 
     @Test
@@ -57,7 +56,7 @@ public void init() {
     private void sendTps() {
         TPSInfoContainer tpsInfo = createTPsInfo();
         try {
-            IDatabase db = new AmazonDynamoDatabaseDocApi(dbclient);
+            IDatabase db = new AmazonDynamoDatabaseDocApi(dynamoDbClient);
             List<com.intuit.tank.reporting.databases.Item> items = new ArrayList<com.intuit.tank.reporting.databases.Item>();
             for (TPSInfo info : tpsInfo.getTpsInfos()) {
                 com.intuit.tank.reporting.databases.Item item = createItem(info);
diff --git a/agent/apiharness_pkg/pom.xml b/agent/apiharness_pkg/pom.xml
index 0a09f24aa..3f4bcf909 100644
--- a/agent/apiharness_pkg/pom.xml
+++ b/agent/apiharness_pkg/pom.xml
@@ -6,18 +6,15 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
-
   <artifactId>apiharness</artifactId>
 
   <packaging>pom</packaging>
   <name>Apiharness Packaging</name>
 
-
   <dependencies>
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>agent</artifactId>
@@ -25,8 +22,6 @@
     </dependency>
   </dependencies>
 
-
-
   <build>
     <plugins>
       <plugin>
diff --git a/agent/http_client_3/pom.xml b/agent/http_client_3/pom.xml
index 298650e43..a170d641b 100644
--- a/agent/http_client_3/pom.xml
+++ b/agent/http_client_3/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
   
   <artifactId>http_client_commons_3</artifactId>
diff --git a/agent/http_client_4/pom.xml b/agent/http_client_4/pom.xml
index 0d43e5630..5d8e7680a 100644
--- a/agent/http_client_4/pom.xml
+++ b/agent/http_client_4/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>http_client_commons_4</artifactId>
diff --git a/agent/http_client_5/pom.xml b/agent/http_client_5/pom.xml
index fffa8b84e..1c7babf38 100644
--- a/agent/http_client_5/pom.xml
+++ b/agent/http_client_5/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>agent-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>http_client_commons_5</artifactId>
diff --git a/agent/pom.xml b/agent/pom.xml
index e39d6069e..6f4d1f956 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>agent-parent</artifactId>
diff --git a/all-in-one.sh b/all-in-one.sh
index 02089b194..ea9cbb4f6 100644
--- a/all-in-one.sh
+++ b/all-in-one.sh
@@ -7,36 +7,49 @@ if [ -z "$1" ]
 fi
 mkdir -p $INSTALL_DIR 2>/dev/null
 echo "Installing all in one in $INSTALL_DIR"
-echo "downloading and extracting tomcat 6..."
-wget -O /tmp/apache-tomcat.tgz http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.41/bin/apache-tomcat-6.0.41.tar.gz 2>/dev/null
+echo "downloading and extracting tomcat 9..."
+wget -O /tmp/apache-tomcat.tgz http://archive.apache.org/dist/tomcat/tomcat-9/v9.0.39/bin/apache-tomcat-9.0.39.tar.gz 2>/dev/null
 tar -zxf /tmp/apache-tomcat.tgz -C $INSTALL_DIR 2>/dev/null
 rm -f /tmp/apache-tomcat.tgz 2>/dev/null
-ln -snf $INSTALL_DIR/apache-tomcat-6.0.41 $INSTALL_DIR/tomcat6 2>/dev/null
-mkdir $INSTALL_DIR/tomcat6/db 2>/dev/null
-mkdir $INSTALL_DIR/tomcat6/jars 2>/dev/null
+ln -snf $INSTALL_DIR/apache-tomcat-9.0.39 $INSTALL_DIR/tomcat 2>/dev/null
+mkdir $INSTALL_DIR/tomcat/db 2>/dev/null
+mkdir $INSTALL_DIR/tomcat/jars 2>/dev/null
 
 echo "downloading and extracting agent-standalone..."
-wget -O /tmp/agent-standalone-pkg.zip http://tank-public.s3-website-us-east-1.amazonaws.com/agent-standalone-pkg.zip 2>/dev/null
+wget -O /tmp/agent-standalone-pkg.zip https://github.com/intuit/Tank/releases/download/3.0.0/agent-standalone-pkg.zip 2>/dev/null
 unzip -q -d $INSTALL_DIR /tmp/agent-standalone-pkg 2>/dev/null
 rm -f /tmp/agent-standalone-pkg 2>/dev/null
 
 echo "downloading and extracting support libraries..."
-wget -O $INSTALL_DIR/tomcat6/lib/weld-tomcat-support-1.0.1-Final.jar http://central.maven.org/maven2/org/jboss/weld/servlet/weld-tomcat-support/1.0.1-Final/weld-tomcat-support-1.0.1-Final.jar 2>/dev/null
-wget -O /$INSTALL_DIR/tomcat6/lib/h2-1.4.187.jar http://repo2.maven.org/maven2/com/h2database/h2/1.4.187/h2-1.4.187.jar 2>/dev/null
-wget -O /$INSTALL_DIR/tomcat6/conf/server.xml http://tank-public.s3-website-us-east-1.amazonaws.com/server-all-in-one.xml 2>/dev/null
-wget -O /$INSTALL_DIR/tomcat6/settings.xml http://tank-public.s3-website-us-east-1.amazonaws.com/settings-all-in-one.xml 2>/dev/null
-wget -O $INSTALL_DIR/tomcat6/conf/context.xml http://tank-public.s3-website-us-east-1.amazonaws.com/context.xml 2>/dev/null
+wget -O /$INSTALL_DIR/tomcat/lib/h2-1.4.200.jar https://repo1.maven.org/maven2/com/h2database/h2/1.4.200/h2-1.4.200.jar 2>/dev/null
+wget -O /$INSTALL_DIR/tomcat/settings.xml https://github.com/intuit/Tank/blob/master/assets/settings-all-in-one.xml 2>/dev/null
 
 echo "downloading and installing tank war file..."
-rm -fr $INSTALL_DIR/tomcat6/webapps/docs $INSTALL_DIR/tomcat6/webapps/examples $INSTALL_DIR/tomcat6/webapps/ROOT 2>/dev/null
-wget -O $INSTALL_DIR/tomcat6/webapps/ROOT.war http://tank-public.s3-website-us-east-1.amazonaws.com/tank.war 2>/dev/null
+rm -fr $INSTALL_DIR/tomcat/webapps/docs $INSTALL_DIR/tomcat/webapps/examples $INSTALL_DIR/tomcat/webapps/ROOT 2>/dev/null
+wget -O $INSTALL_DIR/tomcat/webapps/ROOT.war https://github.com/intuit/Tank/releases/download/3.0.0/tank.war 2>/dev/null
+
+echo "Creating context file at $INSTALL_DIR/start.sh ..."
+cat << EOF > $INSTALL_DIR/tomcat/conf/context.xml
+#!/bin/bash
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Context>
+    <Resource name="jdbc/watsDS" auth="Container"
+        type="javax.sql.DataSource"
+        driverClassName="org.h2.Driver"
+        url="jdbc:h2:mem:tank"
+        username="sa" password=""
+        maxActive="20" maxIdle="10" maxWait="-1"/>
+</Context>
+EOF
+chmod 644 $INSTALL_DIR/tomcat/conf/context.xml 2>/dev/null
 
 echo "Creating start script at $INSTALL_DIR/start.sh ..."
 cat << EOF > $INSTALL_DIR/start.sh
 #!/bin/bash
 echo "Starting Tomcat..."
 export JAVA_OPTS="-Xms256m -Xmx1024m -XX:PermSize=64m -XX:MaxPermSize=128m -Djava.awt.headless=true"
-cd $INSTALL_DIR/tomcat6/
+cd $INSTALL_DIR/tomcat/
 bin/startup.sh &> /dev/null
 echo "Tomcat started."
 cd $INSTALL_DIR/agent-standalone/
@@ -50,7 +63,7 @@ echo "Creating stop script at $INSTALL_DIR/stop.sh..."
 cat << EOF > $INSTALL_DIR/stop.sh
 #!/bin/bash
 echo "Stopping Tomcat..."
-$INSTALL_DIR/tomcat6/bin/shutdown.sh &> /dev/null
+$INSTALL_DIR/tomcat/bin/shutdown.sh &> /dev/null
 echo "Stopping Agent..."
 kill $(ps aux | grep '[a]gent-standalone' | awk '{print $2}') &> /dev/null
 kill $(ps aux | grep '[a]piharness' | awk '{print $2}') &> /dev/null
diff --git a/api/pom.xml b/api/pom.xml
index 2cd764b95..b8d48d2be 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>api</artifactId>
@@ -61,8 +61,12 @@
     </dependency>
 
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-s3</artifactId>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>s3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>apache-client</artifactId>
     </dependency>
 
     <dependency>
diff --git a/api/src/main/java/com/intuit/tank/harness/AmazonUtil.java b/api/src/main/java/com/intuit/tank/harness/AmazonUtil.java
index 320bf1f48..620ed184d 100644
--- a/api/src/main/java/com/intuit/tank/harness/AmazonUtil.java
+++ b/api/src/main/java/com/intuit/tank/harness/AmazonUtil.java
@@ -19,25 +19,24 @@
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.HashMap;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 
+import com.google.common.base.Splitter;
 import com.google.common.collect.ImmutableMap;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import com.intuit.tank.logging.LoggingProfile;
 import com.intuit.tank.vm.api.enumerated.VMRegion;
-import com.intuit.tank.vm.api.enumerated.VMSize;
 import com.intuit.tank.vm.common.TankConstants;
 import org.apache.logging.log4j.message.ObjectMessage;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 /**
  * 
  * AmazonUtil
@@ -55,7 +54,6 @@ public class AmazonUtil {
     public static VMRegion getVMRegion() {
         try {
             String zone = getMetaData(CloudMetaDataType.zone);
-            LOG.info(new ObjectMessage(ImmutableMap.of("Message", "Running in zone " + zone)));
             return VMRegion.getRegionFromZone(zone);
         } catch (IOException ioe) {
             LOG.warn(new ObjectMessage(ImmutableMap.of("Message","Error getting region. using CUSTOM...")));
@@ -84,27 +82,20 @@ public static boolean isInAmazon() {
      */
     public static String getZone() {
         try {
-            String zone = getMetaData(CloudMetaDataType.zone);
-            LOG.info(new ObjectMessage(ImmutableMap.of("Message","Running in zone " + zone)));
-            return zone;
-        } catch (Exception e) {
+            return getMetaData(CloudMetaDataType.zone);
+        } catch (IOException e) {
             LOG.info(new ObjectMessage(ImmutableMap.of("Message","cannot determine zone")));
         }
         return "unknown";
     }
 
     public static String getPublicHostName() throws IOException {
-        String ret = null;
         try {
-            ret = getMetaData(CloudMetaDataType.public_hostname);
-        } catch (Exception e) {
-            LOG.debug(new ObjectMessage(ImmutableMap.of("Message","Failed getting public host: " + e)));
-        }
-        if (StringUtils.isBlank(ret)) {
-            //LOG.info("getting local_ipv4...");
-            ret = getMetaData(CloudMetaDataType.local_ipv4);
+            return getMetaData(CloudMetaDataType.public_hostname);
+        } catch (IOException e) {
+            // returns private IP because private hostname is unresolvable
+            return getMetaData(CloudMetaDataType.local_ipv4);
         }
-        return ret;
     }
 
     /**
@@ -114,35 +105,11 @@ public static String getPublicHostName() throws IOException {
      * @throws IOException
      */
     public static String getPublicIp() throws IOException {
-        return getMetaData(CloudMetaDataType.public_ipv4);
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public static String getAWSKeyFromUserData() {
-        String ret = null;
         try {
-            ret = getUserDataAsMap().get(TankConstants.KEY_AWS_SECRET_KEY);
+            return getMetaData(CloudMetaDataType.public_ipv4);
         } catch (IOException e) {
-            LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error getting key: " + e.toString())));
+            return getMetaData(CloudMetaDataType.local_ipv4);
         }
-        return ret;
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public static String getAWSKeyIdFromUserData() {
-        String ret = null;
-        try {
-            ret = getUserDataAsMap().get(TankConstants.KEY_AWS_SECRET_KEY_ID);
-        } catch (IOException e) {
-            LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error getting key ID: " + e.toString())));
-        }
-        return ret;
     }
 
     /**
@@ -168,10 +135,8 @@ public static String getInstanceId() {
      *             if there is an error communicating with the amazon cloud.
      */
     @Nonnull
-    public static VMSize getInstanceType() throws IOException {
-        String metaData = getMetaData(CloudMetaDataType.instance_type);
-        VMSize ret = VMSize.fromRepresentation(metaData);
-        return ret != null ? ret : VMSize.HighCPUExtraLarge;
+    public static String getInstanceType() throws IOException {
+        return getMetaData(CloudMetaDataType.instance_type);
     }
 
     /**
@@ -183,8 +148,7 @@ public static VMSize getInstanceType() throws IOException {
      */
     @Nonnull
     public static String getMetaData(CloudMetaDataType metaData) throws IOException {
-        InputStream inputStream = getInputStream(BASE + META_DATA + "/" + metaData.getKey());
-        return convertStreamToString(inputStream);
+        return getResponseString(BASE + META_DATA + "/" + metaData.getKey());
     }
 
     /**
@@ -194,168 +158,98 @@ public static String getMetaData(CloudMetaDataType metaData) throws IOException
      * @throws IOException
      */
     public static String getUserDataAsString() throws IOException {
-        String result = null;
-        InputStream inputStream = getInputStream(BASE + USER_DATA);
-        result = convertStreamToString(inputStream);
-        return result;
+        return getResponseString(BASE + USER_DATA);
     }
 
     /**
      * gets the job id form user data
-     * 
+     *
      * @return
      */
     public static String getJobId() {
-        String ret = null;
-        try {
-            ret = getUserDataAsMap().get(TankConstants.KEY_JOB_ID);
-        } catch (IOException e) {
-            LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error getting job ID: " + e.toString())));
-        }
-        return ret != null ? ret : "unknown";
+        String result = getUserDataAsMap().get(TankConstants.KEY_JOB_ID);
+        return StringUtils.isNotEmpty(result)
+                ? result
+                : "unknown";
     }
 
     /**
      * gets the project name for user data
-     * 
+     *
      * @return
      */
     public static String getProjectName() {
-        String ret = null;
-        try {
-            ret = getUserDataAsMap().get(TankConstants.KEY_PROJECT_NAME);
-        } catch (IOException e) {
-            LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error getting Project  Name: " + e.toString())));
-        }
-        return ret != null ? ret : "unknown";
+        String result = getUserDataAsMap().get(TankConstants.KEY_PROJECT_NAME);
+        return StringUtils.isNotEmpty(result)
+                ? result
+                : "unknown";
     }
 
     /**
      * gets logging profile form user data
-     * 
+     *
      * @return LoggingProfile
      */
     public static LoggingProfile getLoggingProfile() {
-        LoggingProfile ret = LoggingProfile.STANDARD;
-        try {
-            String lp = getUserDataAsMap().get(TankConstants.KEY_LOGGING_PROFILE);
-            if (lp != null) {
-                ret = LoggingProfile.valueOf(lp);
-            }
-        } catch (Exception e) {
-            LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error getting LoggingProfile: " + e.toString())));
-        }
-        return ret;
+        String result = getUserDataAsMap().get(TankConstants.KEY_LOGGING_PROFILE);
+        return StringUtils.isNotEmpty(result)
+                ? LoggingProfile.valueOf(result)
+                : LoggingProfile.STANDARD;
     }
 
     public static int getCapacity() {
-        int ret = 4000;
-        try {
-            String lp = getUserDataAsMap().get(TankConstants.KEY_NUM_USERS_PER_AGENT);
-            if (lp != null) {
-                ret = Integer.valueOf(lp);
-            }
-        } catch (Exception e) {
-            LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error getting capacity: " + e.toString())));
-        }
-        return ret;
+        String result = getUserDataAsMap().get(TankConstants.KEY_NUM_USERS_PER_AGENT);
+        return StringUtils.isNotEmpty(result)
+                ? Integer.parseInt(result)
+                : 4000;
     }
 
     /**
      * gets stop behavior form user data.
-     * 
+     *
      * @return Stopbehavior
      */
     public static StopBehavior getStopBehavior() {
-        StopBehavior ret = StopBehavior.END_OF_SCRIPT_GROUP;
-        try {
-            String sb = getUserDataAsMap().get(TankConstants.KEY_STOP_BEHAVIOR);
-            if (sb != null) {
-                ret = StopBehavior.valueOf(sb);
-            }
-        } catch (Exception e) {
-            LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error getting StopBehavior: " + e.toString())));
-        }
-        return ret;
+        String result = getUserDataAsMap().get(TankConstants.KEY_STOP_BEHAVIOR);
+        return StringUtils.isNotEmpty(result)
+                ? StopBehavior.valueOf(result)
+                : StopBehavior.END_OF_SCRIPT_GROUP;
     }
 
     /**
      * gets if we are using EIP from user data
-     * 
+     *
      * @return
      */
     public static boolean usingEip() {
-        boolean ret = false;
-        try {
-            ret = getUserDataAsMap().get(TankConstants.KEY_USING_BIND_EIP) != null;
-        } catch (IOException e) {
-            LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error getting is using EIP: " + e.toString())));
-        }
-        return ret;
+        return StringUtils.isNotEmpty(getUserDataAsMap().get(TankConstants.KEY_USING_BIND_EIP));
     }
 
     /**
      * gewts controller base form user data
-     * 
+     *
      * @return
      */
     public static String getControllerBaseUrl() {
-        String ret = null;
-        try {
-            ret = getUserDataAsMap().get(TankConstants.KEY_CONTROLLER_URL);
-        } catch (IOException e) {
-            LOG.warn(new ObjectMessage(ImmutableMap.of("Message", "Error getting controller url: " + e.toString())));
-        }
-        return ret != null ? ret : "http://localhost:8080/";
+        String result = getUserDataAsMap().get(TankConstants.KEY_CONTROLLER_URL);
+        return StringUtils.isNotEmpty(result)
+                ? result
+                : "http://localhost:8080/";
     }
 
     /**
      * Gets the user data associated with this instance.
      * 
      * @return the user data as a Map
-     * @throws IOException
      */
-    public static Map<String, String> getUserDataAsMap() throws IOException {
-        Map<String, String> result = null;
-        InputStream inputStream = getInputStream(BASE + USER_DATA);
-        result = convertStreamToMap(inputStream);
-        return result;
-    }
-
-    private static Map<String, String> convertStreamToMap(InputStream is) throws IOException {
-        Map<String, String> result = new HashMap<String, String>();
-        if (is != null) {
-            try {
-                BufferedReader r = new BufferedReader(new InputStreamReader(is));
-                String s = r.readLine();
-                while (s != null) {
-                    String[] pair = s.split("=", 2);
-                    if (pair.length == 2) {
-                        result.put(pair[0], pair[1]);
-                    }
-                    s = r.readLine();
-                }
-            } finally {
-                try {
-                    is.close();
-                } catch (IOException e) {}
-            }
-        }
-        return result;
-    }
-
-    private static String convertStreamToString(InputStream is) throws IOException {
-        if (is != null) {
-            try {
-                return IOUtils.toString(is, UTF_8);
-            } finally {
-                try {
-                    is.close();
-                } catch (IOException e) {}
+    public static Map<String, String> getUserDataAsMap() {
+        try {
+            String userData = getResponseString(BASE + USER_DATA);
+            if (StringUtils.isNotEmpty(userData)) {
+                return Splitter.on(System.getProperty("line.separator")).withKeyValueSeparator("=").split(userData);
             }
-        } else {
-            return "";
-        }
+        } catch (IllegalArgumentException | IOException e) { }
+        return Collections.emptyMap();
     }
 
     /**
@@ -363,11 +257,13 @@ private static String convertStreamToString(InputStream is) throws IOException {
      * @return
      * @throws IOException
      */
-    private static InputStream getInputStream(String url) throws IOException {
+    private static String getResponseString(String url) throws IOException {
         HttpURLConnection con = (HttpURLConnection) new URL(url).openConnection();
         con.setRequestMethod("GET");
         con.setConnectTimeout(3000);
-        return con.getInputStream();
+        InputStream is = con.getInputStream();
+        return new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))
+                .lines()
+                .collect(Collectors.joining(System.getProperty("line.separator")));
     }
-
 }
diff --git a/api/src/main/java/com/intuit/tank/harness/StopBehavior.java b/api/src/main/java/com/intuit/tank/harness/StopBehavior.java
index 04083ac14..3920adbe1 100644
--- a/api/src/main/java/com/intuit/tank/harness/StopBehavior.java
+++ b/api/src/main/java/com/intuit/tank/harness/StopBehavior.java
@@ -43,13 +43,12 @@ public String getDescription() {
     }
 
     public static StopBehavior fromString(String stopBehavior) {
-        StopBehavior ret = StopBehavior.END_OF_SCRIPT_GROUP;
         try {
-            ret = valueOf(stopBehavior);
+            return valueOf(stopBehavior);
         } catch (Exception e) {
             // bad name return default
+            return StopBehavior.END_OF_SCRIPT_GROUP;
         }
-        return ret;
     }
 
 }
diff --git a/api/src/main/java/com/intuit/tank/storage/S3FileStorage.java b/api/src/main/java/com/intuit/tank/storage/S3FileStorage.java
index 2ec5290ab..72203bc2f 100644
--- a/api/src/main/java/com/intuit/tank/storage/S3FileStorage.java
+++ b/api/src/main/java/com/intuit/tank/storage/S3FileStorage.java
@@ -1,37 +1,41 @@
 package com.intuit.tank.storage;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.zip.GZIPInputStream;
 
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.util.IOUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.s3.model.AccessControlList;
-import com.amazonaws.services.s3.model.AmazonS3Exception;
-import com.amazonaws.services.s3.model.Bucket;
-import com.amazonaws.services.s3.model.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.s3.model.S3ObjectInputStream;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
 import com.intuit.tank.vm.settings.CloudCredentials;
 import com.intuit.tank.vm.settings.CloudProvider;
 import com.intuit.tank.vm.settings.TankConfig;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache.ProxyConfiguration;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3ClientBuilder;
+import software.amazon.awssdk.services.s3.model.BucketAlreadyExistsException;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
+import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
+import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+import software.amazon.awssdk.services.s3.model.S3Object;
+import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
 
 /**
  * FileStorage that writes to the file system.
@@ -49,7 +53,7 @@ public class S3FileStorage implements FileStorage, Serializable {
     private boolean compress = true;
     private boolean encrypt = true;
 
-    private AmazonS3 s3Client;
+    private S3Client s3Client;
 
     /**
      * @param bucketName
@@ -61,32 +65,28 @@ public S3FileStorage(String bucketName, boolean compress) {
         this.compress = compress;
         try {
             TankConfig tankConfig = new TankConfig();
-            encrypt = tankConfig.isS3EncryptionEnabled();
+            this.encrypt = tankConfig.isS3EncryptionEnabled();
             CloudCredentials creds = tankConfig.getVmManagerConfig().getCloudCredentials(CloudProvider.amazon);
-            ClientConfiguration config = new ClientConfiguration();
-            if (StringUtils.isNotBlank(System.getProperty("http.proxyHost"))) {
+            S3ClientBuilder s3ClientBuilder = S3Client.builder();
+            if (creds != null && StringUtils.isNotBlank(System.getProperty("http.proxyHost"))) {
                 try {
-                    config.setProxyHost(System.getProperty("http.proxyHost"));
+                    URIBuilder uriBuilder = new URIBuilder().setHost(System.getProperty("http.proxyHost"));
                     if (StringUtils.isNotBlank(System.getProperty("http.proxyPort"))) {
-                        config.setProxyPort(Integer.parseInt(System.getProperty("http.proxyPort")));
+                        uriBuilder.setPort(Integer.parseInt(System.getProperty("http.proxyPort")));
                     }
+                    ApacheHttpClient.Builder httpClientBuilder = ApacheHttpClient.builder()
+                            .proxyConfiguration(
+                                    ProxyConfiguration.builder().endpoint(uriBuilder.build()).build());
+                    s3ClientBuilder.httpClientBuilder(httpClientBuilder);
                 } catch (NumberFormatException e) {
                     LOG.error("invalid proxy setup.");
                 }
-
             }
-            assert creds != null;
-            if (StringUtils.isNotBlank(creds.getKeyId()) && StringUtils.isNotBlank(creds.getKey())) {
-                BasicAWSCredentials credentials = new BasicAWSCredentials(creds.getKeyId(), creds.getKey());
-                this.s3Client = AmazonS3ClientBuilder.standard()
-                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                        .withClientConfiguration(config)
-                        .build();
-            } else {
-                this.s3Client = AmazonS3ClientBuilder.standard()
-                        .withClientConfiguration(config)
-                        .build();
+            if (creds != null && StringUtils.isNotBlank(creds.getKeyId()) && StringUtils.isNotBlank(creds.getKey())) {
+                AwsCredentials credentials = AwsBasicCredentials.create(creds.getKeyId(), creds.getKey());
+                s3ClientBuilder.credentialsProvider(StaticCredentialsProvider.create(credentials));
             }
+            s3Client = s3ClientBuilder.build();
             createBucket(bucketName);
         } catch (Exception ex) {
             LOG.error(ex.getMessage(), ex);
@@ -107,74 +107,63 @@ private void parseBucketName(String name) {
 
     @Override
     public void storeFileData(FileData fileData, InputStream in) {
-        String path = FilenameUtils.separatorsToUnix(FilenameUtils.normalize(extraPath + fileData.getPath() + "/" + fileData.getFileName()));
-        path = StringUtils.stripStart(path, "/");
+        String key = FilenameUtils.separatorsToUnix(
+                FilenameUtils.normalize(extraPath + fileData.getPath() + "/" + fileData.getFileName()));
+        key = StringUtils.stripStart(key, "/");
         try {
-            ObjectMetadata metaData = new ObjectMetadata();
+            PutObjectRequest.Builder request = PutObjectRequest.builder().bucket(bucketName).key(key);
             if (encrypt) {
-                metaData.setSSEAlgorithm(ObjectMetadata.AES_256_SERVER_SIDE_ENCRYPTION);     
+                request.serverSideEncryption(ServerSideEncryption.AES256);
             }
             if (fileData.getAttributes() != null) {
-                for (Entry<String, String> entry : fileData.getAttributes().entrySet()) {
-                    metaData.addUserMetadata(entry.getKey(), entry.getValue());
-                }
+                request.metadata(fileData.getAttributes());
             }
             if (compress) {
                 in = new GZIPInputStream(in);
             }
-            s3Client.putObject(bucketName, path, in, metaData);
+            s3Client.putObject(request.build(), RequestBody.fromInputStream(in, in.available()));
         } catch (Exception e) {
             LOG.error("Error storing file: " + e, e);
             throw new RuntimeException(e);
         } finally {
-            IOUtils.closeQuietly(in, null);
+            IOUtils.closeQuietly(in);
         }
     }
 
     @Override
     public InputStream readFileData(FileData fileData) {
-        String path = FilenameUtils.separatorsToUnix(FilenameUtils.normalize(extraPath + fileData.getPath() + "/" + fileData.getFileName()));
-        path = StringUtils.stripStart(path, "/");
-        InputStream ret = null;
-        try {
-            S3Object object = s3Client.getObject(bucketName, path);
-            if (object != null) {
-                ret = object.getObjectContent();
-                if (compress) {
-                    ret = new GZIPInputStream(ret);
-                }
-            }
-        } catch (Exception e) {
-            LOG.error("Error getting File: " + e, e);
-            throw new RuntimeException(e);
-        }
-        return ret;
+        String key = FilenameUtils.separatorsToUnix(
+                FilenameUtils.normalize(extraPath + fileData.getPath() + "/" + fileData.getFileName()));
+        key = StringUtils.stripStart(key, "/");
+        return s3Client.getObject(GetObjectRequest.builder().bucket(bucketName).key(key).build());
     }
 
     private void createBucket(String bucketName) {
-        AccessControlList configuration = null;
         try {
-            configuration = s3Client.getBucketAcl(bucketName);
-        } catch (Exception e) {
-            LOG.info("Bucket " + bucketName + " does not exist.");
-        }
-        if (configuration == null) {
-            Bucket bucket = s3Client.createBucket(bucketName);
-            LOG.info("Created bucket " + bucket.getName() + " at " + bucket.getCreationDate());
+            s3Client.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
+            LOG.info("Created bucket " + bucketName + " at " + "now");
+        } catch (BucketAlreadyExistsException baee) {//Good
+        } catch (S3Exception e) {
+            LOG.error("Error creating bucket: " + e, e);
         }
     }
 
     @Override
     public boolean exists(FileData fileData) {
         boolean ret = true;
-        String path = FilenameUtils.separatorsToUnix(FilenameUtils.normalize(extraPath + fileData.getPath() + "/" + fileData.getFileName()));
-        path = StringUtils.stripStart(path, "/");
+        String key = FilenameUtils.separatorsToUnix(
+                FilenameUtils.normalize(extraPath + fileData.getPath() + "/" + fileData.getFileName()));
+        key = StringUtils.stripStart(key, "/");
         try {
-            s3Client.getObjectMetadata(bucketName, path);
-        } catch (AmazonS3Exception e) {
-            ret = false;
+            s3Client.headObject(HeadObjectRequest.builder().bucket(bucketName).key(key).build());
+        } catch (NoSuchKeyException e) {
+            return false;
+        } catch (S3Exception e) {
+            LOG.error("Error Checking existence of S3 object: " + e, e);
+            return false;
+
         }
-        return ret;
+        return true;
     }
 
     @Override
@@ -186,20 +175,14 @@ public List<FileData> listFileData(String path) {
                 prefix = prefix + "/";
             }
             prefix = StringUtils.removeStart(prefix, "/");
-            ListObjectsRequest listObjectsRequest = new ListObjectsRequest().withBucketName(bucketName).withPrefix(prefix);
-            listObjectsRequest.setDelimiter("/");
-            ObjectListing objectListing;
-            do {
-                objectListing = s3Client.listObjects(listObjectsRequest);
-                for (S3ObjectSummary objectSummary : objectListing.getObjectSummaries()) {
-                    String fileName = FilenameUtils.getName(FilenameUtils.normalize(objectSummary.getKey()));
-                    if (StringUtils.isNotBlank(fileName)) {
-                        ret.add(new FileData(path, fileName));
-                    }
+            ListObjectsResponse response = s3Client.listObjects(ListObjectsRequest.builder().bucket(bucketName).prefix(prefix).delimiter("/").build());
+            for (S3Object object : response.contents()) {
+                String fileName = FilenameUtils.getName(FilenameUtils.normalize(object.key()));
+                if (StringUtils.isNotBlank(fileName)) {
+                    ret.add(new FileData(path, fileName));
                 }
-                listObjectsRequest.setMarker(objectListing.getNextMarker());
-            } while (objectListing.isTruncated());
-        } catch (AmazonS3Exception e) {
+            }
+        } catch (S3Exception e) {
             LOG.error("Error Listing Files: " + e, e);
             throw new RuntimeException(e);
         }
@@ -208,11 +191,11 @@ public List<FileData> listFileData(String path) {
 
     @Override
     public boolean delete(FileData fileData) {
-        String path = FilenameUtils.separatorsToUnix(FilenameUtils.normalize(fileData.getPath() + "/" + fileData.getFileName()));
-        path = StringUtils.stripStart(path, "/");
+        String key = FilenameUtils.separatorsToUnix(FilenameUtils.normalize(fileData.getPath() + "/" + fileData.getFileName()));
+        key = StringUtils.stripStart(key, "/");
         try {
-            s3Client.deleteObject(bucketName, path);
-        } catch (AmazonS3Exception e) {
+            s3Client.deleteObject(DeleteObjectRequest.builder().bucket(bucketName).key(key).build());
+        } catch (S3Exception e) {
             return false;
         }
         return true;
diff --git a/api/src/main/java/com/intuit/tank/vm/api/enumerated/VMRegion.java b/api/src/main/java/com/intuit/tank/vm/api/enumerated/VMRegion.java
index 40dac7da3..007b3fd5c 100644
--- a/api/src/main/java/com/intuit/tank/vm/api/enumerated/VMRegion.java
+++ b/api/src/main/java/com/intuit/tank/vm/api/enumerated/VMRegion.java
@@ -64,7 +64,7 @@ public String getName() {
      * @return
      */
     public static VMRegion getRegionFromZone(String zone) {
-        return Arrays.stream(VMRegion.values()).filter(vmr -> zone.toLowerCase().startsWith(vmr.region.toLowerCase())).findFirst().orElse(VMRegion.US_EAST);
+        return Arrays.stream(VMRegion.values()).filter(vmr -> zone.toLowerCase().startsWith(vmr.region.toLowerCase())).findFirst().orElse(VMRegion.STANDALONE);
     }
 
     /**
diff --git a/api/src/main/java/com/intuit/tank/vm/api/enumerated/VMSize.java b/api/src/main/java/com/intuit/tank/vm/api/enumerated/VMSize.java
deleted file mode 100644
index f3b3a5b9e..000000000
--- a/api/src/main/java/com/intuit/tank/vm/api/enumerated/VMSize.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.intuit.tank.vm.api.enumerated;
-
-/*
- * #%L
- * Intuit Tank Api
- * %%
- * Copyright (C) 2011 - 2015 Intuit Inc.
- * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * #L%
- */
-
-/*
- * Large							:  4 ECUs, 2 Cores, 7.5 GB
- * ExtraLarge						:  8 ECUs, 4 Cores, 15 GB
- * HighMemoryExtraLarge				:  6.5 ECUs, 2 Cores, 17.1 GB
- * HighMemoryDoubleExtraLarge		:  13 ECUs, 4 Cores, 34.2 GB
- * HighMemoryQuadrupleExtraLarge	:  26 ECUs, 8 Cores, 68.4 GB
- * HighCPUExtraLarge				:  20 ECUs, 8 Cores, 7 GB
- */
-
-import java.util.Arrays;
-
-public enum VMSize {
-    Micro("t1.micro"), // $0.020 / hour
-    Small("m1.small"), // $0.080 / hour
-    Medium("m1.medium"), // $0.160 / hour
-    Large("m1.large"), // $0.32 / hour
-    ExtraLarge("m1.xlarge"), // $0.640 / hour
-    HighMemoryExtraLarge("m2.xlarge"), // $0.450 / hour
-    HighMemoryDoubleExtraLarge("m2.2xlarge"), // $0.900 / hour
-    HighMemoryQuadrupleExtraLarge("m2.4xlarge"), // $1.800 / hour
-    HighCPUMedium("c1.medium"), // $0.165 / hour
-    HighCPUExtraLarge("c1.xlarge"), // $0.660 / hour
-    HighIOExtraLarge("hi1.4xlarge")// $3.100 / hour
-    ;
-
-    private String representation;
-
-    /**
-     * @param representation
-     */
-    private VMSize(String representation) {
-        this.representation = representation;
-    }
-
-    /**
-     * @return the representation
-     */
-    public String getRepresentation() {
-        return representation;
-    }
-
-    public static VMSize fromRepresentation(String representation) {
-        return Arrays.stream(VMSize.values()).filter(s -> s.representation.equalsIgnoreCase(representation)).findFirst().orElse(null);
-    }
-}
diff --git a/api/src/main/java/com/intuit/tank/vm/common/PasswordEncoder.java b/api/src/main/java/com/intuit/tank/vm/common/PasswordEncoder.java
index 7df07113f..14011316d 100644
--- a/api/src/main/java/com/intuit/tank/vm/common/PasswordEncoder.java
+++ b/api/src/main/java/com/intuit/tank/vm/common/PasswordEncoder.java
@@ -16,7 +16,7 @@
  * #L%
  */
 
-import org.apache.commons.codec.binary.Base64;
+import org.apache.tomcat.util.codec.binary.Base64;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
diff --git a/api/src/main/java/com/intuit/tank/vm/settings/CloudCredentials.java b/api/src/main/java/com/intuit/tank/vm/settings/CloudCredentials.java
index dcdab0c60..0ad3ee735 100644
--- a/api/src/main/java/com/intuit/tank/vm/settings/CloudCredentials.java
+++ b/api/src/main/java/com/intuit/tank/vm/settings/CloudCredentials.java
@@ -50,21 +50,16 @@ public CloudProvider getType() {
      * @return the keyId
      */
     public String getKeyId() {
-        // first try userData
-        String ret = AmazonUtil.getAWSKeyIdFromUserData();
+        // try to get from property
+        String key = config.getString("secret-key-id-property", "AWS_SECRET_KEY_ID");
+        String ret = System.getProperty(key);
         if (StringUtils.isBlank(ret)) {
-            // try to get from property
-            String key = config.getString("secret-key-id-property", "AWS_SECRET_KEY_ID");
-            ret = System.getProperty(key);
-            if (StringUtils.isBlank(ret)) {
-                ret = System.getenv(key);
-            }
-            if (StringUtils.isBlank(ret)) {
-                // finally get straight from config
-                ret = config.getString("secret-key-id");
-            }
+            ret = System.getenv(key);
+        }
+        if (StringUtils.isBlank(ret)) {
+            // finally get straight from config
+            ret = config.getString("secret-key-id");
         }
-
         return ret;
     }
 
@@ -72,19 +67,15 @@ public String getKeyId() {
      * @return the key
      */
     public String getKey() {
-        // first try userData
-        String ret = AmazonUtil.getAWSKeyFromUserData();
+        // try to get from property
+        String key = config.getString("secret-key-property", "AWS_SECRET_KEY");
+        String ret = System.getProperty(key);
+        if (StringUtils.isBlank(ret)) {
+            ret = System.getenv(key);
+        }
         if (StringUtils.isBlank(ret)) {
-            // try to get from property
-            String key = config.getString("secret-key-property", "AWS_SECRET_KEY");
-            ret = System.getProperty(key);
-            if (StringUtils.isBlank(ret)) {
-                ret = System.getenv(key);
-            }
-            if (StringUtils.isBlank(ret)) {
-                // finally get straight from config
-                ret = config.getString("secret-key");
-            }
+            // finally get straight from config
+            ret = config.getString("secret-key");
         }
         return ret;
     }
diff --git a/api/src/main/resources/settings.xml b/api/src/main/resources/settings.xml
index 33baad811..87adc28c1 100644
--- a/api/src/main/resources/settings.xml
+++ b/api/src/main/resources/settings.xml
@@ -3,23 +3,23 @@
 <tank-settings>
 
 	<!-- The server side storage directory for datafiles. Can be an absolute 
-		or relative path or an s3 bucket by prefixing a bucket with s3: e.g. s3:tank-data-files -->
-	<data-file-storage>datafiles</data-file-storage>
+		or relative path or an s3 bucket by prefixing a bucket with s3: e.g. s3:tank-data-files
+	<data-file-storage>datafiles</data-file-storage> -->
 
 	<!-- The server side storage directory for timing data. Can be an absolute 
 		or relative path or an s3 bucket by prefixing a bucket with s3: e.g. s3:tank-timing-files -->
-	<timing-file-storage>timing</timing-file-storage>
+	<timing-file-storage>timing</timing-file-storage> -->
 
 	<!-- The server side storage directory for agent files to be sent to agents. 
 		All files in this directory will be sent to each agent. to override the default 
 		agent startup behavior, include a start_wats.sh script with modifications. 
 		Can be an absolute or relative path or an s3 bucket by prefixing a bucket 
-		with s3: e.g. s3:tank-agent-supports -->
-	<jar-file-storage>jars</jar-file-storage>
+		with s3: e.g. s3:tank-agent-supports
+	<jar-file-storage>jars</jar-file-storage> -->
 
 	<!-- The server side storage directory for temp script files. must be local 
-		file system. -->
-	<tmp-file-storage>tmpfiles</tmp-file-storage>
+		file system.
+	<tmp-file-storage>tmpfiles</tmp-file-storage> -->
 
 	<!-- name of this instance (no spaces). used in timing table names. -->
 	<instance-name>tank</instance-name>
@@ -36,7 +36,7 @@
 
 	<!-- if this rest calls require authentication using api key or username/password 
 		or logged in via session -->
-	<rest-security-enabled>true</rest-security-enabled>
+	<rest-security-enabled>false</rest-security-enabled>
 
 	<!-- Products that can be selected by users for categorization -->
 	<products>
@@ -172,9 +172,6 @@
 
 		<!-- Credentials for the cloud provider -->
 		<credentials type="amazon">
-			<!-- Set credentials via system or java properties. -->
-			<secret-key-id-property>AWS_SECRET_KEY_ID</secret-key-id-property>
-			<secret-key-property>AWS_SECRET_KEY</secret-key-property>
 			<!-- Set if you want to specifiy credentials directly here. less secure! -->
 			<!-- <secret-key-id>[AWS_SECRET_KEY_ID]</secret-key-id> <secret-key>[AWS_SECRET_KEY]</secret-key> -->
 			<!-- Set if you need a proxy to talk to amazon services -->
@@ -188,8 +185,10 @@
 		</tags>
 
 		<!-- Instance descriptions for regions -->
-		<instance-descriptions region="US_WEST_1">
+		<instance-descriptions region="US_WEST_2">
 			<instance-descripion name="AGENT">
+				<!-- if using SSM Parameters. recommended over using raw ami -->
+				<!-- <ssm-ami>[SSM-AMI-ID]</ssm-ami> -->
 				<ami>[AMI-ID]</ami>
 				<keypair>[KEYPAIR]</keypair>
 				<!-- if using roles. recommended over using security keys -->
@@ -199,8 +198,9 @@
 			</instance-descripion>
 		</instance-descriptions>
 
-		<instance-descriptions region="US_EAST">
+		<instance-descriptions region="US_EAST_2">
 			<instance-descripion name="AGENT">
+				<ssm-ami>[SSM-AMI-ID]</ssm-ami>
 				<ami>[AMI-ID]</ami>
 				<keypair>[KEYPAIR]</keypair>
 				<!-- if using roles. recommended over using security keys -->
@@ -212,16 +212,11 @@
 
 		<!-- used to set agent instnces and calculate costs. -->
 		<instance-types type="amazon">
-			<type name="c3.large" cost=".105" users="500" cpus="2" ecus="7"
-				mem="3.75" jvmArgs="-Xms2560m -Xmx2560m" />
-			<type name="c3.xlarge" cost=".21" users="2000" cpus="4" ecus="14"
-				mem="7.5" jvmArgs="-Xms6g -Xmx6g" />
-			<type name="c3.2xlarge" cost=".42" users="4000" cpus="8" ecus="28"
-				mem="15" default="true" jvmArgs="-Xms12g -Xmx12g" />
-			<type name="c3.4xlarge" cost=".84" users="8000" cpus="16" ecus="55"
-				mem="30" jvmArgs="-Xms125g -Xmx25g" />
-			<type name="c3.8xlarge" cost="1.68" users="16000" cpus="32"
-				ecus="108" mem="60" jvmArgs="-Xms50g -Xmx50g" />
+			<type name="c5.large" cost=".085" users="500" cpus="2" ecus="8" mem="4" jvmArgs="-Xms2g -Xmx2g -XX:+UseG1GC" />
+			<type name="c5.xlarge" cost=".17" users="2000" cpus="4" ecus="16" mem="8" default="true" jvmArgs="-Xms5g -Xmx5g -XX:+UseG1GC" />
+			<type name="c5.2xlarge" cost=".34" users="4000" cpus="8" ecus="31" mem="16" jvmArgs="-Xms10g -Xmx10g -XX:+UseG1GC" />
+			<type name="c5.4xlarge" cost=".68" users="8000" cpus="16" ecus="61" mem="32" jvmArgs="-Xms25g -Xmx25g -XX:+UseG1GC" />
+			<type name="c5.9xlarge" cost="1.53" users="16000" cpus="36" ecus="139" mem="72" jvmArgs="-Xms50g -Xmx50g -XX:+UseG1GC" />
 		</instance-types>
 
 
@@ -242,13 +237,7 @@
 		<!--Configure the results database implementation if reporting is configured 
 			via com.intuit.tank.reporting.db.DatabaseResultsReporter -->
 		<results>
-			<config>
-				<write-capacity>50</write-capacity>
-				<read-capacity>10</read-capacity>
-			</config>
-			<provider>com.intuit.tank.persistence.databases.AmazonDynamoDatabaseDocApi
-			</provider>
-			<!-- <provider>com.intuit.tank.persistence.databases.AmazonSimpleDatabase</provider> -->
+			<provider>com.intuit.tank.persistence.databases.CloudWatchDataSource</provider>
 		</results>
 	</vm-manager>
 
diff --git a/api/src/test/java/com/intuit/tank/harness/AmazonUtilTest.java b/api/src/test/java/com/intuit/tank/harness/AmazonUtilTest.java
new file mode 100644
index 000000000..56217bd41
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/harness/AmazonUtilTest.java
@@ -0,0 +1,90 @@
+package com.intuit.tank.harness;
+
+import com.intuit.tank.logging.LoggingProfile;
+import com.intuit.tank.vm.api.enumerated.VMRegion;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import javax.inject.Inject;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * Purpose: Test AmazonUtil class utility methods
+ * @author : atayal
+ **/
+public class AmazonUtilTest {
+
+	@Inject
+	private AmazonUtil amazonUtil;
+
+	@Test
+	void testGetVMRegion() {
+		VMRegion vmRegion = AmazonUtil.getVMRegion();
+		Assertions.assertNotNull(vmRegion);
+		assertEquals("Standalone Agent", vmRegion.getDescription());
+		assertEquals("standalone-agent", vmRegion.getRegion());
+	}
+
+	@Test
+	void testIsInAmazon() {
+		boolean inAmazon = AmazonUtil.isInAmazon();
+		assertFalse(inAmazon);
+	}
+
+	@Test
+	void testGetZone() {
+		String zone = AmazonUtil.getZone();
+		Assertions.assertNotNull(zone);
+		assertEquals("unknown", zone);
+	}
+
+	@Test
+	void testGetInstanceId() {
+		String instanceId = AmazonUtil.getInstanceId();
+		Assertions.assertNotNull(instanceId);
+		assertEquals("", instanceId);
+	}
+
+	@Test
+	void testGetLoggingProfile() {
+		LoggingProfile loggingProfile = AmazonUtil.getLoggingProfile();
+		Assertions.assertNotNull(loggingProfile);
+		assertEquals("Standard", loggingProfile.getDisplayName());
+		assertEquals("Logs common fields.", loggingProfile.getDescription());
+	}
+
+	@Test
+	void testGetCapacity() {
+		int capacity = AmazonUtil.getCapacity();
+		assertEquals(4000, capacity);
+	}
+
+	@Test
+	void testGetStopBehavior() {
+		StopBehavior stopBehavior = AmazonUtil.getStopBehavior();
+		Assertions.assertNotNull(stopBehavior);
+		assertEquals("Script Group", stopBehavior.getDisplay());
+		assertEquals("Stop after current script group completes.", stopBehavior.getDescription());
+	}
+
+	@Test
+	void testUsingEip() {
+		boolean usingEip = AmazonUtil.usingEip();
+		assertFalse(usingEip);
+	}
+
+	@Test
+	void testGetControllerBaseUrl() {
+		String url = AmazonUtil.getControllerBaseUrl();
+		Assertions.assertNotNull(url);
+		assertEquals("http://localhost:8080/", url);
+	}
+
+	@Test
+	void testGetUserDataAsMap() {
+		Object o = AmazonUtil.getUserDataAsMap();
+		Assertions.assertNotNull(o);
+	}
+
+}
diff --git a/api/src/test/java/com/intuit/tank/http/AuthSchemeTest.java b/api/src/test/java/com/intuit/tank/http/AuthSchemeTest.java
new file mode 100644
index 000000000..d1ed5f718
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/http/AuthSchemeTest.java
@@ -0,0 +1,22 @@
+package com.intuit.tank.http;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Purpose: Test AuthScheme
+ *
+ * @author : atayal
+ **/
+public class AuthSchemeTest {
+
+	@Test
+	void testGetScheme() {
+		AuthScheme scheme = AuthScheme.getScheme("BASIC");
+		Assertions.assertNotNull(scheme);
+		assert scheme == AuthScheme.Basic;
+		assertEquals("BASIC", scheme.getRepresentation());
+	}
+}
diff --git a/api/src/test/java/com/intuit/tank/logging/LogEventTypeTest.java b/api/src/test/java/com/intuit/tank/logging/LogEventTypeTest.java
new file mode 100644
index 000000000..bfa9fd85b
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/logging/LogEventTypeTest.java
@@ -0,0 +1,19 @@
+package com.intuit.tank.logging;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Purpose: Test LogEventType Enum
+ *
+ * @author : atayal
+ **/
+public class LogEventTypeTest {
+
+	@Test
+	void testLogEventTypeEnum() {
+		LogEventType type = LogEventType.valueOf("System");
+		Assertions.assertNotNull(type);
+		assert LogEventType.System == type;
+	}
+}
diff --git a/api/src/test/java/com/intuit/tank/logging/SourceTypeTest.java b/api/src/test/java/com/intuit/tank/logging/SourceTypeTest.java
new file mode 100644
index 000000000..8c05f2876
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/logging/SourceTypeTest.java
@@ -0,0 +1,18 @@
+package com.intuit.tank.logging;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Purpose: Test Enum SourceType
+ *
+ * @author : atayal
+ **/
+public class SourceTypeTest {
+	@Test
+	void testSourceTypeEnum() {
+		SourceType type = SourceType.valueOf("controller");
+		Assertions.assertNotNull(type);
+		assert SourceType.controller == type;
+	}
+}
diff --git a/api/src/test/java/com/intuit/tank/script/RequestDataTypeTest.java b/api/src/test/java/com/intuit/tank/script/RequestDataTypeTest.java
new file mode 100644
index 000000000..d0aa14fce
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/script/RequestDataTypeTest.java
@@ -0,0 +1,19 @@
+package com.intuit.tank.script;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Purpose: Test RequestDataType Enum
+ *
+ * @author : atayal
+ **/
+public class RequestDataTypeTest {
+
+	@Test
+	void testRequestDataTypeEnum() {
+		RequestDataType type = RequestDataType.valueOf("responseContent");
+		Assertions.assertNotNull(type);
+		assert RequestDataType.responseContent == type;
+	}
+}
diff --git a/api/src/test/java/com/intuit/tank/script/TimerActionTest.java b/api/src/test/java/com/intuit/tank/script/TimerActionTest.java
new file mode 100644
index 000000000..e4273074d
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/script/TimerActionTest.java
@@ -0,0 +1,19 @@
+package com.intuit.tank.script;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Purpose: Test RequestDataType Enum
+ *
+ * @author : atayal
+ **/
+public class TimerActionTest {
+
+	@Test
+	void testTimerActionEnum() {
+		TimerAction type = TimerAction.valueOf("START");
+		Assertions.assertNotNull(type);
+		assert TimerAction.START == type;
+	}
+}
diff --git a/api/src/test/java/com/intuit/tank/vm/agent/messages/AgentDataCpTest.java b/api/src/test/java/com/intuit/tank/vm/agent/messages/AgentDataCpTest.java
index 984cd8e01..ee1b65b32 100644
--- a/api/src/test/java/com/intuit/tank/vm/agent/messages/AgentDataCpTest.java
+++ b/api/src/test/java/com/intuit/tank/vm/agent/messages/AgentDataCpTest.java
@@ -40,12 +40,12 @@ public void testAgentData_1()
 
         assertNotNull(result);
         assertEquals(0, result.getUsers());
-        assertEquals(null, result.getZone());
-        assertEquals(null, result.getInstanceId());
-        assertEquals(null, result.getRegion());
-        assertEquals(null, result.getInstanceUrl());
+        assertNull(result.getZone());
+        assertNull(result.getInstanceId());
+        assertNull(result.getRegion());
+        assertNull(result.getInstanceUrl());
         assertEquals(0, result.getCapacity());
-        assertEquals(null, result.getJobId());
+        assertNull(result.getJobId());
     }
 
     /**
@@ -92,7 +92,7 @@ public void testEquals_1()
 
         boolean result = fixture.equals(obj);
 
-        assertEquals(false, result);
+        assertFalse(result);
     }
 
     /**
@@ -111,7 +111,7 @@ public void testEquals_2()
 
         boolean result = fixture.equals(obj);
 
-        assertEquals(false, result);
+        assertFalse(result);
     }
 
     /**
@@ -130,7 +130,7 @@ public void testEquals_3()
 
         boolean result = fixture.equals(obj);
 
-        assertEquals(true, result);
+        assertTrue(result);
     }
 
     /**
@@ -149,7 +149,7 @@ public void testEquals_4()
 
         boolean result = fixture.equals(obj);
 
-        assertEquals(true, result);
+        assertTrue(result);
     }
 
     /**
diff --git a/api/src/test/java/com/intuit/tank/vm/api/enumerated/VMRegionCpTest.java b/api/src/test/java/com/intuit/tank/vm/api/enumerated/VMRegionCpTest.java
index f4792febd..8d3f5f79a 100644
--- a/api/src/test/java/com/intuit/tank/vm/api/enumerated/VMRegionCpTest.java
+++ b/api/src/test/java/com/intuit/tank/vm/api/enumerated/VMRegionCpTest.java
@@ -15,8 +15,6 @@
 
 import org.junit.jupiter.api.*;
 
-import com.intuit.tank.vm.api.enumerated.VMRegion;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -75,10 +73,10 @@ public void testGetRegionFromZone_1()
         VMRegion result = VMRegion.getRegionFromZone(zone);
 
         assertNotNull(result);
-        assertEquals("US East (Northern Virginia)", result.getDescription());
-        assertEquals("US East (Northern Virginia)", result.toString());
-        assertEquals("ec2.us-east-1.amazonaws.com", result.getEndpoint());
-        assertEquals("US_EAST", result.name());
+        assertEquals("Standalone Agent", result.getDescription());
+        assertEquals("Standalone Agent", result.toString());
+        assertEquals("", result.getEndpoint());
+        assertEquals("STANDALONE", result.name());
     }
 
     /**
@@ -96,10 +94,10 @@ public void testGetRegionFromZone_2()
         VMRegion result = VMRegion.getRegionFromZone(zone);
 
         assertNotNull(result);
-        assertEquals("US East (Northern Virginia)", result.getDescription());
-        assertEquals("US East (Northern Virginia)", result.toString());
-        assertEquals("ec2.us-east-1.amazonaws.com", result.getEndpoint());
-        assertEquals("US_EAST", result.name());
+        assertEquals("Standalone Agent", result.getDescription());
+        assertEquals("Standalone Agent", result.toString());
+        assertEquals("", result.getEndpoint());
+        assertEquals("STANDALONE", result.name());
     }
 
     /**
@@ -117,10 +115,10 @@ public void testGetRegionFromZone_3()
         VMRegion result = VMRegion.getRegionFromZone(zone);
 
         assertNotNull(result);
-        assertEquals("US East (Northern Virginia)", result.getDescription());
-        assertEquals("US East (Northern Virginia)", result.toString());
-        assertEquals("ec2.us-east-1.amazonaws.com", result.getEndpoint());
-        assertEquals("US_EAST", result.name());
+        assertEquals("Standalone Agent", result.getDescription());
+        assertEquals("Standalone Agent", result.toString());
+        assertEquals("", result.getEndpoint());
+        assertEquals("STANDALONE", result.name());
     }
 
     /**
diff --git a/api/src/test/java/com/intuit/tank/vm/api/enumerated/VMSizeCpTest.java b/api/src/test/java/com/intuit/tank/vm/api/enumerated/VMSizeCpTest.java
deleted file mode 100644
index 8f16e70ce..000000000
--- a/api/src/test/java/com/intuit/tank/vm/api/enumerated/VMSizeCpTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.intuit.tank.vm.api.enumerated;
-
-/*
- * #%L
- * Intuit Tank Api
- * %%
- * Copyright (C) 2011 - 2015 Intuit Inc.
- * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * #L%
- */
-
-import org.junit.jupiter.api.*;
-
-import com.intuit.tank.vm.api.enumerated.VMSize;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * The class <code>VMSizeCpTest</code> contains tests for the class <code>{@link VMSize}</code>.
- * 
- * @generatedBy CodePro at 9/3/14 3:44 PM
- */
-public class VMSizeCpTest {
-    /**
-     * Run the VMSize fromRepresentation(String) method test.
-     * 
-     * @throws Exception
-     * 
-     * @generatedBy CodePro at 9/3/14 3:44 PM
-     */
-    @Test
-    public void testFromRepresentation_1()
-            throws Exception {
-        String representation = "";
-
-        VMSize result = VMSize.fromRepresentation(representation);
-
-        assertEquals(null, result);
-    }
-
-    /**
-     * Run the VMSize fromRepresentation(String) method test.
-     * 
-     * @throws Exception
-     * 
-     * @generatedBy CodePro at 9/3/14 3:44 PM
-     */
-    @Test
-    public void testFromRepresentation_2()
-            throws Exception {
-        String representation = "";
-
-        VMSize result = VMSize.fromRepresentation(representation);
-
-        assertEquals(null, result);
-    }
-
-    /**
-     * Run the VMSize fromRepresentation(String) method test.
-     * 
-     * @throws Exception
-     * 
-     * @generatedBy CodePro at 9/3/14 3:44 PM
-     */
-    @Test
-    public void testFromRepresentation_3()
-            throws Exception {
-        String representation = "";
-
-        VMSize result = VMSize.fromRepresentation(representation);
-
-        assertEquals(null, result);
-    }
-
-    /**
-     * Run the String getRepresentation() method test.
-     * 
-     * @throws Exception
-     * 
-     * @generatedBy CodePro at 9/3/14 3:44 PM
-     */
-    @Test
-    public void testGetRepresentation_1()
-            throws Exception {
-        VMSize fixture = VMSize.ExtraLarge;
-
-        String result = fixture.getRepresentation();
-
-        assertEquals("m1.xlarge", result);
-    }
-}
\ No newline at end of file
diff --git a/api/src/test/java/com/intuit/tank/vm/common/util/MethodTimerCpTest.java b/api/src/test/java/com/intuit/tank/vm/common/util/MethodTimerCpTest.java
index 3a1975fb5..1e2ed2606 100644
--- a/api/src/test/java/com/intuit/tank/vm/common/util/MethodTimerCpTest.java
+++ b/api/src/test/java/com/intuit/tank/vm/common/util/MethodTimerCpTest.java
@@ -18,6 +18,10 @@
 import org.junit.jupiter.api.*;
 
 import com.intuit.tank.vm.common.util.MethodTimer;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
+
+import java.util.Arrays;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -35,6 +39,7 @@ public class MethodTimerCpTest {
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testMethodTimer_1()
             throws Exception {
         Logger log = LogManager.getLogger(LogManager.ROOT_LOGGER_NAME);
@@ -56,6 +61,7 @@ public void testMethodTimer_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testMethodTimer_2()
             throws Exception {
         Logger log = LogManager.getLogger(LogManager.ROOT_LOGGER_NAME);
@@ -77,6 +83,7 @@ public void testMethodTimer_2()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testEnd_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -97,6 +104,7 @@ public void testEnd_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testEndAndLog_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -117,6 +125,7 @@ public void testEndAndLog_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testGetMarkTimeMessage_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -136,6 +145,7 @@ public void testGetMarkTimeMessage_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testGetMarkTimeMessage_2()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -155,6 +165,7 @@ public void testGetMarkTimeMessage_2()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testGetNaturalTimeMessage_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -173,6 +184,7 @@ public void testGetNaturalTimeMessage_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testGetNaturalTimeMessage_2()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -191,6 +203,7 @@ public void testGetNaturalTimeMessage_2()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testGetTimeMessage_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -209,6 +222,7 @@ public void testGetTimeMessage_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testGetTimeMessage_2()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -227,6 +241,7 @@ public void testGetTimeMessage_2()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testLogMark_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer((Logger) null, Object.class, "");
@@ -248,6 +263,7 @@ public void testLogMark_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testLogMark_2()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -269,6 +285,7 @@ public void testLogMark_2()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testLogTime_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer((Logger) null, Object.class, "");
@@ -289,6 +306,7 @@ public void testLogTime_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testLogTime_2()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -309,6 +327,7 @@ public void testLogTime_2()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testMark_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -329,6 +348,7 @@ public void testMark_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testMark_2()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -349,6 +369,7 @@ public void testMark_2()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testMarkAndLog_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -369,6 +390,7 @@ public void testMarkAndLog_1()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testMarkAndLog_2()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
@@ -390,6 +412,7 @@ public void testMarkAndLog_2()
      * @generatedBy CodePro at 9/3/14 3:41 PM
      */
     @Test
+    @DisabledIfEnvironmentVariable(named = "SKIP_METHODTIMER_TEST", matches = "true")
     public void testStart_1()
             throws Exception {
         MethodTimer fixture = new MethodTimer(LogManager.getLogger(LogManager.ROOT_LOGGER_NAME), Object.class, "");
diff --git a/api/src/test/java/com/intuit/tank/vm/common/util/ReportUtilCpTest.java b/api/src/test/java/com/intuit/tank/vm/common/util/ReportUtilCpTest.java
index ff26139eb..7e2f13a51 100644
--- a/api/src/test/java/com/intuit/tank/vm/common/util/ReportUtilCpTest.java
+++ b/api/src/test/java/com/intuit/tank/vm/common/util/ReportUtilCpTest.java
@@ -77,25 +77,25 @@ public void testGetSummaryData_1()
         assertEquals(23, result.length);
         assertEquals("", result[0]);
         assertEquals("0", result[1]);
-        assertEquals("�", result[2]);
-        assertEquals("�", result[3]);
-        assertEquals("�", result[4]);
-        assertEquals("�", result[5]);
-        assertEquals("�", result[6]);
-        assertEquals("�", result[7]);
-        assertEquals("�", result[8]);
-        assertEquals("�", result[9]);
-        assertEquals("�", result[10]);
-        assertEquals("�", result[11]);
-        assertEquals("�", result[12]);
-        assertEquals("�", result[13]);
-        assertEquals("�", result[14]);
-        assertEquals("�", result[15]);
-        assertEquals("�", result[16]);
-        assertEquals("�", result[17]);
-        assertEquals("�", result[18]);
-        assertEquals("�", result[19]);
-        assertEquals("�", result[20]);
+        assertEquals("NaN", result[2]);
+        assertEquals("NaN", result[3]);
+        assertEquals("NaN", result[4]);
+        assertEquals("NaN", result[5]);
+        assertEquals("NaN", result[6]);
+        assertEquals("NaN", result[7]);
+        assertEquals("NaN", result[8]);
+        assertEquals("NaN", result[9]);
+        assertEquals("NaN", result[10]);
+        assertEquals("NaN", result[11]);
+        assertEquals("NaN", result[12]);
+        assertEquals("NaN", result[13]);
+        assertEquals("NaN", result[14]);
+        assertEquals("NaN", result[15]);
+        assertEquals("NaN", result[16]);
+        assertEquals("NaN", result[17]);
+        assertEquals("NaN", result[18]);
+        assertEquals("NaN", result[19]);
+        assertEquals("NaN", result[20]);
         assertEquals(null, result[21]);
         assertEquals(null, result[22]);
     }
@@ -119,25 +119,25 @@ public void testGetSummaryData_2()
         assertEquals(23, result.length);
         assertEquals("", result[0]);
         assertEquals("0", result[1]);
-        assertEquals("�", result[2]);
-        assertEquals("�", result[3]);
-        assertEquals("�", result[4]);
-        assertEquals("�", result[5]);
-        assertEquals("�", result[6]);
-        assertEquals("�", result[7]);
-        assertEquals("�", result[8]);
-        assertEquals("�", result[9]);
-        assertEquals("�", result[10]);
-        assertEquals("�", result[11]);
-        assertEquals("�", result[12]);
-        assertEquals("�", result[13]);
-        assertEquals("�", result[14]);
-        assertEquals("�", result[15]);
-        assertEquals("�", result[16]);
-        assertEquals("�", result[17]);
-        assertEquals("�", result[18]);
-        assertEquals("�", result[19]);
-        assertEquals("�", result[20]);
+        assertEquals("NaN", result[2]);
+        assertEquals("NaN", result[3]);
+        assertEquals("NaN", result[4]);
+        assertEquals("NaN", result[5]);
+        assertEquals("NaN", result[6]);
+        assertEquals("NaN", result[7]);
+        assertEquals("NaN", result[8]);
+        assertEquals("NaN", result[9]);
+        assertEquals("NaN", result[10]);
+        assertEquals("NaN", result[11]);
+        assertEquals("NaN", result[12]);
+        assertEquals("NaN", result[13]);
+        assertEquals("NaN", result[14]);
+        assertEquals("NaN", result[15]);
+        assertEquals("NaN", result[16]);
+        assertEquals("NaN", result[17]);
+        assertEquals("NaN", result[18]);
+        assertEquals("NaN", result[19]);
+        assertEquals("NaN", result[20]);
         assertEquals(null, result[21]);
         assertEquals(null, result[22]);
     }
diff --git a/api/src/test/java/com/intuit/tank/vm/settings/CloudCredentialsCpTest.java b/api/src/test/java/com/intuit/tank/vm/settings/CloudCredentialsCpTest.java
index 9b293fa18..5e634a873 100644
--- a/api/src/test/java/com/intuit/tank/vm/settings/CloudCredentialsCpTest.java
+++ b/api/src/test/java/com/intuit/tank/vm/settings/CloudCredentialsCpTest.java
@@ -16,9 +16,6 @@
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.junit.jupiter.api.*;
 
-import com.intuit.tank.vm.settings.CloudCredentials;
-import com.intuit.tank.vm.settings.CloudProvider;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -42,10 +39,10 @@ public void testCloudCredentials_1()
         CloudCredentials result = new CloudCredentials(config);
 
         assertNotNull(result);
-        assertEquals(null, result.getKey());
-        assertEquals(null, result.getProxyHost());
-        assertEquals(null, result.getProxyPort());
-        assertEquals(null, result.getKeyId());
+        assertNull(result.getKey());
+        assertNull(result.getProxyHost());
+        assertNull(result.getProxyPort());
+        assertNull(result.getKeyId());
     }
 
     /**
@@ -62,7 +59,7 @@ public void testGetKey_1()
 
         String result = fixture.getKey();
 
-        assertEquals(null, result);
+        assertNull(result);
     }
 
     /**
@@ -79,7 +76,7 @@ public void testGetKeyId_1()
 
         String result = fixture.getKeyId();
 
-        assertEquals(null, result);
+        assertNull(result);
     }
 
     /**
@@ -96,7 +93,7 @@ public void testGetProxyHost_1()
 
         String result = fixture.getProxyHost();
 
-        assertEquals(null, result);
+        assertNull(result);
     }
 
     /**
@@ -113,7 +110,7 @@ public void testGetProxyPort_1()
 
         String result = fixture.getProxyPort();
 
-        assertEquals(null, result);
+        assertNull(result);
     }
 
     /**
diff --git a/api/src/test/java/com/intuit/tank/vm/settings/InstanceDescriptionDefaultsCpTest.java b/api/src/test/java/com/intuit/tank/vm/settings/InstanceDescriptionDefaultsCpTest.java
index cf41b9965..8013450a6 100644
--- a/api/src/test/java/com/intuit/tank/vm/settings/InstanceDescriptionDefaultsCpTest.java
+++ b/api/src/test/java/com/intuit/tank/vm/settings/InstanceDescriptionDefaultsCpTest.java
@@ -18,11 +18,6 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import java.util.List;
-
-import com.intuit.tank.vm.api.enumerated.VMSize;
-import com.intuit.tank.vm.settings.InstanceDescriptionDefaults;
-
 /**
  * The class <code>InstanceDescriptionDefaultsCpTest</code> contains tests for the class
  * <code>{@link InstanceDescriptionDefaults}</code>.
diff --git a/api/src/test/java/com/intuit/tank/vm/settings/InstanceTagTest.java b/api/src/test/java/com/intuit/tank/vm/settings/InstanceTagTest.java
new file mode 100644
index 000000000..e013c7198
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/vm/settings/InstanceTagTest.java
@@ -0,0 +1,30 @@
+package com.intuit.tank.vm.settings;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * Purpose: test InstanceTag class
+ *
+ * @author : atayal
+ **/
+public class InstanceTagTest {
+	@Test
+	void testInstanceTag() {
+		InstanceTag tag = new InstanceTag("tag1", "val1");
+		InstanceTag tag2 = new InstanceTag("tag2", "val2");
+		Assertions.assertEquals("tag1", tag.getName());
+		Assertions.assertEquals("val1", tag.getValue());
+		Map<InstanceTag, Integer> tags = new LinkedHashMap<>();
+		tags.put(tag, 1);
+		tags.put(tag2, 2);
+		assert tag != tag2;
+		Assertions.assertNotEquals(tag, tag2);
+		Assertions.assertNotEquals(tag, "");
+		Assertions.assertEquals("tag1 = val1", tag.toString());
+
+	}
+}
diff --git a/api/src/test/java/com/intuit/tank/vm/settings/ModificationTypeTest.java b/api/src/test/java/com/intuit/tank/vm/settings/ModificationTypeTest.java
new file mode 100644
index 000000000..ba94399b9
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/vm/settings/ModificationTypeTest.java
@@ -0,0 +1,19 @@
+package com.intuit.tank.vm.settings;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Purpose: Test ModificationType Enum
+ *
+ * @author : atayal
+ **/
+public class ModificationTypeTest {
+
+	@Test
+	void testModificationTypeEnum() {
+		ModificationType type = ModificationType.valueOf("ADD");
+		Assertions.assertNotNull(type);
+		assert ModificationType.ADD == type;
+	}
+}
diff --git a/api/src/test/java/com/intuit/tank/vm/settings/ModifiedEntityMessageTest.java b/api/src/test/java/com/intuit/tank/vm/settings/ModifiedEntityMessageTest.java
new file mode 100644
index 000000000..23ce72b71
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/vm/settings/ModifiedEntityMessageTest.java
@@ -0,0 +1,9 @@
+package com.intuit.tank.vm.settings;
+
+/**
+ * Purpose:
+ *
+ * @author : atayal
+ **/
+public class ModifiedEntityMessageTest {
+}
diff --git a/api/src/test/java/com/intuit/tank/vm/settings/PropertiesFileTest.java b/api/src/test/java/com/intuit/tank/vm/settings/PropertiesFileTest.java
new file mode 100644
index 000000000..33a345090
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/vm/settings/PropertiesFileTest.java
@@ -0,0 +1,9 @@
+package com.intuit.tank.vm.settings;
+
+/**
+ * Purpose:
+ *
+ * @author : atayal
+ **/
+public class PropertiesFileTest {
+}
diff --git a/api/src/test/java/com/intuit/tank/vm/settings/ReportingConfigTest.java b/api/src/test/java/com/intuit/tank/vm/settings/ReportingConfigTest.java
new file mode 100644
index 000000000..d7169c3fb
--- /dev/null
+++ b/api/src/test/java/com/intuit/tank/vm/settings/ReportingConfigTest.java
@@ -0,0 +1,9 @@
+package com.intuit.tank.vm.settings;
+
+/**
+ * Purpose:
+ *
+ * @author : atayal
+ **/
+public class ReportingConfigTest {
+}
diff --git a/api/src/test/resources/sampleProp.properties b/api/src/test/resources/sampleProp.properties
new file mode 100644
index 000000000..86fbde046
--- /dev/null
+++ b/api/src/test/resources/sampleProp.properties
@@ -0,0 +1,2 @@
+a=1
+b=2
\ No newline at end of file
diff --git a/api/src/test/resources/settings.xml b/api/src/test/resources/settings.xml
index 33baad811..fdcba513c 100644
--- a/api/src/test/resources/settings.xml
+++ b/api/src/test/resources/settings.xml
@@ -3,23 +3,23 @@
 <tank-settings>
 
 	<!-- The server side storage directory for datafiles. Can be an absolute 
-		or relative path or an s3 bucket by prefixing a bucket with s3: e.g. s3:tank-data-files -->
-	<data-file-storage>datafiles</data-file-storage>
+		or relative path or an s3 bucket by prefixing a bucket with s3: e.g. s3:tank-data-files
+	<data-file-storage>datafiles</data-file-storage> -->
 
-	<!-- The server side storage directory for timing data. Can be an absolute 
+	<!-- The server side storage directory for timing data. Can be an absolute
 		or relative path or an s3 bucket by prefixing a bucket with s3: e.g. s3:tank-timing-files -->
-	<timing-file-storage>timing</timing-file-storage>
+	<timing-file-storage>timing</timing-file-storage> -->
 
-	<!-- The server side storage directory for agent files to be sent to agents. 
-		All files in this directory will be sent to each agent. to override the default 
-		agent startup behavior, include a start_wats.sh script with modifications. 
-		Can be an absolute or relative path or an s3 bucket by prefixing a bucket 
-		with s3: e.g. s3:tank-agent-supports -->
-	<jar-file-storage>jars</jar-file-storage>
+	<!-- The server side storage directory for agent files to be sent to agents.
+		All files in this directory will be sent to each agent. to override the default
+		agent startup behavior, include a start_wats.sh script with modifications.
+		Can be an absolute or relative path or an s3 bucket by prefixing a bucket
+		with s3: e.g. s3:tank-agent-supports
+	<jar-file-storage>jars</jar-file-storage> -->
 
-	<!-- The server side storage directory for temp script files. must be local 
-		file system. -->
-	<tmp-file-storage>tmpfiles</tmp-file-storage>
+	<!-- The server side storage directory for temp script files. must be local
+		file system.
+	<tmp-file-storage>tmpfiles</tmp-file-storage> -->
 
 	<!-- name of this instance (no spaces). used in timing table names. -->
 	<instance-name>tank</instance-name>
@@ -27,16 +27,16 @@
 	<!-- The baseUrl for the controller. Must include the context (tank) -->
 	<controller-base-url>http://localhost:8080/tank</controller-base-url>
 
-	<!-- if this instance is a standalone instance and should not start agents 
+	<!-- if this instance is a standalone instance and should not start agents
 		automatically. -->
 	<standalone>false</standalone>
 
 	<!-- set to true to encrypt data at rest in s3 buckets -->
 	<s3-encrypt>false</s3-encrypt>
 
-	<!-- if this rest calls require authentication using api key or username/password 
+	<!-- if this rest calls require authentication using api key or username/password
 		or logged in via session -->
-	<rest-security-enabled>true</rest-security-enabled>
+	<rest-security-enabled>false</rest-security-enabled>
 
 	<!-- Products that can be selected by users for categorization -->
 	<products>
@@ -67,9 +67,9 @@
 
 		</provider>
 
-		<!-- Use this for Rest reporting directly to the controller. Only for standalone 
+		<!-- Use this for Rest reporting directly to the controller. Only for standalone
 			or all in one. will over tax the controller if used for large load -->
-		<!-- <provider> <reporter>com.intuit.tank.reporting.rest.RestResultsReporter</reporter> 
+		<!-- <provider> <reporter>com.intuit.tank.reporting.rest.RestResultsReporter</reporter>
 			<reader>com.intuit.tank.reporting.rest.RestResultsReader</reader> </provider> -->
 	</reporting>
 
@@ -98,11 +98,11 @@
 
 		<status_report_interval_milis>30000</status_report_interval_milis>
 
-		<!-- Max response time before waiting additional time between requests. 
+		<!-- Max response time before waiting additional time between requests.
 			Helps prevent backups if server is running too slow. (in ms.) -->
 		<max-response-time>5000</max-response-time>
 
-		<!-- Max time to wait if response was too slow. Helps prevent backups if 
+		<!-- Max time to wait if response was too slow. Helps prevent backups if
 			server is running too slow. (in ms.) -->
 		<max-failed-wait-time>180000</max-failed-wait-time>
 
@@ -157,7 +157,7 @@
 			<!-- <eip>0.0.0.0</eip> -->
 		</reserved-elastic-ips>
 
-		<!-- Default instance description items. can be overridden in instance 
+		<!-- Default instance description items. can be overridden in instance
 			descriptions. -->
 		<default-instance-description>
 			<security-group>security_group</security-group>
@@ -172,24 +172,23 @@
 
 		<!-- Credentials for the cloud provider -->
 		<credentials type="amazon">
-			<!-- Set credentials via system or java properties. -->
-			<secret-key-id-property>AWS_SECRET_KEY_ID</secret-key-id-property>
-			<secret-key-property>AWS_SECRET_KEY</secret-key-property>
 			<!-- Set if you want to specifiy credentials directly here. less secure! -->
 			<!-- <secret-key-id>[AWS_SECRET_KEY_ID]</secret-key-id> <secret-key>[AWS_SECRET_KEY]</secret-key> -->
 			<!-- Set if you need a proxy to talk to amazon services -->
 			<!-- <proxy-host></proxy-host> <proxy-port>80</proxy-port> -->
 		</credentials>
 
-		<!-- Include any tags to add to agent instances. note that a maximum of 
+		<!-- Include any tags to add to agent instances. note that a maximum of
 			10 tags is allowed and tank uses 3 tags. -->
 		<tags>
 			<tag name="admin_contact">tank_admin</tag>
 		</tags>
 
 		<!-- Instance descriptions for regions -->
-		<instance-descriptions region="US_WEST_1">
+		<instance-descriptions region="US_WEST_2">
 			<instance-descripion name="AGENT">
+				<!-- if using SSM Parameters. recommended over using raw ami -->
+				<!-- <ssm-ami>[SSM-AMI-ID]</ssm-ami> -->
 				<ami>[AMI-ID]</ami>
 				<keypair>[KEYPAIR]</keypair>
 				<!-- if using roles. recommended over using security keys -->
@@ -199,8 +198,9 @@
 			</instance-descripion>
 		</instance-descriptions>
 
-		<instance-descriptions region="US_EAST">
+		<instance-descriptions region="US_EAST_2">
 			<instance-descripion name="AGENT">
+				<ssm-ami>[SSM-AMI-ID]</ssm-ami>
 				<ami>[AMI-ID]</ami>
 				<keypair>[KEYPAIR]</keypair>
 				<!-- if using roles. recommended over using security keys -->
@@ -212,25 +212,20 @@
 
 		<!-- used to set agent instnces and calculate costs. -->
 		<instance-types type="amazon">
-			<type name="c3.large" cost=".105" users="500" cpus="2" ecus="7"
-				mem="3.75" jvmArgs="-Xms2560m -Xmx2560m" />
-			<type name="c3.xlarge" cost=".21" users="2000" cpus="4" ecus="14"
-				mem="7.5" jvmArgs="-Xms6g -Xmx6g" />
-			<type name="c3.2xlarge" cost=".42" users="4000" cpus="8" ecus="28"
-				mem="15" default="true" jvmArgs="-Xms12g -Xmx12g" />
-			<type name="c3.4xlarge" cost=".84" users="8000" cpus="16" ecus="55"
-				mem="30" jvmArgs="-Xms125g -Xmx25g" />
-			<type name="c3.8xlarge" cost="1.68" users="16000" cpus="32"
-				ecus="108" mem="60" jvmArgs="-Xms50g -Xmx50g" />
+			<type name="c5.large" cost=".085" users="500" cpus="2" ecus="8" mem="4" jvmArgs="-Xms2g -Xmx2g -XX:+UseG1GC" />
+			<type name="c5.xlarge" cost=".17" users="2000" cpus="4" ecus="16" mem="8" default="true" jvmArgs="-Xms5g -Xmx5g -XX:+UseG1GC" />
+			<type name="c5.2xlarge" cost=".34" users="4000" cpus="8" ecus="31" mem="16" jvmArgs="-Xms10g -Xmx10g -XX:+UseG1GC" />
+			<type name="c5.4xlarge" cost=".68" users="8000" cpus="16" ecus="61" mem="32" jvmArgs="-Xms25g -Xmx25g -XX:+UseG1GC" />
+			<type name="c5.9xlarge" cost="1.53" users="16000" cpus="36" ecus="139" mem="72" jvmArgs="-Xms50g -Xmx50g -XX:+UseG1GC" />
 		</instance-types>
 
 
 		<!-- watchdog is used to check if all agents start correctly. -->
 		<watchdog>
-			<!-- The maximum amount of time to wait for the agents to start before 
+			<!-- The maximum amount of time to wait for the agents to start before
 				restarting -->
 			<max-time-for-agent-start>5m</max-time-for-agent-start>
-			<!-- The maximum amount of time to wait for the agents to report to the 
+			<!-- The maximum amount of time to wait for the agents to report to the
 				controller before restarting -->
 			<max-time-for-agent-report>10m</max-time-for-agent-report>
 			<!-- the maximum number of restarts before stopping test -->
@@ -239,16 +234,10 @@
 			<sleep-time-between-check>30s</sleep-time-between-check>
 		</watchdog>
 
-		<!--Configure the results database implementation if reporting is configured 
+		<!--Configure the results database implementation if reporting is configured
 			via com.intuit.tank.reporting.db.DatabaseResultsReporter -->
 		<results>
-			<config>
-				<write-capacity>50</write-capacity>
-				<read-capacity>10</read-capacity>
-			</config>
-			<provider>com.intuit.tank.persistence.databases.AmazonDynamoDatabaseDocApi
-			</provider>
-			<!-- <provider>com.intuit.tank.persistence.databases.AmazonSimpleDatabase</provider> -->
+			<provider>com.intuit.tank.persistence.databases.CloudWatchDataSource</provider>
 		</results>
 	</vm-manager>
 
diff --git a/assets/cleanup_prior_to_3.0.0.sql b/assets/cleanup_prior_to_3.0.0.sql
new file mode 100644
index 000000000..6c1b5825b
--- /dev/null
+++ b/assets/cleanup_prior_to_3.0.0.sql
@@ -0,0 +1,37 @@
+/*
+Script to help cleanup the abandoned rows in the searlized_script_step table
+Recommed running one line at a time, and validating the output
+*/
+
+SELECT count(*) FROM tank.serialized_script_step;
+SELECT count(*) FROM tank.script;
+SELECT `AUTO_INCREMENT` FROM  INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA = 'tank' AND TABLE_NAME = 'serialized_script_step';
+
+CREATE TABLE IF NOT EXISTS tank.serialized_script_step_temp
+(
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `created` datetime NOT NULL,
+  `modified` datetime NOT NULL,
+  `serialized_data` longblob NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=<update with existing count> DEFAULT CHARSET=utf8
+SELECT steps.*
+FROM tank.serialized_script_step AS steps
+JOIN tank.script AS script
+ON script.serial_step_id=steps.id;
+
+SELECT count(*) FROM tank.serialized_script_step_temp;
+
+ALTER TABLE tank.script DROP FOREIGN KEY FKC9E5D0CBD63BDD22;
+
+RENAME TABLE tank.serialized_script_step TO tank.serialized_script_step_old;
+RENAME TABLE tank.serialized_script_step_temp TO tank.serialized_script_step;
+
+ALTER TABLE tank.script ADD CONSTRAINT `FKC9E5D0CBD63BDD22` FOREIGN KEY (`serial_step_id`) REFERENCES `serialized_script_step` (`id`);
+
+
+/*
+Validate scripts in Tank before performing the DROP
+*/
+DROP TABLE tank.serialized_script_step_old;
diff --git a/assets/settings-all-in-one.xml b/assets/settings-all-in-one.xml
new file mode 100644
index 000000000..15d8bd18f
--- /dev/null
+++ b/assets/settings-all-in-one.xml
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- #%L Intuit Tank Api %% Copyright (C) 2011 - 2015 Intuit Inc. %% All
+  rights reserved. This program and the accompanying materials are made available 
+  under the terms of the Eclipse Public License v1.0 which accompanies this 
+  distribution, and is available at http://www.eclipse.org/legal/epl-v10.html 
+  #L% -->
+<tank-settings>
+<!-- The server side storage directory for datafiles -->
+<data-file-storage>datafiles</data-file-storage>
+<!-- The server side storage directory for timing data -->
+<timing-file-storage>timing</timing-file-storage>
+<!-- The server side storage directory for temp script files -->
+<tmp-file-storage>tmpfiles</tmp-file-storage>
+<!-- The server side storage directory for agent files to be sent to agents -->
+<jar-file-storage>jars</jar-file-storage>
+<!-- name of this instance (no spaces). used in timing table names. -->
+<instance-name>tank-demo-all-in-one</instance-name>
+<!-- The baseUrl for the controller. Must include the context (tank) -->
+<controller-base-url>http://localhost:8080</controller-base-url>
+<!-- if this instance is a standalone instance and should not start agents 
+    automatically. -->
+<standalone>true</standalone>
+<!-- if this rest calls require authentication using api key or username/password 
+    or logged in via session -->
+<rest-security-enabled>false</rest-security-enabled>
+<!-- Products that can be selected by users for categorization -->
+<products>
+    <product name="">All Products</product>
+    <product name="MyProduct">My Product</product>
+  </products>
+<!-- Locations used for informational purposes only. -->
+<locations>
+    <location displayName="Unspecified" name="unspecified"/>
+    <location displayName="San Diego\, CA" name="san_diego"/>
+  </locations>
+<!-- mail configuration for notifications -->
+<mail>
+    <mail.smtp.host>localhost</mail.smtp.host>
+    <mail.smtp.port>25</mail.smtp.port>
+    <from-email>do_not_reply@mydomain.com</from-email>
+  </mail>
+<reporting>
+    <!-- Reporter that uses key value database. currently DynamoDB -->
+    <!--<provider>
+      <reporter>com.intuit.tank.reporting.db.DatabaseResultsReporter</reporter>
+      <reader>com.intuit.tank.reporting.db.DatabaseResultsReader</reader>
+      <config/>
+      
+    </provider>
+     --> 
+    <!-- Use this for Rest reporting directly to the controller. 
+      Only for standalone or all in one. will over tax the controller if used for large load -->
+    <provider>
+      <reporter>com.intuit.tank.reporting.rest.RestResultsReporter</reporter>
+      <reader>com.intuit.tank.reporting.rest.RestResultsReader</reader>
+    </provider> 
+  </reporting>
+  <agent-config>
+    <!-- Times used when calculating estimated run time -->
+    <duration-simulation>
+      <simulation for="post" max="1000" min="500"/>
+      <simulation for="get" max="300" min="50"/>
+      <simulation for="process" max="50" min="10"/>
+    </duration-simulation>
+
+    <!-- Where to store csv files on the agent -->
+    <agent-data-file-storage>/tmp</agent-data-file-storage>
+
+    <!-- port that controller talks to agent on -->
+    <agent-http-port>8090</agent-http-port>
+
+    <!-- Max size of response body to log on error -->
+    <max-body-report-size>5000</max-body-report-size>
+
+    <!-- time to wait before re-establishing ssl -->
+    <ssl-timeout>360000</ssl-timeout>
+
+    <!-- connection timeout setting. set to zero to not have a timeout -->
+    <connection-timeout>15000</connection-timeout>
+
+    <status_report_interval_milis>30000</status_report_interval_milis>
+
+    <!-- Max response time before waiting additional time between requests. 
+      Helps prevent backups if server is running too slow. (in ms.) -->
+    <max-response-time>5000</max-response-time>
+
+    <!-- Max time to wait if response was too slow. Helps prevent backups 
+      if server is running too slow. (in ms.) -->
+    <max-failed-wait-time>180000</max-failed-wait-time>
+
+    <!-- Max amount of time after simulation time to run the test. -->
+    <over-simulation-max-time>7200000</over-simulation-max-time>
+
+    <!-- set to true to log each post request. -->
+    <log-post-request>false</log-post-request>
+
+    <!-- set to true to log each post response. -->
+    <log-post-response>false</log-post-response>
+
+    <!-- set to true to log each variable set or unset. -->
+    <log-variables>false</log-variables>
+
+    <!-- how long of a period to calculate the TPS -->
+    <tps-period>30</tps-period>
+
+    <!-- Mime type rgex for logging of response body on error. -->
+    <valid-mime-types>
+      <mime-type-regex>.*text.*</mime-type-regex>
+      <mime-type-regex>.*json.*</mime-type-regex>
+      <mime-type-regex>.*xml.*</mime-type-regex>
+    </valid-mime-types>
+
+    <!-- add any headers that should be added to each request -->
+    <request-headers>
+      <header key="test_flag">test_flag</header>
+    </request-headers>
+
+
+  </agent-config>
+<vm-manager>
+    <default-region>US_EAST</default-region>
+    <!-- <default-region>US_WEST_1</default-region> -->
+    <!-- set to true to default use of available eips for agents -->
+    <use-agent-elastic-ips>false</use-agent-elastic-ips>
+    <!-- reserved eips will not be used -->
+    <reserved-elastic-ips>
+      <!-- <eip>0.0.0.0</eip> -->
+    </reserved-elastic-ips>
+
+    <!-- Default instance description items. can be overridden in instance 
+      descriptions. -->
+    <default-instance-description>
+      <security-group>security_group</security-group>
+      <keypair>myKey</keypair>
+      <reuse-instances>false</reuse-instances>
+    </default-instance-description>
+
+    <!-- Credentials for the cloud provider -->
+    <credentials type="amazon">
+      <!-- Set credentials via system or java properties. -->
+      <secret-key-id-property>AWS_SECRET_KEY_ID</secret-key-id-property>
+      <secret-key-property>AWS_SECRET_KEY</secret-key-property>
+      <!-- Set if you want to specifiy credentials directly here. less secure! -->
+      <!-- <secret-key-id>[AWS_SECRET_KEY_ID]</secret-key-id> <secret-key>[AWS_SECRET_KEY]</secret-key> -->
+      <!-- Set if you need a proxy to talk to amazon services -->
+      <!-- <proxy-host></proxy-host> <proxy-port>80</proxy-port> -->
+    </credentials>
+
+    <!-- Instance descriptions for regions -->
+    <instance-descriptions region="US_WEST_2">
+      <instance-descripion name="AGENT">
+        <ami>[AMI-ID]</ami>
+        <keypair>[KEYPAIR]</keypair>
+      </instance-descripion>
+    </instance-descriptions>
+
+    <instance-descriptions region="US_EAST_2">
+      <instance-descripion name="AGENT">
+        <ami>[AMI-ID]</ami>
+        <keypair>[KEYPAIR]</keypair>
+      </instance-descripion>
+    </instance-descriptions>
+
+    <!-- used to set agent instnces and calculate costs. -->
+  <instance-types type="amazon">
+    <type name="c5.large" cost=".085" users="500" cpus="2" ecus="8" mem="4" jvmArgs="-Xms2g -Xmx2g -XX:+UseG1GC" />
+    <type name="c5.xlarge" cost=".17" users="2000" cpus="4" ecus="16" mem="8" default="true" jvmArgs="-Xms5g -Xmx5g -XX:+UseG1GC" />
+    <type name="c5.2xlarge" cost=".34" users="4000" cpus="8" ecus="31" mem="16" jvmArgs="-Xms10g -Xmx10g -XX:+UseG1GC" />
+    <type name="c5.4xlarge" cost=".68" users="8000" cpus="16" ecus="61" mem="32" jvmArgs="-Xms25g -Xmx25g -XX:+UseG1GC" />
+    <type name="c5.9xlarge" cost="1.53" users="16000" cpus="36" ecus="139" mem="72" jvmArgs="-Xms50g -Xmx50g -XX:+UseG1GC" />
+  </instance-types>
+
+
+    <!-- watchdog is used to check if all agents start correctly. -->
+    <watchdog>
+      <!-- The maximum amount of time to wait for the agents to start before 
+        restarting -->
+      <max-time-for-agent-start>5m</max-time-for-agent-start>
+      <!-- The maximum amount of time to wait for the agents to report to 
+        the controller before restarting -->
+      <max-time-for-agent-report>10m</max-time-for-agent-report>
+      <!-- the maximum number of restarts before stopping test -->
+      <max-restarts>2</max-restarts>
+      <!-- The amount of time to wait between checking for agent start -->
+      <sleep-time-between-check>30s</sleep-time-between-check>
+    </watchdog>
+
+    <results>
+      <provider>com.intuit.tank.persistence.databases.CloudWatchDataSource</provider>
+    </results>
+
+  </vm-manager>
+<security>
+    <!-- groups that can be assigned to users. set isDefault to tru to have 
+      these selected when creating new users -->
+    <groups>
+      <group>admin</group>
+      <group isDefault="true">user</group>
+      <group>script-manager</group>
+      <group>project-manager</group>
+      <group>job-manager</group>
+      <group isDefault="true">guest</group>
+    </groups>
+    <!-- restrictions set which groups can perform which actions. -->
+    <restrictions>
+      <!-- Project permissions -->
+      <restriction operation="CREATE_PROJECT">
+        <groups>
+          <group>user</group>
+          <group>project-manager</group>
+        </groups>
+      </restriction>
+      <restriction operation="DELETE_PROJECT">
+        <groups>
+          <group>project-manager</group>
+        </groups>
+      </restriction>
+      <restriction operation="EDIT_PROJECT">
+        <groups>
+          <group>project-manager</group>
+        </groups>
+      </restriction>
+      <!-- Script permissions -->
+      <restriction operation="CREATE_SCRIPT">
+        <groups>
+          <group>user</group>
+          <group>script-manager</group>
+        </groups>
+      </restriction>
+      <restriction operation="DELETE_SCRIPT">
+        <groups>
+          <group>script-manager</group>
+        </groups>
+      </restriction>
+      <restriction operation="EDIT_SCRIPT">
+        <groups>
+          <group>script-manager</group>
+        </groups>
+      </restriction>
+      <!-- Filter permissions -->
+      <restriction operation="CREATE_FILTER">
+        <groups>
+          <group>user</group>
+          <group>script-manager</group>
+        </groups>
+      </restriction>
+      <restriction operation="DELETE_FILTER">
+        <groups>
+          <group>script-manager</group>
+        </groups>
+      </restriction>
+      <restriction operation="EDIT_FILTER">
+        <groups>
+          <group>script-manager</group>
+        </groups>
+      </restriction>
+      <!-- Data File permissions -->
+      <restriction operation="CREATE_DATAFILE">
+        <groups>
+          <group>user</group>
+          <group>script-manager</group>
+          <group>project-manager</group>
+        </groups>
+      </restriction>
+      <restriction operation="DELETE_DATAFILE">
+        <groups>
+          <group>script-manager</group>
+          <group>project-manager</group>
+        </groups>
+      </restriction>
+      <!-- Job permissions -->
+      <restriction operation="CONTROL_JOB">
+        <groups>
+          <group>job-manager</group>
+          <group>project-manager</group>
+        </groups>
+      </restriction>
+    </restrictions>
+    <!-- Define users to be created on startup if they do not exist. -->
+    <users>
+      <user>
+        <name>admin</name>
+        <password>admin</password>
+        <email>admin@example.com</email>
+        <group>admin</group>
+      </user>
+    </users>
+  </security>
+<!-- These are the scripts that get prepended to every extended script 
+    filter. -->
+<logic-step>
+    <insert-before><![CDATA[
+// ######## Logging functions ##########
+
+/**
+ * prints the line to the output. will be log
+ * 
+ * @param line
+ *            the line to print
+ */
+function logWithDate(line) {
+    ioBean.println(new Date().toString + ": " + line);
+}
+
+/**
+ * prints the line in info context.
+ * 
+ * @param line
+ *            the line to print
+ */
+function log(line) {
+    ioBean.println(line);
+}
+/**
+ * prints the line in error context.
+ * 
+ * @param line
+ *            the line to print
+ */
+function error(line) {
+    ioBean.error(line);
+}
+
+/**
+ * prints the line in debug context. Will be logged to console or test but not
+ * to logs when in production.
+ * 
+ * @param line
+ *            the line to print
+ */
+function debug(line) {
+    ioBean.debug(line);
+}
+
+//######## Data Transformational functions ##########
+
+function toJsonObj(text) {
+    try {
+        return JSON.parse(text);
+    } catch(e) {
+        error("Error parsing json: " + e);
+    }
+    return text;
+}
+
+function toJsonString(jsonObj) {
+    try {
+        return JSON.stringify(jsonObj\, null\, '\t');
+    } catch(e) {
+        error("Error converting json to string json: " + e);
+    }
+    return jsonObj;
+}
+
+
+//######## Data Retrieval functions ##########
+/**
+ * gets the com.intuit.tank.http.BaseRequest object of the last call made.
+ * 
+ * @return the request or null if no requests have been made
+ */
+function getRequest() {
+    return ioBean.getInput("request");
+}
+
+/**
+ * gets the com.intuit.tank.http.BaseResponse object of the last call made.
+ * 
+ * @return the response or null if no requests have been made
+ * 
+ */
+function getResponse() {
+    return ioBean.getInput("response");
+}
+
+/**
+ * gets the request body as string if not binary
+ * 
+ * @return the body or empty string if null or binary
+ */
+function getResquestBody() {
+    if (getRequest() != null) {
+        return getRequest().getBody();
+    }
+    return "";
+}
+
+/**
+ * gets the response body as string if not binary
+ * 
+ * @return the body or empty string if null or binary
+ */
+function getResponseBody() {
+    if (getResponse() != null) {
+    return getResponse().getBody();
+    }
+    return "";
+}
+
+/**
+ * Returns the value of the variable or null if variable does not exist
+ * 
+ * @param key
+ *            the variable name
+ * @returns the variable value.
+ */
+function getVariable(key) {
+    return ioBean.getInput("variables").getVariable(key);
+}
+
+/**
+ * Sets the value of the variable.
+ * 
+ * @param key
+ *            the variable name to set
+ * @param value
+ *            the value to set it to
+ */
+function setVariable(key\, value) {
+    ioBean.getInput("variables").addVariable(key\, value);
+}
+
+//######## Result functions ##########
+
+/**
+ * jump to a group within the script with the specified name.
+ * 
+ * @param groupName
+ *            the name of the group to go to. if the group does not exist\, it
+ *            skips to next script.
+ */
+function gotoGroup(groupName) {
+    setAction("goto " + groupName);
+}
+
+/**
+ * restart the TestPlan from the start.
+ */
+function restartPlan() {
+    setAction("restartPlan");
+}
+
+/**
+ * aborts the current ScriptGroup and proceeds to the next.
+ * 
+ * @returns
+ */
+function abortScriptGroup() {
+    setAction("abortScriptGroup");
+}
+
+/**
+ * aborts the current Script and proceeds to the next.
+ */
+function abortScript() {
+    setAction("abortScript");
+}
+
+/**
+ * aborts the current group and proceeds to the next request after the current
+ * group.
+ */
+function abortGroup() {
+    setAction("abortGroup");
+}
+
+/**
+ * terminates this user.
+ */
+function terminateUser() {
+    setAction("terminateUser");
+}
+
+/**
+ * sets the action in the output.
+ */
+function setAction(action) {
+    ioBean.setOutput("action"\, action);
+}
+
+]]>
+    </insert-before>
+
+    <!-- these get added after the user input script. -->
+    <append-after><![CDATA[
+
+    ]]>
+    </append-after>
+  </logic-step>
+</tank-settings>
diff --git a/assets/tankIcon.png b/assets/tankIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..10bd9989058280004abba9f7439cfbc5ecab5fc0
GIT binary patch
literal 80076
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%0D30=MZ0iLW&4A25<%GrJ|=%0)i{bM7Djh
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
L)~Bc^-LC&1VfTB}

literal 0
HcmV?d00001

diff --git a/aws-config/tank_agent.yml b/aws-config/tank_agent.yml
new file mode 100644
index 000000000..6fa38953b
--- /dev/null
+++ b/aws-config/tank_agent.yml
@@ -0,0 +1,177 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: 'Creates the base Tank Agent that can be snapshotted for use in tank.'
+Parameters:
+  AmiId:
+    Type: 'AWS::EC2::Image::Id'
+    Description: The ID of the latest Amazon Linux 2 baseline AMI
+  TankZip:
+    Type: 'String'
+    Default: 'TankZip.zip'
+    Description: File path to Tank agent-startup-pkg.zip Filename in S3 (ie. s3://bucket/keyname)
+  InstanceType:
+    Description: Amazon EC2 instance type
+    Type: 'String'
+    Default: 'c5.large'
+  KeyName:
+    Type: 'AWS::EC2::KeyPair::KeyName'
+    Description: Amazon EC2 Key Pair
+  SubnetIds:
+    Type: 'List<AWS::EC2::Subnet::Id>'
+    Description: Subnet IDs
+  SecurityGroupIds:
+    Type: 'List<AWS::EC2::SecurityGroup::Id>'
+    Description: SecurityGroup IDs
+
+Resources:
+  AgentInstance:
+    Type: AWS::EC2::Instance
+    Metadata:
+      AWS::CloudFormation::Init:
+        configSets:
+          default:
+            - 'cloudwatch-install'
+            - 'agent-install'
+        cloudwatch-install:
+          packages: {}
+          sources: {}
+          files:
+            /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.d/tank-cloudwatch-config.json:
+              content: |
+                {"logs":{"force_flush_interval":5,"logs_collected":{
+                  "files":{"collect_list":[{"file_path":"/opt/tank_agent/logs/agent.log","log_group_name":"/opt/tank_agent/logs/agent.log","log_stream_name":"{instance_id}"}]}}},
+                  "metrics":{"append_dimensions":{"InstanceId":"${aws:InstanceId}"},"metrics_collected":{
+                    "netstat":{"measurement":["tcp_established","tcp_syn_sent","tcp_close"],"append_dimensions":{"Service":"TankAgent"},"metrics_collection_interval":60},
+                    "disk":{"measurement":["used_percent"],"resources":["/"],"append_dimensions":{"Service":"TankAgent"},"metrics_collection_interval":60},
+                    "mem":{"measurement":["mem_used_percent"],"append_dimensions":{"Service":"TankAgent"},"metrics_collection_interval":60}}}}
+              mode: '000644'
+              owner: 'cwagent'
+              group: 'cwagent'
+          commands: {}
+          services:
+            sysvinit:
+              amazon-cloudwatch-agent:
+                enabled: 'true'
+                ensureRunning: 'true'
+                files:
+                  - "/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.d/tank-cloudwatch-config.json"
+          users: {}
+          groups: {}
+        agent-install:
+          packages:
+            yum:
+              unzip: []
+              java-11-amazon-corretto-headless: []
+          sources: {}
+          files:
+            /etc/init.d/tank_agent:
+              content: |
+                #!/bin/bash
+                # tank_agent
+                # chkconfig: 2345 99 99
+                # description: agent for Tank project
+                ### BEGIN INIT INFO
+                # Provides: $tank_agent
+                ### END INIT INFO
+                # Source function library.
+                  . /etc/init.d/functions
+
+                  RETVAL=0
+                  umask 077
+                  start() {
+                echo -n $"Starting Tank Agent: "
+                       pushd /opt/tank_agent
+                       ulimit -n 20000;
+                       ulimit -a >> /tmp/ulimit_out;
+                       daemon /opt/tank_agent/run.sh&
+                       echo
+                       return $RETVAL
+                }
+                stop() {
+                       echo -n $"Shutdown agent startup: "
+                       kill -9 `ps -ef | grep agent-startup-all | grep -v grep | awk '{print $2}'`
+                       return $RETVAL
+                }
+                restart() {
+                       stop
+                       start
+                }
+                case "$1" in
+                  start)
+                  start
+                  ;;
+                  stop)
+                  stop
+                  ;;
+                  restart|reload)
+                  restart
+                  ;;
+                  *)
+                echo $"Usage: $0 {start|stop|restart}"
+                  exit 1
+                  esac
+                  exit $?
+              mode: '000755'
+              owner: 'root'
+              group: 'root'
+          commands:
+            010_update_DNS_in_security:
+              command: 'sed -i.bak "s/networkaddress.cache.negative.ttl=10/networkaddress.cache.negative.ttl=0/g" /etc/alternatives/jre/conf/security/java.security'
+            020_download_startup_pkg:
+              command: !Sub 'aws s3 cp ${TankZip} /tmp/agent-startup-pkg.zip'
+            021_unzip_startup_pkg:
+              command: 'unzip /tmp/agent-startup-pkg.zip -d /opt'
+            022_mkdir_logs:
+              command: 'mkdir /opt/tank_agent/logs'
+            030_increase_Ephemeral Ports:
+              command: 'echo "net.ipv4.ip_local_port_range=1024 65000" >> /etc/sysctl.conf'
+            031_set_file_open_limit:
+              command: 'sed -i "s/#DefaultLimitNOFILE=/DefaultLimitNOFILE=81960/" /etc/systemd/system.conf'
+            032_set_file_open_limit:
+              command: 'sed -i "s/#DefaultLimitNOFILE=/DefaultLimitNOFILE=81960/" /etc/systemd/user.conf'
+          services:
+            sysvinit:
+              tank_agent:
+                enabled: 'true'
+                ensureRunning: 'true'
+          users: {}
+          groups: {}
+    Properties:
+      ImageId: !Ref AmiId
+      InstanceType: !Ref InstanceType
+      SecurityGroupIds: !Ref SecurityGroupIds
+      KeyName: !Ref KeyName
+      SubnetId: !Ref SubnetIds
+      Tags:
+        - Key: 'Name'
+          Value: 'Tank Agent AMI'
+      UserData:
+        Fn::Base64: !Sub |
+            #!/bin/bash -v
+            # Ensure our PATH is set correctly (on Amazon Linux cfn-signal is in /opt/aws/bin)
+            . ~/.bash_profile
+            yum -y update
+            cfn-init -v \
+               --region  ${AWS::Region} \
+               --stack   ${AWS::StackName} \
+               --resource AgentInstance
+            cfn-signal -e $? \
+               --region  ${AWS::Region} \
+               --stack   ${AWS::StackName} \
+              '${UIInstanceWaitHandle}'
+  UIInstanceWaitHandle:
+    Type: AWS::CloudFormation::WaitConditionHandle
+    Properties: {}
+  UIInstanceWaitCondition:
+    Type: AWS::CloudFormation::WaitCondition
+    DependsOn: AgentInstance
+    Properties:
+      Handle: !Ref UIInstanceWaitHandle
+      Timeout: '1500'
+
+Outputs:
+  AgentInstanceId:
+    Description: InstanceId of the newly created agent instance
+    Value: !Ref AgentInstance
+  AZ:
+    Description: Availability Zone of the newly created EC2 instance
+    Value: !GetAtt [ 'AgentInstance', 'AvailabilityZone' ]
diff --git a/aws-config/tank_controller.yml b/aws-config/tank_controller.yml
new file mode 100644
index 000000000..6357b191d
--- /dev/null
+++ b/aws-config/tank_controller.yml
@@ -0,0 +1,289 @@
+AWSTemplateFormatVersion: 2010-09-09
+Description: Controller Instance - Creates a Tank controller installing java tomcat and configuring the instances appropriately.
+Parameters:
+  AmiId:
+    Type: AWS::SSM::Parameter::Value<String>
+    Default: /aws/service/ami-amazon-linux-latest/amzn2-ami-hvm-x86_64-gp2
+    Description: The ID of the latest Amazon Linux 2 baseline AMI
+  KeyName:
+    Type: AWS::EC2::KeyPair::KeyName
+    Description: Name of an existing EC2 KeyPair to enable SSH access to the instance.
+  SubnetId:
+    Type: AWS::EC2::Subnet::Id
+    Description: Private subnet for the internal instance ip
+  TankWar:
+    Type: String
+    Description: File path to Tank tank.war Filename in S3 (ie. s3://bucket/keyname)
+  TankSettings:
+    Type: String
+    Description: File path to Tank settings.xml Filename in S3 (ie. s3://bucket/keyname)
+  RdsPassword:
+    Type: String
+    NoEcho: true
+    Description: Something secret (more than 8 characters)
+  InstanceType:
+    Description: EC2 instance type
+    Type: String
+    Default: t3a.medium
+    AllowedValues: [ 't3a.medium', 't3.medium', 't3a.large', 't3.large', 't3a.xlarge', 't3.xlarge', 'm5.large', 'm5.xlarge', 'c5.xlarge', 'c5.2xlarge' ]
+    ConstraintDescription: Must be one of t3.medium t3.large t3.xlarge m5.large m5.xlarge c5.xlarge or c5.2xlarge
+
+Mappings:
+  InstanceMap:
+    t3a.medium:
+      JvmHeap: '2g'
+    t3.medium:
+      JvmHeap: '2g'
+    t3a.large:
+      JvmHeap: '4g'
+    t3.large:
+      JvmHeap: '4g'
+    t3a.xlarge:
+      JvmHeap: '10g'
+    t3.xlarge:
+      JvmHeap: '10g'
+    c5.large:
+      JvmHeap: '1g'
+    c5.xlarge:
+      JvmHeap: '5g'
+    c5.2xlarge:
+      JvmHeap: '8g'
+    m5.large:
+      JvmHeap: '4g'
+    m5.xlarge:
+      JvmHeap: '10g'
+
+Resources:
+  RDSInstance:
+    Type: AWS::RDS::DBInstance
+    Properties:
+      DBInstanceIdentifier: tank
+      AutoMinorVersionUpgrade: true
+      DBInstanceClass: db.t3.large
+      Port: 3306
+      AllocatedStorage: 100
+      BackupRetentionPeriod: 30
+      DBName: tank
+      Engine: mysql
+      EngineVersion: 8.0.21
+      MasterUsername: admin
+      MasterUserPassword: !Ref RdsPassword
+      DBSecurityGroups:
+        - !Ref RDSSecurityGroup
+
+  RDSSecurityGroup:
+    Type: AWS::RDS::DBSecurityGroup
+    Properties:
+      GroupDescription: Ingress for Amazon EC2 security group
+      DBSecurityGroupIngress:
+        - EC2SecurityGroupName: !Ref SecurityGroup
+
+  SecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Allow ssh and http tomcat to client host
+      SecurityGroupIngress:
+        - IpProtocol: tcp
+          FromPort: 22
+          ToPort: 22
+          CidrIp: 0.0.0.0/0
+        - IpProtocol: tcp
+          FromPort: 8080
+          ToPort: 8080
+          CidrIp: 0.0.0.0/0
+
+  ControllerInstance:
+    Type: AWS::EC2::Instance
+    Metadata:
+      AWS::CloudFormation::Init:
+        configSets:
+          default: ['pre-install', 'tomcat-install' ]
+        pre-install:
+          packages:
+            yum:
+              amazon-cloudwatch-agent: []
+            rpm:
+              xray-daemon: 'https://s3.dualstack.us-east-2.amazonaws.com/aws-xray-assets.us-east-2/xray-daemon/aws-xray-daemon-3.x.rpm'
+          groups: {}
+          users: {}
+          sources: {}
+          files:
+            /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.d/tank-cloudwatch-config.json:
+              content: |
+                {"logs":{"force_flush_interval":5,"logs_collected":{
+                  "files":{"collect_list":[
+                    {"file_path":"/opt/tomcat/logs/tank.log","log_group_name":"/opt/tomcat/logs/tank.log","log_stream_name":"{instance_id}"},
+                    {"file_path":"/var/log/messages","log_group_name":"/var/log/messages","log_stream_name":"{instance_id}"}]}}},
+                  "metrics":{"append_dimensions":{"InstanceId":"${aws:InstanceId}","InstanceType":"${aws:InstanceType}"},"metrics_collected":{
+                    "disk":{"measurement":["used_percent"],"resources":["/"],"append_dimensions":{"Service":"Tank"},"metrics_collection_interval":60},
+                    "mem":{"measurement":["mem_used_percent"],"append_dimensions":{"Service":"Tank"},"metrics_collection_interval":60}}}}
+              mode: '000644'
+              owner: 'cwagent'
+              group: 'cwagent'
+          commands:
+            000_install_epel:
+              command: 'amazon-linux-extras install epel' #For tomcat-native
+          services:
+              amazon-cloudwatch-agent:
+                enabled: 'true'
+                ensureRunning: 'true'
+                files:
+                  - "/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.d/tank-cloudwatch-config.json"
+        tomcat-install:
+          packages:
+            yum:
+              tomcat-native: []
+              java-11-amazon-corretto-headless: []
+          sources:
+            /opt: 'http://archive.apache.org/dist/tomcat/tomcat-9/v9.0.39/bin/apache-tomcat-9.0.39.tar.gz'
+          files:
+            /etc/init.d/tomcat:
+              content: |
+                #!/bin/bash
+                #
+                # tomcat         Start tomcat
+                #
+                #
+                # chkconfig: 345 88 12
+                # description: start stop tomcat
+                ### BEGIN INIT INFO
+                # Provides: $tomcat
+                ### END INIT INFO
+                # Source function library.
+                . /etc/init.d/functions
+                . /etc/init.d/java_opts
+
+                ulimit -n 50000
+                export CATALINA_HOME=/opt/tomcat
+                RETVAL=0
+                umask 077
+                start() {
+                       cd $CATALINA_HOME
+                       echo -n $"Starting tomcat: "
+                       daemon $CATALINA_HOME/bin/startup.sh
+                       echo
+                       return $RETVAL
+                }
+                stop() {
+                       echo -n $"Shutting down tomcat: "
+                       daemon $CATALINA_HOME/bin/shutdown.sh
+                       echo
+                       return $RETVAL
+                }
+                restart() {
+                       stop
+                       start
+                }
+                case "$1" in
+                 start)
+                       start
+                       ;;
+                 stop)
+                       stop
+                       ;;
+                 restart|reload)
+                       restart
+                       ;;
+                 *)
+                       echo $"Usage: $0 {start|stop|restart}"
+                       exit 1
+                esac
+                exit $?
+              mode: '000755'
+              owner: 'root'
+              group: 'root'
+            /etc/init.d/java_opts:
+              content: !Sub
+                - |
+                  export CATALINA_OPTS="-Xms${heap} -Xmx${heap} -XX:+UseG1GC -Dcom.amazonaws.sdk.enableDefaultMetrics=cloudwatchRegion=${AWS::Region} -Xlog:gc=debug:file=/opt/tomcat/logs/gc.log:time,uptime,level,tags:filecount=3,filesize=200m
+                - {
+                  heap: !FindInMap [ InstanceMap, !Ref InstanceType, JvmHeap ]
+                  }
+              mode: '000755'
+              owner: 'root'
+              group: 'root'
+            /tmp/context.xml:
+              content: !Sub |
+                <?xml version="1.0" encoding="UTF-8"?>
+
+                <Context>
+                    <Resource name="jdbc/watsDS" auth="Container"
+                    type="javax.sql.DataSource"
+                    factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
+                    maxWait="10000"
+                    username="admin"  password="${RdsPassword}"
+                    testOnBorrow="true"
+                    validationQuery="SELECT 1"
+                    removeAbandonedOnBorrow="true"
+                    removeAbandonedOnMaintenance="true"
+                    removeAbandonedTimeout="60"
+                    driverClassName="com.mysql.cj.jdbc.Driver"
+                    jdbcInterceptors="com.amazonaws.xray.sql.mysql.TracingInterceptor"
+                    url="jdbc:mysql://${RDSInstance.Endpoint.Address}:${RDSInstance.Endpoint.Port}/tank"/>
+                </Context>
+              mode: '000644'
+              owner: 'root'
+              group: 'root'
+          commands:
+            010_tomcat_symboliclink:
+              command: 'ln -snf /opt/apache-tomcat-9.0.39 /opt/tomcat'
+            020_clear_out_builtin:
+              command: 'rm -rf /opt/tomcat/webapps/*'
+            030_download_settings:
+              command: !Sub 'aws s3 cp ${TankSettings} /opt/tomcat/settings.xml'
+            #031_set_publicDNSName:
+            #  command: !Sub 'sed -i "s/localhost:8080/${ControllerInstance.PublicDnsName}:8080/" /opt/tomcat/settings.xml'
+            040_download_tank:
+              command: !Sub 'aws s3 cp ${TankWar} /opt/tomcat/webapps/ROOT.war'
+            050_copy_context:
+              command: 'cp /tmp/context.xml /opt/tomcat/conf/context.xml'
+          services:
+            sysvinit:
+              tomcat:
+                enabled      : true
+                ensureRunning: true
+          users: {}
+          groups: {}
+    Properties:
+      ImageId:  !Ref AmiId
+      InstanceType:  !Ref InstanceType
+      IamInstanceProfile: !ImportValue TankControllerProfile
+      SecurityGroupIds:
+        - !GetAtt SecurityGroup.GroupId
+      KeyName: !Ref KeyName
+      SubnetId: !Ref SubnetId
+      Tags:
+        -
+          Key: Name
+          Value: Tank
+      UserData:
+        Fn::Base64: !Sub |
+          #!/bin/bash -v
+          # Ensure our PATH is set correctly (on Amazon Linux cfn-signal is in /opt/aws/bin)
+          . ~/.bash_profile
+          yum update -y
+          /opt/aws/bin/cfn-init -v \
+            --region  ${AWS::Region} \
+            --stack   ${AWS::StackName} \
+            --resource ControllerInstance
+          /opt/aws/bin/cfn-signal -e $? \
+            --region  ${AWS::Region} \
+            --stack   ${AWS::StackName} \
+            '${UIInstanceWaitHandle}'
+  UIInstanceWaitHandle:
+    Type: AWS::CloudFormation::WaitConditionHandle
+    Properties: {}
+  UIInstanceWaitCondition:
+    Type: AWS::CloudFormation::WaitCondition
+    DependsOn: ControllerInstance
+    Properties:
+      Handle:  !Ref UIInstanceWaitHandle
+      Timeout: 1800
+
+Outputs:
+  InstanceId:
+    Description: InstanceId of the newly created controller instance
+    Value:  !Ref ControllerInstance
+  PublicDnsName:
+    Description: PublicDnsName endpoint of the newly created ControllerInstance
+    Value:  !GetAtt [ 'ControllerInstance', 'PublicDnsName' ]
diff --git a/aws-config/tank_instanceProfiles.yml b/aws-config/tank_instanceProfiles.yml
new file mode 100644
index 000000000..675aae485
--- /dev/null
+++ b/aws-config/tank_instanceProfiles.yml
@@ -0,0 +1,84 @@
+AWSTemplateFormatVersion: 2010-09-09
+Description: Create Controller and Agent IAM Instance Profiles for Intuit/Tank installation
+Resources:
+  ControllerProfile:
+    Type: AWS::IAM::InstanceProfile
+    Properties:
+      Path: /
+      Roles:
+        - !Ref ControllerRole
+  ControllerRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Version: 2012-10-17
+        Statement:
+          -
+            Effect: Allow
+            Action: sts:AssumeRole
+            Principal:
+              Service:
+                - ec2.amazonaws.com
+      Path: /
+      ManagedPolicyArns:
+        - arn:aws:iam::aws:policy/AmazonEC2FullAccess
+        - arn:aws:iam::aws:policy/AmazonS3FullAccess
+        - arn:aws:iam::aws:policy/AWSXrayWriteOnlyAccess
+        - arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy
+      Policies:
+        -
+          PolicyName: tank-controller-role
+          PolicyDocument:
+            Version: 2012-10-17
+            Statement:
+              -
+                Effect: Allow
+                Action:
+                  - iam:PassRole
+                  - iam:ListInstanceProfiles
+                  - iam:AddRoleToInstanceProfile
+                  - appconfig:GetConfiguration
+                Resource: "*"
+  AgentProfile:
+    Type: AWS::IAM::InstanceProfile
+    Properties:
+      Path: /
+      Roles:
+        - !Ref AgentRole
+  AgentRole:
+    Type: AWS::IAM::Role
+    Properties:
+      AssumeRolePolicyDocument:
+        Version: 2012-10-17
+        Statement:
+          -
+            Effect: Allow
+            Action: sts:AssumeRole
+            Principal:
+              Service: ec2.amazonaws.com
+      Path: /
+      ManagedPolicyArns:
+        - arn:aws:iam::aws:policy/AmazonS3FullAccess
+        - arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy
+
+Outputs:
+  TankControllerProfile:
+    Description: Tank Controller Profile
+    Value:  !Ref ControllerProfile
+    Export:
+      Name:  TankControllerProfile
+  TankControllerRole:
+    Description: Tank Controller Role
+    Value:  !Ref ControllerRole
+    Export:
+      Name:  TankControllerRole
+  TankAgentProfile:
+    Description: Tank Agent Profile
+    Value:  !Ref AgentProfile
+    Export:
+      Name:  TankAgentProfile
+  TankAgentRole:
+    Description: Tank Agent Role
+    Value:  !Ref AgentRole
+    Export:
+      Name:  TankAgentRole
diff --git a/buildspec.yml b/buildspec.yml
index 7a89ab0e3..65a314259 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -3,15 +3,29 @@ version: 0.2
 env:
   variables:
     MAVEN_OPTS: "-Xms1g -Xmx2g"
+    SKIP_METHODTIMER_TEST: true
 
 phases:
+  install:
+    runtime-versions:
+      java: corretto11
   build:
     commands:
-      - mvn clean install -P release
+      - java -version
+      - mvn clean install surefire-report:report -P release
+
+reports:
+  SurefireReports: # CodeBuild will create a report group called "SurefireReports".
+    files: #Store all of the files
+      - '**/*'
+    base-directory: 'web/web_support/target/surefire-reports' # Location of the reports
 
 artifacts:
-  type: NONE
   files:
     - web/web_ui/target/tank.war
     - agent/agent_startup_pkg/target/agent-startup-pkg.zip
   discard-paths: yes
+
+cache:
+  paths:
+    - '/root/.m2/**/*'
diff --git a/data_access/pom.xml b/data_access/pom.xml
index e66f2e1c5..c37f68048 100644
--- a/data_access/pom.xml
+++ b/data_access/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
 
diff --git a/data_access/src/main/java/com/intuit/tank/dao/GroupDao.java b/data_access/src/main/java/com/intuit/tank/dao/GroupDao.java
index 610f6c94c..a0a6aac35 100644
--- a/data_access/src/main/java/com/intuit/tank/dao/GroupDao.java
+++ b/data_access/src/main/java/com/intuit/tank/dao/GroupDao.java
@@ -26,9 +26,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * GroupDao
  * 
diff --git a/data_access/src/main/java/com/intuit/tank/dao/JobNotificationDao.java b/data_access/src/main/java/com/intuit/tank/dao/JobNotificationDao.java
index 6bd7c69eb..fcbc4ce45 100644
--- a/data_access/src/main/java/com/intuit/tank/dao/JobNotificationDao.java
+++ b/data_access/src/main/java/com/intuit/tank/dao/JobNotificationDao.java
@@ -61,8 +61,10 @@ public JobNotification findRevision(int id, int revisionNumber) {
             begin();
             AuditReader reader = AuditReaderFactory.get(getEntityManager());
             result = reader.find(JobNotification.class, id, revisionNumber);
-            Hibernate.initialize(result.getLifecycleEvents());
-            result.getLifecycleEvents().contains(JobLifecycleEvent.QUEUE_ADD);
+            if(result != null) {
+                Hibernate.initialize(result.getLifecycleEvents());
+                result.getLifecycleEvents().contains(JobLifecycleEvent.QUEUE_ADD);
+            }
             commit();
         } catch (NoResultException e) {
             rollback();
diff --git a/data_access/src/main/java/com/intuit/tank/dao/JobQueueDao.java b/data_access/src/main/java/com/intuit/tank/dao/JobQueueDao.java
index 40cd21754..c5cac31a8 100644
--- a/data_access/src/main/java/com/intuit/tank/dao/JobQueueDao.java
+++ b/data_access/src/main/java/com/intuit/tank/dao/JobQueueDao.java
@@ -25,16 +25,10 @@
 import javax.persistence.Query;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Fetch;
-import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Root;
 
-import com.intuit.tank.project.JobInstance;
-import com.intuit.tank.project.Project;
-import com.intuit.tank.project.Workload;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.hibernate.LockOptions;
 
 import com.intuit.tank.project.JobQueue;
 
diff --git a/data_access/src/main/java/com/intuit/tank/dao/ProjectDao.java b/data_access/src/main/java/com/intuit/tank/dao/ProjectDao.java
index 659c2982b..b31215990 100644
--- a/data_access/src/main/java/com/intuit/tank/dao/ProjectDao.java
+++ b/data_access/src/main/java/com/intuit/tank/dao/ProjectDao.java
@@ -116,7 +116,7 @@ public synchronized Project saveOrUpdateProject(Project project) {
     }
 
     @Override
-    public Project saveOrUpdate(Project entity) throws HibernateException {
+    public Project saveOrUpdate(@Nonnull Project entity) throws HibernateException {
         entity.setModified(new Date());
         return super.saveOrUpdate(entity);
     }
diff --git a/data_access/src/main/java/com/intuit/tank/dao/ScriptDao.java b/data_access/src/main/java/com/intuit/tank/dao/ScriptDao.java
index d9293e6f6..1bf6d705a 100644
--- a/data_access/src/main/java/com/intuit/tank/dao/ScriptDao.java
+++ b/data_access/src/main/java/com/intuit/tank/dao/ScriptDao.java
@@ -19,7 +19,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
+import java.util.Date;
 import java.util.List;
+import java.util.zip.GZIPOutputStream;
 
 import javax.annotation.Nonnull;
 import javax.persistence.EntityManager;
@@ -107,7 +109,6 @@ public void delete(Integer id) throws HibernateException {
                 }
                 LOG.debug("deleting entity " + entity.toString());
                 em.remove(entity);
-                commit();
             }
             commit();
         } catch (Exception e) {
@@ -154,7 +155,7 @@ public Script loadScriptSteps(@Nonnull Script script) {
         if (script.getScriptSteps() == null || script.getScriptSteps().isEmpty()) {
             SerializedScriptStep serializedScriptStep = new SerializedScriptStepDao().findById(script
                     .getSerializedScriptStepId());
-            script.setSerializedSteps(serializedScriptStep);
+            script.deserializeSteps(serializedScriptStep);
         }
         return script;
     }
@@ -174,17 +175,18 @@ public Script saveOrUpdate(Script script) {
         EntityManager em = getEntityManager();
         try {
             begin();
-            SerializedScriptStep serializedScriptStep = serialize(script.getScriptSteps());
+            SerializedScriptStep serializedScriptStep = serialize(script);
             serializedScriptStep.setSerialzedData(
                     Hibernate.getLobCreator(getHibernateSession()).createBlob(serializedScriptStep.getBytes()));
-            SerializedScriptStep serializedSteps = new SerializedScriptStepDao().saveOrUpdate(serializedScriptStep);
+            SerializedScriptStep savedSerializedStep = new SerializedScriptStepDao().saveOrUpdate(serializedScriptStep);
             script.setSerializedScriptStepId(serializedScriptStep.getId());
             if (script.getId() == 0) {
                 em.persist(script);
             } else {
+                script.setModified(new Date());
                 script = em.merge(script);
             }
-            LOG.debug("Saved Script Steps with id " + serializedSteps.getId() + " for script " + script.getId());
+            LOG.debug("Saved Script Steps with id " + savedSerializedStep.getId() + " for script " + script.getId());
             commit();
         } catch (Exception e) {
         	rollback();
@@ -198,16 +200,24 @@ public Script saveOrUpdate(Script script) {
         return script;
     }
 
-    public SerializedScriptStep serialize(List<ScriptStep> steps) {
-        try (   ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                ObjectOutputStream s = new ObjectOutputStream(bos) ) {
-            // if (steps.size() > 0) {
-            s.writeObject(steps);
-            return new SerializedScriptStep(bos.toByteArray());
-            // }
+    private SerializedScriptStep serialize(Script script) {
+        SerializedScriptStep serializedScriptStep = script.getId() > 0 ?
+                new SerializedScriptStepDao().findById(script.getSerializedScriptStepId()) :
+                null;
+        try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
+             GZIPOutputStream gz = new GZIPOutputStream(bos);
+             ObjectOutputStream s = new ObjectOutputStream(gz) ) {
+            s.writeObject(script.getScriptSteps());
+            s.close(); //Necessary to get the last few bites written
+            if ( serializedScriptStep != null) {
+                serializedScriptStep.setBytes(bos.toByteArray());
+            } else {
+                serializedScriptStep = new SerializedScriptStep(bos.toByteArray());
+            }
         } catch (IOException e) {
             throw new AnnotationException(e.toString());
         }
+        return serializedScriptStep;
     }
 
     // private String getUniqueProjects(List<ScriptGroupStep> steps) {
diff --git a/data_access/src/main/java/com/intuit/tank/dao/UserDao.java b/data_access/src/main/java/com/intuit/tank/dao/UserDao.java
index 2fb7f9cac..852f8dfb7 100644
--- a/data_access/src/main/java/com/intuit/tank/dao/UserDao.java
+++ b/data_access/src/main/java/com/intuit/tank/dao/UserDao.java
@@ -59,13 +59,12 @@ public UserDao() {
     @Nullable
     public User authenticate(@Nonnull String userName, @Nonnull String password) {
         User user = findByUserName(userName);
-        User result = null;
         if (user != null) {
             if (PasswordEncoder.validatePassword(password, user.getPassword())) {
-                result = user;
+                return user;
             }
         }
-        return result;
+        return null;
     }
 
     /**
@@ -91,12 +90,12 @@ public User findByUserName(@Nonnull String userName) {
             commit();
         } catch (NoResultException nre) {
             rollback();
-            LOG.info("no entity matching username: " + userName, nre);
+            LOG.info("No entity matching username: " + userName);
         } catch (Exception e) {
             rollback();
             String printQuery = (query != null) ? query.toString()
                     : "Failed to connect to database: ";
-            LOG.info("no entity matching query: " + printQuery, e);
+            LOG.info("No entity matching query: " + printQuery, e);
         } finally {
             cleanup();
         }
diff --git a/data_access/src/test/java/com/intuit/tank/dao/BaseDaoTest.java b/data_access/src/test/java/com/intuit/tank/dao/BaseDaoTest.java
new file mode 100644
index 000000000..13d93a059
--- /dev/null
+++ b/data_access/src/test/java/com/intuit/tank/dao/BaseDaoTest.java
@@ -0,0 +1,50 @@
+package com.intuit.tank.dao;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.intuit.tank.project.User;
+import com.intuit.tank.test.TestGroups;
+
+public class BaseDaoTest {
+
+    private BaseDao<User> dao;
+
+    @BeforeEach
+    public void configure() {
+        LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+        Configuration config = ctx.getConfiguration();
+        config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(Level.INFO);
+        ctx.updateLoggers();
+        dao = new UserDao();
+    }
+
+    @Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testBaseDao() throws Exception {
+        User entity = DaoTestUtil.createUserData("BaseTestUser1", "TestUser1_Password", "BaseTestUser1@intuit.com", "TestGroup1");
+        List<User> entities = new ArrayList<User>();
+        entities.add(entity);
+        dao.persistCollection(entities);
+        
+        List<User> users = dao.findAll();
+        for(User user: users) {
+            if(user.getEmail().equals(entity.getEmail())) {
+                assertEquals(entity.getName(), user.getName());
+                break;
+            }
+        }
+        dao.delete(entity);
+    }
+}
diff --git a/data_access/src/test/java/com/intuit/tank/dao/DaoTestUtil.java b/data_access/src/test/java/com/intuit/tank/dao/DaoTestUtil.java
index 4f0ca04f6..dcac76e86 100644
--- a/data_access/src/test/java/com/intuit/tank/dao/DaoTestUtil.java
+++ b/data_access/src/test/java/com/intuit/tank/dao/DaoTestUtil.java
@@ -17,6 +17,8 @@
  */
 
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
@@ -26,12 +28,19 @@
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 
+import com.intuit.tank.project.DataFile;
+import com.intuit.tank.project.Group;
+import com.intuit.tank.project.JobRegion;
+import com.intuit.tank.project.PeriodicData;
 import com.intuit.tank.project.Project;
 import com.intuit.tank.project.Script;
 import com.intuit.tank.project.ScriptGroup;
 import com.intuit.tank.project.ScriptGroupStep;
 import com.intuit.tank.project.ScriptStep;
+import com.intuit.tank.project.User;
 import com.intuit.tank.project.Workload;
+import com.intuit.tank.vm.api.enumerated.VMRegion;
+import com.intuit.tank.vm.common.PasswordEncoder;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -61,7 +70,7 @@ public static Project createProject() {
                 .productName("Test Product Name")
                 .name("Test Project Name " + generateStringOfLength(15)).build();
     }
-
+    
     /**
      * Generate a new Workload object for testing.
      * 
@@ -180,5 +189,74 @@ public static void checkConstraintViolation(@Nonnull ConstraintViolationExceptio
         }
         fail("Constraint violation did not contain a violation on property " + property);
     }
+    
+    /**
+     * Generate a new PeriodicData object for testing.
+     * 
+     * @return the PeriodicData
+     */
+    public static PeriodicData createPeriodicData(int jobId, Date timestamp) {
+        return PeriodicData.builder()
+        		.min(1)
+        		.max(5)
+        		.jobId(jobId)
+        		.pageId("Test Page Id "+generateStringOfLength(5))
+        		.timestamp(timestamp)
+                .build();
+    }
+    
+    /**
+     * Generate a new User object for testing.
+     * 
+     * @return the User
+     */
+    public static User createUserData(String userName, String password,String email, String group) {
+    	Set<Group> groups = new HashSet<Group>();
+    	groups.add(createGroupData(group));
+        return User.builder()
+        		.name(userName)
+        		.password(PasswordEncoder.encodePassword(password))
+        		.email(email)
+        		.groups(groups)
+        		.generateApiToken()
+                .build();
+    }
+    
+    /**
+     * Generate a new Group object for testing.
+     * 
+     * @return the Group
+     */
+    public static Group createGroupData(String groupName) {
+        return Group.builder()
+        		.name(groupName)
+                .build();
+    }
+    
+    /**
+     * Generate a new DataFile object for testing.
+     * 
+     * @return the DataFile
+     */
+    public static DataFile createDataFileData(String fileName) {
+        return DataFile.builder()
+        		.fileName(fileName)
+        		.path("/test_path")
+        		.comments("test_comments")
+        		.creator("test_creator")
+                .build();
+    }
+    
+    /**
+     * Generate a new JobRegion object for testing.
+     * 
+     * @return the DataFile
+     */
+    public static JobRegion createJobRegionData(String users) {
+        return JobRegion.builder()
+        		.users(users)
+        		.region(VMRegion.US_WEST_2)
+                .build();
+    }
 
 }
diff --git a/data_access/src/test/java/com/intuit/tank/dao/DataFileDaoTest.java b/data_access/src/test/java/com/intuit/tank/dao/DataFileDaoTest.java
new file mode 100644
index 000000000..f1da5e04a
--- /dev/null
+++ b/data_access/src/test/java/com/intuit/tank/dao/DataFileDaoTest.java
@@ -0,0 +1,57 @@
+package com.intuit.tank.dao;
+
+/*
+ * #%L
+ * Data Access
+ * %%
+ * Copyright (C) 2011 - 2015 Intuit Inc.
+ * %%
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * #L%
+ */
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.intuit.tank.project.DataFile;
+import com.intuit.tank.test.TestGroups;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class DataFileDaoTest {
+	private DataFileDao dao;
+	
+	@BeforeEach
+    public void configure() {
+    	LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+    	Configuration config = ctx.getConfiguration();
+    	config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(Level.INFO);
+    	ctx.updateLoggers();
+        dao = new DataFileDao();
+    }
+	
+	@Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testStoreDataFile() throws Exception {
+		DataFile dataFile = DaoTestUtil.createDataFileData("TestFile");
+		
+		String initialString = "text";
+	    InputStream targetStream = new ByteArrayInputStream(initialString.getBytes());
+	    
+		DataFile result = dao.storeDataFile(dataFile, targetStream);
+		assertEquals(dataFile.getFileName(), result.getFileName());
+		
+		
+	}
+}
diff --git a/data_access/src/test/java/com/intuit/tank/dao/FilterGroupDaoTest.java b/data_access/src/test/java/com/intuit/tank/dao/FilterGroupDaoTest.java
new file mode 100644
index 000000000..b98ecabae
--- /dev/null
+++ b/data_access/src/test/java/com/intuit/tank/dao/FilterGroupDaoTest.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2011 Intuit Inc. All Rights Reserved
+ */
+package com.intuit.tank.dao;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.List;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.intuit.tank.project.ScriptFilterGroup;
+import com.intuit.tank.test.TestGroups;
+
+/**
+ * JobQueueDaoTest
+ * 
+ * @author msreekakula
+ * 
+ */
+public class FilterGroupDaoTest {
+
+    private FilterGroupDao dao;
+
+    @BeforeEach
+    public void setUp() {
+    	LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+    	Configuration config = ctx.getConfiguration();
+    	config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(Level.INFO);
+    	ctx.updateLoggers();  // This causes all Loggers to refetch information from their LoggerConfig.
+        dao = new FilterGroupDao();
+    }
+
+    @Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testFindFilterGroups() throws Exception {
+        List<ScriptFilterGroup> configurations = dao.getFilterGroupsForProduct("Test");
+        assertEquals(0, configurations.size());
+    }
+
+}
diff --git a/data_access/src/test/java/com/intuit/tank/dao/GroupDaoTest.java b/data_access/src/test/java/com/intuit/tank/dao/GroupDaoTest.java
new file mode 100644
index 000000000..8598689f5
--- /dev/null
+++ b/data_access/src/test/java/com/intuit/tank/dao/GroupDaoTest.java
@@ -0,0 +1,77 @@
+package com.intuit.tank.dao;
+
+/*
+ * #%L
+ * Data Access
+ * %%
+ * Copyright (C) 2011 - 2015 Intuit Inc.
+ * %%
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * #L%
+ */
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.intuit.tank.project.Group;
+import com.intuit.tank.test.TestGroups;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class GroupDaoTest {
+	private GroupDao dao;
+	
+	@BeforeEach
+    public void configure() {
+    	LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+    	Configuration config = ctx.getConfiguration();
+    	config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(Level.INFO);
+    	ctx.updateLoggers();
+        dao = new GroupDao();
+    }
+	
+	@Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testFindByName() throws Exception {
+		Group first = DaoTestUtil.createGroupData("testGroup");
+		first = dao.saveOrUpdate(first);
+		
+		//Try to fetch the group which was created
+		Group result = dao.findByName("testGroup");
+		assertEquals(first.getId(), result.getId());
+		
+		//Try to fetch a group which was not created, it will return null value
+		result = dao.findByName("testGroup1");
+		assertEquals(null,result);
+		
+		dao.delete(first);
+	}
+	
+	@Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testGetOrCreateGroup() throws Exception {
+		Group first = DaoTestUtil.createGroupData("testGroup");
+		first = dao.saveOrUpdate(first);
+		
+		//Try to create a group which was created earlier, it will not create a new group
+		// and will match with the group id 
+		Group result = dao.getOrCreateGroup("testGroup");
+		assertEquals(first.getId(), result.getId());
+		
+		//Try to create a group with a new name, it will create a new group
+		Group result2 = dao.getOrCreateGroup("testGroup2");
+		assertEquals("testGroup2", result2.getName());
+		
+		dao.delete(first);
+		dao.delete(result2);
+		
+	}
+}
diff --git a/data_access/src/test/java/com/intuit/tank/dao/JobNotificationDaoTest.java b/data_access/src/test/java/com/intuit/tank/dao/JobNotificationDaoTest.java
new file mode 100644
index 000000000..63484b45d
--- /dev/null
+++ b/data_access/src/test/java/com/intuit/tank/dao/JobNotificationDaoTest.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2011 Intuit Inc. All Rights Reserved
+ */
+package com.intuit.tank.dao;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.intuit.tank.project.JobNotification;
+import com.intuit.tank.project.JobQueue;
+import com.intuit.tank.test.TestGroups;
+
+/**
+ * JobQueueDaoTest
+ * 
+ * @author msreekakula
+ * 
+ */
+public class JobNotificationDaoTest {
+
+    private JobNotificationDao dao;
+
+    @BeforeEach
+    public void setUp() {
+    	LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+    	Configuration config = ctx.getConfiguration();
+    	config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(Level.INFO);
+    	ctx.updateLoggers();  // This causes all Loggers to refetch information from their LoggerConfig.
+        dao = new JobNotificationDao();
+    }
+
+    @Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testFindRevisions() throws Exception {
+        JobNotification jobnotification = new JobNotification();
+        jobnotification.setId(1);
+        jobnotification.setBody("Test");
+        JobNotification result = dao.saveOrUpdate(jobnotification);
+        assertEquals(jobnotification.getBody(), result.getBody());
+        JobNotification revisionJob = dao.findRevision(0,1);
+        assertEquals(null, revisionJob);
+
+    }
+
+}
diff --git a/data_access/src/test/java/com/intuit/tank/dao/JobQueueDaoTest.java b/data_access/src/test/java/com/intuit/tank/dao/JobQueueDaoTest.java
new file mode 100644
index 000000000..0e0494ca7
--- /dev/null
+++ b/data_access/src/test/java/com/intuit/tank/dao/JobQueueDaoTest.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright 2011 Intuit Inc. All Rights Reserved
+ */
+package com.intuit.tank.dao;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.intuit.tank.project.JobQueue;
+import com.intuit.tank.test.TestGroups;
+
+/**
+ * JobQueueDaoTest
+ * 
+ * @author msreekakula
+ * 
+ */
+public class JobQueueDaoTest {
+
+    private JobQueueDao dao;
+
+    @BeforeEach
+    public void setUp() {
+    	LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+    	Configuration config = ctx.getConfiguration();
+    	config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(Level.INFO);
+    	ctx.updateLoggers();  // This causes all Loggers to refetch information from their LoggerConfig.
+        dao = new JobQueueDao();
+    }
+
+    @Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testFindJobQueues() throws Exception {
+        JobQueue queue = dao.findOrCreateForProjectId(1);
+        assertEquals(1, queue.getId());
+        JobQueue queue1 = dao.findForJobId(2);
+        assertEquals(null, queue1);
+        List<JobQueue> queue2 = dao.getForProjectIds(Arrays.asList(1,2,3));
+        assertEquals(1, queue2.size());
+        List<JobQueue> recentQueues = dao.findRecent(new Date());
+        assertEquals(0, recentQueues.size());
+
+    }
+
+}
diff --git a/data_access/src/test/java/com/intuit/tank/dao/JobRegionDaoTest.java b/data_access/src/test/java/com/intuit/tank/dao/JobRegionDaoTest.java
new file mode 100644
index 000000000..e4f8aa289
--- /dev/null
+++ b/data_access/src/test/java/com/intuit/tank/dao/JobRegionDaoTest.java
@@ -0,0 +1,69 @@
+package com.intuit.tank.dao;
+
+/*
+ * #%L
+ * Data Access
+ * %%
+ * Copyright (C) 2011 - 2015 Intuit Inc.
+ * %%
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * #L%
+ */
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.intuit.tank.project.JobRegion;
+import com.intuit.tank.test.TestGroups;
+
+public class JobRegionDaoTest {
+
+	private JobRegionDao dao;
+	
+	@BeforeEach
+    public void configure() {
+    	LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+    	Configuration config = ctx.getConfiguration();
+    	config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(Level.INFO);
+    	ctx.updateLoggers();
+        dao = new JobRegionDao();
+    }
+	
+	@Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testCleanRegions() throws Exception {
+		JobRegion jobRegion3 = DaoTestUtil.createJobRegionData("TestUser_1");
+		jobRegion3.setCreated(new Date());
+		
+		JobRegion jobRegion2 = DaoTestUtil.createJobRegionData("TestUser_1");
+		jobRegion2 = dao.saveOrUpdate(jobRegion2);
+		
+		JobRegion jobRegion1 = DaoTestUtil.createJobRegionData("TestUser_1");
+		jobRegion1.setCreated(new Date());
+		jobRegion1 = dao.saveOrUpdate(jobRegion1);
+		
+		
+		List<JobRegion> jobRegions = new ArrayList<JobRegion>(2);
+		jobRegions.add(jobRegion1);
+		jobRegions.add(jobRegion3);
+		
+		Set<JobRegion> regions = dao.cleanRegions(jobRegions);
+		assertEquals(1,  regions.size());
+		
+	}
+}
diff --git a/data_access/src/test/java/com/intuit/tank/dao/PeriodicDataTest.java b/data_access/src/test/java/com/intuit/tank/dao/PeriodicDataTest.java
new file mode 100644
index 000000000..d46a19e29
--- /dev/null
+++ b/data_access/src/test/java/com/intuit/tank/dao/PeriodicDataTest.java
@@ -0,0 +1,95 @@
+package com.intuit.tank.dao;
+
+/*
+ * #%L
+ * Data Access
+ * %%
+ * Copyright (C) 2011 - 2015 Intuit Inc.
+ * %%
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * #L%
+ */
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.intuit.tank.project.PeriodicData;
+import com.intuit.tank.test.TestGroups;
+
+public class PeriodicDataTest {
+	private PeriodicDataDao dao;
+	
+	@BeforeEach
+    public void configure() {
+    	LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+    	Configuration config = ctx.getConfiguration();
+    	config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(Level.INFO);
+    	ctx.updateLoggers();
+        dao = new PeriodicDataDao();
+    }
+	
+	@Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testFindByJobId() throws Exception {
+		PeriodicData first = DaoTestUtil.createPeriodicData(1, new Date());
+        first = dao.saveOrUpdate(first);
+        
+        PeriodicData second = DaoTestUtil.createPeriodicData(2, new Date());
+        second = dao.saveOrUpdate(second);
+        
+        PeriodicData third = DaoTestUtil.createPeriodicData(3, new Date());
+        third = dao.saveOrUpdate(third);
+        
+        List<PeriodicData> list = dao.findByJobId(2);
+        assertEquals(second.getJobId(), list.get(0).getJobId());
+	}
+	
+	@Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testFindByJobIdForDateRange() throws Exception {
+		Date tenDaysBeforeDate = getCustomDate(-10);
+        PeriodicData first = DaoTestUtil.createPeriodicData(1, tenDaysBeforeDate);
+        first = dao.saveOrUpdate(first);
+        
+        Date sevenDaysBeforeDate = getCustomDate(-7);
+        PeriodicData second = DaoTestUtil.createPeriodicData(2, sevenDaysBeforeDate);
+        second = dao.saveOrUpdate(second);
+        
+        Date fiveDaysBeforeDate = getCustomDate(-5);
+        PeriodicData third = DaoTestUtil.createPeriodicData(2, fiveDaysBeforeDate);
+        third = dao.saveOrUpdate(third);
+        
+        
+        Date fourDaysBeforeDate = getCustomDate(-4);
+        List<PeriodicData> list = dao.findByJobId(2, sevenDaysBeforeDate, fourDaysBeforeDate);
+        assertEquals(2, list.size());
+        
+       //Even though PeriodicData exists with jobId, the date range is outside, so empty list is returned
+        list = dao.findByJobId(2, new Date(), new Date());
+        assertEquals(0, list.size());
+        
+        //If both dates are null, then PeriodicData matching the jobIds are returned
+        list = dao.findByJobId(2, null,null);
+        assertEquals(2, list.size());
+	}
+	
+	private Date getCustomDate(int days) {
+		Calendar calendar = Calendar.getInstance();
+		calendar.add(Calendar.DATE, days);
+		return calendar.getTime();
+	}
+}
diff --git a/data_access/src/test/java/com/intuit/tank/dao/ScriptDaoTest.java b/data_access/src/test/java/com/intuit/tank/dao/ScriptDaoTest.java
index 745e5e584..617fac65e 100644
--- a/data_access/src/test/java/com/intuit/tank/dao/ScriptDaoTest.java
+++ b/data_access/src/test/java/com/intuit/tank/dao/ScriptDaoTest.java
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import javax.validation.ConstraintViolationException;
@@ -29,12 +30,11 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 
-import com.intuit.tank.dao.ScriptDao;
 import com.intuit.tank.project.Script;
 import com.intuit.tank.project.ScriptStep;
 import com.intuit.tank.view.filter.ViewFilterType;
+import org.hibernate.PropertyValueException;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -82,7 +82,6 @@ public void configure() {
 
     @Test
     @Tag(TestGroups.FUNCTIONAL)
-    @Disabled
     public void testChildOrder() throws Exception {
         Script entity = DaoTestUtil.createScript();
         entity.addStep(DaoTestUtil.createScriptStep());
@@ -97,17 +96,17 @@ public void testChildOrder() throws Exception {
             children.add(0, removed);
             persisted = dao.saveOrUpdate(persisted);
             persisted = dao.findById(id);
-            assertFalse(persisted.getScriptSteps().get(0).equals(originalOrder.get(0)));
-            assertTrue(persisted.getScriptSteps().get(0).equals(originalOrder.get(2)));
-            assertTrue(persisted.getScriptSteps().get(1).equals(originalOrder.get(0)));
-            assertTrue(persisted.getScriptSteps().get(2).equals(originalOrder.get(1)));
+            assertNotEquals(originalOrder.get(0), persisted.getScriptSteps().get(0));
+            assertEquals(originalOrder.get(2), persisted.getScriptSteps().get(0));
+            assertEquals(originalOrder.get(0), persisted.getScriptSteps().get(1));
+            assertEquals(originalOrder.get(1), persisted.getScriptSteps().get(2));
 
             originalOrder = new ArrayList<ScriptStep>(persisted.getScriptSteps());
             persisted.getScriptSteps().remove(2);
             persisted.getScriptSteps().remove(0);
             persisted = dao.saveOrUpdate(persisted);
             persisted = dao.findById(id);
-            assertTrue(persisted.getScriptSteps().get(0).equals(originalOrder.get(1)));
+            assertEquals(originalOrder.get(1), persisted.getScriptSteps().get(0));
             assertEquals(1, persisted.getScriptSteps().size());
 
         } finally {
@@ -160,10 +159,27 @@ public void testFilter() throws Exception {
         assertEquals(fourth.getId(), list.get(3).getId());
     }
 
+    @Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testCompressScripSteps() {
+
+        Script script = DaoTestUtil.createScript();
+        IntStream.range(0, 500).forEach(i -> script.addStep(DaoTestUtil.createScriptStep()));
+        int id = dao.saveOrUpdate(script).getId();
+
+        Script scriptOut = dao.findById(id);
+        assertNotNull(scriptOut);
+
+        dao.loadScriptSteps(scriptOut);
+        List<ScriptStep> StepsOut = scriptOut.getSteps();
+        assertEquals(500, StepsOut.size());
+
+        dao.delete(id);
+    }
+
     @ParameterizedTest
     @Tag(TestGroups.FUNCTIONAL)
     @MethodSource("validations")
-    @Disabled
     public void testValidation(Script entity, String property, String messageContains) throws Exception {
         try {
             dao.saveOrUpdate(entity);
@@ -171,12 +187,17 @@ public void testValidation(Script entity, String property, String messageContain
         } catch (ConstraintViolationException e) {
             // expected validation
             DaoTestUtil.checkConstraintViolation(e, property, messageContains);
+        } catch (RuntimeException e) {
+            if (e.getCause().getCause() instanceof PropertyValueException) {
+                assertTrue(e.getCause().getCause().getMessage().startsWith("not-null property references a null or transient value"));
+                return;
+            }
+            assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("Value too long for column "));
         }
     }
 
     @Test
     @Tag(TestGroups.FUNCTIONAL)
-    @Disabled
     public void testBasicCreateUpdateDelete() throws Exception {
         List<Script> all = dao.findAll();
         int originalSize = all.size();
diff --git a/data_access/src/test/java/com/intuit/tank/dao/UserDaoTest.java b/data_access/src/test/java/com/intuit/tank/dao/UserDaoTest.java
new file mode 100644
index 000000000..293d19b02
--- /dev/null
+++ b/data_access/src/test/java/com/intuit/tank/dao/UserDaoTest.java
@@ -0,0 +1,72 @@
+package com.intuit.tank.dao;
+
+/*
+ * #%L
+ * Data Access
+ * %%
+ * Copyright (C) 2011 - 2015 Intuit Inc.
+ * %%
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * #L%
+ */
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import com.intuit.tank.project.User;
+import com.intuit.tank.test.TestGroups;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class UserDaoTest {
+	
+	private UserDao dao;
+	
+	@BeforeEach
+    public void configure() {
+    	LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+    	Configuration config = ctx.getConfiguration();
+    	config.getLoggerConfig(LogManager.ROOT_LOGGER_NAME).setLevel(Level.INFO);
+    	ctx.updateLoggers();
+        dao = new UserDao();
+    }
+	
+	@Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testUserDao() throws Exception {
+		User entity = DaoTestUtil.createUserData("TestUser1", "TestUser1_Password", "TestUser1@intuit.com", "TestGroup");
+		entity = dao.saveOrUpdate(entity);
+		
+		//Authenticate user with valid credentials
+		User result = dao.authenticate("TestUser1", "TestUser1_Password");
+		assertEquals(entity.getId(), result.getId());
+		
+		//Authenticate user with invalid credentials
+		result = dao.authenticate("TestUser1", "Wrong_Password");
+		assertNull(result);
+				
+		//Find user by valid API Token
+		result = dao.findByApiToken(entity.getApiToken());
+		assertEquals(entity.getId(), result.getId());
+		
+		//Find user by invalid API Token
+		result = dao.findByApiToken("dummy_token");
+		assertNull(result);
+		
+		//Find user by invalid username
+		result = dao.findByUserName("invalid_username");
+		assertNull(result);
+		
+		dao.delete(entity);
+	}
+	
+}
diff --git a/data_model/pom.xml b/data_model/pom.xml
index fc04a8204..c17b7fc5f 100644
--- a/data_model/pom.xml
+++ b/data_model/pom.xml
@@ -6,7 +6,7 @@
    <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>data-model</artifactId>
diff --git a/data_model/src/main/java/com/intuit/tank/project/DataFile.java b/data_model/src/main/java/com/intuit/tank/project/DataFile.java
index de92426a4..5fd565ec7 100644
--- a/data_model/src/main/java/com/intuit/tank/project/DataFile.java
+++ b/data_model/src/main/java/com/intuit/tank/project/DataFile.java
@@ -1,5 +1,6 @@
 package com.intuit.tank.project;
 
+
 /*
  * #%L
  * Intuit Tank data model
@@ -119,5 +120,75 @@ public int hashCode() {
     public int compareTo(DataFile o) {
         return path.compareTo(o.path);
     }
+    
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static Builder builderFrom(DataFile df) {
+        return new Builder(df);
+    }
+    
+    /**
+     * Fluent Builder for DataFile Builder
+     * 
+     * @author Vaishakh
+     * 
+     */
+    public static class Builder extends DataFileBase<Builder> {
+
+        private Builder() {
+            super(new DataFile());
+        }
+
+        private Builder(DataFile df) {
+            super(df);
+        }
+
+        public DataFile build() {
+            return getInstance();
+        }
+    }
+
+    private static class DataFileBase<GeneratorT extends DataFileBase<GeneratorT>> {
+        private DataFile instance;
+
+        protected DataFileBase(DataFile aInstance) {
+            instance = aInstance;
+        }
+
+        protected DataFile getInstance() {
+            return instance;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT comments(String aValue) {
+            instance.setComments(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT fileName(String aValue) {
+            instance.setFileName(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT path(String aValue) {
+            instance.setPath(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT creator(String aValue) {
+            instance.setCreator(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+    }
 
 }
diff --git a/data_model/src/main/java/com/intuit/tank/project/Group.java b/data_model/src/main/java/com/intuit/tank/project/Group.java
index 270c8fa47..bd406853c 100644
--- a/data_model/src/main/java/com/intuit/tank/project/Group.java
+++ b/data_model/src/main/java/com/intuit/tank/project/Group.java
@@ -99,4 +99,51 @@ public int hashCode() {
         return new HashCodeBuilder(29, 45).append(getName()).toHashCode();
     }
 
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static Builder builderFrom(Group g) {
+        return new Builder(g);
+    }
+    
+    /**
+     * Fluent Builder for Group Builder
+     * 
+     * @author Vaishakh
+     * 
+     */
+    public static class Builder extends GroupBase<Builder> {
+
+        private Builder() {
+            super(new Group());
+        }
+
+        private Builder(Group g) {
+            super(g);
+        }
+
+        public Group build() {
+            return getInstance();
+        }
+    }
+
+    private static class GroupBase<GeneratorT extends GroupBase<GeneratorT>> {
+        private Group instance;
+
+        protected GroupBase(Group aInstance) {
+            instance = aInstance;
+        }
+
+        protected Group getInstance() {
+            return instance;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT name(String aValue) {
+            instance.setName(aValue);
+
+            return (GeneratorT) this;
+        }
+    }
 }
diff --git a/data_model/src/main/java/com/intuit/tank/project/JobConfiguration.java b/data_model/src/main/java/com/intuit/tank/project/JobConfiguration.java
index fefa08a18..09170962b 100644
--- a/data_model/src/main/java/com/intuit/tank/project/JobConfiguration.java
+++ b/data_model/src/main/java/com/intuit/tank/project/JobConfiguration.java
@@ -212,4 +212,53 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return new HashCodeBuilder(29, 45).append(getId()).toHashCode();
     }
+    
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static Builder builderFrom(JobConfiguration jc) {
+        return new Builder(jc);
+    }
+
+    /**
+     * Fluent Builder for JobConfiguration Builder
+     * 
+     * @author Vaishakh
+     * 
+     */
+    public static class Builder extends JobConfigurationBase<Builder> {
+
+        private Builder() {
+            super(new JobConfiguration());
+        }
+
+        private Builder(JobConfiguration jc) {
+            super(jc);
+        }
+
+        public JobConfiguration build() {
+            return getInstance();
+        }
+    }
+
+    private static class JobConfigurationBase<GeneratorT extends JobConfigurationBase<GeneratorT>> {
+        private JobConfiguration instance;
+
+        protected JobConfigurationBase(JobConfiguration aInstance) {
+            instance = aInstance;
+        }
+
+        protected JobConfiguration getInstance() {
+            return instance;
+        }
+
+        @SuppressWarnings("unchecked")
+        public GeneratorT jobRegion(Set<JobRegion> aValue) {
+            instance.setJobRegions(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+    }
 }
\ No newline at end of file
diff --git a/data_model/src/main/java/com/intuit/tank/project/JobRegion.java b/data_model/src/main/java/com/intuit/tank/project/JobRegion.java
index 495b1febf..d48ad75e9 100644
--- a/data_model/src/main/java/com/intuit/tank/project/JobRegion.java
+++ b/data_model/src/main/java/com/intuit/tank/project/JobRegion.java
@@ -143,5 +143,61 @@ public String toString() {
     public int compareTo(JobRegion o) {
         return this.region.compareTo(o.region);
     }
+   
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static Builder builderFrom(JobRegion jr) {
+        return new Builder(jr);
+    }
+    
+    /**
+     * Fluent Builder for JobRegion Builder
+     * 
+     * @author Vaishakh
+     * 
+     */
+    public static class Builder extends JobRegionBase<Builder> {
+
+        private Builder() {
+            super(new JobRegion());
+        }
+
+        private Builder(JobRegion jr) {
+            super(jr);
+        }
+
+        public JobRegion build() {
+            return getInstance();
+        }
+    }
+
+    private static class JobRegionBase<GeneratorT extends JobRegionBase<GeneratorT>> {
+        private JobRegion instance;
+
+        protected JobRegionBase(JobRegion aInstance) {
+            instance = aInstance;
+        }
+
+        protected JobRegion getInstance() {
+            return instance;
+        }
+
+        @SuppressWarnings("unchecked")
+        public GeneratorT users(String aValue) {
+            instance.setUsers(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT region(VMRegion aValue) {
+            instance.setRegion(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+    }
 
 }
diff --git a/data_model/src/main/java/com/intuit/tank/project/PeriodicData.java b/data_model/src/main/java/com/intuit/tank/project/PeriodicData.java
index 0f3df59e9..29dae003d 100644
--- a/data_model/src/main/java/com/intuit/tank/project/PeriodicData.java
+++ b/data_model/src/main/java/com/intuit/tank/project/PeriodicData.java
@@ -1,5 +1,6 @@
 package com.intuit.tank.project;
 
+
 /*
  * #%L
  * Intuit Tank data model
@@ -27,6 +28,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+
 @Entity
 @Table(name = "timing_periodic",
         indexes = { @Index(name = "IDX_TS_JOB_ID", columnList = "job_id"),
@@ -216,5 +218,102 @@ public int hashCode() {
     public int compareTo(PeriodicData o) {
         return new CompareToBuilder().append(timestamp, o.timestamp).toComparison();
     }
+    
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static Builder builderFrom(PeriodicData p) {
+        return new Builder(p);
+    }
+    
+    /**
+     * Fluent Builder for PeriodicData Builder
+     * 
+     * @author Vaishakh
+     * 
+     */
+    public static class Builder extends PeriodicDataBase<Builder> {
+
+        private Builder() {
+            super(new PeriodicData());
+        }
+
+        private Builder(PeriodicData p) {
+            super(p);
+        }
+
+        public PeriodicData build() {
+            return getInstance();
+        }
+    }
+
+    private static class PeriodicDataBase<GeneratorT extends PeriodicDataBase<GeneratorT>> {
+        private PeriodicData instance;
+
+        protected PeriodicDataBase(PeriodicData aInstance) {
+            instance = aInstance;
+        }
+
+        protected PeriodicData getInstance() {
+            return instance;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT max(double aValue) {
+            instance.setMax(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT min(double aValue) {
+            instance.setMin(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT mean(double aValue) {
+            instance.setMean(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT jobId(int aValue) {
+            instance.setJobId(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT pageId(String aValue) {
+            instance.setPageId(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT timestamp(Date aValue) {
+            instance.setTimestamp(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT period(int aValue) {
+            instance.setPeriod(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT sampleSize(int aValue) {
+            instance.setSampleSize(aValue);
+
+            return (GeneratorT) this;
+        }
+    }
 
 }
diff --git a/data_model/src/main/java/com/intuit/tank/project/Script.java b/data_model/src/main/java/com/intuit/tank/project/Script.java
index 2160fb96d..bbe916fcf 100644
--- a/data_model/src/main/java/com/intuit/tank/project/Script.java
+++ b/data_model/src/main/java/com/intuit/tank/project/Script.java
@@ -13,9 +13,12 @@
  * #L%
  */
 
+import java.io.InputStream;
 import java.io.ObjectInputStream;
+import java.io.PushbackInputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -63,11 +66,25 @@ public class Script extends OwnableEntity implements Comparable<Script> {
     @Column(name = "serial_step_id")
     private Integer serializedScriptStepId;
 
+    /**
+     * Check if Blob stream begins with gzip magic number, if true decompress
+     * Deserialize Blob stream back into List of ScriptSteps
+     *
+     * @return the List of ScriptStep
+     */
     @SuppressWarnings("unchecked")
-    public static List<ScriptStep> deserializeBlob(SerializedScriptStep serializedScriptStep) {
+    private static List<ScriptStep> deserializeBlob(SerializedScriptStep serializedScriptStep) {
         if (serializedScriptStep != null && serializedScriptStep.getSerialzedBlob() != null) {
-            try ( ObjectInputStream os = new ObjectInputStream(serializedScriptStep.getSerialzedBlob().getBinaryStream()) ) {
-                return (List<ScriptStep>) os.readObject();
+            try ( InputStream input = serializedScriptStep.getSerialzedBlob().getBinaryStream() ) {
+
+                PushbackInputStream pb = new PushbackInputStream( input, 2 ); //we need a pushbackstream to look ahead
+                byte [] signature = new byte[2];
+                pb.read( signature ); //read the signature
+                pb.unread( signature ); //push back the signature to the stream
+                if( signature[ 0 ] == (byte) 0x1f && signature[ 1 ] == (byte) 0x8b ) //check if matches standard gzip magic number
+                    return (List<ScriptStep>) new ObjectInputStream(new GZIPInputStream( pb )).readObject();
+                else
+                    return (List<ScriptStep>) new ObjectInputStream( pb ).readObject();
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -75,18 +92,11 @@ public static List<ScriptStep> deserializeBlob(SerializedScriptStep serializedSc
         return null;
     }
 
-    // /**
-    // * @return the serializedScriptStep
-    // */
-    // public SerializedScriptStep getSerializedScriptStep() {
-    // boolean load = serializedScriptStep == null;
-    //
-    // return serializedScriptStep;
-    // }
     /**
      * @param serializedSteps
+     *          the serializedSteps to be decompressed/deserialized
      */
-    public void setSerializedSteps(SerializedScriptStep serializedSteps) {
+    public void deserializeSteps(SerializedScriptStep serializedSteps) {
         steps = deserializeBlob(serializedSteps);
     }
 
diff --git a/data_model/src/main/java/com/intuit/tank/project/SerializedScriptStep.java b/data_model/src/main/java/com/intuit/tank/project/SerializedScriptStep.java
index 02ac88826..c7cbbc526 100644
--- a/data_model/src/main/java/com/intuit/tank/project/SerializedScriptStep.java
+++ b/data_model/src/main/java/com/intuit/tank/project/SerializedScriptStep.java
@@ -44,13 +44,14 @@ public class SerializedScriptStep extends BaseEntity {
     private byte[] bytes;
 
     /**
-     * @param serialzedData
+     * Constructor
      */
     public SerializedScriptStep() {
     }
 
     /**
      * @param serialzedData
+     *          new constructor for a new script
      */
     public SerializedScriptStep(byte[] serialzedData) {
         this.bytes = serialzedData;
@@ -72,6 +73,14 @@ public Blob getSerialzedBlob() {
         return serialzedData;
     }
 
+    /**
+     * @param bytes
+     *          the bytes stored before Blob creation
+     */
+    public void setBytes(byte[] bytes) {
+        this.bytes = bytes;
+    }
+
     /**
      * @return the bytes
      */
diff --git a/data_model/src/main/java/com/intuit/tank/project/User.java b/data_model/src/main/java/com/intuit/tank/project/User.java
index a8251c132..c4fe069f2 100644
--- a/data_model/src/main/java/com/intuit/tank/project/User.java
+++ b/data_model/src/main/java/com/intuit/tank/project/User.java
@@ -1,5 +1,6 @@
 package com.intuit.tank.project;
 
+
 /*
  * #%L
  * Intuit Tank data model
@@ -189,5 +190,81 @@ public boolean equals(Object obj) {
     public int hashCode() {
         return new HashCodeBuilder(29, 45).append(getId()).toHashCode();
     }
+    
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static Builder builderFrom(User u) {
+        return new Builder(u);
+    }
+    
+    /**
+     * Fluent Builder for User Builder
+     * 
+     * @author Vaishakh
+     * 
+     */
+    public static class Builder extends UserBase<Builder> {
+
+        private Builder() {
+            super(new User());
+        }
+
+        private Builder(User p) {
+            super(p);
+        }
+
+        public User build() {
+            return getInstance();
+        }
+    }
+
+    private static class UserBase<GeneratorT extends UserBase<GeneratorT>> {
+        private User instance;
+
+        protected UserBase(User aInstance) {
+            instance = aInstance;
+        }
+
+        protected User getInstance() {
+            return instance;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT email(String aValue) {
+            instance.setEmail(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT name(String aValue) {
+            instance.setName(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT password(String aValue) {
+            instance.setPassword(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT groups(Set<Group> aValue) {
+            instance.setGroups(aValue);
+
+            return (GeneratorT) this;
+        }
+        
+        @SuppressWarnings("unchecked")
+        public GeneratorT generateApiToken() {
+            instance.generateApiToken();
+
+            return (GeneratorT) this;
+        }
+    }
 
 }
diff --git a/data_model/src/test/java/com/intuit/tank/project/ProjectDTOTest.java b/data_model/src/test/java/com/intuit/tank/project/ProjectDTOTest.java
new file mode 100644
index 000000000..031a05691
--- /dev/null
+++ b/data_model/src/test/java/com/intuit/tank/project/ProjectDTOTest.java
@@ -0,0 +1,70 @@
+package com.intuit.tank.project;
+
+/*
+ * #%L
+ * Intuit Tank data model
+ * %%
+ * Copyright (C) 2011 - 2015 Intuit Inc.
+ * %%
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * #L%
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Date;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * The class <code>ProjectDTOTest</code> contains tests for the class <code>{@link ProjectDTO}</code>.
+ */
+public class ProjectDTOTest {
+
+    @Test
+    public void testProjectDTO_1() {
+        ProjectDTO result = new ProjectDTO();
+        result.setId(1);
+        assertNotNull(result);
+        assertEquals(1, result.getId());
+    }
+
+    @Test
+    public void testProjectDTO_2() {
+        ProjectDTO result = new ProjectDTO();
+        Date date = new Date();
+        result.setCreated(date);
+        result.setModified(date);
+        assertEquals(date, result.getCreated());
+        assertEquals(date, result.getModified());
+    }
+
+    @Test
+    public void testProjectDTO_3() {
+        ProjectDTO result = new ProjectDTO();
+        result.setCreator("creator");
+        result.setName("name");
+        assertEquals("creator", result.getCreator());
+        assertEquals("name", result.getName());
+        assertNotNull(result.toString());
+    }
+
+    @Test
+    public void testProjectDTO_4() {
+        Date date = new Date();
+        ProjectDTO result = new ProjectDTO(1, date, date, "creator", "name", null, "pname", "comment");
+        result.setCreator("creator");
+        result.setName("name");
+        assertEquals("creator", result.getCreator());
+        assertEquals("name", result.getName());
+        assertEquals(1, result.getId());
+        assertEquals(date, result.getCreated());
+        assertEquals(date, result.getModified());
+        assertNotNull(result.toString());
+    }
+}
\ No newline at end of file
diff --git a/data_model/src/test/java/com/intuit/tank/project/RevisionedEntityTest.java b/data_model/src/test/java/com/intuit/tank/project/RevisionedEntityTest.java
index b0cd5a4c9..d6801e944 100644
--- a/data_model/src/test/java/com/intuit/tank/project/RevisionedEntityTest.java
+++ b/data_model/src/test/java/com/intuit/tank/project/RevisionedEntityTest.java
@@ -1,6 +1,8 @@
 package com.intuit.tank.project;
 
-import com.intuit.tank.project.RevisionedEntity;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /*
  * #%L
@@ -22,4 +24,9 @@
  * @generatedBy CodePro at 12/15/14 1:34 PM
  */
 public class RevisionedEntityTest {
+
+    @Test
+    public void testEnum() {
+        assertNotNull(RevisionedEntity.DataFile);
+    }
 }
\ No newline at end of file
diff --git a/data_model/src/test/java/com/intuit/tank/project/ScriptTest.java b/data_model/src/test/java/com/intuit/tank/project/ScriptTest.java
index 4f1f7046d..9e8206522 100644
--- a/data_model/src/test/java/com/intuit/tank/project/ScriptTest.java
+++ b/data_model/src/test/java/com/intuit/tank/project/ScriptTest.java
@@ -165,23 +165,6 @@ public void testDeserializeBlob_1()
         serializedScriptStep.setSerialzedData(new SerialBlob(new byte[] {}));
     }
 
-    /**
-     * Run the List<ScriptStep> deserializeBlob(SerializedScriptStep) method test.
-     *
-     * @throws Exception
-     *
-     * @generatedBy CodePro at 12/15/14 1:34 PM
-     */
-    @Test
-    public void testDeserializeBlob_2()
-        throws Exception {
-        SerializedScriptStep serializedScriptStep = null;
-
-        List<ScriptStep> result = Script.deserializeBlob(serializedScriptStep);
-
-        assertEquals(null, result);
-    }
-
     /**
      * Run the boolean equals(Object) method test.
      *
@@ -604,7 +587,7 @@ public void testSetSerializedSteps_1()
         fixture.setRuntime(1);
         SerializedScriptStep serializedSteps = new SerializedScriptStep();
 
-        fixture.setSerializedSteps(serializedSteps);
+        fixture.deserializeSteps(serializedSteps);
 
     }
 
diff --git a/data_model/src/test/java/com/intuit/tank/project/SummaryDataBuilderTest.java b/data_model/src/test/java/com/intuit/tank/project/SummaryDataBuilderTest.java
index 5d11983bb..1241bbdd0 100644
--- a/data_model/src/test/java/com/intuit/tank/project/SummaryDataBuilderTest.java
+++ b/data_model/src/test/java/com/intuit/tank/project/SummaryDataBuilderTest.java
@@ -21,6 +21,8 @@
 import com.intuit.tank.project.SummaryData;
 import com.intuit.tank.project.SummaryDataBuilder;
 
+import java.util.Date;
+
 /**
  * The class <code>SummaryDataBuilderTest</code> contains tests for the class <code>{@link SummaryDataBuilder}</code>.
  *
@@ -84,6 +86,66 @@ public void testBuild_1()
         assertEquals(null, result.getCreated());
     }
 
+    @Test
+    public void testBuild_2() {
+        SummaryDataBuilder builder = new SummaryDataBuilder();
+
+        builder.withJobId(1);
+        builder.withPageId("pageId");
+        builder.withSampleSize(2);
+        builder.withMean(3.0);
+        builder.withMin(4.0);
+        builder.withMax(5.0);
+        builder.withSttDev(6.0);
+        builder.withKurtosis(7.0);
+        builder.withSkewness(8.0);
+        builder.withVarience(9.0);
+        builder.withPercentile10(10.0);
+        builder.withPercentile20(11.0);
+        builder.withPercentile30(12.0);
+        builder.withPercentile40(12.0);
+        builder.withPercentile50(12.0);
+        builder.withPercentile60(12.0);
+        builder.withPercentile70(12.0);
+        builder.withPercentile80(12.0);
+        builder.withPercentile90(12.0);
+        builder.withPercentile95(12.0);
+        builder.withPercentile99(12.0);
+        builder.withId(13);
+        Date date = new Date();
+        builder.withCreated(date);
+        builder.withModified(date);
+        builder.withForceCreateDate(date);
+
+        SummaryData result = builder.build();
+
+        assertNotNull(result);
+        assertEquals("pageId", result.getPageId());
+        assertEquals(5.0, result.getMax());
+        assertEquals(3.0, result.getMean());
+        assertEquals(1, result.getJobId());
+        assertEquals(9.0, result.getVarience());
+        assertEquals(8.0, result.getSkewness());
+        assertEquals(10.0, result.getPercentile10());
+        assertEquals(12.0, result.getPercentile70());
+        assertEquals(11.0, result.getPercentile20());
+        assertEquals(6.0, result.getSttDev(), 1.0);
+        assertEquals(2, result.getSampleSize());
+        assertEquals(7.0, result.getKurtosis(), 1.0);
+        assertEquals(12.0, result.getPercentile80(), 1.0);
+        assertEquals(12.0, result.getPercentile60(), 1.0);
+        assertEquals(12.0, result.getPercentile90(), 1.0);
+        assertEquals(12.0, result.getPercentile50(), 1.0);
+        assertEquals(12.0, result.getPercentile95(), 1.0);
+        assertEquals(12.0, result.getPercentile99(), 1.0);
+        assertEquals(12.0, result.getPercentile40(), 1.0);
+        assertEquals(12.0, result.getPercentile30(), 1.0);
+        assertEquals(4.0, result.getMin(), 1.0);
+        assertEquals(13, result.getId());
+        assertEquals(date, result.getModified());
+        assertEquals(date, result.getCreated());
+    }
+
     /**
      * Run the SummaryDataBuilder summaryData() method test.
      *
diff --git a/data_model/src/test/java/com/intuit/tank/project/TankDefaultRevisionEntityTest.java b/data_model/src/test/java/com/intuit/tank/project/TankDefaultRevisionEntityTest.java
new file mode 100644
index 000000000..8619d5bd1
--- /dev/null
+++ b/data_model/src/test/java/com/intuit/tank/project/TankDefaultRevisionEntityTest.java
@@ -0,0 +1,55 @@
+package com.intuit.tank.project;
+
+/*
+ * #%L
+ * Intuit Tank data model
+ * %%
+ * Copyright (C) 2011 - 2015 Intuit Inc.
+ * %%
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * #L%
+ */
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Date;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * The class <code>TankDefaultRevisionEntityTest</code> contains tests for the class <code>{@link TankDefaultRevisionEntity}</code>.
+ */
+public class TankDefaultRevisionEntityTest {
+
+    @Test
+    public void testTankDefaultRevisionEntity_1() {
+        TankDefaultRevisionEntity result = new TankDefaultRevisionEntity();
+        result.setId(1);
+        assertNotNull(result);
+        assertEquals(1, result.getId());
+    }
+
+    @Test
+    public void testTankDefaultRevisionEntity_2() {
+        TankDefaultRevisionEntity result = new TankDefaultRevisionEntity();
+        result.setTimestamp(20);
+
+        assertEquals(20, result.getTimestamp());
+        assertEquals(new Date(20), result.getRevisionDate());
+    }
+
+    @Test
+    public void testTankDefaultRevisionEntity_3() {
+        TankDefaultRevisionEntity result = new TankDefaultRevisionEntity();
+
+        assertTrue(result.equals(result));
+        assertTrue(result.equals(new TankDefaultRevisionEntity()));
+        assertNotNull(result.hashCode());
+        assertNotNull(result.toString());
+    }
+}
\ No newline at end of file
diff --git a/data_model/src/test/java/com/intuit/tank/util/CreateDateComparatorTest.java b/data_model/src/test/java/com/intuit/tank/util/CreateDateComparatorTest.java
index 634ea257b..c2caaedaf 100644
--- a/data_model/src/test/java/com/intuit/tank/util/CreateDateComparatorTest.java
+++ b/data_model/src/test/java/com/intuit/tank/util/CreateDateComparatorTest.java
@@ -78,6 +78,18 @@ public void testDescending() {
 
     }
 
+    @Test
+    @Tag(TestGroups.FUNCTIONAL)
+    public void testAscending_1() {
+        CreateDateComparator comp = new CreateDateComparator();
+        List<TestBaseEntity> copied = new ArrayList<CreateDateComparatorTest.TestBaseEntity>(entities);
+        Collections.sort(copied, comp);
+        assertEquals(copied.get(0).position, 0);
+        assertEquals(copied.get(1).position, 1);
+        assertEquals(copied.get(2).position, 2);
+
+    }
+
     /**
      * CreateDateComparatorTest TestBaseEntity
      * 
diff --git a/data_model/src/test/java/com/intuit/tank/util/DataFileUtilTest.java b/data_model/src/test/java/com/intuit/tank/util/DataFileUtilTest.java
new file mode 100644
index 000000000..ea4b86b98
--- /dev/null
+++ b/data_model/src/test/java/com/intuit/tank/util/DataFileUtilTest.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2011 Intuit Inc. All Rights Reserved
+ */
+package com.intuit.tank.util;
+
+/*
+ * #%L
+ * Intuit Tank data model
+ * %%
+ * Copyright (C) 2011 - 2015 Intuit Inc.
+ * %%
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * #L%
+ */
+
+import com.intuit.tank.project.DataFile;
+import com.intuit.tank.storage.FileData;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * DataFileUtilTest
+ *
+ */
+public class DataFileUtilTest {
+
+    @Test
+    public void testGetDataFileServiceUrl() {
+        String expected = "http://localhost:8080/tank/rest/v1/datafile-service/datafile/1/version/2?offset=3&num-lines=4";
+        assertEquals(expected, DataFileUtil.getDataFileServiceUrl(1, 2, 3, 4));
+    }
+
+    @Test
+    public void testGetFileData() {
+        DataFile df = new DataFile();
+        df.setId(1);
+        df.setFileName("testFileName");
+
+        FileData fd = DataFileUtil.getFileData(df);
+
+        assertEquals("1", fd.getPath());
+        assertEquals("testFileName", fd.getFileName());
+    }
+
+    @Test
+    public void testGetNumLines() {
+        assertEquals(0, DataFileUtil.getNumLines(new DataFile()));
+    }
+}
diff --git a/doc/doc_xslt/pom.xml b/doc/doc_xslt/pom.xml
index 9efa90ba2..40ed726ba 100644
--- a/doc/doc_xslt/pom.xml
+++ b/doc/doc_xslt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent-doc</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>pressgang-xslt-ns</artifactId>
diff --git a/doc/jdocbook_style/pom.xml b/doc/jdocbook_style/pom.xml
index 87e05f270..4af5e22c5 100644
--- a/doc/jdocbook_style/pom.xml
+++ b/doc/jdocbook_style/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent-doc</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>tank-common-jdocbook-style</artifactId>
diff --git a/doc/pom.xml b/doc/pom.xml
index 949d26ad3..aee14675a 100755
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>tank-parent-doc</artifactId>
diff --git a/doc/tank_installation_guide/pom.xml b/doc/tank_installation_guide/pom.xml
index e8d6d6ab7..714db2596 100644
--- a/doc/tank_installation_guide/pom.xml
+++ b/doc/tank_installation_guide/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent-doc</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
   
   <artifactId>tank-installation-guide</artifactId>
diff --git a/doc/tank_user_guide/pom.xml b/doc/tank_user_guide/pom.xml
index 77c258e59..673175f8a 100755
--- a/doc/tank_user_guide/pom.xml
+++ b/doc/tank_user_guide/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent-doc</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>tank-user-guide</artifactId>
diff --git a/harness_data/pom.xml b/harness_data/pom.xml
index 5038ac5fd..6a4916df5 100644
--- a/harness_data/pom.xml
+++ b/harness_data/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>harness-data</artifactId>
diff --git a/mail/pom.xml b/mail/pom.xml
index 14cdee8b2..418b96352 100644
--- a/mail/pom.xml
+++ b/mail/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>tank-mail</artifactId>
diff --git a/pom.xml b/pom.xml
index 0b21c27e0..03d9495b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.intuit.tank</groupId>
   <artifactId>tank-parent</artifactId>
-  <version>2.3.4</version>
+  <version>3.0.0</version>
 
   <packaging>pom</packaging>
   <name>Tank Parent</name>
@@ -27,36 +27,37 @@
     <cert.password>tanktank</cert.password>
     <cert.p12>self_signed_tank.p12</cert.p12>
 
-    <version.hibernate>5.1.17.Final</version.hibernate>
-    <version-aws-sdk>1.11.762</version-aws-sdk>
+    <version.hibernate>5.4.22.Final</version.hibernate>
+    <version.aws-sdk-bom>2.15.14</version.aws-sdk-bom>
+    <version.aws-xray-sdk-bom>2.6.1</version.aws-xray-sdk-bom>
 
-    <version-tomcat>9.0.34</version-tomcat>
+    <version-tomcat>9.0.39</version-tomcat>
 
-    <weld.version>3.1.3.Final</weld.version>
+    <weld.version>3.1.5.SP1</weld.version>
     <cdi.version>2.0</cdi.version>
     <version.picketlink.javaee.bom>2.7.1.Final</version.picketlink.javaee.bom>
 
-    <version.enunciate>2.12.1</version.enunciate>
+    <version.enunciate>2.13.2</version.enunciate>
 
-    <version.mojarra>2.3.9</version.mojarra>
+    <version.mojarra>2.4.0</version.mojarra>
     <version.jsf-api>2.3</version.jsf-api>
     <version.primefaces>8.0</version.primefaces>
-    <version.primefaces-ext>8.0</version.primefaces-ext>
+    <version.primefaces-ext>8.0.4</version.primefaces-ext>
     <version.jsr166>1.7.0</version.jsr166>
     <version.surefire>2.22.2</version.surefire>
-    <version.jersey>2.29</version.jersey>
-    <version.junit>5.6.0</version.junit>
-    <version.httpclient>4.5.12</version.httpclient>
-    <version.httpclient5>5.0</version.httpclient5>
-    <version.lucene>8.4.1</version.lucene>
-
-    <version.groovy>2.4.17</version.groovy>
+    <version.jersey>2.32</version.jersey>
+    <version.junit>5.6.2</version.junit>
+    <version.httpclient>4.5.13</version.httpclient>
+    <version.httpclient5>5.0.3</version.httpclient5>
+    <version.lucene>8.6.3</version.lucene>
+    <version.jaxb>2.3.3</version.jaxb>
+
+    <version.groovy>2.4.20</version.groovy>
     <version.spock>1.3-groovy-2.5</version.spock>
 
     <!-- maven-compiler-plugin -->
     <version.compiler.plugin>3.8.1</version.compiler.plugin>
-    <maven.compiler.target>8</maven.compiler.target>
-    <maven.compiler.source>8</maven.compiler.source>
+    <maven.jdk.target>11</maven.jdk.target>
   </properties>
 
 
@@ -292,7 +293,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>test-support</artifactId>
-      <version>2.3.4</version>
+      <version>3.0.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -347,17 +348,21 @@
       <artifactId>javax.servlet.jsp-api</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
   </dependencies>
 
 
   <dependencyManagement>
     <!-- This section specifies defaults for dependencies. --><!-- Any subpom can use these dependencies without specifying version -->
-
     <dependencies>
       <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
-        <version>8.0.19</version>
+        <version>8.0.22</version>
       </dependency>
 
       <dependency>
@@ -568,8 +573,7 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
-        <!-- never versions break jsonlayout -->
-        <version>2.11.2</version>
+        <version>2.13.3</version>
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
@@ -586,7 +590,7 @@
       <dependency>
         <groupId>com.opencsv</groupId>
         <artifactId>opencsv</artifactId>
-        <version>5.1</version>
+        <version>5.2</version>
       </dependency>
 
       <dependency>
@@ -679,12 +683,6 @@
         <artifactId>exp4j</artifactId>
         <version>0.3.11</version>
       </dependency>
-      <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>2.12.0</version>
-        <scope>provided</scope>
-      </dependency>
       <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
@@ -697,9 +695,9 @@
         <version>3.6.1</version>
       </dependency>
       <dependency>
-        <groupId>com.amazonaws</groupId>
-        <artifactId>aws-java-sdk-bom</artifactId>
-        <version>${version-aws-sdk}</version>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>bom</artifactId>
+        <version>${version.aws-sdk-bom}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -707,7 +705,7 @@
       <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-xray-recorder-sdk-bom</artifactId>
-        <version>2.4.0</version>
+        <version>${version.aws-xray-sdk-bom}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -767,11 +765,6 @@
         <artifactId>jsr173</artifactId>
         <version>1.0</version>
       </dependency>
-      <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.3.1</version>
-      </dependency>
       <dependency>
         <groupId>org.jboss.weld.servlet</groupId>
         <artifactId>weld-servlet-core</artifactId>
@@ -836,6 +829,23 @@
         <version>3.0.2</version>
         <scope>provided</scope>
       </dependency>
+
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>${version.jaxb}</version>
+      </dependency>
+      <dependency>
+        <groupId>jakarta.xml.ws</groupId>
+        <artifactId>jakarta.xml.ws-api</artifactId>
+        <version>${version.jaxb}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>${version.jaxb}</version>
+        <scope>runtime</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -957,7 +967,7 @@
             <dependency>
               <groupId>${project.groupId}</groupId>
               <artifactId>test-support</artifactId>
-              <version>2.3.4</version>
+              <version>3.0.0</version>
             </dependency>
           </dependencies>
           <configuration>
@@ -999,8 +1009,7 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${version.compiler.plugin}</version>
           <configuration>
-            <source>${maven.compiler.source}</source>
-            <target>${maven.compiler.target}</target>
+            <release>${maven.jdk.target}</release>
           </configuration>
         </plugin>
         <plugin>
@@ -1149,11 +1158,10 @@
   </reporting>
 
   <repositories>
-
     <repository>
       <id>jboss-repo</id>
       <name>Jboss maven repo</name>
-      <url>http://repository.jboss.org/nexus/content/groups/public</url>
+      <url>https://repository.jboss.org/nexus/content/groups/public</url>
     </repository>
     <repository>
       <id>jboss-public-repository-group</id>
@@ -1167,15 +1175,10 @@
         Releases</name>
       <url>https://repository.jboss.org/nexus/content/repositories/thirdparty-releases</url>
     </repository>
-    <repository>
-      <id>java.net</id>
-      <name>java.net Repository</name>
-      <url>http://download.java.net/maven/2</url>
-    </repository>
     <repository>
       <id>prime-repo</id>
       <name>PrimeFaces Maven Repository</name>
-      <url>http://repository.primefaces.org</url>
+      <url>https://repository.primefaces.org</url>
       <layout>default</layout>
     </repository>
     <repository>
@@ -1183,27 +1186,13 @@
       <name>Codehaus Repo</name>
       <url>https://repository-master.mulesoft.org/nexus/content/groups/public/</url>
     </repository>
-    <repository>
-      <id>ibiblio</id>
-      <name>Main Ibiblio Repo</name>
-      <url>http://maven.ibiblio.org/maven2/</url>
-    </repository>
-    <repository>
-      <id>owr</id>
-      <name>ObjectWeb</name>
-      <url>http://maven.ow2.org/maven2/</url>
-    </repository>
     <repository>
       <id>Maven Central 1</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-    <repository>
-      <id>Maven Central 2</id>
-      <url>http://central.maven.org/maven2</url>
+      <url>https://repo1.maven.org/maven2</url>
     </repository>
     <repository>
       <id>Spring Plugins Repository</id>
-      <url>http://repo.spring.io/plugins-release/</url>
+      <url>https://repo.spring.io/plugins-release/</url>
     </repository>
   </repositories>
 
@@ -1218,7 +1207,7 @@
     <pluginRepository>
       <id>Maven Central 2 plugins</id>
       <name>Central</name>
-      <url>http://repo2.maven.org/maven2</url>
+      <url>https://repo2.maven.org/maven2</url>
       <layout>default</layout>
     </pluginRepository>
   </pluginRepositories>
diff --git a/proxy-parent/WebConversation/pom.xml b/proxy-parent/WebConversation/pom.xml
index 6da243810..bd90934e1 100644
--- a/proxy-parent/WebConversation/pom.xml
+++ b/proxy-parent/WebConversation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>proxy-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>WebConversation</artifactId>
diff --git a/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Header.java b/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Header.java
index 68a7f7ead..aca586d61 100644
--- a/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Header.java
+++ b/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Header.java
@@ -1,6 +1,7 @@
 package com.intuit.tank.conversation;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 import javax.annotation.Nonnull;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -31,11 +32,7 @@ public Header(@Nonnull String key, @Nonnull String value) {
         if (value == null) {
             value = "";
         }
-        try {
-            this.valueBytes = value.getBytes(UTF_8);
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
+        this.valueBytes = value.getBytes(StandardCharsets.UTF_8);
     }
 
     /**
@@ -58,11 +55,7 @@ public void setKey(String key) {
     @XmlTransient
     public String getValue() {
         String value = "";
-        try {
-            value = new String(valueBytes, UTF_8);
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
+        value = new String(valueBytes, StandardCharsets.UTF_8);
         return value;
     }
 
diff --git a/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Request.java b/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Request.java
index 89138fc68..c38502264 100644
--- a/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Request.java
+++ b/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Request.java
@@ -1,6 +1,7 @@
 package com.intuit.tank.conversation;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -74,11 +75,7 @@ public byte[] getBody() {
     public String getBodyAsString() {
         String ret = null;
         if (body != null) {
-            try {
-                ret = new String(body, "UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                // swallow this should never occur.
-            }
+            ret = new String(body, StandardCharsets.UTF_8);
         }
         return ret;
     }
diff --git a/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Response.java b/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Response.java
index c5e645abd..3a337fae7 100644
--- a/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Response.java
+++ b/proxy-parent/WebConversation/src/main/java/com/intuit/tank/conversation/Response.java
@@ -1,6 +1,7 @@
 package com.intuit.tank.conversation;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -60,11 +61,7 @@ public void setBody(byte[] body) {
     public String getBodyAsString() {
         String ret = null;
         if (body != null) {
-            try {
-                ret = new String(body, "UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                // swallow this should never occur.
-            }
+            ret = new String(body, StandardCharsets.UTF_8);
         }
         return ret;
     }
diff --git a/proxy-parent/owasp-proxy/pom.xml b/proxy-parent/owasp-proxy/pom.xml
index 5a4f23be6..2903bfa37 100755
--- a/proxy-parent/owasp-proxy/pom.xml
+++ b/proxy-parent/owasp-proxy/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>proxy-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>owasp-proxy</artifactId>
diff --git a/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/http/server/BufferingHttpRequestHandler.java b/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/http/server/BufferingHttpRequestHandler.java
index 3957a6881..76aed352c 100644
--- a/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/http/server/BufferingHttpRequestHandler.java
+++ b/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/http/server/BufferingHttpRequestHandler.java
@@ -26,6 +26,7 @@
 import java.io.InputStream;
 import java.io.SequenceInputStream;
 import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
 
 import org.owasp.proxy.http.BufferedRequest;
 import org.owasp.proxy.http.MessageFormatException;
@@ -129,7 +130,7 @@ private void handleResponse(final BufferedRequest request,
             try {
                 MessageUtils.buffer(response, brs, max);
                 interceptor.processResponse(request, brs);
-                new String(brs.getDecodedContent(), "utf-8");
+                new String(brs.getDecodedContent(), StandardCharsets.UTF_8);
                 MessageUtils.stream(brs, response);
             } catch (SizeLimitExceededException slee) {
                 InputStream buffered = new ByteArrayInputStream(brs
diff --git a/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/AsciiString.java b/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/AsciiString.java
index 1c75fa215..ccfad617e 100644
--- a/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/AsciiString.java
+++ b/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/AsciiString.java
@@ -22,37 +22,23 @@
 package org.owasp.proxy.util;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 public class AsciiString {
 
     public static String create(byte[] buff) {
         if (buff == null)
             return "";
-        try {
-            return new String(buff, "ASCII");
-        } catch (UnsupportedEncodingException uee) {
-            uee.printStackTrace();
-            return null;
-        }
+        return new String(buff, StandardCharsets.US_ASCII);
     }
 
     public static String create(byte[] buff, int off, int len) {
         if (buff == null)
             return "";
-        try {
-            return new String(buff, off, len, "ASCII");
-        } catch (UnsupportedEncodingException uee) {
-            uee.printStackTrace();
-            return null;
-        }
+        return new String(buff, off, len, StandardCharsets.US_ASCII);
     }
 
     public static byte[] getBytes(String string) {
-        try {
-            return string.getBytes("ASCII");
-        } catch (UnsupportedEncodingException uee) {
-            uee.printStackTrace();
-            return null;
-        }
+        return string.getBytes(StandardCharsets.US_ASCII);
     }
 }
diff --git a/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/Base64.java b/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/Base64.java
index 4178efbb8..3de1fe923 100644
--- a/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/Base64.java
+++ b/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/Base64.java
@@ -22,6 +22,7 @@
 package org.owasp.proxy.util;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 /**
  * <p>
@@ -1627,7 +1628,7 @@ public static void encodeFileToFile(String infile, String outfile)
         String encoded = Base64.encodeFromFile(infile);
         try (java.io.OutputStream out = new java.io.BufferedOutputStream(
                 new java.io.FileOutputStream(outfile))) {
-            out.write(encoded.getBytes("US-ASCII")); // Strict, 7-bit output.
+            out.write(encoded.getBytes(StandardCharsets.US_ASCII)); // Strict, 7-bit output.
         } catch (IOException e) {
             throw e; // Catch and release to execute finally{}
         }
diff --git a/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/TextFormatter.java b/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/TextFormatter.java
index 56cfebc8a..b5498764f 100644
--- a/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/TextFormatter.java
+++ b/proxy-parent/owasp-proxy/src/main/java/org/owasp/proxy/util/TextFormatter.java
@@ -43,7 +43,7 @@ public String format(LogRecord record) {
         buff.append(sdf.format(new Date(record.getMillis())));
         buff.append(Thread.currentThread().getName());
         String className = record.getSourceClassName();
-        if (className.indexOf(".") > -1) {
+        if (className.contains(".")) {
             className = className.substring(className.lastIndexOf(".") + 1,
                     className.length());
         }
diff --git a/proxy-parent/pom.xml b/proxy-parent/pom.xml
index 733c503f0..8e25d5207 100644
--- a/proxy-parent/pom.xml
+++ b/proxy-parent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>proxy-parent</artifactId>
@@ -28,9 +28,10 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <compilerArgument>-XDignore.symbol.file</compilerArgument>
+          <release>11</release>
         </configuration>
       </plugin>
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/proxy-parent/proxy-extension/pom.xml b/proxy-parent/proxy-extension/pom.xml
index f984c4a63..c7f04cce9 100644
--- a/proxy-parent/proxy-extension/pom.xml
+++ b/proxy-parent/proxy-extension/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>proxy-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>proxy-extension</artifactId>
diff --git a/proxy-parent/proxy_pkg/pom.xml b/proxy-parent/proxy_pkg/pom.xml
index 5ef842b74..9fb8ee825 100644
--- a/proxy-parent/proxy_pkg/pom.xml
+++ b/proxy-parent/proxy_pkg/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>proxy-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
 
@@ -22,6 +22,17 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>proxy-extension</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>software.amazon.awssdk</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>runtime</scope>
     </dependency>
   </dependencies>
 
diff --git a/readme.md b/readme.md
index d4ad58f7b..0370bc2ca 100644
--- a/readme.md
+++ b/readme.md
@@ -2,8 +2,8 @@
 
 [![Build Status](https://travis-ci.org/intuit/Tank.svg?branch=master)](https://travis-ci.org/intuit/Tank)
 ![Build Status](https://codebuild.us-east-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiT1Nuc1prblk5Y0E3a05mRjF0QUtBblI0Rk1zTjZyZi9NMWNCaFg4cGlzL1dFN0xVMHgzcGt1ZCtBdFZjNWpMRkhXbGN2T1ZKSmpZbGQ3YjhyaWkzdkJBPSIsIml2UGFyYW1ldGVyU3BlYyI6IlpGbU5vTHM2cHQrbUowOVkiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
-[![release](https://img.shields.io/badge/release-2.3.4-yellogreen.svg)](https://github.com/intuit/Tank/releases/tag/2.3.3)
-[![java](https://img.shields.io/badge/java-1.8-blue.svg)](https://aws.amazon.com/corretto/)
+[![release](https://img.shields.io/badge/release-3.0.0-yellogreen.svg)](https://github.com/intuit/Tank/releases/tag/2.3.3)
+[![java](https://img.shields.io/badge/java-11-blue.svg)](https://aws.amazon.com/corretto/)
 [![tomcat](https://img.shields.io/badge/tomcat-8%20%7C%208.5%20%7C%209-blue.svg)](http://tomcat.apache.org/)
 # Intuit Tank
 
@@ -54,4 +54,4 @@ Any contributions should include new or updated unit tests as necessary to maint
 Tank is provided under the [Eclipse Public License - Version 1.0](http://www.eclipse.org/legal/epl-v10.html)
 
 ## FAQ
-Please see our [FAQ on our wiki](https://github.com/intuit/Tank/wiki/FAQ).
\ No newline at end of file
+Please see our [FAQ on our wiki](https://github.com/intuit/Tank/wiki/FAQ).
diff --git a/reporting/api/pom.xml b/reporting/api/pom.xml
index 89d09a177..acac6e8bc 100644
--- a/reporting/api/pom.xml
+++ b/reporting/api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>reporting-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>reporting-api</artifactId>
diff --git a/reporting/db/pom.xml b/reporting/db/pom.xml
index 307cd83b8..855e0ad78 100644
--- a/reporting/db/pom.xml
+++ b/reporting/db/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>reporting-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>reporting-db</artifactId>
@@ -28,13 +28,13 @@
     </dependency>
 
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-dynamodb</artifactId>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>dynamodb</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-cloudwatchmetrics</artifactId>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>cloudwatch</artifactId>
     </dependency>
 
     <dependency>
diff --git a/reporting/db/src/main/java/com/intuit/tank/persistence/databases/AmazonDynamoDatabaseDocApi.java b/reporting/db/src/main/java/com/intuit/tank/persistence/databases/AmazonDynamoDatabaseDocApi.java
index e07713bd9..d03d98d62 100644
--- a/reporting/db/src/main/java/com/intuit/tank/persistence/databases/AmazonDynamoDatabaseDocApi.java
+++ b/reporting/db/src/main/java/com/intuit/tank/persistence/databases/AmazonDynamoDatabaseDocApi.java
@@ -29,8 +29,6 @@
 
 import javax.annotation.Nonnull;
 
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -38,40 +36,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.amazonaws.AmazonServiceException;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-import com.amazonaws.services.dynamodbv2.document.DynamoDB;
-import com.amazonaws.services.dynamodbv2.document.Table;
-import com.amazonaws.services.dynamodbv2.model.AttributeDefinition;
-import com.amazonaws.services.dynamodbv2.model.AttributeValue;
-import com.amazonaws.services.dynamodbv2.model.BatchWriteItemRequest;
-import com.amazonaws.services.dynamodbv2.model.BatchWriteItemResult;
-import com.amazonaws.services.dynamodbv2.model.ComparisonOperator;
-import com.amazonaws.services.dynamodbv2.model.Condition;
-import com.amazonaws.services.dynamodbv2.model.ConsumedCapacity;
-import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;
-import com.amazonaws.services.dynamodbv2.model.CreateTableResult;
-import com.amazonaws.services.dynamodbv2.model.DeleteRequest;
-import com.amazonaws.services.dynamodbv2.model.DeleteTableRequest;
-import com.amazonaws.services.dynamodbv2.model.DeleteTableResult;
-import com.amazonaws.services.dynamodbv2.model.DescribeTableRequest;
-import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;
-import com.amazonaws.services.dynamodbv2.model.KeyType;
-import com.amazonaws.services.dynamodbv2.model.ListTablesRequest;
-import com.amazonaws.services.dynamodbv2.model.ListTablesResult;
-import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
-import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughputDescription;
-import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughputExceededException;
-import com.amazonaws.services.dynamodbv2.model.PutRequest;
-import com.amazonaws.services.dynamodbv2.model.QueryRequest;
-import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;
-import com.amazonaws.services.dynamodbv2.model.ScanRequest;
-import com.amazonaws.services.dynamodbv2.model.ScanResult;
-import com.amazonaws.services.dynamodbv2.model.TableDescription;
-import com.amazonaws.services.dynamodbv2.model.TableStatus;
-import com.amazonaws.services.dynamodbv2.model.WriteRequest;
 import com.intuit.tank.reporting.databases.Attribute;
 import com.intuit.tank.reporting.databases.IDatabase;
 import com.intuit.tank.reporting.databases.Item;
@@ -83,12 +47,47 @@
 import com.intuit.tank.vm.settings.CloudCredentials;
 import com.intuit.tank.vm.settings.CloudProvider;
 import com.intuit.tank.vm.settings.TankConfig;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.AttributeDefinition;
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
+import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemRequest;
+import software.amazon.awssdk.services.dynamodb.model.BatchWriteItemResponse;
+import software.amazon.awssdk.services.dynamodb.model.ComparisonOperator;
+import software.amazon.awssdk.services.dynamodb.model.Condition;
+import software.amazon.awssdk.services.dynamodb.model.ConsumedCapacity;
+import software.amazon.awssdk.services.dynamodb.model.CreateTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.CreateTableResponse;
+import software.amazon.awssdk.services.dynamodb.model.DeleteRequest;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.DeleteTableResponse;
+import software.amazon.awssdk.services.dynamodb.model.DescribeTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.DescribeTableResponse;
+import software.amazon.awssdk.services.dynamodb.model.KeySchemaElement;
+import software.amazon.awssdk.services.dynamodb.model.KeyType;
+import software.amazon.awssdk.services.dynamodb.model.ListTablesRequest;
+import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
+import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughput;
+import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughputDescription;
+import software.amazon.awssdk.services.dynamodb.model.ProvisionedThroughputExceededException;
+import software.amazon.awssdk.services.dynamodb.model.PutRequest;
+import software.amazon.awssdk.services.dynamodb.model.QueryRequest;
+import software.amazon.awssdk.services.dynamodb.model.ScalarAttributeType;
+import software.amazon.awssdk.services.dynamodb.model.ScanRequest;
+import software.amazon.awssdk.services.dynamodb.model.ScanResponse;
+import software.amazon.awssdk.services.dynamodb.model.TableDescription;
+import software.amazon.awssdk.services.dynamodb.model.TableStatus;
+import software.amazon.awssdk.services.dynamodb.model.UpdateTableRequest;
+import software.amazon.awssdk.services.dynamodb.model.WriteRequest;
 
 public class AmazonDynamoDatabaseDocApi implements IDatabase {
 
     private static final int MAX_NUMBER_OF_RETRIES = 5;
-    private AmazonDynamoDB dynamoDb;
-    private TankConfig config = new TankConfig();
+    private final TankConfig config = new TankConfig();
+    private DynamoDbClient dynamoDbClient;
 
     private static final ThreadPoolExecutor EXECUTOR = new ThreadPoolExecutor(10, 50, 60, TimeUnit.SECONDS,
             new ArrayBlockingQueue<Runnable>(50), Executors.defaultThreadFactory(),
@@ -97,27 +96,27 @@ public class AmazonDynamoDatabaseDocApi implements IDatabase {
     protected static final int BATCH_SIZE = 25;
     private static final long MAX_WRITE_UNITS = 1500L;
 
-    private static Logger logger = LogManager.getLogger(AmazonDynamoDatabaseDocApi.class);
+    private static Logger LOG = LogManager.getLogger(AmazonDynamoDatabaseDocApi.class);
 
     /**
      *
      */
     public AmazonDynamoDatabaseDocApi() {
         CloudCredentials creds = new TankConfig().getVmManagerConfig().getCloudCredentials(CloudProvider.amazon);
-        if (creds != null && StringUtils.isNotBlank(creds.getKeyId())) {
-            AWSCredentials credentials = new BasicAWSCredentials(creds.getKeyId(), creds.getKey());
-            this.dynamoDb = AmazonDynamoDBClientBuilder.standard().withCredentials(new AWSStaticCredentialsProvider(credentials)).build();
+        if (creds != null && StringUtils.isNotBlank(creds.getKey()) && StringUtils.isNotBlank(creds.getKeyId())) {
+            AwsCredentials credentials = AwsBasicCredentials.create(creds.getKeyId(), creds.getKey());
+            this.dynamoDbClient = DynamoDbClient.builder().credentialsProvider(StaticCredentialsProvider.create(credentials)).build();
         } else {
-            this.dynamoDb = AmazonDynamoDBClientBuilder.defaultClient();
+            this.dynamoDbClient = DynamoDbClient.builder().build();
         }
     }
 
     /**
      * 
-     * @param dynamoDb
+     * @param dynamoDbClient
      */
-    public AmazonDynamoDatabaseDocApi(AmazonDynamoDB dynamoDb) {
-        this.dynamoDb = dynamoDb;
+    public AmazonDynamoDatabaseDocApi(DynamoDbClient dynamoDbClient) {
+        this.dynamoDbClient = dynamoDbClient;
     }
 
     /**
@@ -128,34 +127,35 @@ public AmazonDynamoDatabaseDocApi(AmazonDynamoDB dynamoDb) {
     public void initNamespace(String tableName) {
         try {
             if (!hasTable(tableName)) {
-                logger.info("Creating table: " + tableName);
+                LOG.info("Creating table: " + tableName);
                 HierarchicalConfiguration resultsProviderConfig = config.getVmManagerConfig()
                         .getResultsProviderConfig();
                 long readCapacity = getCapacity(resultsProviderConfig, "read-capacity", 10L);
                 long writeCapacity = getCapacity(resultsProviderConfig, "write-capacity", 50L);
                 ArrayList<AttributeDefinition> attributeDefinitions = new ArrayList<AttributeDefinition>();
-                attributeDefinitions.add(new AttributeDefinition().withAttributeName(
-                        DatabaseKeys.JOB_ID_KEY.getShortKey()).withAttributeType(ScalarAttributeType.S));
-                attributeDefinitions.add(new AttributeDefinition().withAttributeName(
-                        DatabaseKeys.REQUEST_NAME_KEY.getShortKey()).withAttributeType(ScalarAttributeType.S));
-                ProvisionedThroughput provisionedThroughput = new ProvisionedThroughput().withReadCapacityUnits(
-                        readCapacity).withWriteCapacityUnits(writeCapacity);
-                KeySchemaElement hashKeyElement = new KeySchemaElement().withAttributeName(
-                        DatabaseKeys.JOB_ID_KEY.getShortKey()).withKeyType(KeyType.HASH);
-                KeySchemaElement rangeKeyElement = new KeySchemaElement().withAttributeName(
-                        DatabaseKeys.REQUEST_NAME_KEY.getShortKey()).withKeyType(KeyType.RANGE);
-                CreateTableRequest request = new CreateTableRequest()
-                        .withTableName(tableName)
-                        .withKeySchema(hashKeyElement, rangeKeyElement)
-                        .withAttributeDefinitions(attributeDefinitions)
-                        .withProvisionedThroughput(provisionedThroughput);
-
-                CreateTableResult result = dynamoDb.createTable(request);
+                attributeDefinitions.add(AttributeDefinition.builder().attributeName(
+                        DatabaseKeys.JOB_ID_KEY.getShortKey()).attributeType(ScalarAttributeType.S).build());
+                attributeDefinitions.add(AttributeDefinition.builder().attributeName(
+                        DatabaseKeys.REQUEST_NAME_KEY.getShortKey()).attributeType(ScalarAttributeType.S).build());
+                ProvisionedThroughput provisionedThroughput = ProvisionedThroughput.builder().readCapacityUnits(
+                        readCapacity).writeCapacityUnits(writeCapacity).build();
+                KeySchemaElement hashKeyElement = KeySchemaElement.builder().attributeName(
+                        DatabaseKeys.JOB_ID_KEY.getShortKey()).keyType(KeyType.HASH).build();
+                KeySchemaElement rangeKeyElement = KeySchemaElement.builder().attributeName(
+                        DatabaseKeys.REQUEST_NAME_KEY.getShortKey()).keyType(KeyType.RANGE).build();
+                CreateTableRequest request = CreateTableRequest.builder()
+                        .tableName(tableName)
+                        .keySchema(hashKeyElement, rangeKeyElement)
+                        .attributeDefinitions(attributeDefinitions)
+                        .provisionedThroughput(provisionedThroughput)
+                        .build();
+
+                CreateTableResponse response = dynamoDbClient.createTable(request);
                 waitForStatus(tableName, TableStatus.ACTIVE);
-                logger.info("Created table: " + result.getTableDescription().getTableName());
+                LOG.info("Created table: " + response.tableDescription().tableName());
             }
         } catch (Exception t) {
-            logger.error(t, t);
+            LOG.error(t, t);
             throw new RuntimeException(t);
         }
     }
@@ -168,7 +168,7 @@ private long getCapacity(HierarchicalConfiguration resultsProviderConfig, String
                     return Long.parseLong(string);
                 }
             } catch (Exception e) {
-                logger.error(e.toString());
+                LOG.error(e.toString());
             }
         }
         return defaultValue;
@@ -182,14 +182,14 @@ private long getCapacity(HierarchicalConfiguration resultsProviderConfig, String
     public void removeNamespace(String tableName) {
         try {
             if (hasTable(tableName)) {
-                logger.info("Deleting table: " + tableName);
-                DeleteTableRequest deleteTableRequest = new DeleteTableRequest(tableName);
-                DeleteTableResult result = dynamoDb.deleteTable(deleteTableRequest);
-                logger.info("Deleted table: " + result.getTableDescription().getTableName());
+                LOG.info("Deleting table: " + tableName);
+                DeleteTableRequest deleteTableRequest = DeleteTableRequest.builder().tableName(tableName).build();
+                DeleteTableResponse response = dynamoDbClient.deleteTable(deleteTableRequest);
+                LOG.info("Deleted table: " + response.tableDescription().tableName());
                 waitForDelete(tableName);
             }
         } catch (Exception t) {
-            logger.error(t, t);
+            LOG.error(t, t);
             throw new RuntimeException(t);
         }
     }
@@ -202,14 +202,14 @@ public void removeNamespace(String tableName) {
     public boolean hasTable(String tableName) {
         String nextTableName = null;
         do {
-            ListTablesResult listTables = dynamoDb.listTables(new ListTablesRequest()
-                    .withExclusiveStartTableName(nextTableName));
-            for (String name : listTables.getTableNames()) {
+            ListTablesResponse listTables =
+                    dynamoDbClient.listTables(ListTablesRequest.builder().exclusiveStartTableName(nextTableName).build());
+            for (String name : listTables.tableNames()) {
                 if (tableName.equalsIgnoreCase(name)) {
                     return true;
                 }
             }
-            nextTableName = listTables.getLastEvaluatedTableName();
+            nextTableName = listTables.lastEvaluatedTableName();
         } while (nextTableName != null);
         return false;
     }
@@ -224,13 +224,17 @@ public void addTimingResults(final @Nonnull String tableName, final @Nonnull Lis
         if (!results.isEmpty()) {
             Runnable task = new Runnable() {
                 public void run() {
-                    MethodTimer mt = new MethodTimer(logger, this.getClass(), "addTimingResults (" + results + ")");
+                    MethodTimer mt = new MethodTimer(LOG, this.getClass(), "addTimingResults (" + results + ")");
                     List<WriteRequest> requests;
                     try {
-                        requests = results.stream().map(result -> getTimingAttributes(result)).map(item -> new PutRequest().withItem(item)).map(putRequest -> new WriteRequest().withPutRequest(putRequest)).collect(Collectors.toList());
+                        requests = results.stream()
+                                .map(result -> getTimingAttributes(result))
+                                .map(item -> PutRequest.builder().item(item).build())
+                                .map(putRequest -> WriteRequest.builder().putRequest(putRequest).build())
+                                .collect(Collectors.toList());
                         sendBatch(tableName, requests);
                     } catch (Exception t) {
-                        logger.error("Error adding results: " + t.getMessage(), t);
+                        LOG.error("Error adding results: " + t.getMessage(), t);
                         throw new RuntimeException(t);
                     }
                     mt.endAndLog();
@@ -253,14 +257,14 @@ public Set<String> getTables(String regex) {
         Set<String> result = new HashSet<String>();
         String nextTableName = null;
         do {
-            ListTablesResult listTables = dynamoDb.listTables(new ListTablesRequest()
-                    .withExclusiveStartTableName(nextTableName));
-            for (String s : listTables.getTableNames()) {
+            ListTablesResponse listTables = dynamoDbClient.listTables(ListTablesRequest.builder()
+                    .exclusiveStartTableName(nextTableName).build());
+            for (String s : listTables.tableNames()) {
                 if (s.matches(regex)) {
                     result.add(s);
                 }
             }
-            nextTableName = listTables.getLastEvaluatedTableName();
+            nextTableName = listTables.lastEvaluatedTableName();
         } while (nextTableName != null);
 
         return result;
@@ -274,46 +278,47 @@ public Set<String> getTables(String regex) {
     public PagedDatabaseResult getPagedItems(String tableName, Object nextToken, String minRange,
             String maxRange, String instanceId, String jobId) {
         Map<String, AttributeValue> lastKeyEvaluated = (Map<String, AttributeValue>) nextToken;
-        ScanRequest scanRequest = new ScanRequest().withTableName(tableName);
+        ScanRequest.Builder scanRequest = ScanRequest.builder().tableName(tableName);
         Map<String, Condition> conditions = new HashMap<String, Condition>();
         if (jobId != null) {
-            Condition jobIdCondition = new Condition();
-            jobIdCondition.withComparisonOperator(ComparisonOperator.EQ)
-                    .withAttributeValueList(new AttributeValue().withS(jobId));
-
+            Condition jobIdCondition = Condition.builder().comparisonOperator(ComparisonOperator.EQ)
+                    .attributeValueList(AttributeValue.builder().s(jobId).build()).build();
             conditions.put(DatabaseKeys.JOB_ID_KEY.getShortKey(), jobIdCondition);
         }
         if (StringUtils.isNotBlank(instanceId)) {
             // add a filter
-            Condition filter = new Condition();
-            filter.withComparisonOperator(ComparisonOperator.EQ).withAttributeValueList(
-                    new AttributeValue().withS(instanceId));
-            scanRequest.addScanFilterEntry(DatabaseKeys.INSTANCE_ID_KEY.getShortKey(), filter);
+            Condition filter = Condition.builder()
+                    .comparisonOperator(ComparisonOperator.EQ)
+                    .attributeValueList(AttributeValue.builder().s(instanceId).build())
+                    .build();
+            Map<String, Condition> map = new HashMap<>();
+            map.put(DatabaseKeys.INSTANCE_ID_KEY.getShortKey(), filter);
+            scanRequest.scanFilter(map);
         }
-        Condition rangeKeyCondition = new Condition();
+        Condition.Builder rangeKeyCondition = Condition.builder();
         if (minRange != null && maxRange != null) {
-            rangeKeyCondition.withComparisonOperator(ComparisonOperator.BETWEEN.toString())
-                    .withAttributeValueList(new AttributeValue().withS(minRange))
-                    .withAttributeValueList(new AttributeValue().withS(maxRange));
-
+            rangeKeyCondition.comparisonOperator(ComparisonOperator.BETWEEN.toString())
+                    .attributeValueList(AttributeValue.builder().s(minRange).build())
+                    .attributeValueList(AttributeValue.builder().s(maxRange).build());
         } else if (minRange != null) {
-            rangeKeyCondition.withComparisonOperator(ComparisonOperator.GE.toString())
-                    .withAttributeValueList(new AttributeValue().withS(minRange));
+            rangeKeyCondition.comparisonOperator(ComparisonOperator.GE.toString())
+                    .attributeValueList(AttributeValue.builder().s(minRange).build());
         } else if (maxRange != null) {
-            rangeKeyCondition.withComparisonOperator(ComparisonOperator.LT.toString())
-                    .withAttributeValueList(new AttributeValue().withS(maxRange));
+            rangeKeyCondition.comparisonOperator(ComparisonOperator.LT.toString())
+                    .attributeValueList(AttributeValue.builder().s(maxRange).build());
         } else {
             rangeKeyCondition = null;
         }
         if (rangeKeyCondition != null) {
-            conditions.put(DatabaseKeys.REQUEST_NAME_KEY.getShortKey(), rangeKeyCondition);
+            conditions.put(DatabaseKeys.REQUEST_NAME_KEY.getShortKey(), rangeKeyCondition.build());
         }
-        scanRequest.withScanFilter(conditions);
-        scanRequest.withExclusiveStartKey(lastKeyEvaluated);
+        scanRequest.scanFilter(conditions);
+        scanRequest.exclusiveStartKey(lastKeyEvaluated);
 
-        ScanResult result = dynamoDb.scan(scanRequest);
-        List<Item> ret = result.getItems().stream().map(this::getItemFromResult).collect(Collectors.toList());
-        return new PagedDatabaseResult(ret, result.getLastEvaluatedKey());
+        ScanResponse response = dynamoDbClient.scan(scanRequest.build());
+        return new PagedDatabaseResult(
+                response.items().stream().map(this::getItemFromResult).collect(Collectors.toList()),
+                response.lastEvaluatedKey());
     }
 
     /**
@@ -346,17 +351,17 @@ public void addItems(final String tableName, List<Item> itemList, final boolean
             final List<Item> items = new ArrayList<Item>(itemList);
             Runnable task = new Runnable() {
                 public void run() {
-                    MethodTimer mt = new MethodTimer(logger, this.getClass(), "addItems (" + items + ")");
+                    MethodTimer mt = new MethodTimer(LOG, this.getClass(), "addItems (" + items + ")");
                     List<WriteRequest> requests;
                     try {
                         requests = items.stream()
                                 .map(item -> itemToMap(item))
-                                .map(toInsert -> new PutRequest().withItem(toInsert))
-                                .map(putRequest -> new WriteRequest().withPutRequest(putRequest))
+                                .map(toInsert -> PutRequest.builder().item(toInsert).build())
+                                .map(putRequest -> WriteRequest.builder().putRequest(putRequest).build())
                                 .collect(Collectors.toList());
                         sendBatch(tableName, requests);
                     } catch (Exception t) {
-                        logger.error("Error adding results: " + t.getMessage(), t);
+                        LOG.error("Error adding results: " + t.getMessage(), t);
                         throw new RuntimeException(t);
                     }
                     mt.endAndLog();
@@ -377,7 +382,7 @@ public void run() {
     public void deleteForJob(final String tableName, final String jobId, final boolean asynch) {
         Runnable task = new Runnable() {
             public void run() {
-                MethodTimer mt = new MethodTimer(logger, this.getClass(), "deleteForJob (" + jobId + ")");
+                MethodTimer mt = new MethodTimer(LOG, this.getClass(), "deleteForJob (" + jobId + ")");
 
                 List<Item> items = getItems(tableName, null, null, null, jobId);
                 if (!items.isEmpty()) {
@@ -387,16 +392,16 @@ public void run() {
                             String id = item.getAttributes().stream().filter(attr -> DatabaseKeys.REQUEST_NAME_KEY.getShortKey().equals(attr.getName())).findFirst().map(Attribute::getValue).orElse(null);
                             if (id != null) {
                                 Map<String, AttributeValue> keyMap = new HashMap<String, AttributeValue>();
-                                keyMap.put(DatabaseKeys.REQUEST_NAME_KEY.getShortKey(), new AttributeValue().withS(id));
-                                keyMap.put(DatabaseKeys.JOB_ID_KEY.getShortKey(), new AttributeValue().withS(jobId));
-                                DeleteRequest deleteRequest = new DeleteRequest().withKey(keyMap);
-                                WriteRequest writeRequest = new WriteRequest().withDeleteRequest(deleteRequest);
+                                keyMap.put(DatabaseKeys.REQUEST_NAME_KEY.getShortKey(), AttributeValue.builder().s(id).build());
+                                keyMap.put(DatabaseKeys.JOB_ID_KEY.getShortKey(), AttributeValue.builder().s(jobId).build());
+                                DeleteRequest deleteRequest = DeleteRequest.builder().key(keyMap).build();
+                                WriteRequest writeRequest = WriteRequest.builder().deleteRequest(deleteRequest).build();
                                 requests.add(writeRequest);
                             }
                         }
                         sendBatch(tableName, requests);
                     } catch (Exception t) {
-                        logger.error("Error adding results: " + t.getMessage(), t);
+                        LOG.error("Error adding results: " + t.getMessage(), t);
                         throw new RuntimeException(t);
                     }
                 }
@@ -423,13 +428,13 @@ public String getDatabaseName(TankDatabaseType type, String jobId) {
     public boolean hasJobData(String tableName, String jobId) {
         if (hasTable(tableName)) {
             Map<String, Condition> keyConditions = new HashMap<String, Condition>();
-            Condition jobIdCondition = new Condition().withComparisonOperator(ComparisonOperator.EQ)
-                    .withAttributeValueList(new AttributeValue().withS(jobId));
+            Condition jobIdCondition = Condition.builder().comparisonOperator(ComparisonOperator.EQ)
+                    .attributeValueList(AttributeValue.builder().s(jobId).build()).build();
             keyConditions.put(DatabaseKeys.JOB_ID_KEY.getShortKey(), jobIdCondition);
-            QueryRequest queryRequest = new QueryRequest().withTableName(tableName).withKeyConditions(keyConditions)
-                    .withLimit(1);
+            QueryRequest queryRequest = QueryRequest.builder().tableName(tableName).keyConditions(keyConditions)
+                    .limit(1).build();
 
-            return dynamoDb.query(queryRequest).getCount() > 0;
+            return dynamoDbClient.query(queryRequest).count() > 0;
         }
         return false;
     }
@@ -442,7 +447,7 @@ private Item getItemFromResult(Map<String, AttributeValue> attributeMap) {
         List<Attribute> attrs = new ArrayList<Attribute>();
         Item ret = new Item(null, attrs);
         for (Map.Entry<String, AttributeValue> item : attributeMap.entrySet()) {
-            Attribute a = new Attribute(item.getKey(), item.getValue().getS());
+            Attribute a = new Attribute(item.getKey(), item.getValue().s());
             attrs.add(a);
             if (a.getName().equalsIgnoreCase(DatabaseKeys.LOGGING_KEY_KEY.getShortKey())) {
                 ret.setName(a.getValue());
@@ -472,7 +477,7 @@ private void addAttribute(Map<String, AttributeValue> attributes, String key, St
         if (value == null) {
             value = "";
         }
-        attributes.put(key, new AttributeValue().withS(value));
+        attributes.put(key, AttributeValue.builder().s(value).build());
     }
 
     private void addItemsToTable(String tableName, final BatchWriteItemRequest request) {
@@ -483,41 +488,38 @@ private void addItemsToTable(String tableName, final BatchWriteItemRequest reque
         do {
             shouldRetry = false;
             try {
-                BatchWriteItemResult result = dynamoDb.batchWriteItem(request);
-                if (result != null) {
+                BatchWriteItemResponse response = dynamoDbClient.batchWriteItem(request);
+                if (response != null) {
                     try {
-                        List<ConsumedCapacity> consumedCapacity = result.getConsumedCapacity();
+                        List<ConsumedCapacity> consumedCapacity = response.consumedCapacity();
                         for (ConsumedCapacity cap : consumedCapacity) {
-                            logger.info(cap.getCapacityUnits());
+                            LOG.info(cap.capacityUnits());
                         }
                     } catch (Exception e) {
                         // ignore this
                     }
                 }
-            } catch (AmazonServiceException e) {
+            } catch (AwsServiceException e) {
                 if (e instanceof ProvisionedThroughputExceededException) {
                     try {
-                        DynamoDB db = new DynamoDB(dynamoDb);
-                        Table table = db.getTable(tableName);
-                        ProvisionedThroughputDescription oldThroughput = table.getDescription()
-                                .getProvisionedThroughput();
-                        logger.info("ProvisionedThroughputExceeded throughput = " + oldThroughput);
-                        ProvisionedThroughput newThroughput = new ProvisionedThroughput()
-                                .withReadCapacityUnits(
-                                        table.getDescription().getProvisionedThroughput().getReadCapacityUnits())
-                                .withWriteCapacityUnits(
-                                        getIncreasedThroughput(table.getDescription().getProvisionedThroughput()
-                                                .getReadCapacityUnits()));
+                        DescribeTableResponse response =
+                                dynamoDbClient.describeTable(DescribeTableRequest.builder().tableName(tableName).build());
+                        ProvisionedThroughputDescription oldThroughput = response.table().provisionedThroughput();
+                        LOG.info("ProvisionedThroughputExceeded throughput = " + oldThroughput);
+                        ProvisionedThroughput newThroughput = ProvisionedThroughput.builder()
+                                .readCapacityUnits(response.table().provisionedThroughput().readCapacityUnits())
+                                .writeCapacityUnits(getIncreasedThroughput(response.table().provisionedThroughput()
+                                        .readCapacityUnits())).build();
+
                         if (!oldThroughput.equals(newThroughput)) {
-                            logger.info("Updating throughput to " + newThroughput);
-                            table.updateTable(newThroughput);
-                            table.waitForActive();
+                            LOG.info("Updating throughput to " + newThroughput);
+                            dynamoDbClient.updateTable(UpdateTableRequest.builder().provisionedThroughput(newThroughput).build());
                         }
                     } catch (Exception e1) {
-                        logger.error("Error increasing capacity: " + e, e);
+                        LOG.error("Error increasing capacity: " + e, e);
                     }
                 }
-                int status = e.getStatusCode();
+                int status = e.statusCode();
                 if (status == HttpStatus.SC_INTERNAL_SERVER_ERROR
                         || status == HttpStatus.SC_SERVICE_UNAVAILABLE) {
                     shouldRetry = true;
@@ -525,10 +527,10 @@ private void addItemsToTable(String tableName, final BatchWriteItemRequest reque
                     try {
                         Thread.sleep(delay);
                     } catch (InterruptedException iex) {
-                        logger.error("Caught InterruptedException exception", iex);
+                        LOG.error("Caught InterruptedException exception", iex);
                     }
                 } else {
-                    logger.error("Error writing to DB: " + e.getMessage());
+                    LOG.error("Error writing to DB: " + e.getMessage());
                     throw new RuntimeException(e);
                 }
             }
@@ -545,7 +547,7 @@ private Long getIncreasedThroughput(Long readCapacityUnits) {
     }
 
     private void waitForStatus(String tableName, TableStatus status) {
-        logger.info("Waiting for " + tableName + " to become " + status.toString() + "...");
+        LOG.info("Waiting for " + tableName + " to become " + status.toString() + "...");
 
         long startTime = System.currentTimeMillis();
         long endTime = startTime + (10 * 60 * 1000);
@@ -555,14 +557,14 @@ private void waitForStatus(String tableName, TableStatus status) {
             } catch (Exception e) {
             }
             try {
-                DescribeTableRequest request = new DescribeTableRequest().withTableName(tableName);
-                TableDescription tableDescription = dynamoDb.describeTable(request).getTable();
-                String tableStatus = tableDescription.getTableStatus();
-                logger.debug("  - current state: " + tableStatus);
+                DescribeTableRequest request = DescribeTableRequest.builder().tableName(tableName).build();
+                TableDescription tableDescription = dynamoDbClient.describeTable(request).table();
+                String tableStatus = tableDescription.tableStatusAsString();
+                LOG.debug("  - current state: " + tableStatus);
                 if (tableStatus.equals(status.toString()))
                     return;
-            } catch (AmazonServiceException ase) {
-                if (!ase.getErrorCode().equalsIgnoreCase("ResourceNotFoundException"))
+            } catch (AwsServiceException ase) {
+                if (!ase.awsErrorDetails().errorCode().equalsIgnoreCase("ResourceNotFoundException"))
                     throw ase;
             }
         }
@@ -571,7 +573,7 @@ private void waitForStatus(String tableName, TableStatus status) {
     }
 
     private void waitForDelete(String tableName) {
-        logger.info("Waiting for " + tableName + " to become deleted...");
+        LOG.info("Waiting for " + tableName + " to become deleted...");
 
         long startTime = System.currentTimeMillis();
         long endTime = startTime + (10 * 60 * 1000);
@@ -584,8 +586,8 @@ private void waitForDelete(String tableName) {
                 if (!hasTable(tableName)) {
                     return;
                 }
-            } catch (AmazonServiceException ase) {
-                if (!ase.getErrorCode().equalsIgnoreCase("ResourceNotFoundException"))
+            } catch (AwsServiceException ase) {
+                if (!ase.awsErrorDetails().errorCode().equalsIgnoreCase("ResourceNotFoundException"))
                     throw ase;
             }
         }
@@ -606,7 +608,7 @@ private Map<String, AttributeValue> itemToMap(Item item) {
             throw new RuntimeException("Item does not contain a job ID");
         } else if (!attributes.containsKey(DatabaseKeys.REQUEST_NAME_KEY.getShortKey())) {
             AttributeValue attVal = attributes.get(DatabaseKeys.TIMESTAMP_KEY.getShortKey());
-            String timestamp = attVal != null ? attVal.getS() : ReportUtil.getTimestamp(new Date());
+            String timestamp = attVal != null ? attVal.s() : ReportUtil.getTimestamp(new Date());
             if (attVal == null) {
                 addAttribute(attributes, DatabaseKeys.TIMESTAMP_KEY.getShortKey(), timestamp);
             }
@@ -628,7 +630,7 @@ private void sendBatch(final String tableName, List<WriteRequest> requests) {
             List<WriteRequest> batch = requests.subList(i * BATCH_SIZE,
                     Math.min(i * BATCH_SIZE + BATCH_SIZE, requests.size()));
             requestItems.put(tableName, batch);
-            addItemsToTable(tableName, new BatchWriteItemRequest().withRequestItems(requestItems));
+            addItemsToTable(tableName, BatchWriteItemRequest.builder().requestItems(requestItems).build());
         }
     }
 }
diff --git a/reporting/db/src/main/java/com/intuit/tank/persistence/databases/CloudWatchDataSource.java b/reporting/db/src/main/java/com/intuit/tank/persistence/databases/CloudWatchDataSource.java
index 1fe684ed5..f829c1b3d 100644
--- a/reporting/db/src/main/java/com/intuit/tank/persistence/databases/CloudWatchDataSource.java
+++ b/reporting/db/src/main/java/com/intuit/tank/persistence/databases/CloudWatchDataSource.java
@@ -1,24 +1,30 @@
 package com.intuit.tank.persistence.databases;
 
-import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
-import com.amazonaws.services.cloudwatch.AmazonCloudWatchClientBuilder;
-import com.amazonaws.services.cloudwatch.model.Dimension;
-import com.amazonaws.services.cloudwatch.model.MetricDatum;
-import com.amazonaws.services.cloudwatch.model.PutMetricDataRequest;;
-import com.amazonaws.services.cloudwatch.model.StandardUnit;
-import com.amazonaws.services.cloudwatch.model.StatisticSet;
 import com.intuit.tank.reporting.databases.IDatabase;
 import com.intuit.tank.reporting.databases.Item;
 import com.intuit.tank.reporting.databases.PagedDatabaseResult;
 import com.intuit.tank.reporting.databases.TankDatabaseType;
 import com.intuit.tank.results.TankResult;
+import com.intuit.tank.vm.settings.CloudCredentials;
+import com.intuit.tank.vm.settings.CloudProvider;
+import com.intuit.tank.vm.settings.TankConfig;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
+import software.amazon.awssdk.services.cloudwatch.model.Dimension;
+import software.amazon.awssdk.services.cloudwatch.model.MetricDatum;
+import software.amazon.awssdk.services.cloudwatch.model.PutMetricDataRequest;
+import software.amazon.awssdk.services.cloudwatch.model.StandardUnit;
+import software.amazon.awssdk.services.cloudwatch.model.StatisticSet;
 
 import javax.annotation.Nonnull;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -38,9 +44,20 @@
 public class CloudWatchDataSource implements IDatabase {
     private static final Logger LOG = LogManager.getLogger(CloudWatchDataSource.class);
 
-    private final AmazonCloudWatch cloudWatchClient = AmazonCloudWatchClientBuilder.defaultClient();
+    private CloudWatchClient cloudWatchClient;
+    private static final int MAX_CLOUDWATCH_METRICS_SUPPORTED = 150;
     private static final String namespace = "Intuit/Tank";
 
+    public CloudWatchDataSource() {
+        CloudCredentials creds = new TankConfig().getVmManagerConfig().getCloudCredentials(CloudProvider.amazon);
+        if (creds != null && StringUtils.isNotBlank(creds.getKey()) && StringUtils.isNotBlank(creds.getKeyId())) {
+            AwsCredentials credentials = AwsBasicCredentials.create(creds.getKeyId(), creds.getKey());
+            this.cloudWatchClient = CloudWatchClient.builder().credentialsProvider(StaticCredentialsProvider.create(credentials)).build();
+        } else {
+            this.cloudWatchClient = CloudWatchClient.builder().build();
+        }
+    }
+
     @Override
     public void initNamespace(@Nonnull String tableName) {}
 
@@ -63,16 +80,18 @@ public boolean hasJobData(@Nonnull String tableName, String jobId) {
     @Override
     public void addTimingResults(@Nonnull String tableName, @Nonnull List<TankResult> results, boolean asynch) {
         LOG.trace("Starting addTimingResults with " + results.size() + " items");
-        Date timestamp = results.get(results.size()-1).getTimeStamp();
+        Instant timestamp = results.get(results.size()-1).getTimeStamp().toInstant();
         List<MetricDatum> datumList = new ArrayList<>();
 
-        Dimension instanceId = new Dimension()
-                .withName("InstanceId")
-                .withValue(results.get(0).getInstanceId());
+        Dimension instanceId = Dimension.builder()
+                .name("InstanceId")
+                .value(results.get(0).getInstanceId())
+                .build();
 
-        Dimension jobId = new Dimension()
-                .withName("JobId")
-                .withValue(results.get(0).getJobId());
+        Dimension jobId = Dimension.builder()
+                .name("JobId")
+                .value(results.get(0).getJobId())
+                .build();
         try {
             Map<String, List<Integer>> grouped = results.stream()
                     .collect(groupingBy(TankResult::getRequestName,
@@ -86,37 +105,43 @@ public void addTimingResults(@Nonnull String tableName, @Nonnull List<TankResult
                         () -> groupResults.stream()
                                 .sorted()
                                 .mapToDouble(Double::valueOf);
-                Collection<Double> sortedList = doubleStream.get().boxed().collect(Collectors.toList());
+                Collection<Double> sortedList = doubleStream.get()
+                        .boxed().limit(MAX_CLOUDWATCH_METRICS_SUPPORTED).collect(Collectors.toList());
                 double[] sortedArray = doubleStream.get().toArray();
                 double sum = doubleStream.get().sum();
 
-                Dimension request = new Dimension()
-                        .withName("RequestName")
-                        .withValue(entry.getKey());
-
-                datumList.add(new MetricDatum()
-                        .withMetricName("ResponseTime")
-                        .withUnit(StandardUnit.Milliseconds)
-                        .withStatisticValues(new StatisticSet()
-                                .withMaximum(sortedArray[size - 1])
-                                .withMinimum(sortedArray[0])
-                                .withSampleCount((double) size)
-                                .withSum(sum))
-                        .withValues(sortedList)
-                        .withTimestamp(timestamp)
-                        .withDimensions(request, instanceId, jobId));
-
-                datumList.add(new MetricDatum()
-                        .withMetricName("RequestCount")
-                        .withUnit(StandardUnit.Count)
-                        .withValue((double) size)
-                        .withTimestamp(timestamp)
-                        .withDimensions(request, instanceId, jobId));
+                Dimension request = Dimension.builder()
+                        .name("RequestName")
+                        .value(entry.getKey())
+                        .build();
+
+                datumList.add(MetricDatum.builder()
+                        .metricName("ResponseTime")
+                        .unit(StandardUnit.MILLISECONDS)
+                        .statisticValues(StatisticSet.builder()
+                                .maximum(sortedArray[size - 1])
+                                .minimum(sortedArray[0])
+                                .sampleCount((double) size)
+                                .sum(sum)
+                                .build())
+                        .values(sortedList)
+                        .timestamp(timestamp)
+                        .dimensions(request, instanceId, jobId)
+                        .build());
+
+                datumList.add(MetricDatum.builder()
+                        .metricName("RequestCount")
+                        .unit(StandardUnit.COUNT)
+                        .value((double) size)
+                        .timestamp(timestamp)
+                        .dimensions(request, instanceId, jobId)
+                        .build());
             }
             LOG.trace("Sending to CloudWatchMetrics: " + datumList.size() + " to " + namespace);
-            PutMetricDataRequest request = new PutMetricDataRequest()
-                    .withNamespace(namespace)
-                    .withMetricData(datumList);
+            PutMetricDataRequest request = PutMetricDataRequest.builder()
+                    .namespace(namespace)
+                    .metricData(datumList)
+                    .build();
 
             cloudWatchClient.putMetricData(request);
         } catch (Exception e) {
diff --git a/reporting/db/src/main/java/com/intuit/tank/persistence/databases/S3Datasource.java b/reporting/db/src/main/java/com/intuit/tank/persistence/databases/S3Datasource.java
index fd930febe..9b2b716c7 100644
--- a/reporting/db/src/main/java/com/intuit/tank/persistence/databases/S3Datasource.java
+++ b/reporting/db/src/main/java/com/intuit/tank/persistence/databases/S3Datasource.java
@@ -1,7 +1,5 @@
 package com.intuit.tank.persistence.databases;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -12,24 +10,29 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import com.intuit.tank.vm.settings.CloudCredentials;
+import com.intuit.tank.vm.settings.CloudProvider;
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.amazonaws.AmazonClientException;
-import com.amazonaws.AmazonServiceException;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.intuit.tank.reporting.databases.IDatabase;
 import com.intuit.tank.reporting.databases.Item;
 import com.intuit.tank.reporting.databases.PagedDatabaseResult;
 import com.intuit.tank.reporting.databases.TankDatabaseType;
 import com.intuit.tank.results.TankResult;
 import com.intuit.tank.vm.settings.TankConfig;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.S3Exception;
 
 import javax.annotation.Nonnull;
 
@@ -45,7 +48,7 @@
 public class S3Datasource implements IDatabase {
 	private static final Logger LOG = LogManager.getLogger(S3Datasource.class);
 
-	private final AmazonS3 s3Client = AmazonS3ClientBuilder.defaultClient();
+	private S3Client s3Client;
 	private String hostname = "fail";
     private String metricString = "";
 	private String tags = "";
@@ -54,6 +57,16 @@ public class S3Datasource implements IDatabase {
 	private HierarchicalConfiguration resultsProviderConfig =
 			new TankConfig().getVmManagerConfig().getResultsProviderConfig();
 
+	public S3Datasource() {
+		CloudCredentials creds = new TankConfig().getVmManagerConfig().getCloudCredentials(CloudProvider.amazon);
+		if (creds != null && StringUtils.isNotBlank(creds.getKey()) && StringUtils.isNotBlank(creds.getKeyId())) {
+			AwsCredentials credentials = AwsBasicCredentials.create(creds.getKeyId(), creds.getKey());
+			this.s3Client = S3Client.builder().credentialsProvider(StaticCredentialsProvider.create(credentials)).build();
+		} else {
+			this.s3Client = S3Client.builder().build();
+		}
+	}
+
 	@Override
 	public void initNamespace(String tableName) {}
 
@@ -89,8 +102,10 @@ public void addTimingResults(String tableName, List<TankResult> results, boolean
 			LOG.error("Results Provider Config is Empty. Please update settings.xml to include S3Datasource Configuration");
 		}
 
+		String region = new DefaultAwsRegionProviderChain().getRegion().toString();
+
 		if (StringUtils.endsWith(bucketName, "-")) {
-			bucketName = bucketName.concat(s3Client.getRegionName());
+			bucketName = bucketName.concat(region);
 		}
 
 		StringBuilder sb = new StringBuilder();
@@ -101,7 +116,7 @@ public void addTimingResults(String tableName, List<TankResult> results, boolean
 		try {
 			String tagsComplete = " source=" + hostname +
 					" instanceid=" + instance +  
-					" location=" + s3Client.getRegionName() +
+					" location=" + region +
 					" " + tags +
 					" jobid=" + jobId + 
 					System.getProperty("line.separator");
@@ -141,21 +156,19 @@ public void addTimingResults(String tableName, List<TankResult> results, boolean
 					.append(tagsComplete);
 			}
 			LOG.trace("Sending to S3: " + sb.toString());
-			InputStream is =  new ByteArrayInputStream(sb.toString().getBytes());
-			ObjectMetadata metaData = new ObjectMetadata();
-			metaData.setContentLength(sb.length());
-			PutObjectRequest putObjectRequest =
-					new PutObjectRequest(bucketName, "TANK-AgentData-" + UUID.randomUUID() + ".log", is, metaData)
-							.withCannedAcl(CannedAccessControlList.BucketOwnerFullControl);
-			s3Client.putObject(putObjectRequest);
-		} catch (AmazonServiceException ase) {
-			LOG.error("AmazonServiceException: which " +
+			PutObjectRequest.Builder request = PutObjectRequest.builder()
+					.bucket(bucketName)
+					.key("TANK-AgentData-" + UUID.randomUUID() + ".log")
+					.acl(ObjectCannedACL.BUCKET_OWNER_FULL_CONTROL);
+			s3Client.putObject(request.build(), RequestBody.fromString(sb.toString()));
+		} catch (SdkClientException ase) {
+			LOG.error("SdkClientException: which " +
             		"means your request made it " +
                     "to Amazon S3, but was rejected with an error response" +
                     " for some reason. bucket=" + bucketName +
                     "," + ase.getMessage(), ase);
-		} catch (AmazonClientException ace) {
-			LOG.error("AmazonClientException: which " +
+		} catch (S3Exception ace) {
+			LOG.error("S3Exception: which " +
             		"means the client encountered " +
                     "an internal error while trying to " +
                     "communicate with S3, " +
diff --git a/reporting/db/src/main/java/com/intuit/tank/reporting/db/DatabaseResultsReporter.java b/reporting/db/src/main/java/com/intuit/tank/reporting/db/DatabaseResultsReporter.java
index 2ea444b9d..6c2008d77 100644
--- a/reporting/db/src/main/java/com/intuit/tank/reporting/db/DatabaseResultsReporter.java
+++ b/reporting/db/src/main/java/com/intuit/tank/reporting/db/DatabaseResultsReporter.java
@@ -68,7 +68,6 @@ public void sendTpsResults(final String jobId, final String instanceId, final TP
                         .collect(Collectors.toList());
                 if (!items.isEmpty()) {
                     String tableName = getTpsTableName(db);
-                    LOG.info(new ObjectMessage(ImmutableMap.of("Message", "Sending " + items.size() + " to TPS Table " + tableName)));
                     db.addItems(tableName, items, false);
                 }
             } catch (Exception t) {
diff --git a/reporting/db/src/test/java/com/intuit/tank/persistence/databases/AmazonDynamoDatabaseTest.java b/reporting/db/src/test/java/com/intuit/tank/persistence/databases/AmazonDynamoDatabaseTest.java
index 5c948562a..a482f8d63 100644
--- a/reporting/db/src/test/java/com/intuit/tank/persistence/databases/AmazonDynamoDatabaseTest.java
+++ b/reporting/db/src/test/java/com/intuit/tank/persistence/databases/AmazonDynamoDatabaseTest.java
@@ -5,18 +5,12 @@
 import java.util.Date;
 import java.util.List;
 
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.junit.jupiter.api.BeforeEach;
 
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.dynamodbv2.model.ListTablesResult;
 import com.intuit.tank.reporting.databases.Attribute;
 import com.intuit.tank.reporting.databases.Item;
 import com.intuit.tank.results.TankResult;
@@ -25,6 +19,11 @@
 import com.intuit.tank.vm.common.util.ReportUtil;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.dynamodb.model.ListTablesResponse;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -34,7 +33,7 @@ public class AmazonDynamoDatabaseTest {
     private static final String TEST_TABLE = "TestTable";
     private static final int NUM_ENTRIES = 100;
     private AmazonDynamoDatabaseDocApi db;
-    private AmazonDynamoDB dynamoDb;
+    private DynamoDbClient dynamoDbClient;
     
     @BeforeEach
     public void init() {
@@ -46,10 +45,10 @@ public void init() {
 
     @BeforeEach
     public void before() {
-        AWSCredentials credentials = new BasicAWSCredentials(System.getProperty("AWS_SECRET_KEY_ID"),
+        AwsCredentials credentials = AwsBasicCredentials.create(System.getProperty("AWS_SECRET_KEY_ID"),
                 System.getProperty("AWS_SECRET_KEY"));
-        dynamoDb = AmazonDynamoDBClientBuilder.standard().withCredentials(new AWSStaticCredentialsProvider(credentials)).build();
-        db = new AmazonDynamoDatabaseDocApi(dynamoDb);
+        dynamoDbClient = DynamoDbClient.builder().credentialsProvider(StaticCredentialsProvider.create(credentials)).build();
+        db = new AmazonDynamoDatabaseDocApi(dynamoDbClient);
     }
 
 //    @BeforeMethod
@@ -66,8 +65,8 @@ public void cleanTables() {
     @Test
     @Tag(TestGroups.EXPERIMENTAL)
     public void testListTables() {
-        ListTablesResult listTables = dynamoDb.listTables();
-        for (String s : listTables.getTableNames()) {
+        ListTablesResponse listTables = dynamoDbClient.listTables();
+        for (String s : listTables.tableNames()) {
             System.out.println(s);
         }
 
diff --git a/reporting/local/pom.xml b/reporting/local/pom.xml
index 60bc97272..41365a605 100644
--- a/reporting/local/pom.xml
+++ b/reporting/local/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>reporting-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>reporting-local-storage</artifactId>
diff --git a/reporting/pom.xml b/reporting/pom.xml
index b452b51dc..bc4e5df63 100644
--- a/reporting/pom.xml
+++ b/reporting/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>reporting-parent</artifactId>
diff --git a/reporting/rest/pom.xml b/reporting/rest/pom.xml
index 352ee7815..f877e3c1d 100644
--- a/reporting/rest/pom.xml
+++ b/reporting/rest/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>reporting-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>reporting-rest</artifactId>
diff --git a/rest/api/agent/pom.xml b/rest/api/agent/pom.xml
index e990dd471..7841b6f7e 100644
--- a/rest/api/agent/pom.xml
+++ b/rest/api/agent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>agent-api</artifactId>
diff --git a/rest/api/automation/pom.xml b/rest/api/automation/pom.xml
index f4c337a9a..9ebeda401 100644
--- a/rest/api/automation/pom.xml
+++ b/rest/api/automation/pom.xml
@@ -6,7 +6,7 @@
  <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>automation-api</artifactId>
diff --git a/rest/api/automation/src/main/java/com/intuit/tank/api/model/v1/automation/CreateJobRequest.java b/rest/api/automation/src/main/java/com/intuit/tank/api/model/v1/automation/CreateJobRequest.java
index c8f1a5c33..7261e15ff 100644
--- a/rest/api/automation/src/main/java/com/intuit/tank/api/model/v1/automation/CreateJobRequest.java
+++ b/rest/api/automation/src/main/java/com/intuit/tank/api/model/v1/automation/CreateJobRequest.java
@@ -50,7 +50,13 @@ public class CreateJobRequest implements Serializable {
     private int userIntervalIncrement;
     
     @XmlElement(name="stopBehavior")
-    private String stopBehavior = StopBehavior.END_OF_TEST.getDisplay();
+    private String stopBehavior = StopBehavior.END_OF_TEST.name();
+
+    @XmlElement(name="vmInstance")
+    private String vmInstance;
+
+    @XmlElement(name="numUsersPerAgent")
+    private int numUsersPerAgent;
     
     @XmlElement(name="jobRegions")
     private Set<CreateJobRegion> jobRegions = new HashSet<CreateJobRegion>();
@@ -110,6 +116,20 @@ public Set<CreateJobRegion> getJobRegions() {
     public String getStopBehavior() {
         return stopBehavior;
     }
+
+    /**
+     * @return the vmInstance
+     */
+    public String getVmInstance() {
+        return vmInstance;
+    }
+
+    /**
+     * @return the numUsersPerAgent
+     */
+    public int getNumUsersPerAgent() {
+        return numUsersPerAgent;
+    }
     
     /**
      * @param jobRegions
diff --git a/rest/api/automation/src/main/java/com/intuit/tank/api/service/v1/automation/AutomationService.java b/rest/api/automation/src/main/java/com/intuit/tank/api/service/v1/automation/AutomationService.java
index 422654326..699cbdbe8 100644
--- a/rest/api/automation/src/main/java/com/intuit/tank/api/service/v1/automation/AutomationService.java
+++ b/rest/api/automation/src/main/java/com/intuit/tank/api/service/v1/automation/AutomationService.java
@@ -82,23 +82,6 @@ public interface AutomationService {
     @Nonnull
     Response saveAs(@PathParam("scriptId") String scriptId, @PathParam("name") String name);
     
-    /**
-     * Uploads a script to an existing script 
-     * 
-     * @param formData
-     *            Multi-part form data should contain a scriptId with the formKey of scriptId and the
-     *            file data with formKey of file
-     *            Example: curl -X POST -F "scriptId=x" -F "scriptName=xx" -F "file=@tank-script.xml" http://xxx/rest/v1/automation-service/uploadScript
-     * @return Response status code 201 (created) if successful or an error code
-     */
-    @POST
-    @Path("/uploadScript")
-    @Consumes({ MediaType.MULTIPART_FORM_DATA })
-    @Produces({ MediaType.APPLICATION_JSON })
-    @Nonnull
-    @Deprecated
-    Response uploadScript(@Nonnull FormDataMultiPart formData);
-
     /**
      * Uploads a script to an existing script
      *
@@ -115,6 +98,7 @@ public interface AutomationService {
     @PUT
     @Path("/upload/script")
     @Consumes({ MediaType.MULTIPART_FORM_DATA })
+    @Produces({ MediaType.TEXT_PLAIN })
     @Nonnull
     Response uploadScript(@QueryParam("id") int scriptId,
                           @QueryParam("name") String scriptName,
diff --git a/rest/api/cloud/pom.xml b/rest/api/cloud/pom.xml
index 8f2da35cc..b4f36a21f 100644
--- a/rest/api/cloud/pom.xml
+++ b/rest/api/cloud/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>cloud-api</artifactId>
diff --git a/rest/api/common/pom.xml b/rest/api/common/pom.xml
index 2296c1bac..bcbea4cdd 100644
--- a/rest/api/common/pom.xml
+++ b/rest/api/common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>api-common</artifactId>
diff --git a/rest/api/datafile/pom.xml b/rest/api/datafile/pom.xml
index 39ab55927..a0ef8e546 100644
--- a/rest/api/datafile/pom.xml
+++ b/rest/api/datafile/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
 
diff --git a/rest/api/filter/pom.xml b/rest/api/filter/pom.xml
index 55c4be6a2..35eaa446a 100644
--- a/rest/api/filter/pom.xml
+++ b/rest/api/filter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>filter-api</artifactId>
diff --git a/rest/api/job/pom.xml b/rest/api/job/pom.xml
index 528f8f62e..13c1a5157 100644
--- a/rest/api/job/pom.xml
+++ b/rest/api/job/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>job-api</artifactId>
diff --git a/rest/api/pom.xml b/rest/api/pom.xml
index 74b8f4eb8..61e102480 100644
--- a/rest/api/pom.xml
+++ b/rest/api/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>rest-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>api-parent</artifactId>
diff --git a/rest/api/project/pom.xml b/rest/api/project/pom.xml
index 20c3e7a28..8d99c4361 100644
--- a/rest/api/project/pom.xml
+++ b/rest/api/project/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>project-api</artifactId>
diff --git a/rest/api/reporting/pom.xml b/rest/api/reporting/pom.xml
index 488eaa6e1..20aad71de 100644
--- a/rest/api/reporting/pom.xml
+++ b/rest/api/reporting/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>report-api</artifactId>
diff --git a/rest/api/script/pom.xml b/rest/api/script/pom.xml
index 6ff09e630..03c0502c2 100644
--- a/rest/api/script/pom.xml
+++ b/rest/api/script/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>script-api</artifactId>
diff --git a/rest/api/user/pom.xml b/rest/api/user/pom.xml
index 987c8a017..c39798b3d 100644
--- a/rest/api/user/pom.xml
+++ b/rest/api/user/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>api-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>user-api</artifactId>
diff --git a/rest/client/agent/pom.xml b/rest/client/agent/pom.xml
index 17838ff4b..ce3ac6f63 100644
--- a/rest/client/agent/pom.xml
+++ b/rest/client/agent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>agent-client</artifactId>
diff --git a/rest/client/automation/pom.xml b/rest/client/automation/pom.xml
index ebbd97b47..1d2d1db3d 100644
--- a/rest/client/automation/pom.xml
+++ b/rest/client/automation/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>automation-client</artifactId>
diff --git a/rest/client/cloud/pom.xml b/rest/client/cloud/pom.xml
index 3569396d1..b380a7aa1 100644
--- a/rest/client/cloud/pom.xml
+++ b/rest/client/cloud/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>cloud-client</artifactId>
diff --git a/rest/client/common/pom.xml b/rest/client/common/pom.xml
index 481e827d1..86ebaf7f1 100644
--- a/rest/client/common/pom.xml
+++ b/rest/client/common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>client-common</artifactId>
diff --git a/rest/client/datafile/pom.xml b/rest/client/datafile/pom.xml
index ef0408831..df5f26489 100644
--- a/rest/client/datafile/pom.xml
+++ b/rest/client/datafile/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>datafile-client</artifactId>
diff --git a/rest/client/filter/pom.xml b/rest/client/filter/pom.xml
index ee99d0038..ed91f454a 100644
--- a/rest/client/filter/pom.xml
+++ b/rest/client/filter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>filter-client</artifactId>
diff --git a/rest/client/job/pom.xml b/rest/client/job/pom.xml
index 2c5de8e24..9c9daba58 100644
--- a/rest/client/job/pom.xml
+++ b/rest/client/job/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>job-client</artifactId>
diff --git a/rest/client/pom.xml b/rest/client/pom.xml
index 24d55f332..f00519f29 100644
--- a/rest/client/pom.xml
+++ b/rest/client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>rest-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>client-parent</artifactId>
diff --git a/rest/client/project/pom.xml b/rest/client/project/pom.xml
index 004ab393d..97db255b3 100644
--- a/rest/client/project/pom.xml
+++ b/rest/client/project/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>project-client</artifactId>
diff --git a/rest/client/reporting/pom.xml b/rest/client/reporting/pom.xml
index 4e7bc9e4f..c0e8508a2 100644
--- a/rest/client/reporting/pom.xml
+++ b/rest/client/reporting/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>report-client</artifactId>
diff --git a/rest/client/script/pom.xml b/rest/client/script/pom.xml
index ebf972245..0410914e2 100644
--- a/rest/client/script/pom.xml
+++ b/rest/client/script/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>script-client</artifactId>
diff --git a/rest/client/user/pom.xml b/rest/client/user/pom.xml
index 8360703de..25f3c25a2 100644
--- a/rest/client/user/pom.xml
+++ b/rest/client/user/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>client-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
   
   <artifactId>user-client</artifactId>
diff --git a/rest/pom.xml b/rest/pom.xml
index be474ddc2..3049b0f06 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.intuit.tank</groupId>
 		<artifactId>tank-parent</artifactId>
-		<version>2.3.4</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>rest-parent</artifactId>
diff --git a/rest/service/agent/pom.xml b/rest/service/agent/pom.xml
index dc451a1b5..d7eb96edb 100644
--- a/rest/service/agent/pom.xml
+++ b/rest/service/agent/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>agent-service</artifactId>
diff --git a/rest/service/automation/pom.xml b/rest/service/automation/pom.xml
index 031df9a8e..d251ab5a4 100644
--- a/rest/service/automation/pom.xml
+++ b/rest/service/automation/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>automation-service</artifactId>
diff --git a/rest/service/automation/src/main/java/com/intuit/tank/service/impl/v1/automation/AutomationServiceV1.java b/rest/service/automation/src/main/java/com/intuit/tank/service/impl/v1/automation/AutomationServiceV1.java
index eb32deb9b..21306399f 100644
--- a/rest/service/automation/src/main/java/com/intuit/tank/service/impl/v1/automation/AutomationServiceV1.java
+++ b/rest/service/automation/src/main/java/com/intuit/tank/service/impl/v1/automation/AutomationServiceV1.java
@@ -253,45 +253,6 @@ public Response saveAs(String scriptId, String saveAsName) {
 		}
 		return Response.ok().entity(newScriptId).build();
 	}
-		
-	/**
-	 * @inheritDoc
-	 */
-	@Override
-	@Nonnull
-	public Response uploadScript(@Nonnull FormDataMultiPart formData) {
-		ResponseBuilder responseBuilder = Response.ok();
-		FormDataBodyPart scriptId = formData.getField("scriptId");
-		FormDataBodyPart newScriptName = formData.getField("scriptName");
-		FormDataBodyPart filePart = formData.getField("file");
-		try (InputStream is = filePart.getValueAs(InputStream.class)) {
-			Script script = null;
-			if ("0".equals(scriptId.getValue())) {
-				script = new Script();
-				script.setName("New");
-				script.setCreator("System");
-			} else {
-				script = new ScriptDao().findById(Integer.parseInt(scriptId.getValue()));
-			}
-			ScriptProcessor scriptProcessor = new ServletInjector<ScriptProcessor>().getManagedBean(servletContext,
-					ScriptProcessor.class);
-
-			scriptProcessor.setScript(script);
-			if (StringUtils.isNotEmpty(newScriptName.getValue())) {
-				script.setName(newScriptName.getValue());
-			}
-			List<ScriptStep> scriptSteps = scriptProcessor.getScriptSteps(new BufferedReader(new InputStreamReader(is)),
-					new ArrayList<>());
-			script = new ScriptDao().saveOrUpdate(script);
-			sendMsg(script, ModificationType.UPDATE);
-			responseBuilder.entity(Integer.toString(script.getId()));
-		} catch (Exception e) {
-			LOG.error("Error starting script: " + e, e);
-			responseBuilder = Response.status(Status.INTERNAL_SERVER_ERROR);
-			responseBuilder.entity("An External Script failed with Exception: " + e.toString());
-		}
-		return responseBuilder.build();
-	}
 
 	/**
 	 * @inheritDoc
@@ -378,15 +339,17 @@ public Response createJob(@Nonnull CreateJobRequest request) {
 		LOG.info(request.toString());
 		if (StringUtils.isEmpty(request.getProjectName())) {
 			return Response.status(Status.BAD_REQUEST)
-					.entity("Creating a Job requires a name\n").build();
+					.entity("Creating a Job requires an existing Project\n").build();
 		} else {
 			ProjectDao projectDao = new ProjectDao();
 			Project project = projectDao.findByName(request.getProjectName());
 
-			if (project != null) {
-				buildJobConfiguration(request, project);
-				project = projectDao.saveOrUpdateProject(project);
+			if (project == null) {
+				return Response.status(Status.BAD_REQUEST)
+						.entity("Creating a Job requires an existing Project\n").build();
 			}
+			buildJobConfiguration(request, project);
+			project = projectDao.saveOrUpdateProject(project);
 
 			JobInstance job = addJobToQueue(project, request);
 			return Response.ok().entity(Integer.toString(job.getId())).build();
@@ -395,15 +358,21 @@ public Response createJob(@Nonnull CreateJobRequest request) {
 
 	private void buildJobConfiguration(@Nonnull CreateJobRequest request, Project project) {
 		JobConfiguration jobConfiguration = project.getWorkloads().get(0).getJobConfiguration();
+
 		if (StringUtils.isNotEmpty(request.getRampTime())) {
             jobConfiguration.setRampTimeExpression(request.getRampTime());
-        }
+		}
+		
 		if (StringUtils.isNotEmpty(request.getSimulationTime())) {
             jobConfiguration.setSimulationTimeExpression(request.getSimulationTime());
-        }
+		}
+		
 		jobConfiguration.setUserIntervalIncrement(request.getUserIntervalIncrement());
 		jobConfiguration.setStopBehavior(StringUtils.isNotEmpty(request.getStopBehavior())
-                ? request.getStopBehavior() : StopBehavior.END_OF_SCRIPT_GROUP.getDisplay());
+				? request.getStopBehavior() : StopBehavior.END_OF_SCRIPT_GROUP.name());
+				
+		jobConfiguration.setVmInstanceType(request.getVmInstance());
+		jobConfiguration.setNumUsersPerAgent(request.getNumUsersPerAgent());
 
 		boolean hasSimTime = jobConfiguration.getSimulationTime() > 0
                 || (StringUtils.isNotBlank(request.getSimulationTime())
@@ -524,6 +493,8 @@ private JobInstance addJobToQueue(Project p, AutomationRequest request, Script s
 		jobInstance.setLocation(jc.getLocation());
 		jobInstance.setLoggingProfile(jc.getLoggingProfile());
 		jobInstance.setStopBehavior(jc.getStopBehavior());
+		jobInstance.setVmInstanceType(jc.getVmInstanceType());
+		jobInstance.setNumUsersPerAgent(jc.getNumUsersPerAgent());
 		jobInstance.setReportingMode(jc.getReportingMode());
 		jobInstance.getVariables().putAll(jc.getVariables());
 		// set version info
@@ -598,6 +569,8 @@ private JobInstance addJobToQueue(Project project, CreateJobRequest request) {
 		jobInstance.setLocation(jc.getLocation());
 		jobInstance.setLoggingProfile(jc.getLoggingProfile());
 		jobInstance.setStopBehavior(jc.getStopBehavior());
+		jobInstance.setVmInstanceType(jc.getVmInstanceType());
+		jobInstance.setNumUsersPerAgent(jc.getNumUsersPerAgent());
 		jobInstance.setReportingMode(jc.getReportingMode());
 		jobInstance.getVariables().putAll(jc.getVariables());
 		// set version info
diff --git a/rest/service/cloud/pom.xml b/rest/service/cloud/pom.xml
index eda824ac4..db13c9074 100644
--- a/rest/service/cloud/pom.xml
+++ b/rest/service/cloud/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>cloud-service</artifactId>
diff --git a/rest/service/cloud/src/main/java/com/intuit/tank/service/impl/v1/cloud/JobController.java b/rest/service/cloud/src/main/java/com/intuit/tank/service/impl/v1/cloud/JobController.java
index e707daf10..1dbf17bfd 100644
--- a/rest/service/cloud/src/main/java/com/intuit/tank/service/impl/v1/cloud/JobController.java
+++ b/rest/service/cloud/src/main/java/com/intuit/tank/service/impl/v1/cloud/JobController.java
@@ -193,7 +193,7 @@ public void stopJob(String jobId) {
      * @inheritDoc
      */
     public void stopAgent(String instanceId) {
-        stopAgents(Arrays.asList(instanceId));
+        stopAgents(Collections.singletonList(instanceId));
 
     }
 
@@ -217,7 +217,7 @@ public void pauseJob(String jobId) {
      * @inheritDoc
      */
     public void pauseAgent(String instanceId) {
-        pauseAgents(Arrays.asList(instanceId));
+        pauseAgents(Collections.singletonList(instanceId));
     }
 
     /**
@@ -240,7 +240,7 @@ public void restartJob(String jobId) {
      * @inheritDoc
      */
     public void restartAgent(String instanceId) {
-        restartAgents(Arrays.asList(instanceId));
+        restartAgents(Collections.singletonList(instanceId));
     }
 
     /**
@@ -254,7 +254,7 @@ public void restartAgents(List<String> instanceIds) {
      * @inheritDoc
      */
     public void pauseRampInstance(String instanceId) {
-        pauseRampInstances(Arrays.asList(instanceId));
+        pauseRampInstances(Collections.singletonList(instanceId));
     }
 
     /**
@@ -277,7 +277,7 @@ public void pauseRampInstances(List<String> instanceIds) {
      * @inheritDoc
      */
     public void resumeRampInstance(String instanceId) {
-        resumeRampInstances(Arrays.asList(instanceId));
+        resumeRampInstances(Collections.singletonList(instanceId));
     }
 
     /**
diff --git a/rest/service/common/pom.xml b/rest/service/common/pom.xml
index 3be6be4ca..c4a92fc8d 100644
--- a/rest/service/common/pom.xml
+++ b/rest/service/common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>service-common</artifactId>
diff --git a/rest/service/datafile/pom.xml b/rest/service/datafile/pom.xml
index 0705b655b..8e9f5650a 100644
--- a/rest/service/datafile/pom.xml
+++ b/rest/service/datafile/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>datafile-service</artifactId>
diff --git a/rest/service/filter/pom.xml b/rest/service/filter/pom.xml
index a815e5488..74be91a64 100644
--- a/rest/service/filter/pom.xml
+++ b/rest/service/filter/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>filter-service</artifactId>
diff --git a/rest/service/job/pom.xml b/rest/service/job/pom.xml
index 347c496eb..1d19221bb 100644
--- a/rest/service/job/pom.xml
+++ b/rest/service/job/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>job-service</artifactId>
diff --git a/rest/service/pom.xml b/rest/service/pom.xml
index b206a42dd..e8979244a 100644
--- a/rest/service/pom.xml
+++ b/rest/service/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>rest-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>service-parent</artifactId>
diff --git a/rest/service/project/pom.xml b/rest/service/project/pom.xml
index cee079360..7f9d25736 100644
--- a/rest/service/project/pom.xml
+++ b/rest/service/project/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>project-service</artifactId>
diff --git a/rest/service/reporting/pom.xml b/rest/service/reporting/pom.xml
index 0072cb0e4..e68f213f4 100644
--- a/rest/service/reporting/pom.xml
+++ b/rest/service/reporting/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>report-service</artifactId>
diff --git a/rest/service/script/pom.xml b/rest/service/script/pom.xml
index efeaf76ed..7aed2ee2b 100644
--- a/rest/service/script/pom.xml
+++ b/rest/service/script/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>script-service</artifactId>
diff --git a/rest/service/script/src/main/java/com/intuit/tank/service/impl/v1/script/ScriptServiceV1.java b/rest/service/script/src/main/java/com/intuit/tank/service/impl/v1/script/ScriptServiceV1.java
index 508fd9103..eb4e601e5 100644
--- a/rest/service/script/src/main/java/com/intuit/tank/service/impl/v1/script/ScriptServiceV1.java
+++ b/rest/service/script/src/main/java/com/intuit/tank/service/impl/v1/script/ScriptServiceV1.java
@@ -29,6 +29,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nonnull;
 import javax.servlet.ServletContext;
 import javax.ws.rs.Path;
 import javax.ws.rs.WebApplicationException;
@@ -47,9 +48,9 @@
 import javax.xml.transform.sax.SAXSource;
 
 import com.intuit.tank.script.util.ScriptServiceUtil;
-import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
 import org.xml.sax.InputSource;
@@ -86,9 +87,6 @@
  * DataFileServiceV1
  * 
  * @author dangleton
- * 
- */
-/**
  * @author hsomani
  * 
  */
@@ -106,6 +104,7 @@ public class ScriptServiceV1 implements ScriptService {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
     public String ping() {
         return "PONG " + getClass().getSimpleName();
@@ -114,10 +113,10 @@ public String ping() {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
     public Response updateTankScript(FormDataMultiPart formData) {
-        ScriptTO scriptTo = null;
-        InputStream is = null;
+        InputStream inputStream = null;
         Map<String, List<FormDataBodyPart>> fields = formData.getFields();
         ScriptDao dao = new ScriptDao();
         for (Entry<String, List<FormDataBodyPart>> entry : fields.entrySet()) {
@@ -128,45 +127,29 @@ public Response updateTankScript(FormDataMultiPart formData) {
                 LOG.debug("MediaType " + mediaType);
                 if (MediaType.APPLICATION_OCTET_STREAM_TYPE.equals(mediaType)) {
                     // get the file
-                    is = part.getValueAs(InputStream.class);
+                    inputStream = part.getValueAs(InputStream.class);
                 }
             }
         }
-        ResponseBuilder responseBuilder = null;
-        if (is != null) {
-            try {
-                //Source: https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Prevention_Cheat_Sheet#Unmarshaller
-                SAXParserFactory spf = SAXParserFactory.newInstance();
-                spf.setNamespaceAware(true);
-                spf.setFeature("http://xml.org/sax/features/external-general-entities", false);
-                spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-                spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-                
-                Source xmlSource = new SAXSource(spf.newSAXParser().getXMLReader(), new InputSource(is));
-                
-                JAXBContext ctx = JAXBContext.newInstance(ScriptTO.class.getPackage().getName());
-                scriptTo = (ScriptTO) ctx.createUnmarshaller().unmarshal(xmlSource);
-                Script script = ScriptServiceUtil.transferObjectToScript(scriptTo);
-                if (script.getId() > 0) {
-                    Script existing = dao.findById(script.getId());
-                    if (existing == null) {
-                        LOG.error("Error updating script: Script passed with unknown id.");
-                        throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
-                    }
-                    if (!existing.getName().equals(script.getName())) {
-                        LOG.error("Error updating script: Cannot change the name of an existing Script.");
-                        throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
-                    }
+        ResponseBuilder responseBuilder = Response.serverError();
+        if (inputStream != null) {
+            ScriptTO scriptTo = ScriptServiceUtil.parseXMLtoScriptTO(inputStream);
+            Script script = ScriptServiceUtil.transferObjectToScript(scriptTo);
+            if (script.getId() > 0) {
+                Script existing = dao.findById(script.getId());
+                if (existing == null) {
+                    LOG.error("Error updating script: Script passed with unknown id.");
+                    throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
                 }
-                script = dao.saveOrUpdate(script);
-                responseBuilder = Response.ok();
-                responseBuilder.entity(Integer.toString(script.getId()));
-            } catch (Exception e) {
-                LOG.error("Error unmarshalling script: " + e.getMessage(), e);
-                throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
-            } finally {
-                IOUtils.closeQuietly(is);
+                if (!existing.getName().equals(script.getName())) {
+                    LOG.error("Error updating script: Cannot change the name of an existing Script.");
+                    throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
+                }
+                script.setSerializedScriptStepId(existing.getSerializedScriptStepId());
             }
+            script = dao.saveOrUpdate(script);
+            responseBuilder = Response.ok();
+            responseBuilder.entity(Integer.toString(script.getId()));
         }
         return responseBuilder.build();
     }
@@ -174,6 +157,7 @@ public Response updateTankScript(FormDataMultiPart formData) {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
     public Response convertScript(FormDataMultiPart formData) {
         ScriptUploadRequest request = null;
@@ -205,6 +189,7 @@ public Response convertScript(FormDataMultiPart formData) {
                             JAXBContext ctx = JAXBContext.newInstance(ScriptUploadRequest.class.getPackage().getName());
                             request = (ScriptUploadRequest) ctx.createUnmarshaller().unmarshal(xmlSource);
                         } catch (JAXBException | ParserConfigurationException | SAXException e) {
+                            LOG.error("Error unmarshalling script: " + e.getMessage() , e);
                             throw new RuntimeException(e);
                         }
                     }
@@ -251,16 +236,17 @@ public Response convertScript(FormDataMultiPart formData) {
      * @inheritDoc
      */
     @Override
-    public Response updateScript(Integer id, ScriptTO scriptTo) {
-        Script s = ScriptServiceUtil.transferObjectToScript(scriptTo);
+    public Response updateScript(@Nonnull Integer id, @Nonnull ScriptTO scriptTo) {
+        Script script = ScriptServiceUtil.transferObjectToScript(scriptTo);
         ScriptDao dao = new ScriptDao();
-        Script storedScript = dao.findById(id);
+        Script existing = dao.findById(id);
         ResponseBuilder responseBuilder = null;
-        if (storedScript != null) {
+        if (existing != null) {
+            script.setSerializedScriptStepId(existing.getSerializedScriptStepId());
             try {
-                s = dao.saveOrUpdate(s);
+                script = dao.saveOrUpdate(script);
                 URI location = uriInfo.getBaseUriBuilder().path(ScriptService.class)
-                        .path(ScriptService.class.getMethod("getScript", Integer.class)).build(s.getId());
+                        .path(ScriptService.class.getMethod("getScript", Integer.class)).build(script.getId());
                 responseBuilder = Response.created(location);
             } catch (Exception e) {
                 LOG.error("Error building uri: " + e.getMessage(), e);
@@ -276,7 +262,7 @@ public Response updateScript(Integer id, ScriptTO scriptTo) {
      * @inheritDoc
      */
     @Override
-    public Response deleteScript(Integer id) {
+    public Response deleteScript(@Nonnull Integer id) {
         return delete(id);
     }
 
@@ -314,6 +300,7 @@ private Response delete(int scriptId) {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
     public Response getScriptDescriptions() {
         ResponseBuilder responseBuilder = Response.ok();
@@ -327,6 +314,7 @@ public Response getScriptDescriptions() {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
     public Response newScript(ScriptTO scriptTo) {
         scriptTo.setCreated(null);
@@ -350,7 +338,7 @@ public Response newScript(ScriptTO scriptTo) {
      * @inheritDoc
      */
     @Override
-    public Response getScript(Integer id) {
+    public Response getScript(@Nonnull Integer id) {
         ResponseBuilder responseBuilder = Response.ok();
         ScriptDao dao = new ScriptDao();
         Script script = dao.findById(id);
@@ -388,7 +376,7 @@ public Response downloadHarnessScript(Integer scriptId) {
      * @inheritDoc
      */
     @Override
-    public Response downloadScript(Integer id) {
+    public Response downloadScript(@Nonnull Integer id) {
         ResponseBuilder responseBuilder = Response.ok();
         ScriptDao dao = new ScriptDao();
         final Script script = dao.findById(id);
@@ -408,8 +396,9 @@ public Response downloadScript(Integer id) {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
-    public Response getScriptSteps(Integer id, int start, int numSteps) {
+    public Response getScriptSteps(@Nonnull Integer id, int start, int numSteps) {
         ResponseBuilder responseBuilder = Response.ok();
         ScriptDao dao = new ScriptDao();
         Script script = dao.findById(id);
@@ -440,7 +429,7 @@ public Response getScriptSteps(Integer id, int start, int numSteps) {
      * @inheritDoc
      */
     @Override
-    public Response getScriptDescription(Integer id) {
+    public Response getScriptDescription(@Nonnull Integer id) {
         ResponseBuilder responseBuilder = Response.ok();
         ScriptDao dao = new ScriptDao();
         Script script = dao.findById(id);
@@ -456,8 +445,9 @@ public Response getScriptDescription(Integer id) {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
-    public Response scriptFilterRequest(ScriptFilterRequest filterRequest) {
+    public Response scriptFilterRequest(@Nonnull ScriptFilterRequest filterRequest) {
         ResponseBuilder responseBuilder = null;
         ScriptDao dao = new ScriptDao();
         try {
@@ -479,8 +469,9 @@ public Response scriptFilterRequest(ScriptFilterRequest filterRequest) {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
-    public Response getExternalScript(Integer id) {
+    public Response getExternalScript(@Nonnull Integer id) {
         ResponseBuilder responseBuilder = Response.ok();
         ExternalScriptDao dao = new ExternalScriptDao();
         ExternalScript script = dao.findById(id);
@@ -496,6 +487,7 @@ public Response getExternalScript(Integer id) {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
     public Response getExternalScripts() {
         ResponseBuilder responseBuilder = Response.ok();
@@ -513,6 +505,7 @@ public Response getExternalScripts() {
     /**
      * @inheritDoc
      */
+    @Nonnull
     @Override
     public Response saveOrUpdateExternalScript(ExternalScriptTO to) {
         ResponseBuilder responseBuilder = null;
@@ -532,8 +525,7 @@ public Response saveOrUpdateExternalScript(ExternalScriptTO to) {
         return responseBuilder.build();
     }
 
-    private Script descriptorToScript(ScriptDao dao,
-            ScriptDescription sd) {
+    private Script descriptorToScript(ScriptDao dao, ScriptDescription sd) {
         Script script;
         if (sd.getId() != null && sd.getId() != 0) {
             script = dao.findById(sd.getId());
@@ -558,7 +550,7 @@ private List<ScriptFilter> getFilters(List<Integer> filterIds) {
      * @see com.intuit.tank.api.service.v1.script.ScriptService#deleteFilter(java.lang.Integer)
      */
     @Override
-    public Response deleteFilter(Integer id) {
+    public Response deleteFilter(@Nonnull Integer id) {
         return deleteFilterHelper(id);
     }
 
diff --git a/rest/service/user/pom.xml b/rest/service/user/pom.xml
index 04480f294..72cdeb770 100644
--- a/rest/service/user/pom.xml
+++ b/rest/service/user/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>service-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>user-service</artifactId>
diff --git a/script_processor/pom.xml b/script_processor/pom.xml
index a57efd4fc..14a962a25 100644
--- a/script_processor/pom.xml
+++ b/script_processor/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>tank-script-processor</artifactId>
diff --git a/script_processor/src/main/java/com/intuit/tank/script/util/ScriptServiceUtil.java b/script_processor/src/main/java/com/intuit/tank/script/util/ScriptServiceUtil.java
index 05706e003..b7de82b63 100644
--- a/script_processor/src/main/java/com/intuit/tank/script/util/ScriptServiceUtil.java
+++ b/script_processor/src/main/java/com/intuit/tank/script/util/ScriptServiceUtil.java
@@ -28,7 +28,19 @@
 import com.intuit.tank.script.RequestDataPhase;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.tomcat.util.http.fileupload.IOUtils;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.sax.SAXSource;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -360,4 +372,24 @@ public static ExternalScript TOToExternalScript(ExternalScriptTO script) {
         return ret;
     }
 
+    public static ScriptTO parseXMLtoScriptTO(InputStream inputStream) {
+        try {
+            //Source: https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Prevention_Cheat_Sheet#Unmarshaller
+            SAXParserFactory spf = SAXParserFactory.newInstance();
+            spf.setNamespaceAware(true);
+            spf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+            spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+            spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+
+            Source xmlSource = new SAXSource(spf.newSAXParser().getXMLReader(), new InputSource(inputStream));
+
+            JAXBContext ctx = JAXBContext.newInstance(ScriptTO.class.getPackage().getName());
+            return (ScriptTO) ctx.createUnmarshaller().unmarshal(xmlSource);
+        } catch (ParserConfigurationException | JAXBException | SAXException e) {
+            LOG.error("Error unmarshalling script: " + e.getMessage() , e);
+            throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+        }
+    }
 }
diff --git a/search/document_util/pom.xml b/search/document_util/pom.xml
index 105e1c766..08815cce2 100644
--- a/search/document_util/pom.xml
+++ b/search/document_util/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>search-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>document-util</artifactId>
diff --git a/search/lucene_indexer/pom.xml b/search/lucene_indexer/pom.xml
index 39f649e52..64562a4e9 100644
--- a/search/lucene_indexer/pom.xml
+++ b/search/lucene_indexer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>search-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>lucene-indexer</artifactId>
diff --git a/search/pom.xml b/search/pom.xml
index 59d9205c3..935bb5a4a 100755
--- a/search/pom.xml
+++ b/search/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>search-parent</artifactId>
diff --git a/search/script_search/pom.xml b/search/script_search/pom.xml
index 85424cdf0..1ed6da4e9 100644
--- a/search/script_search/pom.xml
+++ b/search/script_search/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>search-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>script-search</artifactId>
diff --git a/tank_common/pom.xml b/tank_common/pom.xml
index 8a38f133a..4bc5ed5f5 100644
--- a/tank_common/pom.xml
+++ b/tank_common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>tank-common</artifactId>
diff --git a/tank_vmManager/pom.xml b/tank_vmManager/pom.xml
index da7671e1d..231474661 100644
--- a/tank_vmManager/pom.xml
+++ b/tank_vmManager/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>tank-vm-manager</artifactId>
@@ -52,23 +52,24 @@
     </dependency>
 
      <dependency>
-       <groupId>com.amazonaws</groupId>
-       <artifactId>aws-java-sdk-ec2</artifactId>
+       <groupId>software.amazon.awssdk</groupId>
+       <artifactId>ec2</artifactId>
      </dependency>
-
      <dependency>
-       <groupId>com.amazonaws</groupId>
-       <artifactId>aws-java-sdk-cloudwatch</artifactId>
+       <groupId>software.amazon.awssdk</groupId>
+       <artifactId>cloudwatch</artifactId>
      </dependency>
-
      <dependency>
-       <groupId>com.amazonaws</groupId>
-       <artifactId>aws-java-sdk-sns</artifactId>
+       <groupId>software.amazon.awssdk</groupId>
+       <artifactId>sns</artifactId>
      </dependency>
-
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-ssm</artifactId>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>ssm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>netty-nio-client</artifactId>
     </dependency>
 
     <dependency>
diff --git a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/VMTrackerImpl.java b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/VMTrackerImpl.java
index e80a17f50..e837b9010 100644
--- a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/VMTrackerImpl.java
+++ b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/VMTrackerImpl.java
@@ -19,7 +19,6 @@
 import static com.intuit.tank.vm.common.TankConstants.NOTIFICATIONS_EVENT_EVENT_TIME_KEY;
 
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
@@ -42,7 +41,6 @@
 import javax.inject.Named;
 
 import com.amazonaws.xray.AWSXRay;
-import com.amazonaws.xray.entities.Entity;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/IEnvironmentInstance.java b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/IEnvironmentInstance.java
index 5353a79e0..43d3e7f11 100644
--- a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/IEnvironmentInstance.java
+++ b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/IEnvironmentInstance.java
@@ -16,12 +16,12 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 
-import com.amazonaws.services.ec2.model.Address;
 import com.intuit.tank.vm.api.enumerated.VMImageType;
 import com.intuit.tank.vm.api.enumerated.VMRegion;
 import com.intuit.tank.vm.vmManager.VMInformation;
 import com.intuit.tank.vm.vmManager.VMRequest;
 import com.intuit.tank.vmManager.environment.amazon.KeyValuePair;
+import software.amazon.awssdk.services.ec2.model.Address;
 
 /**
  * IEnvironmentInstance Represents an environment to create or act upon in the cloud. TODO: This interface uses mixed
diff --git a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/JobRequest.java b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/JobRequest.java
index 8379cf894..f70159d67 100644
--- a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/JobRequest.java
+++ b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/JobRequest.java
@@ -13,7 +13,6 @@
  * #L%
  */
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.amazonaws.xray.AWSXRay;
diff --git a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonDataConverter.java b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonDataConverter.java
index 0322e4489..239af7a92 100644
--- a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonDataConverter.java
+++ b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonDataConverter.java
@@ -23,12 +23,11 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.amazonaws.services.ec2.model.Instance;
-import com.amazonaws.services.ec2.model.InstanceStateChange;
-import com.amazonaws.services.ec2.model.Reservation;
 import com.intuit.tank.vm.api.enumerated.VMProvider;
 import com.intuit.tank.vm.api.enumerated.VMRegion;
 import com.intuit.tank.vm.vmManager.VMInformation;
+import software.amazon.awssdk.services.ec2.model.Instance;
+import software.amazon.awssdk.services.ec2.model.InstanceStateChange;
 
 /**
  * AmazonDataConverter
@@ -44,8 +43,8 @@ public List<VMInformation> processStateChange(List<InstanceStateChange> changes)
         try {
             for (InstanceStateChange instance : changes) {
                 VMInformation info = new VMInformation();
-                info.setInstanceId(instance.getInstanceId());
-                info.setState(instance.getCurrentState().getName());
+                info.setInstanceId(instance.instanceId());
+                info.setState(instance.currentState().nameAsString());
                 output.add(info);
             }
 
@@ -60,36 +59,37 @@ public List<VMInformation> processStateChange(List<InstanceStateChange> changes)
     }
 
     /**
-     * @param data
+     * @param requesterId
      * @param instance
      * @param region
      * @return
      */
-    public VMInformation instanceToVmInformation(Reservation data, Instance instance, VMRegion region) {
+    public VMInformation instanceToVmInformation(String requesterId, Instance instance, VMRegion region) {
         VMInformation info = new VMInformation();
         info.setProvider(VMProvider.Amazon);
-        info.setRequestId(data.getRequesterId());
-        info.setImageId(instance.getImageId());
-        info.setInstanceId(instance.getInstanceId());
-        info.setKeyName(instance.getKeyName());
+        info.setRequestId(requesterId);
+        info.setImageId(instance.imageId());
+        info.setInstanceId(instance.instanceId());
+        info.setKeyName(instance.keyName());
         // info.setLaunchTime();
         info.setRegion(region);
-        info.setPlatform(instance.getPlatform());
-        info.setPrivateDNS(instance.getPrivateDnsName());
-        info.setPublicDNS(instance.getPublicDnsName());
-        info.setState(instance.getState().getName());
-        info.setSize(instance.getInstanceType());
+        info.setPlatform(instance.platformAsString());
+        info.setPrivateDNS(instance.privateDnsName());
+        info.setPublicDNS(instance.publicDnsName());
+        info.setState(instance.state().nameAsString());
+        info.setSize(instance.instanceTypeAsString());
         return info;
     }
 
     /**
-     * @param reservation
+     * @param requesterId
+     * @param instances
      * @param region
      * @return
      */
-    public List<VMInformation> processReservation(Reservation reservation, VMRegion region) {
+    public List<VMInformation> processReservation(String requesterId, List<Instance> instances, VMRegion region) {
         try {
-            return reservation.getInstances().stream().map(instance -> instanceToVmInformation(reservation, instance, region)).collect(Collectors.toList());
+            return instances.stream().map(instance -> instanceToVmInformation(requesterId, instance, region)).collect(Collectors.toList());
         } catch (Exception ex) {
             LOG.error(ex.getMessage());
             throw new RuntimeException(ex);
diff --git a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonInstance.java b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonInstance.java
index f1b7506dd..7e1a06e34 100644
--- a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonInstance.java
+++ b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonInstance.java
@@ -1,41 +1,5 @@
 package com.intuit.tank.vmManager.environment.amazon;
 
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.handlers.AsyncHandler;
-import com.amazonaws.services.ec2.AmazonEC2Async;
-import com.amazonaws.services.ec2.AmazonEC2AsyncClientBuilder;
-import com.amazonaws.services.ec2.model.Address;
-import com.amazonaws.services.ec2.model.AmazonEC2Exception;
-import com.amazonaws.services.ec2.model.AssociateAddressRequest;
-import com.amazonaws.services.ec2.model.AttachVolumeRequest;
-import com.amazonaws.services.ec2.model.CreateTagsRequest;
-import com.amazonaws.services.ec2.model.DescribeAddressesRequest;
-import com.amazonaws.services.ec2.model.DescribeAddressesResult;
-import com.amazonaws.services.ec2.model.DescribeInstancesRequest;
-import com.amazonaws.services.ec2.model.DescribeInstancesResult;
-import com.amazonaws.services.ec2.model.IamInstanceProfileSpecification;
-import com.amazonaws.services.ec2.model.Instance;
-import com.amazonaws.services.ec2.model.InstanceType;
-import com.amazonaws.services.ec2.model.Placement;
-import com.amazonaws.services.ec2.model.RebootInstancesRequest;
-import com.amazonaws.services.ec2.model.Reservation;
-import com.amazonaws.services.ec2.model.RunInstancesRequest;
-import com.amazonaws.services.ec2.model.RunInstancesResult;
-import com.amazonaws.services.ec2.model.StartInstancesRequest;
-import com.amazonaws.services.ec2.model.StartInstancesResult;
-import com.amazonaws.services.ec2.model.StopInstancesRequest;
-import com.amazonaws.services.ec2.model.StopInstancesResult;
-import com.amazonaws.services.ec2.model.Tag;
-import com.amazonaws.services.ec2.model.Tenancy;
-import com.amazonaws.services.ec2.model.TerminateInstancesRequest;
-import com.amazonaws.services.ec2.model.TerminateInstancesResult;
-import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagement;
-import com.amazonaws.services.simplesystemsmanagement.AWSSimpleSystemsManagementClientBuilder;
-import com.amazonaws.services.simplesystemsmanagement.model.GetParameterRequest;
-import com.amazonaws.services.simplesystemsmanagement.model.GetParameterResult;
 import com.intuit.tank.dao.JobInstanceDao;
 import com.intuit.tank.project.JobInstance;
 import com.intuit.tank.vm.api.enumerated.VMImageType;
@@ -57,6 +21,42 @@
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.ProxyConfiguration;
+import software.amazon.awssdk.services.ec2.Ec2AsyncClient;
+import software.amazon.awssdk.services.ec2.Ec2AsyncClientBuilder;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.ec2.model.Address;
+import software.amazon.awssdk.services.ec2.model.AssociateAddressRequest;
+import software.amazon.awssdk.services.ec2.model.AttachVolumeRequest;
+import software.amazon.awssdk.services.ec2.model.CreateTagsRequest;
+import software.amazon.awssdk.services.ec2.model.DescribeAddressesRequest;
+import software.amazon.awssdk.services.ec2.model.DescribeAddressesResponse;
+import software.amazon.awssdk.services.ec2.model.DescribeInstancesRequest;
+import software.amazon.awssdk.services.ec2.model.DescribeInstancesResponse;
+import software.amazon.awssdk.services.ec2.model.Ec2Exception;
+import software.amazon.awssdk.services.ec2.model.IamInstanceProfileSpecification;
+import software.amazon.awssdk.services.ec2.model.Instance;
+import software.amazon.awssdk.services.ec2.model.InstanceType;
+import software.amazon.awssdk.services.ec2.model.Placement;
+import software.amazon.awssdk.services.ec2.model.RebootInstancesRequest;
+import software.amazon.awssdk.services.ec2.model.Reservation;
+import software.amazon.awssdk.services.ec2.model.RunInstancesMonitoringEnabled;
+import software.amazon.awssdk.services.ec2.model.RunInstancesRequest;
+import software.amazon.awssdk.services.ec2.model.RunInstancesResponse;
+import software.amazon.awssdk.services.ec2.model.StartInstancesRequest;
+import software.amazon.awssdk.services.ec2.model.StartInstancesResponse;
+import software.amazon.awssdk.services.ec2.model.StopInstancesRequest;
+import software.amazon.awssdk.services.ec2.model.Tag;
+import software.amazon.awssdk.services.ec2.model.Tenancy;
+import software.amazon.awssdk.services.ec2.model.TerminateInstancesRequest;
+import software.amazon.awssdk.services.ec2.model.TerminateInstancesResponse;
+import software.amazon.awssdk.services.ssm.SsmClient;
+import software.amazon.awssdk.services.ssm.model.GetParameterRequest;
+import software.amazon.awssdk.services.ssm.model.GetParameterResponse;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
@@ -69,8 +69,8 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Future;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 
@@ -80,7 +80,7 @@ public class AmazonInstance implements IEnvironmentInstance {
     private static final int MAX_INSTANCE_BATCH_SIZE = 10;
     private static Logger LOG = LogManager.getLogger(AmazonInstance.class);
 
-    private AmazonEC2Async asynchEc2Client;
+    private Ec2AsyncClient ec2AsyncClient;
     private VMRegion vmRegion;
 
     private TankConfig config = new TankConfig();
@@ -93,35 +93,27 @@ public AmazonInstance(@Nonnull VMRegion vmRegion) {
         this.vmRegion = vmRegion;
         try {
             CloudCredentials creds = config.getVmManagerConfig().getCloudCredentials(CloudProvider.amazon);
-            ClientConfiguration clientConfig = new ClientConfiguration();
-            clientConfig.setMaxConnections(2);
-            if (StringUtils.isNotBlank(creds.getProxyHost())) {
+            Ec2AsyncClientBuilder ec2AsyncClientBuilder = Ec2AsyncClient.builder();
+            if (creds != null && StringUtils.isNotBlank(creds.getProxyHost())) {
                 try {
-                    clientConfig.setProxyHost(creds.getProxyHost());
+                    ProxyConfiguration.Builder proxyConfig = ProxyConfiguration.builder().host(creds.getProxyHost());
                     if (StringUtils.isNotBlank(creds.getProxyPort())) {
-                        clientConfig.setProxyPort(Integer.valueOf(creds.getProxyPort()));
+                        proxyConfig.port(Integer.parseInt(System.getProperty(creds.getProxyPort())));
                     }
+                    NettyNioAsyncHttpClient.Builder httpClientBuilder =
+                            NettyNioAsyncHttpClient.builder().proxyConfiguration(proxyConfig.build());
+                    ec2AsyncClientBuilder.httpClientBuilder(httpClientBuilder);
                 } catch (NumberFormatException e) {
                     LOG.error("invalid proxy setup.");
                 }
-
             }
-            if (StringUtils.isNotBlank(creds.getKey()) && StringUtils.isNotBlank(creds.getKeyId())) {
-                AWSCredentials credentials = new BasicAWSCredentials(creds.getKeyId(), creds.getKey());
-                asynchEc2Client = AmazonEC2AsyncClientBuilder
-                        .standard()
-                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                        .withClientConfiguration(clientConfig)
-                        .withRegion(vmRegion.getRegion())
-                        .build();
-            } else {
-                asynchEc2Client = AmazonEC2AsyncClientBuilder
-                        .standard()
-                        .withClientConfiguration(clientConfig)
-                        .withRegion(vmRegion.getRegion())
-                        .build();
+            if (creds != null && StringUtils.isNotBlank(creds.getKey()) && StringUtils.isNotBlank(creds.getKeyId())) {
+                AwsCredentials credentials = AwsBasicCredentials.create(creds.getKeyId(), creds.getKey());
+                ec2AsyncClientBuilder.credentialsProvider(StaticCredentialsProvider.create(credentials));
             }
-
+            ec2AsyncClient = ec2AsyncClientBuilder
+                    .region(Region.of(vmRegion.getRegion()))
+                    .build();
         } catch (Exception ex) {
             LOG.error("Error initializing amazonclient: " + ex, ex);
             throw new RuntimeException(ex);
@@ -129,11 +121,12 @@ public AmazonInstance(@Nonnull VMRegion vmRegion) {
     }
 
     public void attachVolume(String volumneId, String instanceId, String device) {
-        AttachVolumeRequest attachVolumeRequest = new AttachVolumeRequest(volumneId, instanceId, device);
-        asynchEc2Client.attachVolume(attachVolumeRequest);
-        RebootInstancesRequest rebootInstancesRequest = new RebootInstancesRequest();
-        rebootInstancesRequest.withInstanceIds(instanceId);
-        asynchEc2Client.rebootInstances(rebootInstancesRequest);
+        AttachVolumeRequest attachVolumeRequest =
+                AttachVolumeRequest.builder().volumeId(volumneId).instanceId(instanceId).device(device).build();
+        ec2AsyncClient.attachVolume(attachVolumeRequest);
+        RebootInstancesRequest rebootInstancesRequest =
+                RebootInstancesRequest.builder().instanceIds(instanceId).build();
+        ec2AsyncClient.rebootInstances(rebootInstancesRequest);
     }
 
     /**
@@ -142,19 +135,14 @@ public void attachVolume(String volumneId, String instanceId, String device) {
      */
     @Override
     public List<VMInformation> describeInstances(String... instanceIds) {
-        try {
-            HashSet<String> ids = new HashSet<String>(Arrays.asList(instanceIds));
-
-            return asynchEc2Client.describeInstances().getReservations().stream()
-                    .flatMap(reservationDescription -> reservationDescription.getInstances()
-                            .stream()
-                            .filter(instance -> ids.contains(instance.getInstanceId()))
-                            .map(instance -> new AmazonDataConverter().instanceToVmInformation(reservationDescription, instance, vmRegion)))
-                    .collect(Collectors.toList());
-        } catch (Exception e) {
-            LOG.error("Failed to retrieve instance from Amazon: " + e.getMessage());
-            throw new RuntimeException(e);
-        }
+        HashSet<String> ids = new HashSet<String>(Arrays.asList(instanceIds));
+
+        return ec2AsyncClient.describeInstances().join().reservations().stream()
+                .flatMap(reservationDescription -> reservationDescription.instances()
+                        .stream()
+                        .filter(instance -> ids.contains(instance.instanceId()))
+                        .map(instance -> new AmazonDataConverter().instanceToVmInformation(reservationDescription.requesterId(), instance, vmRegion)))
+                .collect(Collectors.toList());
     }
 
     /**
@@ -178,17 +166,16 @@ public List<VMInformation> create(VMRequest request) {
                 for (VMInformation vmInfo : instances) {
                     LOG.info("found instance with id " + vmInfo.getInstanceId() + " with state of " + vmInfo.getState());
                     if ("stopped".equalsIgnoreCase(vmInfo.getState())) {
-                        StartInstancesRequest startInstancesRequest = new StartInstancesRequest();
-                        startInstancesRequest.withInstanceIds(vmInfo.getInstanceId());
+                        StartInstancesRequest startInstancesRequest = StartInstancesRequest.builder().instanceIds(vmInfo.getInstanceId()).build();
                         // restart this instance
-                        StartInstancesResult startInstances = asynchEc2Client.startInstances(startInstancesRequest);
-                        result.addAll(new AmazonDataConverter().processStateChange(startInstances.getStartingInstances()));
+                        StartInstancesResponse startInstances = ec2AsyncClient.startInstances(startInstancesRequest).join();
+                        result.addAll(new AmazonDataConverter().processStateChange(startInstances.startingInstances()));
                         break;
                     }
                 }
             }
             if (result.isEmpty()) {
-                InstanceType size = AmazonInstance.getInstanceType(instanceRequest.getSize());
+                InstanceType instanceType = AmazonInstance.getInstanceType(instanceRequest.getSize());
                 VmInstanceType vmType = config.getVmManagerConfig().getInstanceType(instanceRequest.getSize());
                 String keyPair = instanceDescription.getKeypair();
                 if (instanceRequest.getJobId() != null) {
@@ -234,48 +221,48 @@ public List<VMInformation> create(VMRequest request) {
                 String image = getAMI(instanceDescription);
                 LOG.info("Requesting " + remaining + " instances in " + vmRegion.getName() + " with AMI=" + image);
 
-                RunInstancesRequest runInstancesRequestTemplate = new RunInstancesRequest();
-                Tenancy tenancy = StringUtils.isEmpty(instanceDescription.getTenancy()) ? Tenancy.Default : Tenancy.fromValue(instanceDescription.getTenancy());
-                runInstancesRequestTemplate.withImageId(image)
-                                    .withInstanceType(size.toString())
-                					.withKeyName(keyPair)
-                					.withPlacement(new Placement().withTenancy(tenancy))
-                					.withMonitoring(true)
-                					.withUserData(userData);
+                RunInstancesRequest.Builder runInstancesRequestTemplate = RunInstancesRequest.builder();
+                Tenancy tenancy = StringUtils.isEmpty(instanceDescription.getTenancy()) ? Tenancy.DEFAULT : Tenancy.fromValue(instanceDescription.getTenancy());
+                runInstancesRequestTemplate.imageId(image)
+                        .instanceType(instanceType.toString())
+                        .keyName(keyPair)
+                        .placement(Placement.builder().tenancy(tenancy).build())
+                        .monitoring(RunInstancesMonitoringEnabled.builder().build())
+                        .userData(userData);
 
                 Collection<String> c = instanceDescription.getSecurityGroupIds();
                 if (!c.isEmpty()) {
                 	LOG.info("Security Group IDs " + c.toString());
-                    runInstancesRequestTemplate.withSecurityGroupIds(c);
+                    runInstancesRequestTemplate.securityGroupIds(c);
                 } else {
-                    runInstancesRequestTemplate.withSecurityGroups(instanceDescription.getSecurityGroup());
+                    runInstancesRequestTemplate.securityGroups(instanceDescription.getSecurityGroup());
                 }
                 if (StringUtils.isNotBlank(instanceDescription.getIamRole())) {
-                    IamInstanceProfileSpecification iamInstanceProfile = new IamInstanceProfileSpecification().withName(instanceDescription.getIamRole());
-                    runInstancesRequestTemplate.withIamInstanceProfile(iamInstanceProfile);
+                    runInstancesRequestTemplate.iamInstanceProfile(
+                            IamInstanceProfileSpecification.builder().name(instanceDescription.getIamRole()).build());
                 }
                 // add zone info if specified
                 if (!StringUtils.isEmpty(instanceDescription.getZone())) {
-                    runInstancesRequestTemplate.withPlacement(new Placement().withAvailabilityZone(instanceDescription.getZone()));
+                    runInstancesRequestTemplate.placement(Placement.builder().availabilityZone(instanceDescription.getZone()).build());
                 }
                 // Loop to request agent instances
                 List<String> subnetIds = instanceDescription.getSubnetIds();
                 int position = ThreadLocalRandom.current().nextInt(subnetIds.size());
                 while ( !subnetIds.isEmpty() && remaining > 0 ) {
-                    RunInstancesRequest runInstancesRequest = runInstancesRequestTemplate.clone();
-                    runInstancesRequest.withSubnetId(subnetIds.get(position >= subnetIds.size() ? 0 : position++));
+                    RunInstancesRequest.Builder runInstancesRequest = runInstancesRequestTemplate.copy();
+                    runInstancesRequest.subnetId(subnetIds.get(position >= subnetIds.size() ? 0 : position++));
                     int requestCount = Math.min(remaining, MAX_INSTANCE_BATCH_SIZE);
                     try {
-                        RunInstancesResult results =
-                                asynchEc2Client.runInstances(
-                                        runInstancesRequest.withMinCount(1).withMaxCount(requestCount));
-                        result.addAll(new AmazonDataConverter().processReservation(results.getReservation(), vmRegion));
-                        remaining -= results.getReservation().getInstances().size();
-                    } catch (AmazonEC2Exception ae) {
+                        RunInstancesResponse response = ec2AsyncClient.runInstances(
+                                runInstancesRequest.minCount(1).maxCount(requestCount).build()).join();
+                        result.addAll(new AmazonDataConverter().processReservation(
+                                response.requesterId(), response.instances(), vmRegion));
+                        remaining -= response.instances().size();
+                    } catch (Ec2Exception ae) {
                         LOG.error("Amazon issue starting instances: count="
                                 + remaining + " : subnets=" + subnetIds.size() + " : " + ae.getMessage());
                         if(StringUtils.contains(ae.getMessage(), "InsufficientInstanceCapacity")) {
-                            subnetIds.remove(runInstancesRequest.getSubnetId());
+                            subnetIds.remove(runInstancesRequest.build().subnetId());
                         }
                     }
                 }
@@ -283,12 +270,13 @@ public List<VMInformation> create(VMRequest request) {
                 if (instanceRequest.isUseEips()) {
                     Set<Address> availableEips = new HashSet<Address>();
                     synchronized (instanceRequest.getRegion()) {
-                        DescribeAddressesResult describeAddresses = asynchEc2Client.describeAddresses(new DescribeAddressesRequest());
+                        DescribeAddressesResponse describeAddresses =
+                                ec2AsyncClient.describeAddresses(DescribeAddressesRequest.builder().build()).join();
                         Set<String> reserved = config.getVmManagerConfig().getReservedElasticIps();
-                        for (Address address : describeAddresses.getAddresses()) {
+                        for (Address address : describeAddresses.addresses()) {
                             String elasticIPType = instanceDescription.isVPC() ? "vpc" : "standard";
-                            if (elasticIPType.equalsIgnoreCase(address.getDomain()) && StringUtils.isBlank(address.getInstanceId())) {
-                                String ip = address.getPublicIp();
+                            if (elasticIPType.equalsIgnoreCase(address.domainAsString()) && StringUtils.isBlank(address.instanceId())) {
+                                String ip = address.publicIp();
                                 if (!reserved.contains(ip)) {
                                     availableEips.add(address);
                                 }
@@ -319,7 +307,7 @@ public List<VMInformation> create(VMRequest request) {
                 // bind to the public ip
                 String instanceId = result.get(0).getInstanceId();
                 // wait for instance to be in running state
-                associateAddress(instanceId, new Address().withPublicIp(instanceDescription.getPublicIp()), null);
+                associateAddress(instanceId, Address.builder().publicIp(instanceDescription.getPublicIp()).build(), null);
                 // reboot(result);
             }
             if (!result.isEmpty()) {
@@ -328,7 +316,7 @@ public List<VMInformation> create(VMRequest request) {
                 tagInstance(ids, buildTags(instanceRequest));
             }
 
-        } catch (AmazonEC2Exception ae) {
+        } catch (Ec2Exception ae) {
             LOG.error("Amazon issue starting instances: " + ae.getMessage(), ae);
             throw new RuntimeException(ae);
         } catch (Exception ex) {
@@ -346,25 +334,21 @@ public List<VMInformation> create(VMRequest request) {
     public void tagInstance(final List<String> instanceIds, KeyValuePair... tag) {
         if (tag.length != 0) {
             final List<Tag> tags = Arrays.stream(tag)
-                    .map(pair -> new Tag(pair.getKey(), pair.getValue())).collect(Collectors.toList());
+                    .map(pair -> Tag.builder().key(pair.getKey()).value(pair.getValue()).build()).collect(Collectors.toList());
 
             new Thread( () -> {
                 int count = 0;
                 try {
                     while (++count <= 5 && !instanceIds.isEmpty()) {
-                        Thread.sleep(5000);
-                        CreateTagsRequest createTagsRequest
-                                = new CreateTagsRequest().withResources(instanceIds).withTags(tags);
-                        asynchEc2Client.createTagsAsync(createTagsRequest);
-                        Thread.sleep(1000);
-
-                        Future<DescribeInstancesResult> describeInstances
-                                = asynchEc2Client.describeInstancesAsync(
-                                        new DescribeInstancesRequest().withInstanceIds(instanceIds));
-                        for (Reservation r : describeInstances.get().getReservations()) {
-                            for (Instance i : r.getInstances()) {
-                                if (i.getTags() != null && !i.getTags().isEmpty()) {
-                                    instanceIds.remove(i.getInstanceId());
+                        CreateTagsRequest createTagsRequest = CreateTagsRequest.builder().resources(instanceIds).tags(tags).build();
+                        ec2AsyncClient.createTags(createTagsRequest);
+                        DescribeInstancesResponse response =
+                                ec2AsyncClient.describeInstances(
+                                        DescribeInstancesRequest.builder().instanceIds(instanceIds).build()).join();
+                        for (Reservation reservation : response.reservations()) {
+                            for (Instance instance : reservation.instances()) {
+                                if (instance.tags() != null && !instance.tags().isEmpty()) {
+                                    instanceIds.remove(instance.instanceId());
                                 }
                             }
                         }
@@ -411,10 +395,10 @@ private KeyValuePair[] buildTags(VMInstanceRequest instanceRequest) {
     private String buildNameTag(VMInstanceRequest instanceRequest) {
         StringBuilder sb = new StringBuilder(instanceRequest.getImage().getConfigName());
         if (StringUtils.isNoneEmpty(instanceRequest.getJobId())) {
-            sb.append(" job(" + instanceRequest.getJobId() + ")");
+            sb.append("-job[" + instanceRequest.getJobId() + "]");
         }
         if (StringUtils.isNoneEmpty(config.getInstanceName())) {
-            sb.insert(0, config.getInstanceName() + " ");
+            sb.insert(0, config.getInstanceName() + "-");
         }
         return sb.toString();
     }
@@ -422,36 +406,20 @@ private String buildNameTag(VMInstanceRequest instanceRequest) {
     @Override
     public List<VMInformation> kill(VMRequest request) {
         VMKillRequest killRequest = (VMKillRequest) request;
-        TerminateInstancesRequest terminateInstancesRequest = new TerminateInstancesRequest(killRequest.getInstances());
-        TerminateInstancesResult terminateInstances = asynchEc2Client.terminateInstances(terminateInstancesRequest);
-        return new AmazonDataConverter().processStateChange(terminateInstances.getTerminatingInstances());
+        TerminateInstancesRequest terminateInstancesRequest =
+                TerminateInstancesRequest.builder().instanceIds(killRequest.getInstances()).build();
+        TerminateInstancesResponse response = ec2AsyncClient.terminateInstances(terminateInstancesRequest).join();
+        return new AmazonDataConverter().processStateChange(response.terminatingInstances());
     }
 
     @Override
     public void killInstances(List<String> instanceIds) {
-
         // Filter instanceId list to only instances in the client defined region.
         List<VMInformation> instancesInRegion = describeInstances(instanceIds.toArray(new String[instanceIds.size()]));
         List<String> instanceIdsInRegion = instancesInRegion.stream().map(VMInformation::getInstanceId).collect(Collectors.toList());
 
         if (!instanceIdsInRegion.isEmpty()) {
-            // asynchronous AWS SDK terminate instances.
-            asynchEc2Client.terminateInstancesAsync(
-                    new TerminateInstancesRequest(instanceIdsInRegion),
-                    new AsyncHandler<TerminateInstancesRequest, TerminateInstancesResult>() {
-                        @Override
-                        public void onError(Exception exception) {
-                            LOG.warn("something went wrong killing the instances : {}",
-                                    exception.getLocalizedMessage());
-                        }
-
-                        @Override
-                        public void onSuccess(TerminateInstancesRequest request, TerminateInstancesResult result) {
-                            LOG.trace("instances killed successfully : {}",
-                                    result.getTerminatingInstances());
-                        }
-                    });
-            //return new AmazonDataConverter().processStateChange(terminateInstances.getTerminatingInstances());
+            ec2AsyncClient.terminateInstances(TerminateInstancesRequest.builder().instanceIds(instanceIdsInRegion).build());
         }
     }
 
@@ -462,15 +430,15 @@ public void onSuccess(TerminateInstancesRequest request, TerminateInstancesResul
     public List<VMInformation> findInstancesOfType(VMRegion region, VMImageType type) {
         List<VMInformation> ret = new ArrayList<>();
         try {
-            DescribeInstancesResult instances = asynchEc2Client.describeInstances();
+            DescribeInstancesResponse response = ec2AsyncClient.describeInstances().join();
             InstanceDescription instanceForRegionAndType = config.getVmManagerConfig().getInstanceForRegionAndType(region, type);
-            for (Reservation res : instances.getReservations()) {
-                if (res.getInstances() != null) {
-                    for (com.amazonaws.services.ec2.model.Instance inst : res.getInstances()) {
-                        if ((inst.getState().getName().equalsIgnoreCase("running")
-                                || inst.getState().getName().equalsIgnoreCase("pending"))
-                                && inst.getImageId().equals(instanceForRegionAndType.getAmi())) {
-                            ret.add(new AmazonDataConverter().instanceToVmInformation(res, inst, region));
+            for (Reservation reservation : response.reservations()) {
+                if (reservation.instances() != null) {
+                    for (Instance instance : reservation.instances()) {
+                        if ((instance.state().nameAsString().equalsIgnoreCase("running")
+                                || instance.state().nameAsString().equalsIgnoreCase("pending"))
+                                && instance.imageId().equals(instanceForRegionAndType.getAmi())) {
+                            ret.add(new AmazonDataConverter().instanceToVmInformation(reservation.requesterId(), instance, region));
                         }
                     }
                 }
@@ -486,15 +454,15 @@ public List<VMInformation> findInstancesOfType(VMRegion region, VMImageType type
      * @inheritDoc
      */
     private List<VMInformation> findAllInstancesOfType(VMRegion region, VMImageType type) {
-        List<VMInformation> ret = new ArrayList<VMInformation>();
+        List<VMInformation> ret = new ArrayList<>();
         try {
-            DescribeInstancesResult instances = asynchEc2Client.describeInstances();
+            DescribeInstancesResponse response = ec2AsyncClient.describeInstances().join();
             InstanceDescription instanceForRegionAndType = config.getVmManagerConfig().getInstanceForRegionAndType(region, type);
-            for (Reservation res : instances.getReservations()) {
-                if (res.getInstances() != null) {
-                    for (com.amazonaws.services.ec2.model.Instance inst : res.getInstances()) {
-                        if (inst.getImageId().equals(instanceForRegionAndType.getAmi())) {
-                            ret.add(new AmazonDataConverter().instanceToVmInformation(res, inst, region));
+            for (Reservation reservation : response.reservations()) {
+                if (reservation.instances() != null) {
+                    for (Instance instance : reservation.instances()) {
+                        if (instance.imageId().equals(instanceForRegionAndType.getAmi())) {
+                            ret.add(new AmazonDataConverter().instanceToVmInformation(reservation.requesterId(), instance, region));
                         }
                     }
                 }
@@ -519,7 +487,7 @@ private static InstanceType getInstanceType(String size) {
         } catch (Exception e) {
             LOG.warn("Error parsing vminstanceType " + size, e);
         }
-        return InstanceType.C52xlarge;
+        return InstanceType.C5_LARGE;
     }
 
     /**
@@ -531,9 +499,9 @@ private String getAMI(InstanceDescription instanceDescription) {
         String name = instanceDescription.getSSMAmi();
         if (StringUtils.isNotEmpty(name)) {
             try {
-                final AWSSimpleSystemsManagement client = AWSSimpleSystemsManagementClientBuilder.defaultClient();
-                GetParameterResult result = client.getParameter(new GetParameterRequest().withName(name));
-                return result.getParameter().getValue();
+                final SsmClient ssmClient = SsmClient.builder().build();
+                GetParameterResponse response = ssmClient.getParameter(GetParameterRequest.builder().name(name).build());
+                return response.parameter().value();
             } catch (Exception e) {
                 LOG.error("Error retriveing AMI from SSM with name " + name + ", default to InstanceRequest", e);
             }
@@ -550,33 +518,32 @@ public void associateAddress(final String instanceId, final Address address, fin
             try {
                 long start = System.currentTimeMillis();
                 int count = 0;
-                LOG.info("Setting ip for instance " + instanceId + " to " + address.getPublicIp());
+                LOG.info("Setting ip for instance " + instanceId + " to " + address.publicIp());
                 while ((System.currentTimeMillis() - start) < ASSOCIATE_IP_MAX_WAIT_MILIS && !associated) {
                     count++;
                     try {
-                       if (address.getAllocationId() == null) {
-                            asynchEc2Client.associateAddressAsync(new AssociateAddressRequest()
-                                                                .withInstanceId(instanceId)
-                                                                .withPublicIp(address.getPublicIp()));
+                        if (address.allocationId() == null) {
+                            ec2AsyncClient.associateAddress(
+                                    AssociateAddressRequest.builder().instanceId(instanceId).publicIp(address.publicIp()).build());
                         } else {
-                            asynchEc2Client.associateAddressAsync(new AssociateAddressRequest()
-                                                                .withInstanceId(instanceId)
-                                                                .withAllocationId(address.getAllocationId()));
+                            ec2AsyncClient.associateAddress(
+                                    AssociateAddressRequest.builder().instanceId(instanceId).allocationId(address.allocationId()).build());
                         }
                         Thread.sleep((new Random().nextInt(10) + 10) * 100L);
-                        Future<DescribeInstancesResult> describeInstances
-                                = asynchEc2Client.describeInstancesAsync(new DescribeInstancesRequest().withInstanceIds(instanceId));
-                        for (Reservation r : describeInstances.get().getReservations()) {
-                            for (Instance i : r.getInstances()) {
-                                if (address.getPublicIp().equals(i.getPublicIpAddress())) {
+                        DescribeInstancesResponse describeInstances =
+                                ec2AsyncClient.describeInstances(
+                                        DescribeInstancesRequest.builder().instanceIds(instanceId).build()).join();
+                        for (Reservation reservation : describeInstances.reservations()) {
+                            for (Instance instance : reservation.instances()) {
+                                if (address.publicIp().equals(instance.publicIpAddress())) {
                                     associated = true;
                                 }
                             }
                         }
                         if (associated) {
-                            LOG.info(instanceId + " associated with " + address.getPublicIp());
+                            LOG.info(instanceId + " associated with " + address.publicIp());
                         } else if (count % 5 == 0) {
-                            LOG.info(instanceId + " not associated yet " + address.getPublicIp() + ". Retrying... count = " + count);
+                            LOG.info(instanceId + " not associated yet " + address.publicIp() + ". Retrying... count = " + count);
                         }
                     } catch (Exception e) {
                         if (count < 5) {
@@ -600,8 +567,7 @@ public void associateAddress(final String instanceId, final Address address, fin
     public void reboot(List<VMInformation> instances) {
         List<String> instanceIds = instances.stream()
                 .map(VMInformation::getInstanceId).collect(Collectors.toCollection(() -> new ArrayList<>(instances.size())));
-        asynchEc2Client.rebootInstancesAsync(new RebootInstancesRequest(instanceIds));
-        // ec2Interface.rebootInstances(instanceIds);
+        ec2AsyncClient.rebootInstances(RebootInstancesRequest.builder().instanceIds(instanceIds).build());
     }
 
     /**
@@ -614,23 +580,7 @@ public void stopInstances(List<String> instanceIds) {
         List<String> instanceIdsInRegion = instancesInRegion.stream().map(VMInformation::getInstanceId).collect(Collectors.toList());
 
         if (!instanceIdsInRegion.isEmpty()) {
-            // asynchronous AWS SDK stop instances.
-            asynchEc2Client.stopInstancesAsync(
-                    new StopInstancesRequest(instanceIdsInRegion),
-                    new AsyncHandler<StopInstancesRequest, StopInstancesResult>() {
-                        @Override
-                        public void onError(Exception exception) {
-                            LOG.warn("something went wrong stopping the instances {}",
-                                    exception.getLocalizedMessage());
-                        }
-
-                        @Override
-                        public void onSuccess(StopInstancesRequest request, StopInstancesResult result) {
-                            LOG.trace("instances stopped successfully {}",
-                                    result.getStoppingInstances());
-                        }
-                    });
-            //return new AmazonDataConverter().processStateChange(stoppingInstances);
+            ec2AsyncClient.stopInstances(StopInstancesRequest.builder().instanceIds(instanceIdsInRegion).build());
         }
     }
 
@@ -659,10 +609,12 @@ private AssociateContainer(String instanceId, Address address) {
 
     public String findPublicName(String instanceId) {
         try {
-            DescribeInstancesRequest describeInstancesRequest = new DescribeInstancesRequest().withInstanceIds(instanceId);
-            DescribeInstancesResult result = asynchEc2Client.describeInstances(describeInstancesRequest);
-            if (result.getReservations() != null && result.getReservations().size() == 1) {
-                return result.getReservations().get(0).getInstances().get(0).getPublicDnsName();
+            DescribeInstancesRequest describeInstancesRequest =
+                    DescribeInstancesRequest.builder().instanceIds(instanceId).build();
+            DescribeInstancesResponse response = ec2AsyncClient.describeInstances(describeInstancesRequest).join();
+            if (response.reservations() != null && response.reservations().size() == 1) {
+                Reservation reservation = response.reservations().get(0);
+                return reservation.instances().get(0).publicDnsName();
             }
         } catch (Exception e) {
             LOG.error("Error getting public dns: " + e, e);
diff --git a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonS3.java b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonS3.java
index 1041c2968..31e2c4e7d 100644
--- a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonS3.java
+++ b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/AmazonS3.java
@@ -13,25 +13,28 @@
  * #L%
  */
 
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.AccessControlList;
-import com.amazonaws.services.s3.model.Bucket;
-import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.s3.model.S3ObjectInputStream;
 import com.intuit.tank.vm.settings.CloudCredentials;
 import com.intuit.tank.vm.settings.CloudProvider;
 import com.intuit.tank.vm.settings.TankConfig;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.sync.RequestBody;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache.ProxyConfiguration;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
+import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.S3Exception;
+;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
@@ -40,7 +43,7 @@
 public class AmazonS3 {
     private static final Logger LOG = LogManager.getLogger(AmazonS3.class);
 
-    private com.amazonaws.services.s3.AmazonS3 s3Client;
+    private S3Client s3Client;
 
     /**
      * 
@@ -48,30 +51,29 @@ public class AmazonS3 {
     public AmazonS3() {
 
         try {
-            CloudCredentials creds = new TankConfig().getVmManagerConfig().getCloudCredentials(
-                    CloudProvider.amazon);
-            ClientConfiguration config = new ClientConfiguration();
+            CloudCredentials creds = new TankConfig().getVmManagerConfig().getCloudCredentials(CloudProvider.amazon);
+            ApacheHttpClient.Builder httpClientBuilder = ApacheHttpClient.builder();
             if (StringUtils.isNotBlank(System.getProperty("http.proxyHost"))) {
                 try {
-                    config.setProxyHost(System.getProperty("http.proxyHost"));
+                    URIBuilder uriBuilder = new URIBuilder().setHost(System.getProperty("http.proxyHost"));
                     if (StringUtils.isNotBlank(System.getProperty("http.proxyPort"))) {
-                        config.setProxyPort(Integer.valueOf(System.getProperty("http.proxyPort")));
+                        uriBuilder.setPort(Integer.parseInt(System.getProperty("http.proxyPort")));
                     }
+                    httpClientBuilder.proxyConfiguration(
+                            ProxyConfiguration.builder().endpoint(uriBuilder.build()).build());
                 } catch (NumberFormatException e) {
                     LOG.error("invalid proxy setup.");
                 }
-
             }
             if (StringUtils.isNotBlank(creds.getKeyId()) && StringUtils.isNotBlank(creds.getKey())) {
-                BasicAWSCredentials credentials = new BasicAWSCredentials(creds.getKeyId(), creds.getKey());
-                this.s3Client = AmazonS3ClientBuilder
-                        .standard()
-                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                        .withClientConfiguration(config)
+                AwsCredentials credentials = AwsBasicCredentials.create(creds.getKeyId(), creds.getKey());
+                this.s3Client = S3Client.builder()
+                        .credentialsProvider(StaticCredentialsProvider.create(credentials))
+                        .httpClientBuilder(httpClientBuilder)
                         .build();
             } else {
-                this.s3Client = AmazonS3ClientBuilder.standard()
-                        .withClientConfiguration(config)
+                this.s3Client = S3Client.builder()
+                        .httpClientBuilder(httpClientBuilder)
                         .build();
             }
         } catch (Exception ex) {
@@ -81,10 +83,11 @@ public AmazonS3() {
     }
 
     public void createBucket(String bucketName) {
-        AccessControlList configuration = s3Client.getBucketAcl(bucketName);
-        if (configuration == null) {
-            Bucket bucket = s3Client.createBucket(bucketName);
-            LOG.info("Created bucket " + bucket.getName() + " at " + bucket.getCreationDate());
+        try {
+            s3Client.createBucket(CreateBucketRequest.builder().bucket(bucketName).build());
+            LOG.info("Created bucket " + bucketName + " at " + "now");
+        } catch (S3Exception e) {
+            LOG.error("Error creating bucket: " + e, e);
         }
     }
 
@@ -92,42 +95,30 @@ public void createBucket(String bucketName) {
      *
      * @param bucketName
      *            the base bucketname
-     * @param path
-     *            the
-     * @return
+     * @param key
+     *            the object location
      */
-    public void storeFile(String bucketName, String path, Map<String, String> metaMap, InputStream in) {
-        ObjectMetadata metaData = new ObjectMetadata();
-        if (metaMap != null) {
-            for (Entry<String, String> entry : metaMap.entrySet()) {
-                metaData.addUserMetadata(entry.getKey(), entry.getValue());
-            }
-        }
-        s3Client.putObject(bucketName, path, in, metaData);
+    public void storeFile(String bucketName, String key, Map<String, String> metaMap, InputStream in) {
+        try {
+            s3Client.putObject(
+                    PutObjectRequest.builder().bucket(bucketName).key(key).metadata(metaMap).build(),
+                    RequestBody.fromInputStream(in, in.available()));
+        } catch (IOException e) {
+            LOG.error("IO Error putting stream into bucket: " + e, e);
+    }
     }
 
     /**
      *
      * @param bucketName
      *            the base bucketname
-     * @param path
-     *            the
+     * @param key
+     *            the object location
      * @return
      */
-    public InputStream getFile(String bucketName, String path) {
-        InputStream ret = null;
-        S3Object object = s3Client.getObject(bucketName, path);
-        if (object != null) {
-            try ( S3ObjectInputStream objectContent = object.getObjectContent();
-                  ByteArrayOutputStream temp = new ByteArrayOutputStream()){
-                IOUtils.copy(objectContent, temp);
-                ret = new ByteArrayInputStream(temp.toByteArray());
-            } catch (Exception e) {
-                LOG.error("Error getting File: " + e, e);
-                throw new RuntimeException(e);
-            }
-        }
-        return ret;
+    public InputStream getStream(String bucketName, String key) {
+        return s3Client
+                .getObject(GetObjectRequest.builder().bucket(bucketName).key(key).build());
     }
 
     /**
@@ -135,17 +126,18 @@ public InputStream getFile(String bucketName, String path) {
      * 
      * @param bucketName
      *            the base bucketname
-     * @param path
-     *            the
+     * @param key
+     *            the object location
      * @return
      */
-    public Map<String, String> getFileMetaData(String bucketName, String path) {
+    public Map<String, String> getFileMetaData(String bucketName, String key) {
         Map<String, String> ret = new HashMap<String, String>();
         try {
-            ObjectMetadata objectMetadata = s3Client.getObjectMetadata(bucketName, path);
-            if (objectMetadata != null) {
-                for (Entry<String, Object> entry : objectMetadata.getRawMetadata().entrySet()) {
-                    ret.put(entry.getKey(), entry.getValue().toString());
+            HeadObjectResponse response = s3Client
+                    .headObject(HeadObjectRequest.builder().bucket(bucketName).key(key).build());
+            if (response.metadata() != null) {
+                for (Entry<String, String> entry : response.metadata().entrySet()) {
+                    ret.put(entry.getKey(), entry.getValue());
                 }
             }
         } catch (Exception e) {
diff --git a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/CloudwatchInstance.java b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/CloudwatchInstance.java
index 31e46aa4d..101728aab 100644
--- a/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/CloudwatchInstance.java
+++ b/tank_vmManager/src/main/java/com/intuit/tank/vmManager/environment/amazon/CloudwatchInstance.java
@@ -13,33 +13,39 @@
  * #L%
  */
 
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.services.cloudwatch.AmazonCloudWatchAsync;
-import com.amazonaws.services.cloudwatch.AmazonCloudWatchAsyncClientBuilder;
-import com.amazonaws.services.cloudwatch.model.ComparisonOperator;
-import com.amazonaws.services.cloudwatch.model.DeleteAlarmsRequest;
-import com.amazonaws.services.cloudwatch.model.Dimension;
-import com.amazonaws.services.cloudwatch.model.MetricAlarm;
-import com.amazonaws.services.cloudwatch.model.PutMetricAlarmRequest;
-import com.amazonaws.services.cloudwatch.model.Statistic;
-import com.amazonaws.services.sns.AmazonSNSAsync;
-import com.amazonaws.services.sns.AmazonSNSAsyncClientBuilder;
-import com.amazonaws.services.sns.model.CreateTopicResult;
-import com.amazonaws.services.sns.model.ListTopicsResult;
-import com.amazonaws.services.sns.model.SubscribeRequest;
-import com.amazonaws.services.sns.model.Topic;
 import com.intuit.tank.vm.api.enumerated.VMRegion;
 import com.intuit.tank.vm.settings.CloudCredentials;
 import com.intuit.tank.vm.settings.CloudProvider;
 import com.intuit.tank.vm.settings.TankConfig;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.AwsCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.http.apache.ApacheHttpClient;
+import software.amazon.awssdk.http.apache.ProxyConfiguration;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchClient;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchClientBuilder;
+import software.amazon.awssdk.services.cloudwatch.model.ComparisonOperator;
+import software.amazon.awssdk.services.cloudwatch.model.DeleteAlarmsRequest;
+import software.amazon.awssdk.services.cloudwatch.model.Dimension;
+import software.amazon.awssdk.services.cloudwatch.model.MetricAlarm;
+import software.amazon.awssdk.services.cloudwatch.model.PutMetricAlarmRequest;
+import software.amazon.awssdk.services.cloudwatch.model.Statistic;
+import software.amazon.awssdk.services.sns.SnsClient;
+import software.amazon.awssdk.services.sns.SnsClientBuilder;
+import software.amazon.awssdk.services.sns.model.CreateTopicRequest;
+import software.amazon.awssdk.services.sns.model.CreateTopicResponse;
+import software.amazon.awssdk.services.sns.model.ListTopicsRequest;
+import software.amazon.awssdk.services.sns.model.ListTopicsResponse;
+import software.amazon.awssdk.services.sns.model.SubscribeRequest;
+import software.amazon.awssdk.services.sns.model.Topic;
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -53,11 +59,11 @@
 public class CloudwatchInstance {
 
     protected static final long ASSOCIATE_IP_MAX_WAIT_MILIS = 1000 * 60 * 10;// ten minutes
-    private static Logger logger = LogManager.getLogger(CloudwatchInstance.class);
+    private static Logger LOG = LogManager.getLogger(CloudwatchInstance.class);
 
-    private AmazonCloudWatchAsync asynchCloudWatchClient;
+    private CloudWatchClient cloudWatchClient;
 
-    private AmazonSNSAsync asyncSnsClient;
+    private SnsClient snsClient;
 
     private TankConfig config = new TankConfig();
 
@@ -72,46 +78,36 @@ public CloudwatchInstance(VMRegion vmRegion) {
         }
         try {
             CloudCredentials creds = config.getVmManagerConfig().getCloudCredentials(CloudProvider.amazon);
-            ClientConfiguration clientConfig = new ClientConfiguration();
-            clientConfig.setMaxConnections(2);
-            if (StringUtils.isNotBlank(creds.getProxyHost())) {
+            CloudWatchClientBuilder cloudWatchClientBuilder = CloudWatchClient.builder();
+            SnsClientBuilder snsClientBuilder = SnsClient.builder();
+            if (creds != null && StringUtils.isNotBlank(creds.getProxyHost())) {
                 try {
-                    clientConfig.setProxyHost(creds.getProxyHost());
-                    
+                    URIBuilder uriBuilder = new URIBuilder().setHost(creds.getProxyHost());
                     if (StringUtils.isNotBlank(creds.getProxyPort())) {
-                        clientConfig.setProxyPort(Integer.valueOf(creds.getProxyPort()));
+                        uriBuilder.setPort(Integer.parseInt(System.getProperty(creds.getProxyPort())));
                     }
+                    ApacheHttpClient.Builder httpClientBuilder = ApacheHttpClient.builder()
+                            .proxyConfiguration(
+                                    ProxyConfiguration.builder().endpoint(uriBuilder.build()).build());
+                    cloudWatchClientBuilder.httpClientBuilder(httpClientBuilder);
+                    snsClientBuilder.httpClientBuilder(httpClientBuilder);
                 } catch (NumberFormatException e) {
-                    logger.error("invalid proxy setup.");
+                    LOG.error("invalid proxy setup.");
                 }
-
             }
-            if (StringUtils.isNotBlank(creds.getKeyId()) && StringUtils.isNotBlank(creds.getKey())) {
-                AWSCredentials credentials = new BasicAWSCredentials(creds.getKeyId(), creds.getKey());
-                asynchCloudWatchClient = AmazonCloudWatchAsyncClientBuilder
-                        .standard()
-                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                        .withClientConfiguration(clientConfig)
-                        .withRegion(vmRegion.getRegion())
-                        .build();
-                asyncSnsClient = AmazonSNSAsyncClientBuilder
-                        .standard()
-                        .withCredentials(new AWSStaticCredentialsProvider(credentials))
-                        .withClientConfiguration(clientConfig)
-                        .withRegion(vmRegion.getRegion())
-                        .build();
-            } else {
-                asynchCloudWatchClient = AmazonCloudWatchAsyncClientBuilder.standard()
-                        .withClientConfiguration(clientConfig)
-                        .withRegion(vmRegion.getRegion())
-                        .build();
-                asyncSnsClient = AmazonSNSAsyncClientBuilder.standard()
-                        .withClientConfiguration(clientConfig)
-                        .withRegion(vmRegion.getRegion())
-                        .build();
+            if (creds != null && StringUtils.isNotBlank(creds.getKey()) && StringUtils.isNotBlank(creds.getKeyId())) {
+                AwsCredentials credentials = AwsBasicCredentials.create(creds.getKeyId(), creds.getKey());
+                cloudWatchClientBuilder.credentialsProvider(StaticCredentialsProvider.create(credentials));
+                snsClientBuilder.credentialsProvider(StaticCredentialsProvider.create(credentials));
             }
+            cloudWatchClient = cloudWatchClientBuilder
+                    .region(Region.of(vmRegion.getRegion()))
+                    .build();
+            snsClient = snsClientBuilder
+                    .region(Region.of(vmRegion.getRegion()))
+                    .build();
         } catch (Exception ex) {
-            logger.error(ex.getMessage());
+            LOG.error(ex.getMessage());
             throw new RuntimeException(ex);
         }
     }
@@ -123,10 +119,10 @@ public CloudwatchInstance(VMRegion vmRegion) {
      */
     public void removeWatch(String email, String jobId) {
         String alarmName = getAlarmName(email, jobId);
-        for (MetricAlarm a : asynchCloudWatchClient.describeAlarms().getMetricAlarms()) {
-            if (a.getAlarmName().equalsIgnoreCase(alarmName)) {
-                DeleteAlarmsRequest req = new DeleteAlarmsRequest().withAlarmNames(alarmName);
-                asynchCloudWatchClient.deleteAlarmsAsync(req);
+        for (MetricAlarm alarm : cloudWatchClient.describeAlarms().metricAlarms()) {
+            if (alarm.alarmName().equalsIgnoreCase(alarmName)) {
+                DeleteAlarmsRequest request = DeleteAlarmsRequest.builder().alarmNames(alarmName).build();
+                cloudWatchClient.deleteAlarms(request);
             }
         }
     }
@@ -140,26 +136,30 @@ public void removeWatch(String email, String jobId) {
     public void addWatch(Collection<String> instances, String email, String jobId) {
 
         String alarmName = getAlarmName(email, jobId);
-        for (MetricAlarm a : asynchCloudWatchClient.describeAlarms().getMetricAlarms()) {
-            if (a.getAlarmName().equalsIgnoreCase(alarmName)) {
-                logger.info("Alarm for job " + jobId + " and email " + email + " already exists.");
+        for (MetricAlarm alarm : cloudWatchClient.describeAlarms().metricAlarms()) {
+            if (alarm.alarmName().equalsIgnoreCase(alarmName)) {
+                LOG.info("Alarm for job " + jobId + " and email " + email + " already exists.");
                 return;
             }
         }
-        List<Dimension> dimensions = instances.stream().map(instanceId -> new Dimension().withName("InstanceId").withValue(instanceId)).collect(Collectors.toList());
-        PutMetricAlarmRequest request = new PutMetricAlarmRequest()
-                .withActionsEnabled(true).withAlarmName(alarmName)
-                .withComparisonOperator(ComparisonOperator.GreaterThanOrEqualToThreshold)
-                .withDimensions(dimensions)
-                .withAlarmActions(getOrCreateNotification(email))
-                .withEvaluationPeriods(1)
-                .withPeriod(60)
-                .withThreshold(60.0D)
-                .withStatistic(Statistic.Average)
-                .withMetricName("CPUUtilization")
-                .withNamespace("AWS/EC2");
-        asynchCloudWatchClient.putMetricAlarm(request);
-        logger.info("Created alarm " + alarmName);
+        List<Dimension> dimensions = instances.stream()
+                .map(instanceId -> Dimension.builder().name("InstanceId").value(instanceId).build())
+                .collect(Collectors.toList());
+        PutMetricAlarmRequest request = PutMetricAlarmRequest.builder()
+                .actionsEnabled(true)
+                .alarmName(alarmName)
+                .comparisonOperator(ComparisonOperator.GREATER_THAN_OR_EQUAL_TO_THRESHOLD)
+                .dimensions(dimensions)
+                .alarmActions(getOrCreateNotification(email))
+                .evaluationPeriods(1)
+                .period(60)
+                .threshold(60.0D)
+                .statistic(Statistic.AVERAGE)
+                .metricName("CPUUtilization")
+                .namespace("AWS/EC2")
+                .build();
+        cloudWatchClient.putMetricAlarm(request);
+        LOG.info("Created alarm " + alarmName);
     }
 
     /**
@@ -172,19 +172,19 @@ public String getOrCreateNotification(String email) {
         String topicName = getTopicName(email);
         String nextToken = null;
         do {
-            ListTopicsResult listTopics = asyncSnsClient.listTopics(nextToken);
-            List<Topic> topics = listTopics.getTopics();
-            ret = topics.stream().filter(s -> s.getTopicArn().endsWith(topicName)).findFirst().map(Topic::getTopicArn).orElse(ret);
-            nextToken = listTopics.getNextToken();
+            ListTopicsResponse listTopics = snsClient.listTopics(ListTopicsRequest.builder().nextToken(nextToken).build());
+            List<Topic> topics = listTopics.topics();
+            ret = topics.stream().filter(s -> s.topicArn().endsWith(topicName)).findFirst().map(Topic::topicArn).orElse(ret);
+            nextToken = listTopics.nextToken();
         } while (ret == null && nextToken != null);
         if (ret == null) {
             // create the topic and the subscription
-            CreateTopicResult topic = asyncSnsClient.createTopic(topicName);
-            SubscribeRequest req = new SubscribeRequest(topic.getTopicArn(), "email", email);
-            asyncSnsClient.subscribeAsync(req);
-            ret = topic.getTopicArn();
+            CreateTopicResponse topic = snsClient.createTopic(CreateTopicRequest.builder().name(topicName).build());
+            snsClient.subscribe(
+                    SubscribeRequest.builder().topicArn(topic.topicArn()).attributes(
+                            new HashMap<String,String>(){{ put( "email", email); }}).build());
+            ret = topic.topicArn();
         }
-
         return ret;
     }
 
diff --git a/tank_vmManager/src/test/java/com/intuit/tank/vmManager/environment/amazon/AmazonDataConverterTest.java b/tank_vmManager/src/test/java/com/intuit/tank/vmManager/environment/amazon/AmazonDataConverterTest.java
index 00aa3fe46..41db891ea 100644
--- a/tank_vmManager/src/test/java/com/intuit/tank/vmManager/environment/amazon/AmazonDataConverterTest.java
+++ b/tank_vmManager/src/test/java/com/intuit/tank/vmManager/environment/amazon/AmazonDataConverterTest.java
@@ -20,11 +20,10 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import com.amazonaws.services.ec2.model.InstanceStateChange;
-import com.amazonaws.services.ec2.model.Reservation;
 import com.intuit.tank.vm.api.enumerated.VMRegion;
 import com.intuit.tank.vm.vmManager.VMInformation;
-import com.intuit.tank.vmManager.environment.amazon.AmazonDataConverter;
+import software.amazon.awssdk.services.ec2.model.InstanceStateChange;
+import software.amazon.awssdk.services.ec2.model.Reservation;
 
 /**
  * The class <code>AmazonDataConverterTest</code> contains tests for the class <code>{@link AmazonDataConverter}</code>.
@@ -55,10 +54,10 @@ public void testAmazonDataConverter_1()
     public void testProcessReservation_1()
             throws Exception {
         AmazonDataConverter fixture = new AmazonDataConverter();
-        Reservation reservation = new Reservation();
+        Reservation reservation = Reservation.builder().build();
         VMRegion region = VMRegion.ASIA_1;
 
-        List<VMInformation> result = fixture.processReservation(reservation, region);
+        List<VMInformation> result = fixture.processReservation(reservation.requesterId(), reservation.instances(), region);
 
         assertNotNull(result);
         assertEquals(0, result.size());
@@ -75,10 +74,10 @@ public void testProcessReservation_1()
     public void testProcessReservation_2()
             throws Exception {
         AmazonDataConverter fixture = new AmazonDataConverter();
-        Reservation reservation = new Reservation();
+        Reservation reservation = Reservation.builder().build();
         VMRegion region = VMRegion.ASIA_1;
 
-        List<VMInformation> result = fixture.processReservation(reservation, region);
+        List<VMInformation> result = fixture.processReservation(reservation.requesterId(), reservation.instances(), region);
 
         assertNotNull(result);
         assertEquals(0, result.size());
diff --git a/test_support/pom.xml b/test_support/pom.xml
index 9e43026e7..7276a30c6 100644
--- a/test_support/pom.xml
+++ b/test_support/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>com.intuit.tank</groupId>
   <artifactId>test-support</artifactId>
-  <version>2.3.4</version>
+  <version>3.0.0</version>
 
   <packaging>jar</packaging>
   <description>Intuit Tank Test Support module</description>
@@ -31,6 +31,8 @@
     <version.surefire>2.22.2</version.surefire>
     <license-maven-plugin.version>2.0.0</license-maven-plugin.version>
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+
+    <version.jaxb>2.3.3</version.jaxb>
   </properties>
 
   <build>
@@ -79,6 +81,19 @@
     </pluginManagement>
   </build>
 
+  <dependencies>
+    <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>${version.jaxb}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish.jaxb</groupId>
+        <artifactId>jaxb-runtime</artifactId>
+        <version>${version.jaxb}</version>
+      </dependency>
+  </dependencies>
+
   <distributionManagement>
     <repository>
       <id>${repository.id}</id>
diff --git a/tools/.pom.xml.un~ b/tools/.pom.xml.un~
deleted file mode 100644
index e3e9ef49b8ffc32c18f544036410acf838454e71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1524
zcmWH`%$*;a=aT=FfoWc7>e?*XWAE<G3XsaR<SAJu+R`n4u_NJM_FZYEosYR07#K`|
zSX}`MY;yBcN^?@}vQqQ1GxLh$3vx=+GxKcpp~66=azM-h#Ed}948$M+qG6aJ^v9>~
zEFf7XhWHC0Ss-A7P+$@yB?{yJ2LiBBFo98;${`T?UFsP)Iv5$gN&w9k0b*G2gQ7wi
z6!Qe4-Lw%LlgLpHawRBMVab7EG$uhoLQ4S5Sf9W#$pDE-S)gU|Kn%*jpr|1>6GLMY
wIZpz0gEKHFHnl*U(bxoq0xbbBHorlONpQYIk4-I3NRe!#sH;mbdp=(U00d)fZvX%Q

diff --git a/tools/agent_debugger/pom.xml b/tools/agent_debugger/pom.xml
index 14dcc38ae..90557226b 100755
--- a/tools/agent_debugger/pom.xml
+++ b/tools/agent_debugger/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tools-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>agent-debugger</artifactId>
diff --git a/tools/agent_debugger/src/main/java/com/intuit/tank/tools/debugger/ActionProducer.java b/tools/agent_debugger/src/main/java/com/intuit/tank/tools/debugger/ActionProducer.java
index 8f7a6e71c..78fd3bc7f 100644
--- a/tools/agent_debugger/src/main/java/com/intuit/tank/tools/debugger/ActionProducer.java
+++ b/tools/agent_debugger/src/main/java/com/intuit/tank/tools/debugger/ActionProducer.java
@@ -679,7 +679,7 @@ public void actionPerformed(ActionEvent e) {
                     debuggerFrame.start();
                 }
             };
-            ret.putValue(Action.SHORT_DESCRIPTION, "Start debugging script.");
+            ret.putValue(Action.SHORT_DESCRIPTION, "Start Debugging Script.");
             actionMap.put(ACTION_START, ret);
         }
         return ret;
@@ -875,18 +875,17 @@ public void actionPerformed(ActionEvent e) {
     }
 
     public static Icon getIcon(String string, IconSize size) {
-        ImageIcon ret = null;
         String resourcePath = (size == IconSize.SMALL ? "gfx/16/" : "gfx/32/") + string;
         try {
             ClassLoader cl = Thread.currentThread().getContextClassLoader();
             URL url = cl.getResource(resourcePath);
             // System.out.println("URL is: " + url);
-            ret = new ImageIcon(ImageIO.read(url));
+            return new ImageIcon(ImageIO.read(url));
         } catch (Exception e) {
             // System.out.println("URL is: " + url);
             LOG.error("Error loading image " + resourcePath + ": " + e);
         }
-        return ret;
+        return null;
     }
 
     private void showError(final String msg) {
diff --git a/tools/agent_debugger/src/main/java/com/intuit/tank/tools/debugger/SelectDialog.java b/tools/agent_debugger/src/main/java/com/intuit/tank/tools/debugger/SelectDialog.java
index 4123f588f..a1f798c6e 100644
--- a/tools/agent_debugger/src/main/java/com/intuit/tank/tools/debugger/SelectDialog.java
+++ b/tools/agent_debugger/src/main/java/com/intuit/tank/tools/debugger/SelectDialog.java
@@ -59,7 +59,7 @@ public class SelectDialog<SELECTION_TYPE extends Object> extends JDialog {
     private JList list;
     private JButton okBT;
     private SELECTION_TYPE selectedObject;
-    private SELECTION_TYPE[] selectedObjects;
+    private List<SELECTION_TYPE> selectedObjects;
     private List<SELECTION_TYPE> items;
     private long timeClicked;
 
@@ -99,7 +99,7 @@ public void mouseClicked(MouseEvent e) {
         JPanel labelPanel = new JPanel(new GridLayout(singleSelection ? 1 : 2, 1, 0, 5));
         labelPanel.add(new JLabel("Select a " + itemType + "."));
         if (!singleSelection) {
-            String key = System.getProperty("os.name").toLowerCase().indexOf("mac") != -1 ? "⌘" : "control";
+            String key = System.getProperty("os.name").toLowerCase().contains("mac") ? "⌘" : "control";
             System.out.println(key);
             labelPanel.add(new JLabel("Hold down the " + key
                     + " key to select multiple " + itemType + "."));
@@ -128,10 +128,9 @@ public SELECTION_TYPE getSelectedObject() {
      * @return the selectedScript
      */
     public List<SELECTION_TYPE> getSelectedObjects() {
-        if (selectedObjects != null) {
-            return (List<SELECTION_TYPE>) Arrays.asList(selectedObjects);
-        }
-        return Collections.emptyList();
+        return (selectedObjects != null) ?
+                selectedObjects :
+                Collections.emptyList();
     }
 
     public void filter(final long timeValue) {
@@ -189,7 +188,7 @@ private Component createButtonPanel() {
     private void select() {
 
         selectedObject = (SELECTION_TYPE) list.getSelectedValue();
-        selectedObjects = (SELECTION_TYPE[]) list.getSelectedValues();
+        selectedObjects = list.getSelectedValuesList();
         if (selectedObject != null) {
             setVisible(false);
         }
diff --git a/tools/agent_debugger/src/main/java/org/fife/io/UnicodeWriter.java b/tools/agent_debugger/src/main/java/org/fife/io/UnicodeWriter.java
index 28bfd01bc..63e07bdfa 100755
--- a/tools/agent_debugger/src/main/java/org/fife/io/UnicodeWriter.java
+++ b/tools/agent_debugger/src/main/java/org/fife/io/UnicodeWriter.java
@@ -184,22 +184,27 @@ private void init(OutputStream out, String encoding) throws IOException {
 		// NOTE: Creating an OutputStreamWriter with encoding "UTF-16" DOES
 		// DOES write out the BOM; "UTF-16LE", "UTF-16BE", "UTF-32", "UTF-32LE"
 		// and "UTF-32BE" don't.
-		if ("UTF-8".equals(encoding)) {
-			if (getWriteUtf8BOM()) {
-				out.write(UTF8_BOM, 0, UTF8_BOM.length);
-			}
-		}
-		else if ("UTF-16LE".equals(encoding)) {
-			out.write(UTF16LE_BOM, 0, UTF16LE_BOM.length);
-		}
-		else if (/*"UTF-16".equals(encoding) || */"UTF-16BE".equals(encoding)) {
-			out.write(UTF16BE_BOM, 0, UTF16BE_BOM.length);
-		}
-		else if ("UTF-32LE".equals(encoding)) {
-			out.write(UTF32LE_BOM, 0, UTF32LE_BOM.length);
-		}
-		else if ("UTF-32".equals(encoding) || "UTF-32BE".equals(encoding)) {
-			out.write(UTF32BE_BOM, 0, UTF32BE_BOM.length);
+		switch (encoding) {
+			case "UTF-8":
+				if (getWriteUtf8BOM()) {
+					out.write(UTF8_BOM, 0, UTF8_BOM.length);
+				}
+				break;
+			case "UTF-16LE":
+				out.write(UTF16LE_BOM, 0, UTF16LE_BOM.length);
+				break;
+			case "UTF-16BE":
+				/*"UTF-16".equals(encoding) || */
+
+				out.write(UTF16BE_BOM, 0, UTF16BE_BOM.length);
+				break;
+			case "UTF-32LE":
+				out.write(UTF32LE_BOM, 0, UTF32LE_BOM.length);
+				break;
+			case "UTF-32":
+			case "UTF-32BE":
+				out.write(UTF32BE_BOM, 0, UTF32BE_BOM.length);
+				break;
 		}
 
 	}
diff --git a/tools/agent_debugger/src/main/java/org/fife/ui/rtextarea/IconRowHeader.java b/tools/agent_debugger/src/main/java/org/fife/ui/rtextarea/IconRowHeader.java
index 2260b5068..c5c3649c2 100755
--- a/tools/agent_debugger/src/main/java/org/fife/ui/rtextarea/IconRowHeader.java
+++ b/tools/agent_debugger/src/main/java/org/fife/ui/rtextarea/IconRowHeader.java
@@ -18,7 +18,6 @@
 import java.awt.event.MouseListener;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
diff --git a/tools/agent_debugger_pkg/pom.xml b/tools/agent_debugger_pkg/pom.xml
index 99009bb5a..a8af0c6ff 100644
--- a/tools/agent_debugger_pkg/pom.xml
+++ b/tools/agent_debugger_pkg/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.intuit.tank</groupId>
 		<artifactId>tools-parent</artifactId>
-		<version>2.3.4</version>
+		<version>3.0.0</version>
 	</parent>
 
 	<artifactId>agent-debugger-package</artifactId>
@@ -15,7 +15,6 @@
 	<name>Agent Debugger Packaging</name>
 
 	<dependencies>
-
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>agent-debugger</artifactId>
@@ -30,20 +29,8 @@
 					<artifactId>picketlink</artifactId>
 				</exclusion>
 				<exclusion>
-					<groupId>com.amazonaws</groupId>
-					<artifactId>aws-java-sdk-dynamodb</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.amazonaws</groupId>
-					<artifactId>aws-java-sdk-simpledb</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.amazonaws</groupId>
-					<artifactId>aws-java-sdk-ec2</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.amazonaws</groupId>
-					<artifactId>aws-java-sdk-s3</artifactId>
+					<groupId>software.amazon.awssdk</groupId>
+					<artifactId>*</artifactId>
 				</exclusion>
 				<exclusion>
 					<groupId>org.hibernate</groupId>
diff --git a/tools/jenkins_plugin/pom.xml b/tools/jenkins_plugin/pom.xml
index 316cb7803..1d8f1e410 100644
--- a/tools/jenkins_plugin/pom.xml
+++ b/tools/jenkins_plugin/pom.xml
@@ -34,7 +34,7 @@
     </licenses>
 
     <properties>
-        <version.tank-proxy>2.3.4</version.tank-proxy>
+        <version.tank-proxy>3.0.0</version.tank-proxy>
         <!-- Baseline Jenkins version you use to build and test the plugin. Users
     must have this version or newer to run. -->
         <jenkins.version>2.97</jenkins.version>
diff --git a/tools/pom.xml b/tools/pom.xml
index 6d8bfa785..c25e40916 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>tools-parent</artifactId>
diff --git a/tools/script_engine/pom.xml b/tools/script_engine/pom.xml
index ca1bd7c15..f286283a5 100644
--- a/tools/script_engine/pom.xml
+++ b/tools/script_engine/pom.xml
@@ -6,7 +6,7 @@
  <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tools-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>script-engine</artifactId>
diff --git a/tools/script_filter/pom.xml b/tools/script_filter/pom.xml
index c7a775291..0a9d02dc5 100755
--- a/tools/script_filter/pom.xml
+++ b/tools/script_filter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tools-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>script-filter</artifactId>
@@ -26,7 +26,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>script-client</artifactId>
       <version>${project.version}</version>
-
       <exclusions>
         <exclusion>
 	      <groupId>org.hibernate</groupId>
@@ -41,13 +40,9 @@
 	      <artifactId>picketlink</artifactId>
         </exclusion>
         <exclusion>
-	      <groupId>com.amazonaws</groupId>
-	      <artifactId>aws-java-sdk-ec2</artifactId>
+	      <groupId>software.amazon.awssdk</groupId>
+	      <artifactId>*</artifactId>
         </exclusion>
-        <exclusion>
-	      <groupId>com.amazonaws</groupId>
-	      <artifactId>aws-java-sdk-s3</artifactId>
-		    </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/tools/script_filter/src/main/java/com/intuit/tank/tools/script/ScriptFilterRunner.java b/tools/script_filter/src/main/java/com/intuit/tank/tools/script/ScriptFilterRunner.java
index 11f9177ee..8078b42d9 100644
--- a/tools/script_filter/src/main/java/com/intuit/tank/tools/script/ScriptFilterRunner.java
+++ b/tools/script_filter/src/main/java/com/intuit/tank/tools/script/ScriptFilterRunner.java
@@ -410,7 +410,7 @@ protected void saveScript(File selectedFile) {
      * 
      */
     protected void saveXml() {
-        try (Writer fw = new OutputStreamWriter(new FileOutputStream(xmlFile), "UTF-8")) {
+        try (Writer fw = new OutputStreamWriter(new FileOutputStream(xmlFile), StandardCharsets.UTF_8)) {
             // fw = new FileWriter(xmlFile);
             JAXBContext ctx = JAXBContext.newInstance(ScriptTO.class.getPackage().getName());
             Marshaller marshaller = ctx.createMarshaller();
@@ -479,6 +479,7 @@ private void loadTSXml(File selectedFile) {
             saveBT.setEnabled(true);
         } catch (JAXBException | ParserConfigurationException | SAXException | FileNotFoundException e) {
             JOptionPane.showMessageDialog(this, e.getMessage(), "Error reading file", JOptionPane.ERROR_MESSAGE);
+            e.printStackTrace();
         }
     }
 
diff --git a/tools/script_filter/src/main/java/com/intuit/tank/tools/script/SelectDialog.java b/tools/script_filter/src/main/java/com/intuit/tank/tools/script/SelectDialog.java
index 215660e99..bd35e1ade 100644
--- a/tools/script_filter/src/main/java/com/intuit/tank/tools/script/SelectDialog.java
+++ b/tools/script_filter/src/main/java/com/intuit/tank/tools/script/SelectDialog.java
@@ -16,6 +16,8 @@
  * #L%
  */
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -23,6 +25,8 @@
 import java.awt.Frame;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.List;
@@ -33,6 +37,8 @@
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 
 /**
@@ -45,9 +51,12 @@ public class SelectDialog<SELECTION_TYPE extends Object> extends JDialog {
 
     private static final long serialVersionUID = 1L;
 
+    private JTextField filterField;
     private JList list;
     private JButton okBT;
     private SELECTION_TYPE selectedObject;
+    private List<SELECTION_TYPE> externalScripts;
+    private long timeClicked;
 
     /**
      * @param f
@@ -55,7 +64,10 @@ public class SelectDialog<SELECTION_TYPE extends Object> extends JDialog {
      */
     public SelectDialog(Frame f, List<SELECTION_TYPE> externalScripts) {
         super(f, true);
+        this.externalScripts = externalScripts;
         setLayout(new BorderLayout());
+        filterField = new JTextField();
+        filterField.addKeyListener(new KeyHandler());
         list = new JList(externalScripts.toArray());
         list.addListSelectionListener( (ListSelectionEvent e) -> okBT.setEnabled(list.getSelectedIndex() != -1));
         list.addMouseListener(new MouseAdapter() {
@@ -74,6 +86,7 @@ public void mouseClicked(MouseEvent e) {
         add(new JLabel("Select a script."), BorderLayout.NORTH);
 
         JScrollPane sp = new JScrollPane(list);
+        add(filterField, BorderLayout.NORTH);
         add(sp, BorderLayout.CENTER);
         add(createButtonPanel(), BorderLayout.SOUTH);
         setSize(new Dimension(400, 500));
@@ -125,4 +138,39 @@ private void select() {
         }
     }
 
+    public void filter(final long timeValue) {
+        new Thread( () -> {
+            try {
+                Thread.sleep(200);
+                if (timeValue == timeClicked) {
+                    SwingUtilities.invokeLater( () -> {
+                        list.setListData(externalScripts.stream().filter(obj -> StringUtils.isBlank(filterField.getText())
+                                || StringUtils.containsIgnoreCase(obj.toString(), filterField.getText()
+                                .trim())).toArray());
+                        list.repaint();
+                    });
+                } else {
+                    System.out.println("skipping...");
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
+
+    class KeyHandler extends KeyAdapter {
+
+        public void keyPressed(KeyEvent evt) {
+            if (evt.getKeyCode() == KeyEvent.VK_ESCAPE) {
+                setVisible(false);
+            }
+        }
+
+        @Override
+        public void keyTyped(KeyEvent arg0) {
+            timeClicked = System.currentTimeMillis();
+            filter(timeClicked);
+        }
+    }
+
 }
diff --git a/tools/script_filter_pkg/pom.xml b/tools/script_filter_pkg/pom.xml
index f38cad25d..be8cc651a 100644
--- a/tools/script_filter_pkg/pom.xml
+++ b/tools/script_filter_pkg/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tools-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>script-filter-package</artifactId>
@@ -21,6 +21,11 @@
       <artifactId>script-filter</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
 
diff --git a/web/pom.xml b/web/pom.xml
index a124323e2..8655679fe 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>tank-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>web-parent</artifactId>
diff --git a/web/web_support/pom.xml b/web/web_support/pom.xml
index 25785080b..9704d8c8b 100644
--- a/web/web_support/pom.xml
+++ b/web/web_support/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>web-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>web-support</artifactId>
@@ -149,5 +149,17 @@
       <artifactId>validation-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.6</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
   </dependencies>
 </project>
diff --git a/web/web_support/src/main/java/com/intuit/tank/admin/UserLoader.java b/web/web_support/src/main/java/com/intuit/tank/admin/UserLoader.java
index b7aa98bcf..00d644943 100644
--- a/web/web_support/src/main/java/com/intuit/tank/admin/UserLoader.java
+++ b/web/web_support/src/main/java/com/intuit/tank/admin/UserLoader.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
 
diff --git a/web/web_support/src/main/java/com/intuit/tank/auth/TankAuthenticator.java b/web/web_support/src/main/java/com/intuit/tank/auth/TankAuthenticator.java
index d18573b3e..1e98ae845 100644
--- a/web/web_support/src/main/java/com/intuit/tank/auth/TankAuthenticator.java
+++ b/web/web_support/src/main/java/com/intuit/tank/auth/TankAuthenticator.java
@@ -18,6 +18,7 @@
 
 import java.io.Serializable;
 
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.faces.context.FacesContext;
@@ -26,6 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 import com.amazonaws.xray.AWSXRay;
+import com.intuit.tank.service.InitializeEnvironment;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -60,14 +62,17 @@ public class TankAuthenticator extends BaseAuthenticator implements Serializable
 
     private static final Logger LOG = LogManager.getLogger(TankAuthenticator.class);
 
+    @Inject
+    private InitializeEnvironment initializeEnvironment;
+
     @Inject
     private Identity identity;
     
     @Inject
-    IdentityManager identityManager;
+    private IdentityManager identityManager;
     
     @Inject
-    RelationshipManager relationshipManager;
+    private RelationshipManager relationshipManager;
 
     @Inject
     private DefaultLoginCredentials credentials;
@@ -81,6 +86,11 @@ public class TankAuthenticator extends BaseAuthenticator implements Serializable
 
     private String uri;
 
+    @PostConstruct
+    public void init() {
+        initializeEnvironment.ping();
+    }
+
     public void authenticate() {
         
         if (credentials.getUserId() == null || credentials.getPassword() == null) {
diff --git a/web/web_support/src/main/java/com/intuit/tank/job/ActJobNodeBean.java b/web/web_support/src/main/java/com/intuit/tank/job/ActJobNodeBean.java
index be858b394..121ee638b 100644
--- a/web/web_support/src/main/java/com/intuit/tank/job/ActJobNodeBean.java
+++ b/web/web_support/src/main/java/com/intuit/tank/job/ActJobNodeBean.java
@@ -136,12 +136,7 @@ public List<VMNodeBean> getSubNodes() {
 
     @Override
     public boolean hasSubNodes() {
-        if (vmBeans.size() > 0) {
-            return true;
-        }
-        else {
-            return false;
-        }
+        return vmBeans.size() > 0;
     }
 
     @Override
diff --git a/web/web_support/src/main/java/com/intuit/tank/project/ProjectLoader.java b/web/web_support/src/main/java/com/intuit/tank/project/ProjectLoader.java
index 2ce80a89b..3cd80231d 100644
--- a/web/web_support/src/main/java/com/intuit/tank/project/ProjectLoader.java
+++ b/web/web_support/src/main/java/com/intuit/tank/project/ProjectLoader.java
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.Dependent;
 import javax.enterprise.event.Observes;
 import javax.faces.model.SelectItem;
diff --git a/web/web_support/src/main/java/com/intuit/tank/script/LogicTestData.java b/web/web_support/src/main/java/com/intuit/tank/script/LogicTestData.java
index 80cf153ec..6bf9e6500 100644
--- a/web/web_support/src/main/java/com/intuit/tank/script/LogicTestData.java
+++ b/web/web_support/src/main/java/com/intuit/tank/script/LogicTestData.java
@@ -17,7 +17,6 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
diff --git a/web/web_support/src/main/java/com/intuit/tank/script/ScriptBean.java b/web/web_support/src/main/java/com/intuit/tank/script/ScriptBean.java
index 9dcd70993..f847270c5 100644
--- a/web/web_support/src/main/java/com/intuit/tank/script/ScriptBean.java
+++ b/web/web_support/src/main/java/com/intuit/tank/script/ScriptBean.java
@@ -23,7 +23,6 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import com.amazonaws.xray.AWSXRay;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/web/web_support/src/main/java/com/intuit/tank/script/TankXmlUploadBean.java b/web/web_support/src/main/java/com/intuit/tank/script/TankXmlUploadBean.java
index edaa20607..9463c2eeb 100644
--- a/web/web_support/src/main/java/com/intuit/tank/script/TankXmlUploadBean.java
+++ b/web/web_support/src/main/java/com/intuit/tank/script/TankXmlUploadBean.java
@@ -23,12 +23,6 @@
 import javax.enterprise.event.Event;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.sax.SAXSource;
 
 import com.intuit.tank.script.util.ScriptServiceUtil;
 import org.apache.commons.io.IOUtils;
@@ -40,7 +34,6 @@
 import org.picketlink.idm.model.basic.User;
 import org.primefaces.event.FileUploadEvent;
 import org.primefaces.model.file.UploadedFile;
-import org.xml.sax.InputSource;
 
 import com.intuit.tank.ModifiedScriptMessage;
 import com.intuit.tank.api.model.v1.script.ScriptTO;
@@ -51,9 +44,6 @@
 import com.intuit.tank.qualifier.Modified;
 import com.intuit.tank.util.UploadedFileIterator;
 import com.intuit.tank.wrapper.FileInputStreamWrapper;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
 
 @Named
 @RequestScoped
@@ -109,50 +99,36 @@ public void clearDialog() {
         messages.clear();
     }
 
-    public void processScript(InputStream inputStream, String fileName) {
-        try {
-            ScriptDao dao = new ScriptDao();
-            
-            //Source: https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Prevention_Cheat_Sheet#Unmarshaller
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            spf.setFeature("http://xml.org/sax/features/external-general-entities", false);
-            spf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-            spf.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
-            
-            Source xmlSource = new SAXSource(spf.newSAXParser().getXMLReader(), new InputSource(inputStream));
-            
-            JAXBContext ctx = JAXBContext.newInstance(ScriptTO.class.getPackage().getName());
-            ScriptTO scriptTo = (ScriptTO) ctx.createUnmarshaller().unmarshal(xmlSource);
-            Script script = ScriptServiceUtil.transferObjectToScript(scriptTo);
-            if (script.getId() > 0) {
-                Script existing = dao.findById(script.getId());
-                if (existing == null) {
-                    LOG.error("Error updating script: Script passed with unknown id.");
-                    messages.error("Script " + fileName + " passed with unknown id.");
-                    return;
-                }
-                if (!existing.getName().equals(script.getName())) {
-                    LOG.error("Error updating script: Cannot change the name of an existing Script.");
-                    messages.error("Cannot change the name of an existing script.");
-                    return;
-                }
-                if (!security.isAdmin() && !security.isOwner(script)) {
-                    LOG.error("Error updating script: Cannot change the name of an existing Script.");
-                    messages.error("You do not have rights to modify " + script.getName() + ".");
-                    return;
-                }
-            } else {
-                script.setCreator(identityManager.lookupById(User.class, identity.getAccount().getId()).getLoginName());
+    private void processScript(InputStream inputStream, String fileName) {
+        ScriptDao dao = new ScriptDao();
+
+        ScriptTO scriptTo = ScriptServiceUtil.parseXMLtoScriptTO(inputStream);
+        Script script = ScriptServiceUtil.transferObjectToScript(scriptTo);
+        if (script.getId() > 0) {
+            Script existing = dao.findById(script.getId());
+            if (existing == null) {
+                LOG.error("Error updating script: Script passed with unknown id.");
+                messages.error("Script " + fileName + " passed with unknown id.");
+                return;
+            }
+            if (!existing.getName().equals(script.getName())) {
+                LOG.error("Error updating script: Cannot change the name of an existing Script.");
+                messages.error("Cannot change the name of an existing script.");
+                return;
+            }
+            if (!security.isAdmin() && !security.isOwner(script)) {
+                LOG.error("Error updating script: Cannot change the name of an existing Script.");
+                messages.error("You do not have rights to modify " + script.getName() + ".");
+                return;
             }
-            script = dao.saveOrUpdate(script);
-            LOG.info("Script " + script.getName() + " from file " + fileName + " has been added.");
-            messages.info("Script " + script.getName() + " from file " + fileName + " has been added.");
-            scriptEvent.fire(new ModifiedScriptMessage(script, this));
-        } catch (ParserConfigurationException | JAXBException | SAXException e) {
-            LOG.error("Error unmarshalling script: " + e.getMessage() + " from file " + fileName, e);
-            messages.error("Error unmarshalling script: " + e.toString() + " from file " + fileName);
+            script.setSerializedScriptStepId(existing.getSerializedScriptStepId());
+        } else {
+            script.setCreator(identityManager.lookupById(User.class, identity.getAccount().getId()).getLoginName());
         }
+        script = dao.saveOrUpdate(script);
+        LOG.info("Script " + script.getName() + " from file " + fileName + " has been added.");
+        messages.info("Script " + script.getName() + " from file " + fileName + " has been added.");
+        scriptEvent.fire(new ModifiedScriptMessage(script, this));
     }
 
     public boolean isUseFlash() {
diff --git a/web/web_support/src/main/java/com/intuit/tank/service/InitializeEnvironment.java b/web/web_support/src/main/java/com/intuit/tank/service/InitializeEnvironment.java
index 5425ffa17..04d706f12 100644
--- a/web/web_support/src/main/java/com/intuit/tank/service/InitializeEnvironment.java
+++ b/web/web_support/src/main/java/com/intuit/tank/service/InitializeEnvironment.java
@@ -45,10 +45,10 @@ public class InitializeEnvironment {
 
     @Inject
     private TankConfig tankConfig;
-    
+
     @Inject
     private PartitionManager partitionManager;
-    
+
     private IdentityManager identityManager;
     
     boolean initialize = false;
@@ -111,6 +111,7 @@ private void createDefaultGroups() {
                 LOG.error("Error creating default Group: " + e, e);
             }
         }
-
     }
+
+    public void ping() {}
 }
diff --git a/web/web_support/src/test/java/com/intuit/tank/project/JobDetailFormatterTest.java b/web/web_support/src/test/java/com/intuit/tank/project/JobDetailFormatterTest.java
index 99248621a..078ec0634 100644
--- a/web/web_support/src/test/java/com/intuit/tank/project/JobDetailFormatterTest.java
+++ b/web/web_support/src/test/java/com/intuit/tank/project/JobDetailFormatterTest.java
@@ -83,8 +83,8 @@ public void getSimulationTime() {
 
     @Test
     public void getVmDetails() {
-        String vmDetails = JobDetailFormatter.getVmDetails(new TankConfig(), "c3.xlarge");
-        assertEquals(vmDetails, "c3.xlarge (cpus=4 ecus=14 memory=7.5 cost=$0.21 per hour)");
+        String vmDetails = JobDetailFormatter.getVmDetails(new TankConfig(), "c5.xlarge");
+        assertEquals("c5.xlarge (cpus=4 ecus=16 memory=8.0 cost=$0.17 per hour)", vmDetails);
     }
 
     /**
diff --git a/web/web_ui/enunciate.xml b/web/web_ui/enunciate.xml
index cf7e1f713..dd33df567 100644
--- a/web/web_ui/enunciate.xml
+++ b/web/web_ui/enunciate.xml
@@ -15,8 +15,10 @@
   		<application path="/rest"/>
   	</jaxrs>
     <c disabled="true" />
+    <c-xml-client disable="true"/>
     <obj-c disabled="true" />
     <csharp disabled="true" />
+    <csharp-xml-client disabled="true"/>
     <jaxws-client disabled="true" />
     <java-client disabled="false" generateJsonJar="true" />
     
diff --git a/web/web_ui/pom.xml b/web/web_ui/pom.xml
index fce79a9b2..82a553dea 100644
--- a/web/web_ui/pom.xml
+++ b/web/web_ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.intuit.tank</groupId>
     <artifactId>web-parent</artifactId>
-    <version>2.3.4</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>tank</artifactId>
@@ -252,8 +252,8 @@
     </dependency>
 
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-cloudwatchmetrics</artifactId>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>cloudwatch</artifactId>
       <scope>runtime</scope>
     </dependency>